@smarterplan/ngx-smarterplan-locations 0.2.44 → 0.2.45

package/src/lib/components/zones/zones.component.html

@@ -1,181 +0,0 @@
-<div class="container-fluid" *ngIf="currentSpace">
-  <div class="m-3">
-    <lib-tab-navigation [menuItems]='menuItems' (onGoBack)="onGoBack()"></lib-tab-navigation>
-  </div>
-  <div class="row" *ngIf="!isEditingZone && !isAddingAudioTrack">
-    <div class="col-md-6">
-      <ul class="list-group list-group-flush">
-        <li class="list-group-item default-zone-line-item">
-          <div class="d-flex justify-content-between align-items-center zone-name" *ngIf="defaultZone">
-            {{defaultZone.name}}
-            <div class="default-zone-label">{{ "whole space" | translate }}</div>
-            <lib-chevron [conditionShowing]="defaultShowing" (click)="onToggleDefaultZone()"></lib-chevron>
-          </div>
-          <div *ngIf="defaultShowing">
-            <ul class="list-group list-group-flush">
-              <li class="list-group-item bg-transparent">{{'Type of zone' | translate}}:
-                {{defaultZone.layer ? defaultZone.layer.name : "No type" | translate}} </li>
-              <li class="list-group-item bg-transparent" *ngIf="defaultZone.surface">
-                {{'Surface' | translate}}, m<sup>2</sup>: {{defaultZone.surface }}
-              </li>
-              <li class="list-group-item bg-transparent" *ngIf="!defaultZone.virtual">{{'Scan Points' | translate}}:
-                {{defaultZone.sweepIDs ? defaultZone.sweepIDs.length : "No scan points" | translate}} </li>
-            </ul>
-            <div *ngFor="let pair of zonesMap | keyvalue">
-              <div *ngIf="pair.key == defaultZone.id">
-                <h5 style="margin: 8px;" *ngIf="pair.value.length > 0">{{'Children zones'|translate}}</h5>
-                <ul class="list-group list-group-flush">
-                  <li class="list-group-item list-group-flush list-group-item-action"
-                    *ngFor="let lot of pair.value; index as zoneIndex">
-                    <div class="d-flex justify-content-between align-items-center zone-name">
-                      {{lot.name}}
-                      <div class="museum-label" *ngIf="lot.isMuseumVisitZone">{{ "itinerary" | translate }}</div>
-                      <lib-chevron [conditionShowing]="zoneIndex==lotIndexDetails"
-                        (click)="onToggleDetail(zoneIndex, lot)"></lib-chevron>
-
-                    </div>
-                    <div *ngIf="zoneIndex==lotIndexDetails">
-                      <ul class="list-group list-group-flush">
-                        <li class="list-group-item bg-transparent" *ngIf="!lot.isMuseumVisitZone">{{'Type of zone' |
-                          translate}}: {{lot.layer ? lot.layer.name :
-                          "No type" | translate}} </li>
-                        <li class="list-group-item bg-transparent" *ngIf="lot.surface">
-                          {{'Surface' | translate}},m<sup>2</sup>: {{lot.surface }}
-                        </li>
-                        <li class="list-group-item bg-transparent" *ngIf="!lot.virtual">{{'Scan Points' | translate}}:
-                          {{lot.sweepIDs ? lot.sweepIDs.length : "No scan points" | translate}} </li>
-                        <li class="list-group-item bg-transparent" *ngIf="lot.virtual">
-                          {{'Zone not visible in 3D visit' | translate}}</li>
-                      </ul>
-                      <button type="button" class="btn btn-outline-primary rounded-pill me-2"
-                        (click)="onEdit(lot)">{{'Edit' | translate}}</button>
-                      <button class="btn btn-outline-primary rounded-pill me-2" (click)="onAddAudioZone(lot)"
-                        *ngIf="isMuseumModule"> {{'add-audio.add' | translate}}</button>
-                      <button type="button" class="btn btn-outline-primary rounded-pill"
-                        (click)="onDelete(lot)">{{'Delete' | translate}}</button>
-                    </div>
-                  </li>
-                </ul>
-
-              </div>
-            </div>
-          </div>
-        </li>
-
-        <li class="list-group-item" *ngFor="let floor of floorZones; index as index">
-          <div class="d-flex justify-content-between align-items-center zone-name">
-            {{floor.name}}
-            <!-- <small>({{ lot.metadata ? ('Calibrated' | translate) : ('Not calibrated' | translate)}})</small> -->
-            <div class="museum-label" *ngIf="floor.isMuseumVisitZone">{{ "itinerary" | translate }}</div>
-            <lib-chevron [conditionShowing]="index==floorDetails"
-              (click)="onToggleDetailFloor(index, floor)"></lib-chevron>
-          </div>
-          <div *ngIf="index==floorDetails">
-            <ul class="list-group list-group-flush">
-              <li class="list-group-item bg-transparent">{{'Type of zone' | translate}}: {{floor.layer ?
-                floor.layer.name :
-                "No type" | translate}} </li>
-              <li class="list-group-item bg-transparent" *ngIf="floor.surface">{{'Surface' | translate}}, m<sup>2</sup>:
-                {{floor.surface }}
-              </li>
-              <li class="list-group-item bg-transparent" *ngIf="!floor.virtual">{{'Scan Points' | translate}}:
-                {{floor.sweepIDs ? floor.sweepIDs.length : "No scan points" | translate}} </li>
-              <li class="list-group-item bg-transparent" *ngIf="floor.virtual">{{'Zone not visible in 3D visit' |
-                translate}}</li>
-            </ul>
-            <button type="button" class="btn btn-outline-primary rounded-pill me-2" (click)="onEdit(floor)">{{'Edit' |
-              translate}}</button>
-
-            <!-- List of children zones -->
-
-            <div *ngFor="let pair of zonesMap | keyvalue">
-              <div *ngIf="pair.key == floor.id">
-                <h5 style="margin: 8px;" *ngIf="pair.value.length > 0">{{'Children zones'|translate}}</h5>
-                <ul class="list-group list-group-flush">
-                  <li class="list-group-item list-group-flush list-group-item-action"
-                    *ngFor="let lot of pair.value; index as zoneIndex">
-                    <div class="d-flex justify-content-between align-items-center zone-name">
-                      <div><span *ngIf="lot.code_ref">{{lot.code_ref}}_</span>{{lot.name}}</div>
-                      <div class="museum-label" *ngIf="lot.isMuseumVisitZone">{{ "itinerary" | translate }}</div>
-                      <lib-chevron [conditionShowing]="zoneIndex==lotIndexDetails"
-                        (click)="onToggleDetail(zoneIndex, lot)"></lib-chevron>
-
-                    </div>
-                    <div *ngIf="zoneIndex==lotIndexDetails">
-                      <ul class="list-group list-group-flush">
-                        <li class="list-group-item bg-transparent" *ngIf="!lot.isMuseumVisitZone">{{'Type of zone' |
-                          translate}}: {{lot.layer ? lot.layer.name :
-                          "No type" | translate}} </li>
-                        <li class="list-group-item bg-transparent" *ngIf="lot.surface">{{'Surface' | translate}},
-                          m<sup>2</sup>:
-                          {{lot.surface }}
-                        </li>
-                        <li class="list-group-item bg-transparent" *ngIf="!lot.virtual">{{'Scan Points' | translate}}:
-                          {{lot.sweepIDs ? lot.sweepIDs.length : "No scan points" | translate}} </li>
-                        <li class="list-group-item bg-transparent" *ngIf="!lot.virtual && lot.isMuseumVisitZone">
-                          {{'Scan Points with audio' | translate}}: {{ lot | countAudioSweeps | async}} </li>
-                        <li class="list-group-item bg-transparent" *ngIf="lot.virtual">
-                          {{'Zone not visible in 3D visit' | translate}}</li>  dist
-                      </ul>
-                      <button type="button" class="btn btn-outline-primary rounded-pill me-2"
-                        (click)="onEdit(lot)">{{'Edit' | translate}}</button>
-                      <button class="btn btn-outline-primary rounded-pill me-2" (click)="onAddAudioZone(lot)"
-                        *ngIf="isMuseumModule"> {{'add-audio.add' | translate}}</button>
-                      <button type="button" class="btn btn-outline-primary rounded-pill"
-                        (click)="onDelete(lot)">{{'Delete' | translate}}</button>
-                    </div>
-                  </li>
-                </ul>
-
-              </div>
-            </div>
-          </div>
-        </li>
-      </ul>
-
-      <div>
-        <button class="btn btn-outline-primary rounded-pill me-2" (click)="onAddLot()">{{'Add zone' |
-          translate}}</button>
-        <button class="btn btn-outline-primary rounded-pill me-2" (click)="onAddMuseumZone()" *ngIf="isMuseumModule">
-          {{'Add museum itinerary' | translate}}</button>
-      </div>
-    </div>
-    <div class="col-md-6" *ngIf="planIsVisible">
-      <div class="d-flex justify-content-center" *ngIf="loadingPlan">
-        <div class="spinner-border" role="status">
-          <span class="visually-hidden">Loading...</span>
-        </div>
-      </div>
-      <div class="row" style="overflow: hidden; flex-direction: column;">
-        <div *ngIf="currentPlan">
-          <lib-plan-legend [isAudioZone]="false"></lib-plan-legend>
-          <div class="planContainer">
-            <div class="mt-3 ms-3" style="height: 500px; width: 100%;" id="planDiv"></div>
-          </div>
-        </div>
-
-        <div *ngIf="!currentPlan && plans && !loadingPlan && currentZone">
-          <div class="mt-3 ms-3" id="no-plan" *ngIf="!currentZone.virtual && !currentZone.isMultipleFloorZone">
-            {{ 'Plan is not calibrated' | translate}}
-          </div>
-          <div class="mt-3 ms-3" id="no-plan" *ngIf="currentZone.virtual">
-            {{ 'No scan points chosen' | translate}}
-          </div>
-          <div class="mt-3 ms-3" id="no-plan" *ngIf="currentZone.isMultipleFloorZone">
-            {{ 'The zone is on several floors' | translate}}
-          </div>
-        </div>
-
-      </div>
-    </div>
-  </div>
-  <div class="mb-3" *ngIf="isEditingZone">
-    <lib-add-zone [zoneEdit]="zoneForEdit" [spaceID]="spaceID" [images360]="images360" [navigationIDs]="navigations"
-      [zones]="allZones" [defaultZone]="defaultZone" (updatedZone)="editCompleted($event)"
-      [isMuseumVisit]="isMuseumVisit"></lib-add-zone>
-  </div>
-  <div class="mb-3" *ngIf="isAddingAudioTrack">
-    <lib-add-audio-zone [spaceID]="spaceID" [defaultZone]="defaultZone" [parentZone]="parentZoneForAudio"
-      [zones]="allZones" [currentAudioZone]="zoneForEdit" (updatedZone)="editCompleted($event)"></lib-add-audio-zone>
-  </div>
-</div>

