@myclub_se/data-access 2.13.1 → 2.15.0

package/lib/api-models/api-activity-participant.d.ts

@@ -0,0 +1,9 @@
+export interface ApiActivityParticipant {
+    id: string;
+    activity_id: string;
+    member_id: string;
+    team_id: string;
+    member_email: string;
+    member_name: string;
+    rf_leader: boolean;
+}

package/lib/api-models/api-bookable-group.d.ts

@@ -0,0 +1,9 @@
+import { ApiBookableItem } from "./api-bookable-item";
+export interface ApiBookableGroup {
+    active: boolean;
+    club_id: string;
+    id: string;
+    name: string;
+    section_id: string | null;
+    bookable_items: Array<ApiBookableItem> | null;
+}

package/lib/api-models/api-bookable-item.d.ts

@@ -0,0 +1,12 @@
+import { ApiBookablePart } from "./api-bookable-part";
+import { ApiBookableTag } from "./api-bookable-tag";
+export interface ApiBookableItem {
+    active: boolean;
+    club_id: string;
+    group_id: string | null;
+    id: string;
+    name: string;
+    section_id: string | null;
+    tags?: Array<ApiBookableTag> | null;
+    parts?: Array<ApiBookablePart> | null;
+}

package/lib/api-models/api-bookable-part.d.ts

@@ -0,0 +1,4 @@
+export interface ApiBookablePart {
+    id: string;
+    name: string;
+}

package/lib/api-models/api-bookable-tag.d.ts

@@ -0,0 +1,7 @@
+export interface ApiBookableTag {
+    club_id: string;
+    id: string;
+    name: string;
+    section_id: string | null;
+    bookable_item_names: Array<string>;
+}

package/lib/api-models/api-booking-calendar-application-time.d.ts

