@smarterplan/ngx-smarterplan-locations 0.2.44 → 0.2.45

package/src/lib/components/zones/add-audio-zone/add-audio-zone.component.ts

@@ -1,269 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
-import { TranslateService } from '@ngx-translate/core';
-import { ZoneService, LayerService, BaseUserService, NavigationService, Layer, Zone, CommentType, CommentService, Comment, filterUniqueArrayByID } from '@smarterplan/ngx-smarterplan-core';
-
-
-@Component({
-    selector: 'lib-add-audio-zone',
-    templateUrl: './add-audio-zone.component.html',
-    styleUrls: ['./add-audio-zone.component.scss'],
-})
-export class AddAudioZoneComponent implements OnInit {
-
-    @Input() spaceID: string;
-
-    @Output() updatedZone = new EventEmitter<any>();
-
-    @Input() defaultZone: Zone;
-
-    @Input() zones: Zone[];
-
-    @Input() parentZone: Zone;
-
-    isSubmitted = false;
-
-    fromPlan: boolean = false;
-
-    chosenScansOnPlan: string[] = [];
-
-    currentOrgId: string;
-
-    audioLayer: Layer;
-
-    commentForm: FormGroup;
-
-    fileToUpload: File;
-
-    audiosForSpace: Comment[];
-
-    isAddingAudio = false;
-
-    chosenAudio: Comment;
-
-    audioZones: Zone[];
-
-    @Input() currentAudioZone: Zone;
-
-    scansModified = false;
-
-    occupiedSweeps: string[] = [];
-
-    unavailableSweeps: string[] = [];
-
-    working = false;
-
-    audioUploaded = false;
-
-    constructor(
-        private fb: FormBuilder,
-        private zoneService: ZoneService,
-        private layerService: LayerService,
-        private userService: BaseUserService,
-        private navigationService: NavigationService,
-        private commentService: CommentService,
-        private translate: TranslateService,
-    ) { }
-
-    ngOnInit(): void {
-        if (this.currentAudioZone) {
-            // we are editing zone
-            this.chosenAudio = this.currentAudioZone.audio;
-            this.chosenScansOnPlan = this.currentAudioZone.sweepIDs;
-            this.parentZone = this.currentAudioZone.parent;
-        }
-        this.setup();
-    }
-
-    async setup() {
-        const mission = this.userService.currentMission(this.spaceID);
-        this.currentOrgId = mission.organisationID;
-        let layers = await this.layerService.getLayerForOrganisation(
-            this.currentOrgId,
-        );
-        this.audioLayer = layers.find((layer) => layer.name === "AUDIO");
-        if (!this.audioLayer) {
-            // first time creating Audio Zone 
-            this.audioLayer = await this.layerService.createLayerForOrganisation("AUDIO", this.currentOrgId);
-        }
-        if (!this.parentZone) {
-            this.parentZone = this.defaultZone;
-        }
-        this.audioZones = this.zones.filter((zone) => zone.audioID && zone.parentID === this.parentZone.id);
-        this.occupiedSweeps = this.audioZones.flatMap((zone) => zone.sweepIDs);
-        // unavailable sweeps: sweeps that do not belong to parent zone
-        this.unavailableSweeps = this.defaultZone.sweepIDs.filter((sweep) => !this.parentZone.sweepIDs.includes(sweep));
-        await this.getAudios();
-        this.commentForm = this.fb.group({
-            title: [null, Validators.required],
-            spaceID: this.spaceID,
-            type: CommentType.AUDIO,
-            ownerID: mission.id,
-        });
-    }
-
-    async onSubmit() {
-        this.isSubmitted = true;
-        this.working = true;
-        if (this.currentAudioZone) {
-            await this.zoneService.updateZone({
-                id: this.currentAudioZone.id,
-                sweepIDs: this.chosenScansOnPlan,
-            });
-            await this.removeTakenSweepsFromOtherZones();
-            this.updatedZone.emit(this.currentAudioZone.id);
-            this.working = false;
-        } else {
-            const zoneInput = {
-                name: `${this.parentZone.name} - ${this.chosenAudio.title}`,
-                surface: 0,
-                spaceID: this.spaceID,
-                layerID: this.audioLayer.id,
-                parentID: this.parentZone.id,
-                isMuseumVisitZone: false,
-                isMultipleFloorZone: this.parentZone.isMultipleFloorZone,
-                audioID: this.chosenAudio.id,
-            } as Zone;
-            try {
-                await this.setSweepsAndNodeForZoneInput(zoneInput);
-                await this.zoneService
-                    .create(zoneInput)
-                    .then(async (zoneCreated) => {
-                        this.currentAudioZone = zoneCreated;
-                        await this.removeTakenSweepsFromOtherZones();
-                        this.updatedZone.emit(zoneCreated.id);
-                    });
-                this.working = false;
-            } catch (error) {
-                console.error(error);
-                this.working = false;
-            }
-        }
-    }
-
-    async setSweepsAndNodeForZoneInput(zoneInput: Zone) {
-        if (this.chosenScansOnPlan.length > 0) {
-            zoneInput.sweepIDs = this.chosenScansOnPlan;
-        }
-        if (zoneInput.sweepIDs && zoneInput.sweepIDs.length > 0) {
-            const navForSweep =
-                await this.navigationService.getNavigationsForMatterportIDForSpace(
-                    zoneInput.sweepIDs[0],
-                    this.spaceID,
-                );
-            zoneInput.nodeIDs = [navForSweep[0].nodeID];
-        }
-    }
-
-    onCancel() {
-        if (this.scansModified) {
-            const message = this.translate.instant("confirm.cancelEditZone");
-            if (!window.confirm(message)) {
-                return;
-            }
-        }
-        this.commentForm = null;
-        this.chosenScansOnPlan = [];
-        this.updatedZone.emit(false);
-    }
-
-    togglePlan() {
-        this.fromPlan = true;
-    }
-
-    onSelectedSweepsFromPlan(result: { "sweeps": string[]; "startSweepID": string; }) {
-        if (result && result.sweeps) {
-            this.chosenScansOnPlan = result.sweeps;
-            this.scansModified = true;
-        }
-        this.fromPlan = false;
-    }
-
-    handleFileInput(event: Event) {
-        const target = event.target as HTMLInputElement;
-        this.fileToUpload = (target.files as FileList)[0];
-    }
-
-    async onUploadAudio() {
-        this.working = true;
-        const commentInput = this.commentForm.value;
-        try {
-            const newAudio = await this.commentService.createCommentWithFile(
-                commentInput,
-                this.fileToUpload,
-            );
-            this.audiosForSpace.push(newAudio);
-            this.isAddingAudio = false;
-            this.working = false;
-            this.audioUploaded = true;
-        } catch (e) {
-            this.working = false;
-            this.audioUploaded = false;
-            console.log(e);
-        }
-
-    }
-
-    async getAudios() {
-        const attachments = await this.commentService.getCommentsBySpaceID(this.spaceID);
-        if (attachments) {
-            this.audiosForSpace = attachments.filter((attachment) => attachment.type === CommentType.AUDIO);
-        }
-    }
-
-    onCancelAudioUpload() {
-        this.commentForm = null;
-        this.isAddingAudio = false;
-        this.fileToUpload = null;
-    }
-
-    onChooseAudio(audio: Comment) {
-        this.chosenAudio = audio;
-        this.currentAudioZone = this.audioZones.find((zone) => zone.audioID === this.chosenAudio.id);
-        if (this.currentAudioZone) {
-            this.chosenScansOnPlan = this.currentAudioZone.sweepIDs;
-        } else {
-            this.chosenScansOnPlan = [];
-        }
-    }
-
-    /**
-     * Removes newly selected sweeps for current zone (they are in chosenScansOnPlan) from other audio zones. 
-     * Rule: one sweep = one audio.
-     */
-    async removeTakenSweepsFromOtherZones() {
-        await Promise.all(this.audioZones.map(async (zone) => {
-            if (zone.id !== this.currentAudioZone.id) {
-                const newSweeps = zone.sweepIDs.filter((sweepID) => !this.chosenScansOnPlan.includes(sweepID));
-                if (newSweeps.length !== zone.sweepIDs.length) {
-                    await this.zoneService.updateZone({ id: zone.id, sweepIDs: newSweeps });
-                }
-            }
-        }));
-    }
-
-    /**
-     * Delete audio as Comment, all its audio Zones and file from S3 (using lambda function)
-     */
-    async onDeleteAudio() {
-        const message = this.translate.instant("confirm.deleteAudio");
-        if (window.confirm(message)) {
-            await this.commentService.deleteComment(this.chosenAudio.id);
-            const index = this.audiosForSpace.indexOf(this.chosenAudio);
-            this.audiosForSpace.splice(index, 1);
-
-            // delete all zones with this comment audio
-            const audioZonesToDelete = this.zones.filter((z) => z.audioID === this.chosenAudio.id);
-            await Promise.all(audioZonesToDelete.map(async (zone) => {
-                await this.zoneService.deleteZone(zone.id);
-                const indexZone = this.audioZones.indexOf(this.currentAudioZone);
-                if (indexZone !== -1) {
-                    this.audioZones.slice(indexZone, 1);
-                }
-            }));
-            this.currentAudioZone = null;
-            this.chosenAudio = null;
-        }
-    }
-
-}

