@smarterplan/ngx-smarterplan-locations 0.2.44 → 0.2.45

package/src/lib/components/form-location/form-location.component.ts

@@ -1,274 +0,0 @@
-import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, AbstractControl } from '@angular/forms';
-import { Space, LevelStatus, SpaceService, PropertyService, BaseUserService, MissionService, enumToArray, uploadFileToS3, Layer, PropertyType, getSignedImageUrlForSpace, LayerService, deleteFromS3 } from '@smarterplan/ngx-smarterplan-core';
-import { ValidatorsService, textValidator, noEmptyValidator, floatValidator } from "@smarterplan/ngx-smarterplan-core";
-
-@Component({
-    selector: 'lib-form-location',
-    templateUrl: './form-location.component.html',
-    styleUrls: ['./form-location.component.scss']
-})
-export class FormLocationComponent implements OnInit {
-
-    form: FormGroup;
-
-    @ViewChild("imageInputContainer")
-    imageInputContainer: ElementRef;
-
-    @ViewChild("imageInput")
-    imageInput: ElementRef;
-
-    @ViewChild("imageBasePreview")
-    imageBasePreview: ElementRef;
-
-    @Input()
-    location: Space;
-
-    imageToUpload: any;
-
-    isSubmitted = false;
-
-    levels: Array<LevelStatus>;
-
-    addMissionForNewSpace = true;
-
-    imageInputText: string;
-
-    currentImage: string;
-
-    imageToBeDeleted: boolean = false;
-
-    errorForm: boolean = false;
-
-    @Output() onChange = new EventEmitter<Space | null>();
-
-    constructor(
-        private spaceService: SpaceService,
-        private propertyService: PropertyService,
-        private userService: BaseUserService,
-        private fb: FormBuilder,
-        private missionService: MissionService,
-        private layerService: LayerService,
-        public validatorsService: ValidatorsService
-    ) {
-        this.levels = enumToArray(LevelStatus);
-    }
-
-    ngOnInit(): void {
-        if (this.location) {
-            this.initEditForm();
-        } else {
-            this.initForm();
-        }
-        this.handleInputImageText();
-    }
-
-    initForm() {
-        this.form = this.fb.group({
-            name: ["", [Validators.required, Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-            addresses: ["", [Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-            latitude: [null, [Validators.maxLength(255), noEmptyValidator(), floatValidator()]],
-            longitude: [null, [Validators.maxLength(255), noEmptyValidator(), floatValidator()]],
-            level: LevelStatus.LOW,
-            classGes: ["", [Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-            classEnergyConsumption: ["", [Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-            constructionYear: ["", [Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-        });
-    }
-
-    initEditForm() {
-        this.form = this.fb.group({
-            id: this.location.id,
-            name: [this.location.name, [Validators.required, Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-            addresses: [this.location.addresses, [Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-            latitude: [this.location.latitude, [Validators.maxLength(255), floatValidator()]],
-            longitude: [this.location.longitude, [Validators.maxLength(255), floatValidator()]],
-            level: this.location.level,
-            classGes: [this.location.classGes, [Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-            classEnergyConsumption: [this.location.classEnergyConsumption, [Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-            constructionYear: [this.location.constructionYear, [Validators.maxLength(255), textValidator(), noEmptyValidator()]],
-        });
-    }
-
-    handleImageInput(target: EventTarget) {
-        this.imageToUpload = (target as HTMLInputElement).files[0];
-        if (this.imageToUpload) {
-            this.imageInputContainer.nativeElement.style.display = "none";
-            const reader = new FileReader();
-            reader.addEventListener("load", () => {
-                this.currentImage = reader.result as string;
-            });
-            reader.readAsDataURL(this.imageToUpload);
-        }
-    }
-
-    async uploadImage(spaceID: string) {
-        if (this.imageToUpload) {
-            uploadFileToS3("locations/", this.imageToUpload, spaceID).then(
-                async (url) => {
-                    if (url) {
-                        await this.spaceService.updateSpace({
-                            id: spaceID,
-                            annexes: url,
-                        });
-                    }
-                },
-            );
-        } else if (this.imageToBeDeleted) {
-            await this.spaceService.updateSpace({
-                id: spaceID,
-                annexes: null,
-            });
-            await deleteFromS3(this.location.annexes);
-        }
-    }
-
-    clearImageFile() {
-        this.imageToUpload = null;
-        this.currentImage = null;
-        this.imageInputContainer.nativeElement.style.display = "flex";
-        this.imageInput.nativeElement.value = "";
-        this.imageInputText = "Add picture";
-    }
-
-    async getLayerByName(name: string): Promise<Layer> {
-        const currentOrgId = this.userService.currentOrganisation().id;
-        const layers = await this.layerService.getLayerByNameForOrganisation(
-            name,
-            currentOrgId,
-        );
-        if (layers) {
-            return layers[0];
-        }
-        // create then
-        return this.layerService.createLayerForOrganisation(name, currentOrgId);
-    }
-
-    async onSubmit() {
-        this.isSubmitted = true;
-        if (!this.form.valid) {
-            this.errorForm = true;
-            return;
-        }
-        try { 
-            this.errorForm = false;
-            let space;
-            if (this.location) {
-                this.changeCommaToDot();
-                space = await this.spaceService.updateSpace(this.form.value);
-                if (space) {
-                    await this.uploadImage(space.id);
-                    this.location = space;
-                    this.onChange.emit(space);
-                }
-            } else {
-                this.changeCommaToDot();
-                const spaceInput = this.form.value as Space;
-                const currentOrgID = this.userService.currentOrganisation().id;
-                spaceInput.organisationID = currentOrgID;
-                let layer = await this.getLayerByName("BUILDING");
-                if (!layer) {
-                    layer = await this.layerService.createLayerForOrganisation(
-                        "BUILDING",
-                        currentOrgID,
-                    );
-                }
-                space = await this.spaceService.createSpace(
-                    spaceInput,
-                    layer,
-                );
-
-                const missions = this.userService.getManagerMissions();
-                if (space && missions.length > 0) {
-                    const exampleMission = missions[0];
-                    await this.uploadImage(space.id);
-                    try {
-                        await this.propertyService.createProperty({
-                            type: PropertyType.PROPERTY,
-                            spaceID: space.id,
-                            organisationID: currentOrgID,
-                        });
-                    } catch (e) {
-                        console.log("API Service does not have Property requests");
-                    }
-
-                    // add directly a mission for this space
-                    if (this.addMissionForNewSpace) {
-                        await this.missionService.create({
-                            spaceID: space.id,
-                            userID: exampleMission.userID,
-                            role: exampleMission.role,
-                            level: exampleMission.level,
-                            organisationID: exampleMission.organisationID,
-                            orderedOrganisationID:
-                                exampleMission.organisationID,
-                        });
-                    }
-                    this.onChange.emit(space);
-                } else {
-                    this.onChange.emit(null);
-                }
-            }
-        } catch (error) {
-            console.error(error);
-            this.onChange.emit(null);
-        }
-    }
-
-    onCancel() {
-        this.form.reset();
-        this.onChange.emit(null);
-    }
-
-    get name(): AbstractControl {
-        return this.form.get("name");
-    }
-
-    changeCommaToDot() {
-        const updatedSpace = this.form.value;
-        if (
-            updatedSpace.latitude &&
-            updatedSpace.latitude.toString().includes(",")
-        ) {
-            updatedSpace.latitude = updatedSpace.latitude
-                .toString()
-                .replace(",", ".");
-            Number.parseFloat(updatedSpace.latitude);
-        }
-        if (
-            updatedSpace.longitude &&
-            updatedSpace.longitude.toString().includes(",")
-        ) {
-            updatedSpace.longitude = updatedSpace.longitude
-                .toString()
-                .replace(",", ".");
-            Number.parseFloat(updatedSpace.longitude);
-        }
-    }
-
-    handleInputImageText() {
-        if (this.location && this.location.annexes) {
-            this.imageInputText = "Change picture";
-            getSignedImageUrlForSpace(this.location).then((url) => {
-                if (url) {
-                    this.currentImage = url;
-                }
-            });
-        } else {
-            this.imageInputText = "Add picture";
-        }
-    }
-
-    
-    isFormError(control) {
-        return control && control.invalid && this.errorForm;
-    }
-
-    
-    onFormChange(){
-        if (this.errorForm && this.form.valid) {
-            this.errorForm = false;
-        }
-
-    }
-}

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

@@ -1,27 +0,0 @@
-<div class="container-fluid dashboard-tab col-sm-10 mb-3" *ngIf="currentSpace" >
-    <div class="m-3">
-      <lib-tab-navigation [menuItems]='menuItems' (onGoBack)="onGoBack()"></lib-tab-navigation>
-    </div>
-    <div class="d-flex justify-content-center" *ngIf="loading">
-      <div class="spinner-border" role="status">
-        <span class="visually-hidden">{{'Loading' | translate}}...</span>
-      </div>
-    </div>
-    <div ngbDropdown class="d-inline-block" *ngIf="currentSpace.visits && currentSpace.visits.length > 0">
-      <button class="btn btn-label-file rounded-pill" id="dropdownBasic1" *ngIf="!currentVisit"
-        ngbDropdownToggle>{{'Choose 3D visit' | translate}}</button>
-      <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-        <button ngbDropdownItem *ngFor="let visit of currentSpace.visits" (click)="setVisit(visit)"> {{ visit.name }}
-        </button>
-      </div>
-    </div>
-    <h3 *ngIf="currentVisit">{{ currentVisit.name }}</h3>
-    <div class="mt-3" *ngIf="currentVisit && currentImages.length == 0 && !loading">
-      <h4>{{'No imported images' | translate }}</h4>
-      <p>{{'For import: go Virtual Visits => Import Images' | translate}}</p>
-    </div>
-    <button *ngIf="currentVisit && currentImages.length > 0 && !loading"
-      class="btn btn-outline-primary rounded-pill no-lowercase mb-2" (click)="onInventoryClick()">
-      {{'Run AI inventory on this image' | translate}}</button>
-    <lib-carousel [images]="currentImages" *ngIf="currentImages" (currentScan)="setCurrentScan($event)"></lib-carousel>
-  </div>

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

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

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

@@ -1,133 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Space, Visit, MenuItem, SpaceService, VisitService, NodeService, InventoryStatus, NavigatorService } from '@smarterplan/ngx-smarterplan-core';
-import { Subject, takeUntil } from 'rxjs';
-
-@Component({
-    selector: 'lib-images',
-    templateUrl: './images.component.html',
-    styleUrls: ['./images.component.scss']
-})
-export class ImagesComponent implements OnInit {
-
-    images: Array<any>;
-
-    spaceID: string;
-
-    currentSpace: Space;
-
-    currentVisit: Visit;
-
-    currentImages: Array<any>;
-
-    loading = false;
-
-    currentScanID: string;
-
-    menuItems: MenuItem[] = [];
-
-    destroy$ = new Subject();
-
-    constructor(
-        private route: ActivatedRoute,
-        private spaceService: SpaceService,
-        private visitService: VisitService,
-        private nodeService: NodeService,
-        private navigatorService: NavigatorService,
-        private router: Router,
-    ) {
-        this.navigatorService.locationIDChange
-            .pipe(takeUntil(this.destroy$))
-            .subscribe((spaceID) => {
-                this.router.navigate(["dashboard/localisation", spaceID, "images"]);
-            });
-
-        this.route.params.subscribe((params) => {
-            this.spaceID = params.id;;
-            this.loadImages();
-        });
-    }
-
-    ngOnInit(): void {
-    }
-
-    ngOnDestroy() {
-        this.destroy$.next(true);
-        this.destroy$.complete();
-    }
-
-    setupMenuItems() {
-        this.menuItems = [
-            { label: "Locations", url: "/localisation" },
-            {
-                label: this.currentSpace.name,
-                url: `/localisation/${this.spaceID}`,
-            },
-            { label: "360° Images" },
-        ];
-
-        if (this.currentVisit) {
-            this.menuItems.push({ label: this.currentVisit.name });
-        }
-    }
-
-    onGoBack() {
-        this.currentVisit = null;
-        this.currentImages = null;
-        this.setupMenuItems();
-    }
-
-    async loadImages() {
-        this.loading = true;
-        this.currentSpace = await this.spaceService.getSpace(this.spaceID);
-        this.setupMenuItems();
-        this.images = await this.visitService.loadImagesForSpace(
-            this.currentSpace,
-        );
-        if (this.currentSpace.visits.length === 1) {
-            this.setVisit(this.currentSpace.visits[0]);
-        }
-        this.loading = false;
-    }
-
-    setVisit(visit) {
-        this.currentVisit = visit;
-        this.currentImages = this.images.filter((im) => {
-            return im.visit === visit;
-        });
-        this.setupMenuItems();
-    }
-
-    setCurrentScan(id) {
-        this.currentScanID = id;
-    }
-
-    async onInventoryClick() {
-        const { node } = this.currentVisit;
-        const { filename } = this.currentImages[this.currentScanID]; // 110ee452_sweep.jpeg
-        // check if node has already errors of inventory
-        const missingFilesErrors = [
-            InventoryStatus.ERROR_FILE_JSON_NOT_EXIST,
-            InventoryStatus.ERROR_FILE_MODEL_NOT_EXIST,
-            InventoryStatus.ERROR_FILE_OBJ_NOT_EXIST,
-        ];
-        if (
-            node.inventoryStatus &&
-            missingFilesErrors.includes(node.inventoryStatus)
-        ) {
-            alert(
-                "Files missing for this visit's inventory. Contact your administrator.",
-            );
-        } else {
-            await this.nodeService.updateNode({
-                id: node.id,
-                inventoryStatus: InventoryStatus.TO_RUN_ONE_IMAGE,
-                navigationForInventory: filename.split("_")[0],
-            });
-            alert(
-                "Automatic AI Inventory started! Detected equipments will appear soon in the visit.",
-            );
-        }
-    }
-
-}

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

@@ -1,63 +0,0 @@
-<div class="dashboard-tab">
-    <div class="header-dashboard-tab">
-      <div class="m-3">
-        <lib-tab-navigation (onGoBack)="onFormChange(null)" [menuItems]='menuItems'></lib-tab-navigation>
-        <span class="ml-3 refreshIcon" (click)="refresh()" *ngIf="!(isAdding)" ngbTooltip="Refresh list">
-          <span class="iconify refreshIcon" data-icon="ion:refresh-circle" data-width="35" data-rotate="90deg"></span>
-        </span>
-      </div>  
-      <lib-search-bar *ngIf="!isAdding && !isMuseumUser" [searchable]="locations" [objectType]="getSearchType()"
-        (searchEvent)="applyResultsSearchBar($event)"></lib-search-bar>
-      
-      <div class="col-md-8">
-        <div class="sp-row" *ngIf="!isAdding && isManager">
-          <button data-testid="new-location-btn" class="btn btn-outline-primary rounded-pill add-location" (click)="onAddLocation()">
-            {{'Add location' | translate}}</button>
-          <!-- <div class="outer_circle">
-            <button id='btn-icon' (click)="onAddLocation()"></button>
-          </div> -->
-        </div>
-      </div>
-    </div>
-    <hr>
-    <div class="row" *ngIf="isAdding">
-      <div class="col-md-6">
-        <h4>{{'New location' | translate}}</h4>
-      </div>
-    </div>
-    <section *ngIf="!isAdding">
-      <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6" *ngIf="filteredLocations">
-          <ul data-testid="location-list-container" class="list-group list-group-flush">
-            <li class="d-flex justify-content-between list-group-item"
-              *ngFor="let loc of filteredLocations; index as index">
-              <div class="d-flex">
-                <div class="col-md-5 img-main-container">
-                  <div id="img_container">
-                    <img class="location-img" *ngIf="loc.annexes; else elseBlock" [src]="loc.annexes">
-                    <ng-template #elseBlock><img class="location-img"
-                        src="./../../../../assets/images/visuel-off-big.jpg" />
-                    </ng-template>
-                    <button [ngClass]="['open-btn-'+getStringNoSpace(loc.name)]" *ngIf="isManagerForSpace(loc.id)" class="btn-details" (click)="onDetailViewClick(loc.id)">
-                      {{'View details' | translate}}</button>
-                  </div>
-  
-                </div>
-                <div class="col-md-7 location-info">
-                  <p>{{loc.name}}</p>
-                  <p>{{loc.addresses}}</p>
-                  <p [ngClass]="['view-btn-'+getStringNoSpace(loc.name)]" *ngFor="let visit of loc.visits" (click)="onVisitClick(loc, visit)" class="visit-name"
-                    [style.cursor]="'pointer'" ngbTooltip="Visit">{{ visit.name ? visit.name : loc.name}}</p>
-                </div>
-              </div>
-            </li>
-  
-          </ul>
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <lib-map [spaces]="filteredLocations"></lib-map>
-        </div>
-      </div>
-    </section>
-    <lib-form-location *ngIf="isAdding" (onChange)="onFormChange($event)"></lib-form-location>
-</div>

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

@@ -1,121 +0,0 @@
-.searchbar {
-  margin-bottom: 10px;
-}
-
-input[type="file"] {
-  display: none;
-}
-
-.form-control {
-  border-radius: var(--form-control-border-radius);
-}
-
-.custom-select {
-  border-color: var(--smarterplan-primary);
-  width: auto;
-}
-
-.form-new-loc {
-  background-color: lightgray;
-  padding-top: 10px;
-  padding-bottom: 10px;
-  margin-bottom: 15px;
-}
-
-.btn-outline-primary {
-  background-color: white;
-}
-
-h4 {
-  color: var(--smarterplan-primary);
-}
-
-section {
-  .list-group {
-    margin-top: 15px;
-  }
-
-  .list-group-item {
-    padding: 5px 0px 5px 0px;
-  }
-
-  .location-info {
-    font-size: 1.1em;
-  }
-  .location-img {
-    width: 100%;
-    object-fit: cover;
-    object-position: center bottom;
-    height: 165px;
-  }
-}
-#img_container {
-  position: relative;
-  display: inline-block;
-  text-align: center;
-  width: 250px;
-}
-.img-main-container {
-  max-width: 250px;
-  width: 250px !important;
-  margin-right: 10px;
-}
-.visit-name {
-    color: var(--smarterplan-primary);
-    font-weight: 600;
-}
-
-.btn-details {
-  background-color: var(--smarterplan-primary-transparent);
-  position: absolute;
-  color: white;
-  bottom: 0px;
-  right: 0px;
-  width: 100%;
-  height: 30%;
-  border: none;
-  font-size: 1em;
-  text-transform: lowercase;
-}
-
-#btn-icon {
-  width: 30px;
-  height: 30px;
-  background: url("../../../../assets/icons/plus.svg");
-  border: none;
-  vertical-align: middle;
-}
-
-#btn-icon:hover {
-  background: url("../../../../assets/icons/plus-over.svg");
-}
-
-#btn-icon[disabled]:hover {
-  background: url("../../../../assets/icons/plus.svg");
-}
-
-.outer_circle {
-  background-color: #ebebeb;
-  border-radius: 50%;
-  width: 32px;
-  height: 32px;
-  padding: 1px;
-  margin-left: 5px;
-}
-
-.refreshIcon {
-    color: var(--smarterplan-primary);
-    cursor: pointer;
-}
-
-.refreshIcon svg {
-  vertical-align: middle !important;
-}
-.add-location {
-  width: 12vw;
-}
-
-.sp-row {
-    display: flex;
-    flex-direction: row;
-}

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

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