@@ -8,13 +8,9 @@ export interface ApiBookingCalendarApplicationTime {
     team_id: string;
     title: string;
     readonly team_name: string;
-    location_zones_taken: number;
     applicant_comment: string | null;
     reviewer_comment: string | null;
     status: string;
-    location_part_id: string | null;
-    readonly location_part_name: string | null;
-    readonly location_id: string;
     repeat: boolean;
     activity_type_id: string | null;
     readonly color: string | null;
@@ -24,5 +20,9 @@ export interface ApiBookingCalendarApplicationTime {
     readonly slot_number_of_available_sessions: string;
     readonly slot_last_repeating_date: string;
     readonly created: string;
-    readonly location_name: string;
+    readonly bookable_name: string;
+    bookable_zones_taken: number;
+    bookable_part_id: string | null;
+    readonly bookable_part_name: string | null;
+    readonly bookable_id: string;
 }

package/lib/api-models/api-booking-calendar-slot-session.d.ts

@@ -11,13 +11,13 @@ export interface ApiBookingCalendarSlotSession {
     readonly is_overbooked: boolean;
     readonly last_repeating_date: string | null;
     readonly type: string;
-    location_zones_taken: number;
     readonly slot_index: number;
     comment: string | null;
-    location_part_id: string | null;
-    readonly location_part_name: string | null;
-    readonly location_id: string;
-    readonly location_name: string | null;
+    bookable_zones_taken: number;
+    bookable_part_id: string | null;
+    readonly bookable_part_name: string | null;
+    readonly bookable_id: string;
+    readonly bookable_name: string | null;
     readonly day: string;
     repeat: boolean;
     activity_type_id: string | null;

package/lib/api-models/api-booking-calendar-slot.d.ts

@@ -10,8 +10,8 @@ export interface ApiBookingCalendarSlot {
     end_time: string;
     group_id: string | null;
     id: string;
-    location_id: string;
-    readonly location_name: string;
+    bookable_id: string;
+    readonly bookable_name: string | null;
     readonly name: string;
     number_of_available_sessions: number;
     sessions: Array<ApiBookingCalendarSlotSession> | null;

package/lib/api-models/api-booking-calendar.d.ts

@@ -1,5 +1,5 @@
-import { ApiActivityLocationGroup } from "./api-activity-location-group";
 import { ApiSearchTeam } from "./api-search-team";
+import { ApiBookableGroup } from "./api-bookable-group";
 export interface ApiBookingCalendar {
     id: string;
     club_id: string;
@@ -10,7 +10,7 @@ export interface ApiBookingCalendar {
     team_id: string | null;
     readonly team_name: string | null;
     status: string;
-    location_groups: Array<ApiActivityLocationGroup> | null;
+    bookable_groups: Array<ApiBookableGroup> | null;
     available_for_teams: Array<ApiSearchTeam> | null;
     is_default: boolean;
     max_application_number: number;

package/lib/api-models/api-event.d.ts

@@ -1,4 +1,5 @@
 import { ApiMemberActivityInvite } from './api-member-activity-invite';
+import { ApiActivityParticipant } from './api-activity-participant';
 export interface ApiEvent {
     activity_id: string | null;
     activity_type: string | null;
@@ -17,6 +18,7 @@ export interface ApiEvent {
     meet_up_time: string;
     member_id: string;
     open_activity: boolean;
+    participants: Array<ApiActivityParticipant>;
     start: string;
     title: string;
     type: string;

package/lib/api-models/api-overbooked-bookable-item.d.ts

@@ -0,0 +1,7 @@
+export interface ApiOverbookedBookableItem {
+    start_time: string;
+    end_time: string;
+    day: string;
+    bookable_name: string;
+    session_names: Array<string>;
+}

package/lib/api-models/index.d.ts

@@ -5,8 +5,13 @@ export * from './api-activity-location';
 export * from './api-activity-location-group';
 export * from './api-activity-location-tag';
 export * from './api-activity-location-part';
+export * from './api-activity-participant';
 export * from './api-activity-type';
 export * from './api-auth';
+export * from './api-bookable-group';
+export * from './api-bookable-item';
+export * from './api-bookable-part';
+export * from './api-bookable-tag';
 export * from './api-booking-calendar';
 export * from './api-booking-calendar-application-time';
 export * from './api-booking-calendar-slot';
@@ -38,6 +43,7 @@ export * from './api-member-type';
 export * from './api-news';
 export * from './api-open-activity';
 export * from './api-optional-fee';
+export * from './api-overbooked-bookable-item';
 export * from './api-overbooked-location';
 export * from './api-partner';
 export * from './api-registration-qr-code';

package/lib/models/activity-location-part.d.ts

@@ -2,7 +2,7 @@ import { FormControl, FormGroup } from "@angular/forms";
 export declare class ActivityLocationPart {
     id: string;
     name: string;
-    static asFormGroup(tag?: ActivityLocationPart): FormGroup<{
+    static asFormGroup(part?: ActivityLocationPart): FormGroup<{
         id: FormControl<string | null>;
         name: FormControl<string | null>;
     }>;

package/lib/models/activity-participant.d.ts

@@ -0,0 +1,10 @@
+export declare class ActivityParticipant {
+    id: string;
+    activityId: string;
+    memberId: string;
+    teamId: string;
+    memberEmail: string;
+    memberName: string;
+    rfLeader: boolean;
+    constructor(id: string, activityId: string, memberId: string, teamId: string, memberEmail: string, memberName: string, rfLeader: boolean);
+}

package/lib/models/bookable-group.d.ts

@@ -0,0 +1,18 @@
+import { FormControl, FormGroup } from "@angular/forms";
+import { BookableItem } from "./bookable-item";
+export declare class BookableGroup {
+    id: string;
+    club_id: string;
+    section_id: string | null;
+    active: boolean;
+    name: string;
+    bookable_items: Array<BookableItem> | null;
+    static asFormGroup(bookableGroup?: BookableGroup): FormGroup<{
+        id: FormControl<string | null>;
+        club_id: FormControl<string | null>;
+        section_id: FormControl<string | null>;
+        name: FormControl<string | null>;
+        active: FormControl<boolean | null>;
+    }>;
+    constructor(id: string, club_id: string, section_id: string | null, active: boolean, name: string, bookable_items: Array<BookableItem> | null);
+}

package/lib/models/bookable-item.d.ts

@@ -0,0 +1,22 @@
+import { FormArray, FormControl, FormGroup } from "@angular/forms";
+import { BookableTag } from "./bookable-tag";
+import { BookablePart } from "./bookable-part";
+export declare class BookableItem {
+    id: string;
+    club_id: string;
+    section_id: string | null;
+    group_id: string | null;
+    active: boolean;
+    name: string;
+    tags?: BookableTag[] | null | undefined;
+    parts?: BookablePart[] | null | undefined;
+    static asFormGroup(bookable?: BookableItem): FormGroup<{
+        id: FormControl<string | null>;
+        club_id: FormControl<string | null>;
+        active: FormControl<boolean | null>;
+        group_id: FormControl<string | null>;
+        tags: FormArray<FormGroup<any>>;
+        parts: FormArray<FormGroup<any>>;
+    }>;
+    constructor(id: string, club_id: string, section_id: string | null, group_id: string | null, active: boolean, name: string, tags?: BookableTag[] | null | undefined, parts?: BookablePart[] | null | undefined);
+}

package/lib/models/bookable-part.d.ts

@@ -0,0 +1,10 @@
+import { FormControl, FormGroup } from "@angular/forms";
+export declare class BookablePart {
+    id: string;
+    name: string;
+    static asFormGroup(part?: BookablePart): FormGroup<{
+        id: FormControl<string | null>;
+        name: FormControl<string | null>;
+    }>;
+    constructor(id: string, name: string);
+}

package/lib/models/bookable-tag.d.ts

@@ -0,0 +1,13 @@
+import { FormControl, FormGroup } from "@angular/forms";
+export declare class BookableTag {
+    id: string;
+    club_id: string;
+    section_id: string | null;
+    name: string;
+    bookable_item_names: Array<string>;
+    static asFormGroup(tag?: BookableTag): FormGroup<{
+        id: FormControl<string | null>;
+        name: FormControl<string | null>;
+    }>;
+    constructor(id: string, club_id: string, section_id: string | null, name: string, bookable_item_names?: Array<string>);
+}

package/lib/models/booking-calendar-application-time.d.ts

@@ -9,13 +9,9 @@ export declare class BookingCalendarApplicationTime {
     section_name: string | null;
     start_time: string;
     team_name: string | null;
-    location_zones_taken: number;
     applicant_comment: string | null;
     reviewer_comment: string | null;
     status: string;
-    location_part_id: string | null;
-    readonly location_part_name: string | null;
-    readonly location_id: string;
     repeat: boolean;
     activity_type_id: string | null;
     readonly color: string | null;
@@ -25,7 +21,11 @@ export declare class BookingCalendarApplicationTime {
     readonly slot_number_of_available_sessions: string;
     readonly slot_last_repeating_date: string | null;
     readonly created: string;
-    readonly location_name: string;
+    bookable_zones_taken: number;
+    bookable_part_id: string | null;
+    readonly bookable_part_name: string | null;
+    readonly bookable_id: string;
+    readonly bookable_name: string | null;
     static asFormGroup(session?: BookingCalendarApplicationTime): FormGroup<{
         id: FormControl<string | null>;
         section_id: FormControl<string | null>;
@@ -36,13 +36,13 @@ export declare class BookingCalendarApplicationTime {
         section_name: FormControl<string | null>;
         start_time: FormControl<string | null>;
         team_name: FormControl<string | null>;
-        location_zones_taken: FormControl<number | null>;
         applicant_comment: FormControl<string | null>;
         reviewer_comment: FormControl<string | null>;
         status: FormControl<string | null>;
-        location_part_id: FormControl<string | null>;
         repeat: FormControl<boolean | null>;
         activity_type_id: FormControl<string | null>;
+        bookable_zones_taken: FormControl<number | null>;
+        bookable_part_id: FormControl<string | null>;
     }>;
-    constructor(id: string, section_id: string | null, slot_id: string, team_id: string | null, title: string, end_time: string, section_name: string | null, start_time: string, team_name: string | null, location_zones_taken: number, applicant_comment: string | null, reviewer_comment: string | null, status: string, location_part_id: string | null, location_part_name: string | null, location_id: string, repeat: boolean, activity_type_id: string | null, color: string | null, slot_start_time: string, slot_end_time: string, slot_day: string, slot_number_of_available_sessions: string, slot_last_repeating_date: string | null, created: string, location_name: string);
+    constructor(id: string, section_id: string | null, slot_id: string, team_id: string | null, title: string, end_time: string, section_name: string | null, start_time: string, team_name: string | null, applicant_comment: string | null, reviewer_comment: string | null, status: string, repeat: boolean, activity_type_id: string | null, color: string | null, slot_start_time: string, slot_end_time: string, slot_day: string, slot_number_of_available_sessions: string, slot_last_repeating_date: string | null, created: string, bookable_zones_taken: number, bookable_part_id: string | null, bookable_part_name: string | null, bookable_id: string, bookable_name: string | null);
 }

package/lib/models/booking-calendar-slot-session.d.ts

@@ -12,19 +12,19 @@ export declare class BookingCalendarSlotSession {
     is_overbooked: boolean;
     last_repeating_date: string | null;
     type: string;
-    location_zones_taken: number;
     readonly slot_index: number;
     comment: string | null;
-    location_part_id: string | null;
-    readonly location_part_name: string | null;
-    readonly location_name: string | null;
-    readonly location_id: string;
     readonly day: string;
     readonly repeat: boolean;
     activity_type_id: string | null;
     readonly color: string | null;
     update_repeating: boolean;
     update_until_date: string | null;
+    bookable_zones_taken: number;
+    bookable_part_id: string | null;
+    readonly bookable_part_name: string | null;
+    readonly bookable_name: string | null;
+    readonly bookable_id: string;
     static asFormGroup(session?: BookingCalendarSlotSession): FormGroup<{
         id: FormControl<string | null>;
         section_id: FormControl<string | null>;
@@ -38,13 +38,13 @@ export declare class BookingCalendarSlotSession {
         is_overbooked: FormControl<boolean | null>;
         last_repeating_date: FormControl<string | null>;
         type: FormControl<string | null>;
-        location_zones_taken: FormControl<number | null>;
         comment: FormControl<string | null>;
-        location_part_id: FormControl<string | null>;
         repeat: FormControl<boolean | null>;
         activity_type_id: FormControl<string | null>;
         update_repeating: FormControl<boolean | null>;
         update_until_date: FormControl<string | null>;
+        bookable_zones_taken: FormControl<number | null>;
+        bookable_part_id: FormControl<string | null>;
     }>;
-    constructor(id: string, section_id: string | null, slot_id: string, team_id: string | null, title: string, end_time: string, section_name: string | null, start_time: string, team_name: string | null, is_overbooked: boolean, last_repeating_date: string | null, type: string, location_zones_taken: number, slot_index: number, comment: string | null, location_part_id: string | null, location_part_name: string | null, location_name: string | null, location_id: string, day: string, repeat: boolean, activity_type_id: string | null, color: string | null, update_repeating: boolean, update_until_date?: string | null);
+    constructor(id: string, section_id: string | null, slot_id: string, team_id: string | null, title: string, end_time: string, section_name: string | null, start_time: string, team_name: string | null, is_overbooked: boolean, last_repeating_date: string | null, type: string, slot_index: number, comment: string | null, day: string, repeat: boolean, activity_type_id: string | null, color: string | null, update_repeating: boolean, update_until_date: string | null, bookable_zones_taken: number, bookable_part_id: string | null, bookable_part_name: string | null, bookable_name: string | null, bookable_id: string);
 }

package/lib/models/booking-calendar-slot.d.ts

@@ -7,12 +7,10 @@ export declare class BookingCalendarSlot {
     id: string;
     calendar_id: string;
     calendar_status: string;
-    location_id: string;
     color: string;
     day: string;
     end_time: string;
     group_id: string | null;
-    location_name: string;
     number_of_available_sessions: number;
     sessions: Array<BookingCalendarSlotSession>;
     open_sessions: Array<BookingCalendarSlotSession>;
@@ -29,10 +27,11 @@ export declare class BookingCalendarSlot {
     reserved_time_position?: BookingCalendarSlotReservedTimePosition | null | undefined;
     application_times?: BookingCalendarApplicationTime[] | null | undefined;
     last_repeating_date?: string | null | undefined;
+    bookable_name?: string | null | undefined;
+    bookable_id?: string | undefined;
     static asFormGroup(slot?: BookingCalendarSlot): FormGroup<{
         id: FormControl<string | null>;
         calendar_id: FormControl<string | null>;
-        location_id: FormControl<string | null>;
         day: FormControl<string | null>;
         end_time: FormControl<string | null>;
         group_id: FormControl<string | null>;
@@ -48,6 +47,7 @@ export declare class BookingCalendarSlot {
         reserved_time_enabled: FormControl<boolean | null>;
         reserved_time: FormControl<string | null>;
         reserved_time_position: FormControl<string | null>;
+        bookable_id: FormControl<string | null>;
     }>;
-    constructor(id: string, calendar_id: string, calendar_status: string, location_id: string, color: string, day: string, end_time: string, group_id: string | null, location_name: string, number_of_available_sessions: number, sessions: Array<BookingCalendarSlotSession>, open_sessions: Array<BookingCalendarSlotSession>, start_time: string, type: BookingCalendarSlotType, repeat: string, update_repeating: boolean, update_until_date: string | null, reserved_time_enabled: boolean, repeat_num?: number | null | undefined, repeat_to_day?: string | null | undefined, repeat_type?: string | null | undefined, reserved_time?: string | null | undefined, reserved_time_position?: BookingCalendarSlotReservedTimePosition | null | undefined, application_times?: BookingCalendarApplicationTime[] | null | undefined, last_repeating_date?: string | null | undefined);
+    constructor(id: string, calendar_id: string, calendar_status: string, color: string, day: string, end_time: string, group_id: string | null, number_of_available_sessions: number, sessions: Array<BookingCalendarSlotSession>, open_sessions: Array<BookingCalendarSlotSession>, start_time: string, type: BookingCalendarSlotType, repeat: string, update_repeating: boolean, update_until_date: string | null, reserved_time_enabled: boolean, repeat_num?: number | null | undefined, repeat_to_day?: string | null | undefined, repeat_type?: string | null | undefined, reserved_time?: string | null | undefined, reserved_time_position?: BookingCalendarSlotReservedTimePosition | null | undefined, application_times?: BookingCalendarApplicationTime[] | null | undefined, last_repeating_date?: string | null | undefined, bookable_name?: string | null | undefined, bookable_id?: string | undefined);
 }

package/lib/models/booking-calendar.d.ts

@@ -1,6 +1,6 @@
 import { FormArray, FormControl, FormGroup } from "@angular/forms";
-import { ActivityLocationGroup } from "./activity-location-group";
 import { SearchTeam } from "./search-team";
+import { BookableGroup } from "./bookable-group";
 export declare class BookingCalendar {
     id: string;
     club_id: string;
@@ -15,8 +15,8 @@ export declare class BookingCalendar {
     allow_team_export: boolean;
     allow_repeated_bookings: boolean;
     is_default: boolean;
-    location_groups?: ActivityLocationGroup[] | null | undefined;
     available_for_teams?: SearchTeam[] | null | undefined;
+    bookable_groups?: BookableGroup[] | null | undefined;
     static asFormGroup(calendar?: BookingCalendar): FormGroup<{
         id: FormControl<string | null>;
         club_id: FormControl<string | null>;
@@ -27,12 +27,12 @@ export declare class BookingCalendar {
         section_name: FormControl<string | null>;
         team_name: FormControl<string | null>;
         status: FormControl<string | null>;
-        location_groups: FormArray<FormGroup<any>>;
+        bookable_groups: FormArray<FormGroup<any>>;
         available_for_teams: FormArray<FormGroup<any>>;
         max_application_number: FormControl<number | null>;
         is_default: FormControl<boolean | null>;
         allow_team_export: FormControl<boolean | null>;
         allow_repeated_bookings: FormControl<boolean | null>;
     }>;
-    constructor(id: string, club_id: string, section_id: string | null, team_id: string | null, club_name: string, name: string, section_name: string | null, team_name: string | null, status: string | null, max_application_number: number, allow_team_export: boolean, allow_repeated_bookings: boolean, is_default: boolean, location_groups?: ActivityLocationGroup[] | null | undefined, available_for_teams?: SearchTeam[] | null | undefined);
+    constructor(id: string, club_id: string, section_id: string | null, team_id: string | null, club_name: string, name: string, section_name: string | null, team_name: string | null, status: string | null, max_application_number: number, allow_team_export: boolean, allow_repeated_bookings: boolean, is_default: boolean, available_for_teams?: SearchTeam[] | null | undefined, bookable_groups?: BookableGroup[] | null | undefined);
 }

package/lib/models/event.d.ts

@@ -1,4 +1,5 @@
 import { MemberActivityInvite } from './member-activity-invite';
+import { ActivityParticipant } from './activity-participant';
 export declare class Event {
     id: string;
     activity_id: string | null;
@@ -17,8 +18,9 @@ export declare class Event {
     meet_up_time: string;
     member_id: string;
     open_activity: boolean;
+    participants: Array<ActivityParticipant>;
     start: string;
     title: string;
     type: string;
-    constructor(id: string, activity_id: string | null, activity_type: string | null, base_background_color: string | null, base_color: string | null, base_name: string | null, calendar_name: string, description: string | null, end: string, invitation_id: string | null, invitation_response: string | null, invited_members: Array<MemberActivityInvite> | null, location: string, meet_up_place: string | null, meet_up_time: string, member_id: string, open_activity: boolean, start: string, title: string, type: string);
+    constructor(id: string, activity_id: string | null, activity_type: string | null, base_background_color: string | null, base_color: string | null, base_name: string | null, calendar_name: string, description: string | null, end: string, invitation_id: string | null, invitation_response: string | null, invited_members: Array<MemberActivityInvite> | null, location: string, meet_up_place: string | null, meet_up_time: string, member_id: string, open_activity: boolean, participants: Array<ActivityParticipant>, start: string, title: string, type: string);
 }

package/lib/models/index.d.ts

@@ -5,10 +5,15 @@ export * from './activity-location';
 export * from './activity-location-group';
 export * from './activity-location-tag';
 export * from './activity-location-part';
+export * from './activity-participant';
 export * from './activity-settings';
 export * from './activity-type';
 export * from './auth';
 export * from './authentication';
+export * from './bookable-group';
+export * from './bookable-item';
+export * from './bookable-part';
+export * from './bookable-tag';
 export * from './booking-calendar';
 export * from './booking-calendar-application-time';
 export * from './booking-calendar-slot';
@@ -42,6 +47,7 @@ export * from './member-type';
 export * from './news';
 export * from './open-activity';
 export * from './optional-fee';
+export * from './overbooked-bookable-item';
 export * from './overbooked-location';
 export * from './partner';
 export * from './public-authentication';

package/lib/models/overbooked-bookable-item.d.ts

@@ -0,0 +1,8 @@
+export declare class OverbookedBookableItem {
+    start_time: string;
+    end_time: string;
+    day: string;
+    bookable_name: string;
+    session_names: Array<string>;
+    constructor(start_time: string, end_time: string, day: string, bookable_name: string, session_names: Array<string>);
+}

package/lib/services/activity.service.d.ts

@@ -1,13 +1,11 @@
 import { ApiService } from './api.service';
-import { Activity, ActivityLocation, ActivityLocationGroup, ActivityLocationTag, ActivityType, Collection, MemberActivityInvite, Role } from '../models';
+import { Activity, ActivityLocation, ActivityType, Collection, MemberActivityInvite, Role } from '../models';
 import { OpenActivitySearchParamsInterface } from '../interfaces';
 import * as i0 from "@angular/core";
 export declare class ActivityService {
     private apiService;
     activityLocationCollection: Collection<ActivityLocation> | undefined;
-    activityTypeCollection: Collection<ActivityType> | undefined;
     activityLocationResponseDate: Date | undefined;
-    activityTypeResponseDate: Date | undefined;
     constructor(apiService: ApiService);
     addTeamActivityInvites(teamId: string, activityId: string, memberIds: Array<string>): import("rxjs").Observable<boolean>;
     createTeamActivity(teamId: string, data: Partial<Activity>): import("rxjs").Observable<Activity>;
@@ -36,34 +34,6 @@ export declare class ActivityService {
     updateClubActivityLocation(clubId: string, location: ActivityLocation): import("rxjs").Observable<ActivityLocation>;
     updateMemberActivityAttendance(memberId: string, activityId: string): import("rxjs").Observable<boolean>;
     updateSectionActivityLocation(sectionId: string, location: ActivityLocation): import("rxjs").Observable<ActivityLocation>;
-    getActivityLocationGroups(role: Role, clubOrSectionOrTeamId: string): import("rxjs").Observable<Collection<ActivityLocationGroup>>;
-    getClubActivityLocationGroups(clubId: string): import("rxjs").Observable<Collection<ActivityLocationGroup>>;
-    getSectionActivityLocationGroups(sectionId: string): import("rxjs").Observable<Collection<ActivityLocationGroup>>;
-    getTeamActivityLocationGroups(teamId: string): import("rxjs").Observable<Collection<ActivityLocationGroup>>;
-    updateActivityLocationGroup(role: Role, clubOrSectionOrTeamId: string, locationGroup: ActivityLocationGroup): import("rxjs").Observable<ActivityLocationGroup>;
-    updateClubActivityLocationGroup(clubId: string, locationGroup: ActivityLocationGroup): import("rxjs").Observable<ActivityLocationGroup>;
-    updateSectionActivityLocationGroup(sectionId: string, locationGroup: ActivityLocationGroup): import("rxjs").Observable<ActivityLocationGroup>;
-    createActivityLocationGroup(role: Role, clubOrSectionOrTeamId: string, locationGroup: Partial<ActivityLocationGroup>): import("rxjs").Observable<ActivityLocationGroup>;
-    createClubActivityLocationGroup(clubId: string, locationGroup: Partial<ActivityLocationGroup>): import("rxjs").Observable<ActivityLocationGroup>;
-    createSectionActivityLocationGroup(sectionId: string, locationGroup: Partial<ActivityLocationGroup>): import("rxjs").Observable<ActivityLocationGroup>;
-    getActivityLocationTags(role: Role, clubOrSectionOrTeamId: string): import("rxjs").Observable<Collection<ActivityLocationTag>>;
-    getClubActivityLocationTags(clubId: string): import("rxjs").Observable<Collection<ActivityLocationTag>>;
-    getSectionActivityLocationTags(sectionId: string): import("rxjs").Observable<Collection<ActivityLocationTag>>;
-    getTeamActivityLocationTags(teamId: string): import("rxjs").Observable<Collection<ActivityLocationTag>>;
-    createActivityLocationTag(role: Role, clubOrSectionOrTeamId: string, tag: Partial<ActivityLocationTag>): import("rxjs").Observable<ActivityLocationTag>;
-    createClubActivityLocationTag(clubId: string, tag: Partial<ActivityLocationTag>): import("rxjs").Observable<ActivityLocationTag>;
-    createSectionActivityLocationTag(sectionId: string, tag: Partial<ActivityLocationTag>): import("rxjs").Observable<ActivityLocationTag>;
-    createTeamActivityLocationTag(teamId: string, tag: Partial<ActivityLocationTag>): import("rxjs").Observable<ActivityLocationTag>;
-    updateActivityLocationTag(role: Role, clubOrSectionOrTeamId: string, tag: ActivityLocationTag): import("rxjs").Observable<ActivityLocationTag>;
-    updateClubActivityLocationTag(clubId: string, tag: ActivityLocationTag): import("rxjs").Observable<ActivityLocationTag>;
-    updateSectionActivityLocationTag(sectionId: string, tag: ActivityLocationTag): import("rxjs").Observable<ActivityLocationTag>;
-    deleteActivityLocationTag(role: Role, clubOrSectionOrTeamId: string, tag: ActivityLocationTag): import("rxjs").Observable<boolean>;
-    deleteClubActivityLocationTag(clubId: string, tag: ActivityLocationTag): import("rxjs").Observable<boolean>;
-    deleteSectionActivityLocationTag(sectionId: string, tag: ActivityLocationTag): import("rxjs").Observable<boolean>;
-    getActivityLocationParts(role: Role, clubOrSectionOrTeamId: string, locationId: string): import("rxjs").Observable<Collection<import("../models").ActivityLocationPart>>;
-    getClubActivityLocationParts(clubId: string, locationId: string): import("rxjs").Observable<Collection<import("../models").ActivityLocationPart>>;
-    getSectionActivityLocationParts(sectionId: string, locationId: string): import("rxjs").Observable<Collection<import("../models").ActivityLocationPart>>;
-    getTeamActivityLocationParts(teamId: string, locationId: string): import("rxjs").Observable<Collection<import("../models").ActivityLocationPart>>;
     getTeamActivityNew(teamId: string): import("rxjs").Observable<Activity>;
     getTeamActivityParticipants(teamId: string, activityId: string): import("rxjs").Observable<Collection<import("../models").SearchMember>>;
     getActivitySettings(role: Role, clubOrSectionOrTeamId: string): import("rxjs").Observable<import("../models").ActivitySettings>;

package/lib/services/bookable.service.d.ts

@@ -0,0 +1,44 @@
+import { ApiService } from './api.service';
+import { BookableGroup, BookableItem, BookableTag, Role } from '../models';
+import * as i0 from "@angular/core";
+export declare class BookableService {
+    private apiService;
+    constructor(apiService: ApiService);
+    getBookableItems(role: Role, clubOrSectionOrTeamId: string): import("rxjs").Observable<import("../models").Collection<BookableItem>>;
+    getTeamBookableItems(teamId: string): import("rxjs").Observable<import("../models").Collection<BookableItem>>;
+    getClubBookableItems(clubId: string): import("rxjs").Observable<import("../models").Collection<BookableItem>>;
+    getSectionBookableItems(sectionId: string): import("rxjs").Observable<import("../models").Collection<BookableItem>>;
+    updateBookableItem(role: Role, clubOrSectionOrTeamId: string, bookableItem: BookableItem): import("rxjs").Observable<BookableItem>;
+    updateClubBookableItem(clubId: string, bookableItem: BookableItem): import("rxjs").Observable<BookableItem>;
+    updateSectionBookableItem(sectionId: string, bookableItem: BookableItem): import("rxjs").Observable<BookableItem>;
+    getBookableGroups(role: Role, clubOrSectionOrTeamId: string): import("rxjs").Observable<import("../models").Collection<BookableGroup>>;
+    getClubBookableGroups(clubId: string): import("rxjs").Observable<import("../models").Collection<BookableGroup>>;
+    getSectionBookableGroups(sectionId: string): import("rxjs").Observable<import("../models").Collection<BookableGroup>>;
+    getTeamBookableGroups(teamId: string): import("rxjs").Observable<import("../models").Collection<BookableGroup>>;
+    updateBookableGroup(role: Role, clubOrSectionOrTeamId: string, bookableGroup: BookableGroup): import("rxjs").Observable<BookableGroup>;
+    updateClubBookableGroup(clubId: string, bookableGroup: BookableGroup): import("rxjs").Observable<BookableGroup>;
+    updateSectionBookableGroup(sectionId: string, bookableGroup: BookableGroup): import("rxjs").Observable<BookableGroup>;
+    createBookableGroup(role: Role, clubOrSectionOrTeamId: string, bookableGroup: Partial<BookableGroup>): import("rxjs").Observable<BookableGroup>;
+    createClubBookableGroup(clubId: string, bookableGroup: Partial<BookableGroup>): import("rxjs").Observable<BookableGroup>;
+    createSectionBookableGroup(sectionId: string, bookableGroup: Partial<BookableGroup>): import("rxjs").Observable<BookableGroup>;
+    getBookableTags(role: Role, clubOrSectionOrTeamId: string): import("rxjs").Observable<import("../models").Collection<BookableTag>>;
+    getClubBookableTags(clubId: string): import("rxjs").Observable<import("../models").Collection<BookableTag>>;
+    getSectionBookableTags(sectionId: string): import("rxjs").Observable<import("../models").Collection<BookableTag>>;
+    getTeamBookableTags(teamId: string): import("rxjs").Observable<import("../models").Collection<BookableTag>>;
+    createBookableTag(role: Role, clubOrSectionOrTeamId: string, tag: Partial<BookableTag>): import("rxjs").Observable<BookableTag>;
+    createClubBookableTag(clubId: string, tag: Partial<BookableTag>): import("rxjs").Observable<BookableTag>;
+    createSectionBookableTag(sectionId: string, tag: Partial<BookableTag>): import("rxjs").Observable<BookableTag>;
+    createTeamBookableTag(teamId: string, tag: Partial<BookableTag>): import("rxjs").Observable<BookableTag>;
+    updateBookableTag(role: Role, clubOrSectionOrTeamId: string, tag: BookableTag): import("rxjs").Observable<BookableTag>;
+    updateClubBookableTag(clubId: string, tag: BookableTag): import("rxjs").Observable<BookableTag>;
+    updateSectionBookableTag(sectionId: string, tag: BookableTag): import("rxjs").Observable<BookableTag>;
+    deleteBookableTag(role: Role, clubOrSectionOrTeamId: string, tag: BookableTag): import("rxjs").Observable<boolean>;
+    deleteClubBookableTag(clubId: string, tag: BookableTag): import("rxjs").Observable<boolean>;
+    deleteSectionBookableTag(sectionId: string, tag: BookableTag): import("rxjs").Observable<boolean>;
+    getBookableParts(role: Role, clubOrSectionOrTeamId: string, bookableId: string): import("rxjs").Observable<import("../models").Collection<import("../models").BookablePart>>;
+    getClubBookableParts(clubId: string, bookableId: string): import("rxjs").Observable<import("../models").Collection<import("../models").BookablePart>>;
+    getSectionBookableParts(sectionId: string, bookableId: string): import("rxjs").Observable<import("../models").Collection<import("../models").BookablePart>>;
+    getTeamBookableParts(teamId: string, bookableId: string): import("rxjs").Observable<import("../models").Collection<import("../models").BookablePart>>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<BookableService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<BookableService>;
+}

package/lib/services/booking-calendar.service.d.ts

@@ -6,14 +6,15 @@ export declare class BookingSlotFilter {
     endDate: string | null;
     calendarIds: string[] | null;
     locationIds: string[] | null;
+    bookableItemIds: string[] | null;
     tagIds: string[] | null;
     teamIds: string[] | null;
-    locationGroupIds: string[] | null;
+    bookableGroupIds: string[] | null;
     activityTypeIds: string[] | null;
     hasOpenSessions: boolean | null;
     showApplicationTimes: boolean | null;
     sortBy: string | null;
-    constructor(startDate?: string | null, endDate?: string | null, calendarIds?: string[] | null, locationIds?: string[] | null, tagIds?: string[] | null, teamIds?: string[] | null, locationGroupIds?: string[] | null, activityTypeIds?: string[] | null, hasOpenSessions?: boolean | null, showApplicationTimes?: boolean | null, sortBy?: string | null);
+    constructor(startDate?: string | null, endDate?: string | null, calendarIds?: string[] | null, locationIds?: string[] | null, bookableItemIds?: string[] | null, tagIds?: string[] | null, teamIds?: string[] | null, bookableGroupIds?: string[] | null, activityTypeIds?: string[] | null, hasOpenSessions?: boolean | null, showApplicationTimes?: boolean | null, sortBy?: string | null);
     static fromFilter(filter: BookingSlotFilter): BookingSlotFilter;
     toParams(): any;
 }
@@ -103,12 +104,12 @@ export declare class BookingCalendarService {
     private deleteClubBookingCalendarApplicationTime;
     private deleteSectionBookingCalendarApplicationTime;
     private deleteTeamBookingCalendarApplicationTime;
-    getOverbookedLocations(role: Role, clubOrSectionOrTeamId: string, bookingSlotFilter: BookingSlotFilter): import("rxjs").Observable<import("../models").Collection<import("../models").OverbookedLocation>>;
-    private getClubOverbookedLocations;
-    private getSectionOverbookedLocations;
     getOverbookedSessions(role: Role, clubOrSectionOrTeamId: string, bookingSlotFilter: BookingSlotFilter): import("rxjs").Observable<import("../models").Collection<BookingCalendarSlotSession>>;
     private getClubOverbookedSessions;
     private getSectionOverbookedSessions;
+    getOverbookedBookables(role: Role, clubOrSectionOrTeamId: string, bookingSlotFilter: BookingSlotFilter): import("rxjs").Observable<import("../models").Collection<import("../models").OverbookedBookableItem>>;
+    private getClubOverbookedBookables;
+    private getSectionOverbookedBookables;
     static ɵfac: i0.ɵɵFactoryDeclaration<BookingCalendarService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<BookingCalendarService>;
 }

package/lib/services/factories/activity-participant-factory.d.ts

@@ -0,0 +1,3 @@
+import { ApiActivityParticipant } from '../../api-models';
+import { ActivityParticipant } from '../../models';
+export declare const activityParticipantFactory: (apiActivityParticipant: ApiActivityParticipant) => ActivityParticipant;

package/lib/services/factories/bookable-group-factory.d.ts

@@ -0,0 +1,3 @@
+import { ApiBookableGroup } from "../../api-models";
+import { BookableGroup } from "../../models";
+export declare const bookableGroupFactory: (apiBookableGroup: ApiBookableGroup) => BookableGroup;

package/lib/services/factories/bookable-item-factory.d.ts

@@ -0,0 +1,3 @@
+import { ApiBookableItem } from '../../api-models';
+import { BookableItem } from '../../models';
+export declare const bookableItemFactory: (apiBookableItem: ApiBookableItem) => BookableItem;