+
[] = [
- SignageComponent,
- SignageTopbarComponent,
- SignageMediaComponent,
- SignageMediaModalComponent,
- SignagePlaylistModalComponent,
- SignageMediaListComponent,
- SignagePlaylistMediaListComponent,
-
- SignageDisplaysComponent,
- SignageDisplayModalComponent,
- SignageZonesComponent,
- SearchOverlayComponent,
- SignageItemPlaylistsComponent,
-];
-
@NgModule({
- declarations: [...COMPONENTS],
+ declarations: [],
imports: [
- CommonModule,
- FormsModule,
- UIModule,
- ComponentsModule,
+ SignageComponent,
+ SignageMediaComponent,
+ SignageDisplaysComponent,
+ SignageZonesComponent,
RouterModule.forChild(ROUTES),
- MatTabsModule,
- DragDropModule,
- ZoneSelectModalComponent,
- SignageApprovePlaylistModalComponent,
-
- SignageMediaPreviewModalComponent,
],
})
export class SignageModule {}
diff --git a/apps/concierge/src/app/signage/zone-select-modal.component.ts b/apps/concierge/src/app/signage/zone-select-modal.component.ts
index dfc21c684e..8a2bedfacf 100644
--- a/apps/concierge/src/app/signage/zone-select-modal.component.ts
+++ b/apps/concierge/src/app/signage/zone-select-modal.component.ts
@@ -5,9 +5,8 @@ import { MatRippleModule } from '@angular/material/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+import { IconComponent, TranslatePipe } from '@placeos/components';
import { queryZones } from '@placeos/ts-client';
-import { IconComponent } from 'libs/components/src/lib/icon.component';
-import { TranslatePipe } from 'libs/components/src/lib/translate.pipe';
import {
BehaviorSubject,
catchError,
diff --git a/apps/concierge/src/app/staff/emergency-contact-modal.component.ts b/apps/concierge/src/app/staff/emergency-contact-modal.component.ts
index 652d612c0d..5e28543bb8 100644
--- a/apps/concierge/src/app/staff/emergency-contact-modal.component.ts
+++ b/apps/concierge/src/app/staff/emergency-contact-modal.component.ts
@@ -1,16 +1,36 @@
+import { CommonModule } from '@angular/common';
import { Component, inject, signal, viewChild } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import {
+ FormControl,
+ FormGroup,
+ FormsModule,
+ ReactiveFormsModule,
+} from '@angular/forms';
+import { MatRippleModule } from '@angular/material/core';
+import {
+ MAT_DIALOG_DATA,
+ MatDialogModule,
+ MatDialogRef,
+} from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatSelectModule } from '@angular/material/select';
import {
i18n,
nextValueFrom,
notifyError,
notifySuccess,
+ OrganisationService,
randomString,
} from '@placeos/common';
-import { OrganisationService } from '@placeos/organisation';
+import {
+ CustomTooltipComponent,
+ IconComponent,
+ TranslatePipe,
+} from '@placeos/components';
+import { UserSearchFieldComponent } from '@placeos/form-fields';
import { showMetadata, updateMetadata } from '@placeos/ts-client';
-import { CustomTooltipComponent } from 'libs/components/src/lib/custom-tooltip.component';
import { BehaviorSubject, combineLatest } from 'rxjs';
import { filter, map, shareReplay, switchMap } from 'rxjs/operators';
import { EmergencyContact } from './emergency-contacts.component';
@@ -169,7 +189,21 @@ import { EmergencyContact } from './emergency-contacts.component';
`,
styles: [``],
- standalone: false,
+ imports: [
+ CommonModule,
+ TranslatePipe,
+ IconComponent,
+ MatDialogModule,
+ MatFormFieldModule,
+ MatInputModule,
+ MatSelectModule,
+ MatRippleModule,
+ FormsModule,
+ ReactiveFormsModule,
+ MatProgressSpinnerModule,
+ CustomTooltipComponent,
+ UserSearchFieldComponent,
+ ],
})
export class EmergencyContactModalComponent {
private _data = inject(MAT_DIALOG_DATA);
diff --git a/apps/concierge/src/app/staff/emergency-contacts.component.ts b/apps/concierge/src/app/staff/emergency-contacts.component.ts
index f473166f41..f10fdd8e90 100644
--- a/apps/concierge/src/app/staff/emergency-contacts.component.ts
+++ b/apps/concierge/src/app/staff/emergency-contacts.component.ts
@@ -1,12 +1,29 @@
import { Clipboard } from '@angular/cdk/clipboard';
+import { CommonModule } from '@angular/common';
import { Component, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { MatRippleModule } from '@angular/material/core';
import { MatDialog } from '@angular/material/dialog';
-import { nextValueFrom, notifySuccess } from '@placeos/common';
-import { OrganisationService } from '@placeos/organisation';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import {
+ nextValueFrom,
+ notifySuccess,
+ OrganisationService,
+} from '@placeos/common';
+import {
+ IconComponent,
+ openConfirmModal,
+ SimpleTableComponent,
+ TranslatePipe,
+} from '@placeos/components';
import { showMetadata, updateMetadata } from '@placeos/ts-client';
-import { openConfirmModal } from 'libs/components/src/lib/confirm-modal.component';
import { BehaviorSubject, combineLatest } from 'rxjs';
import { filter, map, shareReplay, switchMap } from 'rxjs/operators';
+import { ApplicationSidebarComponent } from '../ui/app-sidebar.component';
+import { ApplicationTopbarComponent } from '../ui/app-topbar.component';
import { EmergencyContactModalComponent } from './emergency-contact-modal.component';
import { RoleManagementModalComponent } from './role-management-modal.component';
@@ -213,7 +230,20 @@ export interface EmergencyContactData {
}
`,
],
- standalone: false,
+ imports: [
+ CommonModule,
+ MatRippleModule,
+ IconComponent,
+ MatTooltipModule,
+ SimpleTableComponent,
+ MatFormFieldModule,
+ MatSelectModule,
+ MatInputModule,
+ ApplicationTopbarComponent,
+ ApplicationSidebarComponent,
+ FormsModule,
+ TranslatePipe,
+ ],
})
export class EmergencyContactsComponent {
private _org = inject(OrganisationService);
diff --git a/apps/concierge/src/app/staff/role-management-modal.component.ts b/apps/concierge/src/app/staff/role-management-modal.component.ts
index 4647ebb41f..e961d304c7 100644
--- a/apps/concierge/src/app/staff/role-management-modal.component.ts
+++ b/apps/concierge/src/app/staff/role-management-modal.component.ts
@@ -1,9 +1,16 @@
+import { CommonModule } from '@angular/common';
import { Component, inject, viewChild } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
-import { nextValueFrom } from '@placeos/common';
-import { OrganisationService } from '@placeos/organisation';
+import { MatRippleModule } from '@angular/material/core';
+import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { nextValueFrom, OrganisationService } from '@placeos/common';
+import {
+ CustomTooltipComponent,
+ IconComponent,
+ TranslatePipe,
+} from '@placeos/components';
import { showMetadata, updateMetadata } from '@placeos/ts-client';
-import { CustomTooltipComponent } from 'libs/components/src/lib/custom-tooltip.component';
import { BehaviorSubject, combineLatest } from 'rxjs';
import { filter, map, shareReplay, switchMap } from 'rxjs/operators';
@@ -82,7 +89,16 @@ import { filter, map, shareReplay, switchMap } from 'rxjs/operators';
`,
styles: [``],
- standalone: false,
+ imports: [
+ CommonModule,
+ MatDialogModule,
+ MatRippleModule,
+ MatFormFieldModule,
+ MatInputModule,
+ TranslatePipe,
+ IconComponent,
+ CustomTooltipComponent,
+ ],
})
export class RoleManagementModalComponent {
private _org = inject(OrganisationService);
diff --git a/apps/concierge/src/app/staff/staff-details.component.ts b/apps/concierge/src/app/staff/staff-details.component.ts
index ecd530b860..8de11610ee 100644
--- a/apps/concierge/src/app/staff/staff-details.component.ts
+++ b/apps/concierge/src/app/staff/staff-details.component.ts
@@ -1,7 +1,13 @@
import { Component, inject, input } from '@angular/core';
-import { i18n, notifyError } from '@placeos/common';
-import { StaffUser } from '@placeos/users';
+import { i18n, notifyError, StaffUser } from '@placeos/common';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import {
+ ActionIconComponent,
+ IconComponent,
+ TranslatePipe,
+ UserAvatarComponent,
+} from '@placeos/components';
import { StaffStateService } from './staff-state.service';
@Component({
@@ -62,7 +68,13 @@ import { StaffStateService } from './staff-state.service';
}
`,
styles: [``],
- standalone: false,
+ imports: [
+ UserAvatarComponent,
+ ActionIconComponent,
+ IconComponent,
+ MatTooltipModule,
+ TranslatePipe,
+ ],
})
export class StaffDetailsComponent {
private _state = inject(StaffStateService);
diff --git a/apps/concierge/src/app/staff/staff-listing.component.ts b/apps/concierge/src/app/staff/staff-listing.component.ts
index 2c2dd39893..0085e89cc5 100644
--- a/apps/concierge/src/app/staff/staff-listing.component.ts
+++ b/apps/concierge/src/app/staff/staff-listing.component.ts
@@ -2,6 +2,10 @@ import { Component, ElementRef, inject, viewChild } from '@angular/core';
import { AsyncHandler } from '@placeos/common';
import { map } from 'rxjs/operators';
+import { CommonModule } from '@angular/common';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { TranslatePipe } from '@placeos/components';
+import { StaffDetailsComponent } from './staff-details.component';
import { StaffStateService } from './staff-state.service';
const CHARS = '#abcdefghijklmnopqrstuvwxyz'.split('');
@@ -23,7 +27,7 @@ const CHARS = '#abcdefghijklmnopqrstuvwxyz'.split('');
}
{{ 'APP.CONCIERGE.SIGNAGE_HEADER' | translate }}
@@ -34,20 +40,22 @@ import { SignageStateService } from './signage-state.service'; }
-
+
+
+
{{ group }}
@@ -101,7 +105,12 @@ const CHARS = '#abcdefghijklmnopqrstuvwxyz'.split('');
}
`,
],
- standalone: false,
+ imports: [
+ CommonModule,
+ MatProgressBarModule,
+ StaffDetailsComponent,
+ TranslatePipe,
+ ],
})
export class StaffListingComponent extends AsyncHandler {
private _state = inject(StaffStateService);
diff --git a/apps/concierge/src/app/staff/staff-state.service.ts b/apps/concierge/src/app/staff/staff-state.service.ts
index 1fbcc7e7f9..5a634f2a37 100644
--- a/apps/concierge/src/app/staff/staff-state.service.ts
+++ b/apps/concierge/src/app/staff/staff-state.service.ts
@@ -1,15 +1,15 @@
import { inject, Injectable } from '@angular/core';
-import { searchStaff, StaffUser } from '@placeos/users';
+import { searchStaff } from '@placeos/users';
import { BehaviorSubject, combineLatest } from 'rxjs';
+import { checkinBooking, queryBookings, saveBooking } from '@placeos/bookings';
import {
+ AsyncHandler,
Booking,
- checkinBooking,
- queryBookings,
- saveBooking,
-} from '@placeos/bookings';
-import { AsyncHandler, timePeriodsIntersect } from '@placeos/common';
-import { OrganisationService } from '@placeos/organisation';
+ OrganisationService,
+ StaffUser,
+ timePeriodsIntersect,
+} from '@placeos/common';
import { endOfDay, getUnixTime, startOfDay } from 'date-fns';
import { map, shareReplay, switchMap } from 'rxjs/operators';
@@ -27,13 +27,9 @@ export class StaffStateService extends AsyncHandler {
private _onsite: Record
-
+
[] = [
- StaffComponent,
- StaffTopbarComponent,
- StaffListingComponent,
- StaffDetailsComponent,
- EmergencyContactsComponent,
- EmergencyContactModalComponent,
- RoleManagementModalComponent,
-];
-
@NgModule({
- declarations: [...COMPONENTS],
+ declarations: [],
imports: [
- CommonModule,
- FormsModule,
- UIModule,
+ StaffComponent,
+ EmergencyContactsComponent,
RouterModule.forChild(ROUTES),
],
})
diff --git a/apps/concierge/src/app/surveys/building-list.component.ts b/apps/concierge/src/app/surveys/building-list.component.ts
index 99466c1035..5742d6e4d9 100644
--- a/apps/concierge/src/app/surveys/building-list.component.ts
+++ b/apps/concierge/src/app/surveys/building-list.component.ts
@@ -1,9 +1,13 @@
-import { Component, inject } from '@angular/core';
-import { flatten } from '@placeos/common';
-import { OrganisationService } from '@placeos/organisation';
-import { combineLatest } from 'rxjs';
-import { map, shareReplay, startWith } from 'rxjs/operators';
-import { NewSurveyService } from './new-survey.service';
+import { CommonModule } from '@angular/common';
+import { Component, computed, inject } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { AsyncHandler, flatten, OrganisationService } from '@placeos/common';
+import {
+ AuthenticatedImageDirective,
+ IconComponent,
+ TranslatePipe,
+} from '@placeos/components';
+import { SurveyService } from './survey.service';
@Component({
selector: 'building-list',
@@ -17,12 +21,14 @@ import { NewSurveyService } from './new-survey.service';
(targetEnum: T) {
- return Object.entries(targetEnum)
- .filter((e) => isNaN(Number(e[0])))
- .map((e) => ({
- name: e[0].replace(/_/g, ' '),
- id: e[1],
- }));
-}
-
-export function getEnumMap(targetEnum: T) {
- const enum_map = {};
- Object.entries(targetEnum)
- .filter((e) => isNaN(Number(e[0])))
- .forEach((e) => (enum_map[e[1]] = e[0].replace(/_/g, ' ')));
- return enum_map;
-}
+// import { QuestionModalComponent } from './question-modal.component';
+// import { updateQuestionMap } from './question.pipe';
export interface QuestionFilters {
search_text?: string;
@@ -87,12 +44,30 @@ export interface QuestionFilters {
providedIn: 'root',
})
export class NewSurveyService {
+ private _org = inject(OrganisationService);
+ private _dialog = inject(MatDialog);
+
private _survey_id = new BehaviorSubject('');
private _bld_id = new BehaviorSubject('');
private _change = new BehaviorSubject(0);
private _loading = new BehaviorSubject(false);
private _question_filters = new BehaviorSubject({});
+ public readonly survey_list = signal([]);
+ public readonly answer_list = signal([]);
+ public readonly building_surveys = computed(() => {
+ const bld_id = this._org.building_signal().id;
+ return this.survey_list().filter(
+ (survey) => survey.building_id === bld_id,
+ );
+ });
+ public readonly building_answers = computed(() => {
+ const surveys = this.building_surveys();
+ return this.answer_list().filter((answer) =>
+ surveys.find((s) => s.id === answer.survey_id),
+ );
+ });
+
public readonly survey_list$ = combineLatest([
this._org.building_list,
this._change,
@@ -102,6 +77,7 @@ export class NewSurveyService {
forkJoin(list.map((bld) => querySurveys({ building_id: bld.id }))),
),
map((data) => flatten(data) as Survey[]),
+ tap((list) => this.survey_list.set(list)),
shareReplay(1),
);
@@ -116,6 +92,7 @@ export class NewSurveyService {
),
map((answers) => flatten(answers) as SurveyAnswer[]),
tap(() => this._loading.next(false)),
+ tap((list) => this.answer_list.set(list)),
shareReplay(1),
);
@@ -145,7 +122,7 @@ export class NewSurveyService {
public readonly questions$: Observable = queryQuestions({
limit: 1000,
} as any).pipe(
- tap((l) => updateQuestionMap(l)),
+ // tap((l) => updateQuestionMap(l)),
shareReplay(1),
);
@@ -182,11 +159,6 @@ export class NewSurveyService {
public readonly loading$ = this._loading.asObservable();
- constructor(
- private _org: OrganisationService,
- private _dialog: MatDialog,
- ) {}
-
public get building() {
return this._org.buildings.find(
(bld) => bld.id === this._bld_id.getValue(),
diff --git a/apps/concierge/src/app/surveys/question-modal.component.ts b/apps/concierge/src/app/surveys/question-modal.component.ts
index dc850859e8..4e096ddb6b 100644
--- a/apps/concierge/src/app/surveys/question-modal.component.ts
+++ b/apps/concierge/src/app/surveys/question-modal.component.ts
@@ -1,5 +1,5 @@
import { CommonModule } from '@angular/common';
-import { Component, Inject, viewChild } from '@angular/core';
+import { Component, inject, OnInit, viewChild } from '@angular/core';
import { MatRippleModule } from '@angular/material/core';
import {
MAT_DIALOG_DATA,
@@ -7,13 +7,12 @@ import {
MatDialogRef,
} from '@angular/material/dialog';
import { notifySuccess } from '@placeos/common';
+import { IconComponent, TranslatePipe } from '@placeos/components';
import {
addQuestion,
SurveyQuestion,
updateQuestion,
} from '@placeos/ts-client';
-import { IconComponent } from 'libs/components/src/lib/icon.component';
-import { TranslatePipe } from 'libs/components/src/lib/translate.pipe';
import { lastValueFrom } from 'rxjs';
import { QuestionComponent } from './question.component';
@@ -63,17 +62,17 @@ import { QuestionComponent } from './question.component';
MatDialogModule,
],
})
-export class QuestionModalComponent {
- readonly question_el = viewChild('question_el');
+export class QuestionModalComponent implements OnInit {
+ private _data: SurveyQuestion = inject(MAT_DIALOG_DATA);
+ private _dialog_ref = inject(MatDialogRef);
+
+ public readonly question_el = viewChild('question_el');
public is_edit = false;
public loading = false;
public question: SurveyQuestion;
- constructor(
- @Inject(MAT_DIALOG_DATA) private _data: SurveyQuestion,
- private _dialog_ref: MatDialogRef,
- ) {
+ public ngOnInit() {
this.is_edit = !!(this._data?.id > 0);
this.question = this._data || new SurveyQuestion({ type: 'text' });
console.log('Data', this._data, this.question);
diff --git a/apps/concierge/src/app/surveys/question.component.ts b/apps/concierge/src/app/surveys/question.component.ts
index 6ee39c69d5..39d49e1d54 100644
--- a/apps/concierge/src/app/surveys/question.component.ts
+++ b/apps/concierge/src/app/surveys/question.component.ts
@@ -10,19 +10,20 @@ import {
} from '@angular/core';
import { FormsModule } from '@angular/forms';
import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatRippleModule } from '@angular/material/core';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatRadioModule } from '@angular/material/radio';
import { MatSelectModule } from '@angular/material/select';
-
-import { IconComponent } from 'libs/components/src/lib/icon.component';
-import { SettingsToggleComponent } from 'libs/components/src/lib/settings-toggle.component';
-import { TranslatePipe } from 'libs/components/src/lib/translate.pipe';
-import { CounterComponent } from 'libs/form-fields/src/lib/counter.component';
-
-import { MatRippleModule } from '@angular/material/core';
+import {
+ IconComponent,
+ SettingsToggleComponent,
+ TranslatePipe,
+} from '@placeos/components';
+import { CounterComponent } from '@placeos/form-fields';
import { SurveyQuestion } from '@placeos/ts-client';
-import { QuestionType, QuestionTypeOptions } from './new-survey.service';
+
+import { QuestionType, QuestionTypeOptions } from './types';
@Component({
selector: 'placeos-question',
diff --git a/apps/concierge/src/app/surveys/question.pipe.ts b/apps/concierge/src/app/surveys/question.pipe.ts
index 74399bfdba..b2638fe343 100644
--- a/apps/concierge/src/app/surveys/question.pipe.ts
+++ b/apps/concierge/src/app/surveys/question.pipe.ts
@@ -1,6 +1,7 @@
import { Pipe, PipeTransform } from '@angular/core';
import { AsyncHandler } from '@placeos/common';
import { showQuestion, SurveyQuestion } from '@placeos/ts-client';
+import { lastValueFrom } from 'rxjs';
const QUESTION_MAP: Record = {};
@@ -14,11 +15,8 @@ export function updateQuestionMap(list: SurveyQuestion[]) {
export class QuestionPipe extends AsyncHandler implements PipeTransform {
transform(id: string): SurveyQuestion | undefined {
if (!QUESTION_MAP[id]) {
- this.subscription(
- id,
- showQuestion(id).subscribe(
- (question) => (QUESTION_MAP[id] = question),
- ),
+ lastValueFrom(showQuestion(id)).then(
+ (question) => (QUESTION_MAP[id] = question),
);
}
return QUESTION_MAP[id];
diff --git a/apps/concierge/src/app/surveys/survey-builder.component.ts b/apps/concierge/src/app/surveys/survey-builder.component.ts
index 82d7522ee0..4514b9d19c 100644
--- a/apps/concierge/src/app/surveys/survey-builder.component.ts
+++ b/apps/concierge/src/app/surveys/survey-builder.component.ts
@@ -1,5 +1,5 @@
import { CommonModule } from '@angular/common';
-import { ChangeDetectorRef, Component, OnInit, signal } from '@angular/core';
+import { Component, computed, inject, OnInit, signal } from '@angular/core';
import {
FormControl,
FormGroup,
@@ -15,11 +15,12 @@ import { ActivatedRoute, RouterModule } from '@angular/router';
import {
AsyncHandler,
+ Building,
nextValueFrom,
notifyError,
notifySuccess,
+ OrganisationService,
} from '@placeos/common';
-import { Building, OrganisationService } from '@placeos/organisation';
import {
CdkDragDrop,
@@ -37,17 +38,15 @@ import {
} from '@placeos/ts-client';
import { first, lastValueFrom } from 'rxjs';
-import { IconComponent } from 'libs/components/src/lib/icon.component';
-import { SurveyOutletComponent } from 'libs/components/src/lib/survey-outlet.component';
-import { TranslatePipe } from 'libs/components/src/lib/translate.pipe';
import {
- NewSurveyService,
- QuestionTypeMap,
- QuestionTypeOptions,
- TriggerOptions,
-} from './new-survey.service';
+ IconComponent,
+ SurveyOutletComponent,
+ TranslatePipe,
+} from '@placeos/components';
+import { NewSurveyService } from './new-survey.service';
import { QuestionComponent } from './question.component';
import { QuestionPipe } from './question.pipe';
+import { QuestionTypeMap, QuestionTypeOptions, TriggerOptions } from './types';
@Component({
selector: 'survey-builder',
@@ -157,24 +156,24 @@ import { QuestionPipe } from './question.pipe';
{{
'APP.CONCIERGE.SURVEY_BUILDING_COUNT'
- | translate: { count: (buildings$ | async)?.length }
+ | translate
+ : { count: buildings()?.length }
+ : buildings()?.length
}}
-
- @for (building of buildings$ | async; track building.id) {
- @let stats = (stats$ | async)[building.id];
+
`,
@@ -112,44 +127,42 @@ import { NewSurveyService } from './new-survey.service';
}
`,
],
- standalone: false,
+ imports: [
+ AuthenticatedImageDirective,
+ CommonModule,
+ TranslatePipe,
+ RouterModule,
+ IconComponent,
+ ],
})
-export class BuildingListComponent {
+export class BuildingListComponent extends AsyncHandler {
private _org = inject(OrganisationService);
- private _survey = inject(NewSurveyService);
+ private _survey = inject(SurveyService);
- public readonly buildings$ = this._org.building_list;
- public readonly surveys$ = this._survey.survey_list$;
- public readonly answers$ = this._survey.answer_list$;
+ public readonly buildings = this._org.buildings_signal;
+ public readonly surveys = this._survey.survey_list;
+ public readonly answers = this._survey.answer_list;
- public readonly stats$ = combineLatest([
- this.buildings$,
- this.surveys$,
- this.answers$,
- ]).pipe(
- map(([bld_list, surveys, answers]) => {
- const mapping = {};
- const answers_list = flatten(answers);
- for (let i = 0; i < bld_list.length; i++) {
- const bld = bld_list[i];
- const survey_list = surveys.filter(
- (_) => _.building_id === bld.id,
- );
- mapping[bld.id] = {
- live: survey_list.filter(
- (_) => `${_.trigger}`.toLowerCase() !== 'none',
- ).length,
- drafts: survey_list.filter(
- (_) => `${_.trigger}`.toLowerCase() === 'none',
- ).length,
- answers: answers_list.filter((resp) =>
- survey_list.find((_) => _.id === resp.survey_id),
- ).length,
- };
- }
- return mapping;
- }),
- startWith({}),
- shareReplay(1),
- );
+ public readonly bld_stats = computed(() => {
+ const mapping = {};
+ const answers_list = flatten(this.answers());
+ for (let i = 0; i < this.buildings().length; i++) {
+ const bld = this.buildings()[i];
+ const survey_list = this.surveys().filter(
+ (_) => _.building_id === bld.id,
+ );
+ mapping[bld.id] = {
+ live: survey_list.filter(
+ (_) => `${_.trigger}`.toLowerCase() !== 'none',
+ ).length,
+ drafts: survey_list.filter(
+ (_) => `${_.trigger}`.toLowerCase() === 'none',
+ ).length,
+ answers: answers_list.filter((resp) =>
+ survey_list.find((_) => _.id === resp.survey_id),
+ ).length,
+ };
+ }
+ return mapping;
+ });
}
diff --git a/apps/concierge/src/app/surveys/new-survey-widget.component.ts b/apps/concierge/src/app/surveys/new-survey-widget.component.ts
index 4e5631a1e5..d49bfc78a4 100644
--- a/apps/concierge/src/app/surveys/new-survey-widget.component.ts
+++ b/apps/concierge/src/app/surveys/new-survey-widget.component.ts
@@ -1,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { Component, computed, input } from '@angular/core';
import { SurveyAnswer, SurveyQuestion } from '@placeos/ts-client';
-import { QuestionType } from './new-survey.service';
+import { QuestionType } from './types';
@Component({
selector: 'new-survey-widget',
diff --git a/apps/concierge/src/app/surveys/new-survey.service.ts b/apps/concierge/src/app/surveys/new-survey.service.ts
index 1a39825a7a..fa36efa405 100644
--- a/apps/concierge/src/app/surveys/new-survey.service.ts
+++ b/apps/concierge/src/app/surveys/new-survey.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
+import { computed, inject, Injectable, signal } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
-import { flatten, notifySuccess } from '@placeos/common';
-import { OrganisationService } from '@placeos/organisation';
+import { flatten, notifySuccess, OrganisationService } from '@placeos/common';
+import { openConfirmModal } from '@placeos/components';
import {
queryAnswers,
queryQuestions,
@@ -13,7 +13,6 @@ import {
SurveyAnswer,
SurveyQuestion,
} from '@placeos/ts-client';
-import { openConfirmModal } from 'libs/components/src/lib/confirm-modal.component';
import {
BehaviorSubject,
combineLatest,
@@ -27,50 +26,8 @@ import {
tap,
} from 'rxjs';
import { QuestionModalComponent } from './question-modal.component';
-import { updateQuestionMap } from './question.pipe';
-
-export enum TriggerEnum {
- None = 'NONE',
- Reserved = 'RESERVED',
- Checked_In = 'CHECKEDIN',
- Checked_Out = 'CHECKEDOUT',
- // No_Show = 'NOSHOW',
- Rejected = 'REJECTED',
- Cancelled = 'CANCELLED',
- // Ended = 'ENDED'
- Visitor = 'VISITOR',
-}
-
-export enum QuestionType {
- Single_Line_Text = 'text',
- Comment_Box = 'comment',
- Radio_Group = 'radiogroup',
- Drop_Down = 'dropdown',
- Check_Box = 'checkbox',
- Rating = 'rating',
- Empty = '0[EMPTY]',
-}
-
-export const TriggerOptions = getEnumOptions(TriggerEnum);
-export const QuestionTypeOptions = getEnumOptions(QuestionType);
-export const QuestionTypeMap = getEnumMap(QuestionType);
-
-export function getEnumOptions