+
- Walk Leader{{!display.shouldShowFullDetails(displayedWalk) && displayedWalk.walk.displayName ? " is " + displayedWalk.walk.displayName : ""}}
+ {{ display.isWalk(displayedWalk.walk) ? 'Walk Leader' : (display.eventTypeTitle(displayedWalk.walk) + " Organiser") }}{{ !display.shouldShowFullDetails(displayedWalk) && displayedWalk.walk.displayName ? " is " + displayedWalk.walk.displayName : "" }}
{{displayedWalk?.latestEventType?.description || 'no description'}}
diff --git a/projects/ngx-ramblers/src/app/pages/walks/walk-view/walk-view.ts b/projects/ngx-ramblers/src/app/pages/walks/walk-view/walk-view.ts
index 26d80e6..3e46bcf 100644
--- a/projects/ngx-ramblers/src/app/pages/walks/walk-view/walk-view.ts
+++ b/projects/ngx-ramblers/src/app/pages/walks/walk-view/walk-view.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from "@angular/core";
+import { Component, inject, Input, OnDestroy, OnInit } from "@angular/core";
import { SafeResourceUrl } from "@angular/platform-browser";
import { NgxLoggerLevel } from "ngx-logger";
import { Subscription } from "rxjs";
@@ -8,7 +8,7 @@ import { LoginResponse } from "../../../models/member.model";
import { DisplayedWalk, MapDisplay, Walk } from "../../../models/walk.model";
import { DateUtilsService } from "../../../services/date-utils.service";
import { GoogleMapsService } from "../../../services/google-maps.service";
-import { Logger, LoggerFactory } from "../../../services/logger-factory.service";
+import { LoggerFactory } from "../../../services/logger-factory.service";
import { MeetupService } from "../../../services/meetup.service";
import { MemberLoginService } from "../../../services/member/member-login.service";
import { AlertInstance, NotifierService } from "../../../services/notifier.service";
@@ -18,6 +18,7 @@ import { WalkDisplayService } from "../walk-display.service";
import { SystemConfigService } from "../../../services/system/system-config.service";
import { SystemConfig } from "../../../models/system.model";
import { WalksQueryService } from "../../../services/walks/walks-query.service";
+import { StringUtilsService } from "../../../services/string-utils.service";
@Component({
selector: "app-walk-view",
@@ -113,9 +114,10 @@ import { WalksQueryService } from "../../../services/walks/walks-query.service";
+ elementName="This {{display.eventTypeTitle(displayedWalk.walk)}}">
@@ -200,49 +202,41 @@ import { WalksQueryService } from "../../../services/walks/walks-query.service";
`,
styleUrls: ["./walk-view.sass"],
- changeDetection: ChangeDetectionStrategy.Default
})
export class WalkViewComponent implements OnInit, OnDestroy {
-
- @Input("displayedWalk") set init(displayedWalk: DisplayedWalk) {
- this.applyWalk(displayedWalk);
- }
-
- constructor(
- public walksQueryService: WalksQueryService,
- private walksService: WalksService,
- public googleMapsService: GoogleMapsService,
- private authService: AuthService,
- private memberLoginService: MemberLoginService,
- public display: WalkDisplayService,
- private dateUtils: DateUtilsService,
- public meetupService: MeetupService,
- private urlService: UrlService,
- private systemConfigService: SystemConfigService,
- private notifierService: NotifierService,
- loggerFactory: LoggerFactory) {
- this.logger = loggerFactory.createLogger("WalkViewComponent", NgxLoggerLevel.OFF);
- }
-
public walkIdOrPath: string;
public pathContainsWalkId: boolean;
public displayedWalk: DisplayedWalk;
public displayLinks: boolean;
public fromPostcode = "";
public mapDisplay: MapDisplay = MapDisplay.SHOW_START_POINT;
- private logger: Logger;
public allowWalkAdminEdits: boolean;
public googleMapsUrl: SafeResourceUrl;
public loggedIn: boolean;
private subscriptions: Subscription[] = [];
- private notify: AlertInstance;
public notifyTarget: AlertTarget = {};
-
protected readonly ALERT_WARNING = ALERT_WARNING;
+ public walksQueryService = inject(WalksQueryService);
+ private walksService = inject(WalksService);
+ public googleMapsService = inject(GoogleMapsService);
+ private authService = inject(AuthService);
+ private memberLoginService = inject(MemberLoginService);
+ public display = inject(WalkDisplayService);
+ private dateUtils = inject(DateUtilsService);
+ public meetupService = inject(MeetupService);
+ private urlService = inject(UrlService);
+ protected stringUtils = inject(StringUtilsService);
+ private systemConfigService = inject(SystemConfigService);
+ private notifierService = inject(NotifierService);
+ private logger = inject(LoggerFactory).createLogger("WalkViewComponent", NgxLoggerLevel.OFF);
+ private notify: AlertInstance = this.notifierService.createAlertInstance(this.notifyTarget);
+
+ @Input("displayedWalk") set init(displayedWalk: DisplayedWalk) {
+ this.applyWalk(displayedWalk);
+ }
ngOnInit() {
- this.notify = this.notifierService.createAlertInstance(this.notifyTarget);
this.loggedIn = this.memberLoginService.memberLoggedIn();
this.allowWalkAdminEdits = this.memberLoginService.allowWalkAdminEdits();
this.refreshHomePostcode();
@@ -270,10 +264,6 @@ export class WalkViewComponent implements OnInit, OnDestroy {
this.logger.info("event received:", config);
this.updateGoogleMap();
});
- this.notify.success({
- title: "Single walk showing",
- message: " - "
- });
}
ngOnDestroy(): void {
@@ -285,6 +275,7 @@ export class WalkViewComponent implements OnInit, OnDestroy {
this.walksService.getByIdIfPossible(this.walkIdOrPath)
.then((walk: Walk) => {
if (walk) {
+ this.logger.info("Walk found:", walk);
this.applyWalk(this.display.toDisplayedWalk(walk));
} else {
this.logger.warn("Walk not found:", this.walkIdOrPath)
@@ -303,6 +294,10 @@ export class WalkViewComponent implements OnInit, OnDestroy {
this.displayLinks = !!(this.displayedWalk.walk.meetupEventUrl || this.displayedWalk.walk.osMapsRoute || this.displayedWalk.walk.osMapsRoute || this.displayedWalk.walk.ramblersWalkId || this.displayedWalk.walkLink);
this.updateGoogleMap();
}
+ this.notify.success({
+ title: `Single ${this.display.eventTypeTitle(this.displayedWalk?.walk)} showing`,
+ message: " - "
+ });
}
updateGoogleMap() {
diff --git a/projects/ngx-ramblers/src/app/services/committee/committee-query.service.ts b/projects/ngx-ramblers/src/app/services/committee/committee-query.service.ts
index 9da03e4..6f343dc 100644
--- a/projects/ngx-ramblers/src/app/services/committee/committee-query.service.ts
+++ b/projects/ngx-ramblers/src/app/services/committee/committee-query.service.ts
@@ -92,7 +92,7 @@ export class CommitteeQueryService {
.then(walks => walks?.forEach(walk => events.push({
id: walk.id,
selected: true,
- eventType: GroupEventTypes.WALK,
+ eventType: this.display.groupEventType(walk),
eventDate: walk.walkDate,
eventTime: walk.startTime,
distance: walk.distance,
diff --git a/projects/ngx-ramblers/src/app/services/walks/ramblers-walks-and-events.service.ts b/projects/ngx-ramblers/src/app/services/walks/ramblers-walks-and-events.service.ts
index 86aa4d4..9457be7 100644
--- a/projects/ngx-ramblers/src/app/services/walks/ramblers-walks-and-events.service.ts
+++ b/projects/ngx-ramblers/src/app/services/walks/ramblers-walks-and-events.service.ts
@@ -9,9 +9,11 @@ import { ApiResponse } from "../../models/api-response.model";
import { Member } from "../../models/member.model";
import { RamblersUploadAuditApiResponse } from "../../models/ramblers-upload-audit.model";
import {
+ EventsListRequest,
GroupListRequest,
GroupWalk,
Metadata,
+ RamblersEventType,
RamblersGroupsApiResponse,
RamblersGroupsApiResponseApiResponse,
RamblersWalkResponse,
@@ -20,7 +22,6 @@ import {
RamblersWalksRawApiResponseApiResponse,
RamblersWalksUploadRequest,
WalkLeader,
- WalkListRequest,
WALKS_MANAGER_API_DATE_FORMAT,
WALKS_MANAGER_CSV_DATE_FORMAT,
WALKS_MANAGER_GO_LIVE_DATE,
@@ -68,16 +69,6 @@ import { sortBy } from "../../functions/arrays";
providedIn: "root"
})
export class RamblersWalksAndEventsService {
- private readonly logger: Logger;
- private auditSubject = new ReplaySubject
();
- private walkLeadersSubject = new ReplaySubject();
- private walksSubject = new ReplaySubject();
- private rawWalksSubject = new ReplaySubject();
- private groupsSubject = new ReplaySubject();
- private committeeReferenceData: CommitteeReferenceData;
- private ramblers: Ramblers;
- private BASE_URL = "/api/ramblers/walks-manager";
- private NEAREST_TOWN_PREFIX = "Nearest Town is ";
constructor(private http: HttpClient,
private riskAssessmentService: RiskAssessmentService,
@@ -103,6 +94,18 @@ export class RamblersWalksAndEventsService {
}
+ private readonly logger: Logger;
+ private auditSubject = new ReplaySubject();
+ private walkLeadersSubject = new ReplaySubject();
+ private walksSubject = new ReplaySubject();
+ private rawWalksSubject = new ReplaySubject();
+ private groupsSubject = new ReplaySubject();
+ private committeeReferenceData: CommitteeReferenceData;
+ private ramblers: Ramblers;
+ private BASE_URL = "/api/ramblers/walks-manager";
+ private NEAREST_TOWN_PREFIX = "Nearest Town is ";
+
+
static areMongoIdsSupplied(response: any): response is MongoIdsSupplied {
return (response as MongoIdsSupplied)?._id?.$in !== undefined;
}
@@ -131,7 +134,7 @@ export class RamblersWalksAndEventsService {
this.logger.debug("queryWalkLeaders:");
const date = WALKS_MANAGER_GO_LIVE_DATE;
const dateEnd = this.dateUtils.asMoment().add(2, "month").format(WALKS_MANAGER_API_DATE_FORMAT);
- const body: WalkListRequest = {date, dateEnd, limit: 2000};
+ const body: EventsListRequest = {types: [RamblersEventType.GROUP_WALK], date, dateEnd, limit: 2000};
this.logger.off("queryWalkLeaders:body:", body);
const apiResponse = await this.commonDataService.responseFrom(this.logger, this.http.post(`${this.BASE_URL}/walk-leaders`, body), this.walkLeadersSubject);
return apiResponse.response;
@@ -155,7 +158,7 @@ export class RamblersWalksAndEventsService {
}
async listRamblersWalks(): Promise {
- const apiResponse = await this.commonDataService.responseFrom(this.logger, this.http.post(`${this.BASE_URL}/list-walks`, {}), this.walksSubject);
+ const apiResponse = await this.commonDataService.responseFrom(this.logger, this.http.post(`${this.BASE_URL}/list-events`, {}), this.walksSubject);
this.logger.off("received", apiResponse);
return apiResponse.response;
}
@@ -167,9 +170,18 @@ export class RamblersWalksAndEventsService {
const sort = isEqual(dataQueryOptions?.sort, WalkDateDescending) || isEqual(dataQueryOptions?.sort, WalkDateAscending) ? "date" : "date";
const date = usedIds.length > 0 ? null : this.createStartDate(dataQueryOptions?.criteria);
const dateEnd = usedIds.length > 0 ? null : this.createEndDate(dataQueryOptions?.criteria);
- const body: WalkListRequest = {date, dateEnd, order, sort, rawData: true, limit: 200, ids: usedIds};
+ const body: EventsListRequest = {
+ types: [RamblersEventType.GROUP_WALK, RamblersEventType.GROUP_EVENT, RamblersEventType.WELLBEING_WALK],
+ date,
+ dateEnd,
+ order,
+ sort,
+ rawData: true,
+ limit: 300,
+ ids: usedIds
+ };
this.logger.off("listRamblersWalksRawData:dataQueryOptions:", dataQueryOptions, "ids:", ids, "usedIds:", usedIds, "body:", body);
- const rawData = await this.commonDataService.responseFrom(this.logger, this.http.post(`${this.BASE_URL}/list-walks`, body), this.rawWalksSubject);
+ const rawData = await this.commonDataService.responseFrom(this.logger, this.http.post(`${this.BASE_URL}/list-events`, body), this.rawWalksSubject);
return rawData.response;
}
@@ -492,25 +504,25 @@ export class RamblersWalksAndEventsService {
return this.listRamblersWalksRawData(dataQueryOptions)
.then((ramblersWalksRawApiResponse: RamblersWalksRawApiResponse) => ramblersWalksRawApiResponse.data.map(remoteWalk => this.toWalk(remoteWalk)));
}
-
toWalk(groupWalk: GroupWalk): Walk {
const startMoment = this.dateUtils.asMoment(groupWalk.start_date_time);
const contactName = groupWalk?.walk_leader?.name;
const displayName = this.memberNamingService.createDisplayNameFromContactName(contactName);
const walk: Walk = {
+ eventType: groupWalk.item_type,
media: groupWalk.media,
ascent: groupWalk.ascent_feet?.toString(),
briefDescriptionAndStartPoint: groupWalk.title,
config: {meetup: null},
- contactEmail: groupWalk?.walk_leader?.email_form,
+ contactEmail: groupWalk?.walk_leader?.email_form || groupWalk?.event_organiser?.email_form,
contactId: "n/a",
contactName,
- contactPhone: groupWalk?.walk_leader?.telephone,
+ contactPhone: groupWalk?.walk_leader?.telephone || groupWalk?.event_organiser?.telephone,
displayName,
- distance: `${groupWalk?.distance_miles} miles`,
+ distance: groupWalk?.distance_miles ? `${groupWalk?.distance_miles} miles` : "",
events: [],
grade: groupWalk.difficulty?.description,
- gridReference: groupWalk.start_location?.grid_reference_8,
+ gridReference: groupWalk.start_location?.grid_reference_8 || groupWalk.location.grid_reference_8,
gridReferenceFinish: groupWalk.end_location?.grid_reference_8,
id: groupWalk.id,
location: null,
@@ -522,7 +534,7 @@ export class RamblersWalksAndEventsService {
nearestTown: groupWalk.start_location?.description?.replace(this.NEAREST_TOWN_PREFIX, ""),
osMapsRoute: null,
osMapsTitle: null,
- postcode: groupWalk.start_location?.postcode,
+ postcode: groupWalk.start_location?.postcode || groupWalk.location.postcode,
postcodeFinish: groupWalk.end_location?.postcode,
ramblersPublish: false,
ramblersWalkId: groupWalk.id,
@@ -540,7 +552,8 @@ export class RamblersWalksAndEventsService {
},
features: (groupWalk.facilities || []).concat(groupWalk.transport || []).concat(groupWalk.accessibility || []).sort(sortBy("description")),
startLocation: groupWalk.start_location?.description,
- additionalDetails: groupWalk.additional_details
+ additionalDetails: groupWalk.additional_details,
+ organiser:groupWalk?.event_organiser?.name
};
this.logger.info("groupWalk:", groupWalk, "walk:", walk, "contactName:", contactName, "displayName:", displayName);
return walk;
diff --git a/server/lib/ramblers/list-walks.ts b/server/lib/ramblers/list-events.ts
similarity index 90%
rename from server/lib/ramblers/list-walks.ts
rename to server/lib/ramblers/list-events.ts
index 4052b68..22e8995 100644
--- a/server/lib/ramblers/list-walks.ts
+++ b/server/lib/ramblers/list-events.ts
@@ -8,7 +8,7 @@ import {
RamblersWalksRawApiResponse,
RamblersWalksRawApiResponseApiResponse,
WalkLeader,
- WalkListRequest,
+ EventsListRequest,
WALKS_MANAGER_API_DATE_FORMAT,
WALKS_MANAGER_GO_LIVE_DATE
} from "../../../projects/ngx-ramblers/src/app/models/ramblers-walks-manager";
@@ -30,17 +30,18 @@ noopDebugLog.enabled = false;
debugLog.enabled = false;
export function walkLeaders(req: Request, res: Response): void {
- const body: WalkListRequest = req.body;
- debugLog("listWalks:body:", body);
+ const body: EventsListRequest = req.body;
+ debugLog("listEvents:body:", body);
systemConfig()
.then((systemConfig: SystemConfig) => {
const limit = body.limit;
const date = dateParameter(body);
const dateEnd = dateEndParameter(body);
const defaultOptions = requestDefaults.createApiRequestOptions(systemConfig);
- debugLog("listWalks:defaultOptions:", defaultOptions);
+ debugLog("listEvents:defaultOptions:", defaultOptions);
const optionalParameters = [
optionalParameter("groups", systemConfig?.group?.groupCode),
+ optionalParameter("types", body.types),
optionalParameter("limit", limit),
optionalParameter("date", date),
optionalParameter("date_end", dateEnd)]
@@ -53,7 +54,7 @@ export function walkLeaders(req: Request, res: Response): void {
protocol: defaultOptions.protocol,
headers: defaultOptions.headers,
method: "get",
- path: `/api/volunteers/walksevents?api-key=${systemConfig?.national?.walksManager?.apiKey}&types=group-walk&${optionalParameters}`
+ path: `/api/volunteers/walksevents?api-key=${systemConfig?.national?.walksManager?.apiKey}&${optionalParameters}`
},
debug: noopDebugLog,
res,
@@ -75,10 +76,10 @@ export function walkLeaders(req: Request, res: Response): void {
.catch(error => res.json(error));
}
-export function listWalks(req: Request, res: Response): void {
- const body: WalkListRequest = req.body;
+export function listEvents(req: Request, res: Response): void {
+ const body: EventsListRequest = req.body;
const rawData: boolean = body.rawData;
- debugLog("listWalks:body:", body);
+ debugLog("listEvents:body:", body);
systemConfig()
.then((systemConfig: SystemConfig) => {
const limit = body.limit;
@@ -88,9 +89,10 @@ export function listWalks(req: Request, res: Response): void {
const date = dateParameter(body);
const dateEnd = dateEndParameter(body);
const defaultOptions = requestDefaults.createApiRequestOptions(systemConfig);
- debugLog("listWalks:defaultOptions:", defaultOptions);
+ debugLog("listEvents:defaultOptions:", defaultOptions);
const optionalParameters = [
optionalParameter("groups", systemConfig?.group?.groupCode),
+ optionalParameter("types", body.types),
optionalParameter("ids", ids),
optionalParameter("limit", limit),
optionalParameter("sort", sort),
@@ -106,7 +108,7 @@ export function listWalks(req: Request, res: Response): void {
protocol: defaultOptions.protocol,
headers: defaultOptions.headers,
method: "get",
- path: `/api/volunteers/walksevents?api-key=${systemConfig?.national?.walksManager?.apiKey}&types=group-walk&${optionalParameters}`
+ path: `/api/volunteers/walksevents?api-key=${systemConfig?.national?.walksManager?.apiKey}&${optionalParameters}`
},
debug: noopDebugLog,
res,
@@ -128,7 +130,7 @@ export function listWalks(req: Request, res: Response): void {
.catch(error => res.json(error));
}
-function dateParameter(body: WalkListRequest): string {
+function dateParameter(body: EventsListRequest): string {
if (body?.ids?.length > 0) {
const dateParameter = moment(WALKS_MANAGER_GO_LIVE_DATE).tz("Europe/London").startOf("day").format(WALKS_MANAGER_API_DATE_FORMAT);
debugLog("returning dateParameter:", dateParameter, "given id request:", body.ids, "and dateEnd:", body.date);
@@ -139,7 +141,7 @@ function dateParameter(body: WalkListRequest): string {
}
}
-function dateEndParameter(body: WalkListRequest): string {
+function dateEndParameter(body: EventsListRequest): string {
if (body?.ids?.length > 0) {
const dateEndParameter = moment().tz("Europe/London").add(2, "month").format(WALKS_MANAGER_API_DATE_FORMAT);
debugLog("returning dateEndParameter:", dateEndParameter, "given id request:", body.ids, "and dateEnd:", body.dateEnd);
diff --git a/server/lib/ramblers/ramblers-routes.ts b/server/lib/ramblers/ramblers-routes.ts
index f857237..e2923b2 100644
--- a/server/lib/ramblers/ramblers-routes.ts
+++ b/server/lib/ramblers/ramblers-routes.ts
@@ -5,11 +5,11 @@ import { envConfig } from "../env-config/env-config";
import * as groups from "./list-groups";
import * as memberBulkLoad from "./member-bulk-load";
import * as ramblersWalkUpload from "./ramblers-walk-upload";
-import * as walksAndEvents from "./list-walks";
+import * as walksAndEvents from "./list-events";
const router = express.Router();
-router.post("/walks-manager/list-walks", walksAndEvents.listWalks);
+router.post("/walks-manager/list-events", walksAndEvents.listEvents);
router.post("/walks-manager/list-groups", groups.listGroups);
router.post("/walks-manager/upload-walks", authConfig.authenticate(), ramblersWalkUpload.uploadWalks);
router.post("/walks-manager/walk-leaders", authConfig.authenticate(), walksAndEvents.walkLeaders);
diff --git a/server/lib/shared/message-handlers.ts b/server/lib/shared/message-handlers.ts
index 820609f..e35223e 100644
--- a/server/lib/shared/message-handlers.ts
+++ b/server/lib/shared/message-handlers.ts
@@ -4,9 +4,15 @@ import isEmpty = require("lodash/isEmpty");
import querystring = require("querystring");
import { envConfig } from "../env-config/env-config";
import { MessageHandlerOptions } from "../../../projects/ngx-ramblers/src/app/models/server-models";
+import { isArray } from "lodash";
export function optionalParameter(key: string, value: any): string {
- return key && value ? `${key}=${value}` : "";
+ if (key && value) {
+ const appliedValue = isArray(value) ? value.join(",") : value;
+ return `${key}=${appliedValue}`;
+ } else {
+ return "";
+ }
}
function createRequestAudit(options: MessageHandlerOptions) {