package/src/lib/components/zones/zones.component.scss

@@ -1,36 +0,0 @@
-.museum-label {
-    background-color: #6f3974;
-    font-size: .95rem;
-    border-radius: 10px;
-    padding: 5px 10px;
-    color: #fff;
-    text-transform: uppercase;
-    margin-left: auto;
-    margin-right: 8px;
-}
-
-.default-zone-line-item {
-    border-bottom-width: 3px;
-}
-
-.default-zone-label {
-    background-color: var(--smarterplan-primary);
-    font-size: .95rem;
-    border-radius: 10px;
-    padding: 5px 10px;
-    color: #fff;
-    text-transform: uppercase;
-    margin-left: auto;
-    margin-right: 8px;
-}
-
-.planContainer {
-    overflow: hidden;
-    border-radius: 6px;
-    background-color: var(--smarterplan-secondary);
-    height: 500px;
-}
-
-button {
-    min-width: 80px;
-}

package/src/lib/components/zones/zones.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ZonesComponent } from './zones.component';
-
-describe('ZonesComponent', () => {
-  let component: ZonesComponent;
-  let fixture: ComponentFixture<ZonesComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ZonesComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ZonesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

package/src/lib/components/zones/zones.component.ts

@@ -1,339 +0,0 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
-import {
-    MenuItem, ZoneService, SpaceService, VisitService,
-    NavigationService, BaseUserService, PlanService, wait, Navigation, showScanPointsOnPlanInDiv, Plan, Space, Zone, SpModule, NavigatorService
-} from '@smarterplan/ngx-smarterplan-core';
-import panzoom from "panzoom";
-import { Subject, takeUntil } from 'rxjs';
-@Component({
-    selector: 'lib-zones',
-    templateUrl: './zones.component.html',
-    styleUrls: ['./zones.component.scss']
-})
-export class ZonesComponent implements OnInit {
-
-    lotIndexDetails = -1;
-
-    currentSpace: Space;
-
-    @Output() updatedZone = new EventEmitter<boolean>();
-
-    plans: Plan[];
-
-    zoneForEdit: Zone;
-
-    isEditingZone = false;
-
-    captureDate: number;
-
-    spaceID: string;
-
-    navigations: string[];
-
-    images360: any[];
-
-    carouselIsVisible = false;
-
-    planIsVisible = false;
-
-    currentPlan: Plan;
-
-    currentZone: Zone;
-
-    loadingPlan = false;
-
-    menuItems: MenuItem[] = [];
-
-    isMuseumVisit = false;
-
-    isMuseumModule = false;
-
-    allZones: Zone[];
-
-    floorZones: Zone[] = [];
-
-    zonesMap: Map<string, Zone[]> = new Map();
-
-    floorDetails: number = -1;
-
-    defaultZone: Zone;
-
-    defaultShowing = false;
-
-    isAddingAudioTrack = false;
-
-    parentZoneForAudio: Zone;
-
-    destroy$ = new Subject();
-
-    constructor(
-        private route: ActivatedRoute,
-        private zoneService: ZoneService,
-        private spaceService: SpaceService,
-        private visitService: VisitService,
-        private navigationService: NavigationService,
-        private userService: BaseUserService,
-        private planService: PlanService,
-        private translate: TranslateService,
-        private navigatorService: NavigatorService,
-        private router: Router,
-    ) {
-        // listen to the change of location via navigation bar dropdown
-        this.navigatorService.locationIDChange
-            .pipe(takeUntil(this.destroy$))
-            .subscribe((spaceID) => {
-                this.router.navigate(["dashboard/localisation", spaceID, "zones"]).catch(e => console.log(e.message));
-            });
-
-        this.route.params.subscribe((params) => {
-            this.spaceID = params.id;
-            this.resetZones().catch(e => console.log(e.message));
-        });
-    }
-
-    async ngOnInit() {
-        this.isMuseumModule = this.userService.getSpModule() === SpModule.MUSEUM;
-    }
-
-    ngOnDestroy() {
-        this.destroy$.next(true);
-        this.destroy$.complete();
-    }
-
-    setupMenuItems() {
-        this.menuItems = [
-            { label: "Locations", url: "/localisation" },
-            {
-                label: this.currentSpace.name,
-                url: `/localisation/${this.spaceID}`,
-            },
-            {
-                label: "Zones",
-                url: `/localisation/${this.currentSpace.id}/zones`,
-            },
-        ];
-    }
-
-    onGoBack() {
-        this.editCompleted(null);
-    }
-
-    ngOnChanges() {
-        this.resetZones().catch(e => console.log(e.message));
-    }
-
-    async resetZones() {
-        this.isMuseumVisit = false;
-        this.currentSpace = await this.spaceService.getSpace(this.spaceID);
-        this.setupMenuItems();
-
-        this.allZones = await this.zoneService.getZonesBySpace(this.spaceID);
-        this.defaultZone = this.allZones.find(
-            (zone) => zone.layer && zone.layer.name === "BUILDING" && zone.sweepIDs,
-        );
-
-        this.floorZones = this.allZones.filter(
-            (zone) => zone.layer && zone.layer.name === "FLOOR",
-        );
-        // sort alphabetically
-        this.floorZones.sort((a, b) => a.name.localeCompare(b.name));
-        // we add only children zones that are not Floors
-        if (!!this.defaultZone) {
-          this.zonesMap.set(this.defaultZone.id, this.allZones.filter((zone) => zone.parentID === this.defaultZone.id && !this.floorZones.includes(zone)));
-        }
-        for (const floor of this.floorZones) {
-            const zonesForFloor = this.allZones.filter((zone) => zone.parentID === floor.id);
-            this.zonesMap.set(
-                floor.id,
-                zonesForFloor.sort((a, b) => a.name.localeCompare(b.name)),
-            );
-        }
-        this.resetNavigations();
-        this.images360 = await this.visitService.loadImagesForSpace(
-            this.currentSpace,
-        );
-        this.plans = await this.planService.getPlansWithZonesForSpace(
-            this.spaceID,
-        );
-        this.plans = this.plans.filter((plan) => plan.isCurrentForZone);
-        this.onPlansLoaded().catch(e => console.log(e.message));
-    }
-
-    resetNavigations() {
-        this.navigations = [];
-        const zonesWithSweeps = this.allZones.filter((zone) => zone.sweepIDs);
-        this.navigations = [
-            ...new Set(zonesWithSweeps.flatMap((zone) => zone.sweepIDs)),
-        ];
-    }
-
-    async onPlansLoaded(): Promise<void> {
-        if (this.planIsVisible && this.currentZone) {
-            this.preparePlan().catch(e=>console.log(e.message));
-        }
-    }
-
-    /**
-     * onToggleDetail folds/unfolds details for a zone
-     * @param index
-     * @param zone
-     */
-    async onToggleDetail(index: number, zone: Zone) {
-        this.lotIndexDetails = index === this.lotIndexDetails ? -1 : index;
-        if (this.lotIndexDetails === -1) {
-            this.currentZone = null;
-            this.planIsVisible = false;
-            return;
-        }
-        this.currentZone = zone;
-        this.planIsVisible = true;
-        if (!this.plans) {
-            return; // wait until the plans are set
-        }
-        if (this.loadingPlan) {
-            // another plan is already loading
-            await wait(1000);
-        }
-        this.preparePlan().catch(e=>console.log(e.message));
-    }
-
-    onToggleDetailFloor(index: number, floor: Zone) {
-        this.defaultShowing = false;
-        this.floorDetails = index === this.floorDetails ? -1 : index;
-        if (this.floorDetails === -1) {
-            this.currentZone = null;
-            this.planIsVisible = false;
-            return;
-        }
-        this.currentZone = floor;
-        this.planIsVisible = true;
-        if (!this.plans) {
-            console.log("plans not ready");
-            return; // wait until the plans are set
-        }
-        this.preparePlan().catch(e => console.log(e.message));
-    }
-
-    onToggleDefaultZone() {
-        this.defaultShowing = !this.defaultShowing;
-        this.currentZone = this.defaultShowing ? this.defaultZone : null;
-    }
-
-    async preparePlan() {
-        this.loadingPlan = true;
-        this.currentPlan = null;
-        if (this.currentZone.virtual) {
-            this.currentPlan = null;
-            this.loadingPlan = false;
-            return;
-        }
-        this.currentPlan = await this.planService.getCalibratedPlanForZone(
-            this.currentZone,
-        );
-        if (this.currentPlan) {
-            const scans = await this.navigationService.getNavigationsForZone(
-                this.currentZone,
-            );
-            await this.showScanPointsOnPlan(scans);
-        }
-        this.loadingPlan = false;
-    }
-
-    toggleCarousel() {
-        this.carouselIsVisible = true;
-    }
-
-    onEdit(zone: Zone) {
-        this.zoneForEdit = zone;
-        if (this.zoneForEdit.layer && this.zoneForEdit.layer.name === "AUDIO") {
-            this.isAddingAudioTrack = true;
-        } else {
-            this.isEditingZone = true;
-        }
-
-        this.menuItems.push({
-            label: `${zone.name}`,
-        });
-    }
-
-    onAddLot() {
-        this.isMuseumVisit = false;
-        this.isEditingZone = true;
-        this.menuItems.push({
-            label: "New",
-        });
-    }
-
-    onAddMuseumZone() {
-        this.isMuseumVisit = true;
-        this.isEditingZone = true;
-        this.menuItems.push({
-            label: "New Museum Itinerary",
-        });
-    }
-
-    onAddAudioZone(parentZone: Zone) {
-        this.parentZoneForAudio = parentZone;
-        this.isAddingAudioTrack = true;
-        this.menuItems.push({
-            label: parentZone.name,
-        });
-        this.menuItems.push({
-            label: "add-audio.add",
-        });
-    }
-
-    async onDelete(zone: Zone) {
-        const message = this.translate.instant("confirm.deleteZone");
-        // eslint-disable-next-line no-alert
-        if (window.confirm(message)) {
-            const childrenZones = await this.zoneService.getZonesByParentZone(zone.id);
-            await Promise.all(childrenZones.map(async (childZone) => {
-                await this.zoneService.deleteZone(childZone.id);
-                this.allZones.splice(this.allZones.indexOf(childZone), 1);
-            }));
-            await this.zoneService.deleteZone(zone.id);
-            this.allZones.splice(this.allZones.indexOf(zone), 1);
-            // remove current zone from its parent list
-            if (zone.parentID && Array.from(this.zonesMap.keys()).includes(zone.parentID)) {
-                const zonesForParent = this.zonesMap.get(zone.parentID);
-                zonesForParent.splice(zonesForParent.indexOf(zone), 1);
-                this.zonesMap.set(zone.parentID, zonesForParent);
-            }
-            // we send update of location in order to force update of list of zones in nav bar
-            this.navigatorService.locationIDChange.next(this.spaceID);
-        }
-    }
-
-    editCompleted(event: any) {
-        this.lotIndexDetails = -1;
-        this.currentPlan = null;
-        this.isEditingZone = false;
-        this.isAddingAudioTrack = false;
-        this.zoneForEdit = null;
-        this.planIsVisible = false;
-        this.carouselIsVisible = false;
-        this.setupMenuItems();
-        if (event) {
-            this.resetZones().catch(e=> console.log(e.message));
-            // we send update of location in order to force update of list of zones in nav bar
-            this.navigatorService.locationIDChange.next(this.spaceID);
-        }
-
-    }
-
-    async showScanPointsOnPlan(navigations: Navigation[]) {
-        if (this.currentPlan) {
-            const divPlan = document.querySelector("#planDiv") as HTMLElement;
-            await showScanPointsOnPlanInDiv(this.currentPlan, divPlan, navigations);
-            panzoom(divPlan, {
-                bounds: true,
-                boundsPadding: 0,
-                maxZoom: 3.5,
-            });
-        }
-    }
-
-}