package/src/lib/components/zones/add-zone/add-zone.component.html

@@ -1,153 +0,0 @@
-<div class="main-container" *ngIf="zoneForm">
-    <div class="col-7">
-        <form (ngSubmit)="onSubmitZone()" [formGroup]="zoneForm">
-            <div class="mb-3 row">
-                <label class="col-sm-2 col-form-label">{{'Name' | translate}} *</label>
-                <div class="col-sm-10">
-                    <input type="text" class="form-control" required formControlName="name">
-                    <!-- <div class="invalid-feedback">
-                        {{'A name is required' | translate}}
-                    </div> -->
-                </div>
-            </div>
-            <div class="mb-3 row">
-                <label class="col-sm-2 col-form-label">{{'codeRef' | translate}}</label>
-                <div class="col-sm-10">
-                    <input type="text" class="form-control" formControlName="code_ref">
-                </div>
-            </div>
-            <div class="mb-3 row" *ngIf="!isMuseumVisit && !zoneIsMatterportFloor">
-                <label class="col-sm-2 col-form-label">{{'Type of zone' | translate}}</label>
-                <div class="col-sm-10">
-                    <select class="form-control" formControlName="layerID">
-                        <option value="null" selected disabled hidden> {{ zoneEdit && zoneEdit.layer ?
-                            zoneEdit.layer.name : 'Choose type'}}</option>
-                        <option *ngFor="let layer of layers" [value]="layer.id">
-                            {{ layer.name }}
-                        </option>
-                    </select>
-                    <p class="mt-1 new-type-text">{{'or add new type of zone' | translate }}</p>
-                    <input type="text" class="form-control new-type-input" formControlName="newLayer">
-                    <div *ngIf="newLayer.invalid && (newLayer.dirty || newLayer.touched)" class="text-danger">
-                        <div *ngIf="newLayer.errors?.['forbiddenName']">
-                            {{'Layer exists already' | translate}}
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!--If Editing Zone possibility to assign it to museum itinerary-->
-            <div class="mb-3 row" *ngIf="zoneEdit && !zoneIsMatterportFloor">
-                <label class="col-sm-2 col-form-label">{{ 'Museum Itinerary' | translate }}</label>
-                <div class="col-sm-10">
-                    <input class="checkbox-apply mt-3" type="checkbox" [(ngModel)]="isMuseumVisit"
-                        [ngModelOptions]="{standalone: true}">
-                </div>
-            </div>
-
-            <div class="mb-3 row" *ngIf="!zoneEdit || zoneEdit.isMultipleFloorZone">
-                <label class="col-sm-2 col-form-label">{{ 'Multiple Floors' | translate }}</label>
-                <div class="col-sm-10">
-                    <input class="checkbox-apply mt-3" type="checkbox" [(ngModel)]="multipleFloors"
-                        [disabled]="zoneEdit !== undefined && zoneEdit !== null" (change)="onChangeMultipleFloors()"
-                        [ngModelOptions]="{standalone: true}">
-                    <div class='text-danger' *ngIf="zoneEdit">
-                        {{'cannotChangeMultifloor' | translate}}
-                    </div>
-                </div>
-
-            </div>
-
-            <div class="mb-3 row">
-                <label class="col-sm-2 col-form-label">{{'Surface' | translate}}</label>
-                <div class="col-sm-10">
-                    <input type="text" class="form-control" formControlName="surface">
-                </div>
-            </div>
-
-            <div class="mb-3 row" *ngIf="!zoneIsMatterportFloor">
-                <label class="col-sm-2 col-form-label">{{'Parent zone' | translate}}</label>
-                <div class="col-sm-10">
-                    <input *ngIf="zoneEdit" type="text" class="form-control" formControlName="parent">
-                    <div class="text-danger" *ngIf="zoneEdit">
-                        {{'cannotChangeParent' | translate}}
-                    </div>
-                    <select *ngIf="!zoneEdit" class="form-control" formControlName="parentID">
-                        <option *ngFor="let zone of parentZones" [ngValue]="zone.id">
-                            {{ zone.name }}
-                        </option>
-                    </select>
-
-                </div>
-            </div>
-
-            <div class="mb-3 row" style="max-height: 200px; overflow: auto;" *ngIf="!zoneIsMatterportFloor">
-                <label class="col-sm-2 col-form-label">{{'Scan Points' | translate}}</label>
-                <!-- <p class="col-sm-2" *ngIf="zoneEdit">{{ zoneEdit.sweepIDs.length }} scans</p> -->
-                <p class="col" *ngIf="chosenScansOnPlan.length === 0 && chosenScans.length === 0">
-                    {{'No scan points chosen' | translate}}</p>
-                <div class="col-sm-5" *ngIf="chosenScansOnPlan && chosenScansOnPlan.length > 0">
-                    <p>{{ chosenScansOnPlan.length }} {{'scan points chosen' | translate}}</p>
-                    <!-- <div *ngFor="let scan of chosenScansOnPlan">
-                        <div class="row">
-                            <p class="me-2">{{ scan | slice:0:8 }}</p>
-                            <div (click)="onRemoveScanPlan(scan)" [style.cursor]="'pointer'">
-                                <span class="iconify" data-icon="mdi:trash-can-outline"></span>
-                            </div>
-                        </div>
-                    </div> -->
-                </div>
-                <div class="col-sm-5" *ngIf="carouselIsVisible && chosenScans && chosenScans.length > 0">
-                    <p>{{ chosenScans.length }} {{'scan points chosen' | translate}}</p>
-                    <div *ngFor="let scan of chosenScans">
-                        <div class="row">
-                            <p class="me-2">{{ images360[scan].filename }}</p>
-                            <div (click)="onRemoveScanImage(scan)" [style.cursor]="'pointer'">
-                                <span class="iconify" data-icon="mdi:trash-can-outline"></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row mb-3 mt-3" *ngIf="!zoneIsMatterportFloor">
-                <div class="col">
-                    <button type="button" class="btn btn-outline-primary rounded-pill me-2"
-                        (click)="togglePlan()">{{'Choose scan points on plan' |
-                        translate}}</button>
-                    <button type="button" class="btn btn-outline-primary rounded-pill me-2" (click)="toggleCarousel()"
-                        [disabled]="fromPlan || !images360 || images360.length === 0">
-                        {{'Choose scan points from gallery' | translate}}</button>
-                    <button type="button" class="btn btn-outline-primary rounded-pill me-2" (click)="onAddAll()"
-                        [disabled]="fromPlan || !images360 || images360.length === 0">
-                        {{'add-all-scans' | translate}}</button>
-                </div>
-            </div>
-
-            <!-- <div class="mb-3 row">
-                <label class="col-sm-3 col-form-label">{{'No visible scan points' | translate}}</label>
-                <div class="col-sm-3">
-                    <input class="checkbox-apply mt-3" type="checkbox" [(ngModel)]="noScanPoints"
-                        [ngModelOptions]="{standalone: true}">
-                </div>
-            </div> -->
-
-            <div *ngIf="carouselIsVisible" class="mb-2">
-                <lib-carousel *ngIf="images360 && images360.length > 0" [images]="images360"
-                    (currentScan)="currentScanShowing=$event"></lib-carousel>
-                <button type="button" class="btn btn-outline-primary rounded-pill me-2 mt-3"
-                    (click)="onAddScan()">{{'Add to zone' | translate}}</button>
-            </div>
-            <div class="mt-3">
-                <button type="submit" class="btn btn-primary rounded-pill me-2"
-                    [disabled]="fromPlan || !zoneForm.valid">{{'Save' | translate}}</button>
-                <button type="button" (click)="onCancel()" class="btn btn-outline-primary rounded-pill me-2">
-                    {{'Cancel' | translate}}</button>
-            </div>
-        </form>
-    </div>
-    <div class="edit-plan" *ngIf="fromPlan">
-        <lib-sweep-plan-selection style="width: 100%;" [newZoneData]="newZoneDataFromEditor" [spaceID]="spaceID"
-            [multipleFloors]="multipleFloors" [inputZone]="zoneEdit"
-            (sweepsSelected)="onSelectedSweepsFromPlan($event)"></lib-sweep-plan-selection>
-    </div>
-</div>

package/src/lib/components/zones/add-zone/add-zone.component.scss

@@ -1,44 +0,0 @@
-.main-container {
-  display: flex;
-  flex-direction: column;
-}
-
-.edit-plan {
-  display: flex;
-  margin: 8px 0px;
-}
-
-.form-range {
-  width: 100%;
-}
-
-h2 {
-  color: var(--smarterplan-primary);
-  padding: 0px;
-}
-
-.col-form-label {
-  margin-bottom: 1rem;
-}
-.btn-outline-primary {
-  margin-right: 1rem;
-}
-.new-type-input {
-  margin-bottom: 1rem;
-}
-.new-type-text {
-  margin-bottom: 0.5rem;
-}
-.row {
-  margin: 0px;
-}
-
-p {
-  margin: 0;
-  padding-top: calc(0.375rem + 1px);
-  padding-bottom: calc(0.375rem + 1px);
-}
-
-button {
-  min-width: 80px;
-}

package/src/lib/components/zones/add-zone/add-zone.component.spec.ts

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