Merge branch 'main' of https://github.com/hydrogen2oxygen/final-approach

hydrogen2oxygen · Oct 31, 2023 · 25a92d5 · 25a92d5
2 parents 1613527 + 93a5eb2
commit 25a92d5
Show file tree

Hide file tree

Showing 8 changed files with 880 additions and 675 deletions.
diff --git a/server/src/main/java/de/pietro/lusso/territory/domain/dashboard/TerritoryInfos.java b/server/src/main/java/de/pietro/lusso/territory/domain/dashboard/TerritoryInfos.java
@@ -13,6 +13,8 @@ public class TerritoryInfos {
     private Date registerRequest;
     private Date returnRequest;
 
+    private String simpleFeatureData;
+
     public UUID getUuid() {
         return uuid;
     }
@@ -68,4 +70,12 @@ public Date getReturnRequest() {
     public void setReturnRequest(Date returnRequest) {
         this.returnRequest = returnRequest;
     }
+
+    public String getSimpleFeatureData() {
+        return simpleFeatureData;
+    }
+
+    public void setSimpleFeatureData(String simpleFeatureData) {
+        this.simpleFeatureData = simpleFeatureData;
+    }
 }
diff --git a/server/src/main/java/de/pietro/lusso/territory/services/DatabaseService.java b/server/src/main/java/de/pietro/lusso/territory/services/DatabaseService.java
@@ -457,6 +457,8 @@ public int compare(Preacher o1, Preacher o2) {
                     territoryInfos.setName(territory.getName());
                     territoryInfos.setAssignDate(lastRegistryEntry.getAssignDate());
                     territoryInfos.setReturnDate(lastRegistryEntry.getReturnDate());
+                    TerritoryMap territoryMap = getTerritoryMapByNumber(territoryNumber);
+                    territoryInfos.setSimpleFeatureData(territoryMap.getSimpleFeatureData());
                     dashboard.getTerritories().add(territoryInfos);
                 }
 

diff --git a/server/src/main/territoryMap/package-lock.json b/server/src/main/territoryMap/package-lock.json
diff --git a/server/src/main/territoryMap/src/app/app-routing.module.ts b/server/src/main/territoryMap/src/app/app-routing.module.ts
@@ -1,7 +1,6 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
 import {MapComponent} from "./components/map/map.component";
-import {DashboardComponent} from "./components/dashboard/dashboard.component";
 
 const routes: Routes = [
   { path: 'map', component: MapComponent },

diff --git a/server/src/main/territoryMap/src/app/components/map/map.component.ts b/server/src/main/territoryMap/src/app/components/map/map.component.ts
@@ -154,6 +154,7 @@ export class MapComponent implements OnInit {
         this.id = params['id'];
         if (this.id.startsWith("dashboard")) {
           this.dashboardMode = true;
+          this.loadDashboardData(this.id)
         } else {
           this.loadTerritoryData(this.id);
         }
@@ -165,7 +166,21 @@ export class MapComponent implements OnInit {
     });
   }
 
-  private loadTerritoryData(uuid: string) {
+  private loadDashboardData(uuid:string) {
+    this.dataService.loadDashboardData(uuid).subscribe( dashboard => {
+      dashboard.territories.forEach(terr => {
+        console.log(terr)
+        if (terr.simpleFeatureData != null) {
+          this.readTerritoryMap(terr.number, terr.name, terr.simpleFeatureData);
+        }
+      })
+      this.extent = this.source.getExtent();
+      this.map?.getView().fit(this.extent);
+      this.title.setTitle('DASHBOARD TERRITORIES');
+    })
+  }
+
+  private loadTerritoryData(uuid:string) {
 
     this.dataService.loadTerritoryData(uuid).subscribe(territoryData => {
 
@@ -178,28 +193,7 @@ export class MapComponent implements OnInit {
       }
 
       if (territoryData.simpleFeatureData != null) {
-        let feature = this.wktFormat.readFeature(territoryData.simpleFeatureData, {
-          dataProjection: 'EPSG:3857',
-          featureProjection: 'EPSG:3857'
-        });
-
-        feature.set('number', territoryData.number);
-        feature.set('name', '' + territoryData.name);
-        feature.setId(territoryData.number);
-        this.source.addFeature(feature);
-
-        // @ts-ignore
-        this.extent = feature.getGeometry().getExtent();
-        this.map?.getView().fit(this.extent);
-
-        this.title.setTitle(territoryData.number + ' ' + territoryData.name);
-
-        this.territoryData.streetList.forEach(street => {
-          let value: boolean = this.local.get(this.territoryData.number + ' ' + street.streetName);
-          if (value == null) value = false;
-          street.checked = value;
-        });
-
+        this.readTerritoryMap(territoryData.number, territoryData.name, territoryData.simpleFeatureData);
       } else if (territoryData.territories.length > 0) {
         this.title.setTitle(territoryData.name);
 
@@ -214,11 +208,30 @@ export class MapComponent implements OnInit {
           feature.setId(t.number);
           this.source.addFeature(feature);
         });
-
-        this.extent = this.source.getExtent();
-        this.map?.getView().fit(this.extent);
       }
 
+      this.extent = this.source.getExtent();
+      this.map?.getView().fit(this.extent);
+
+    });
+  }
+
+  private readTerritoryMap(number:string,name:string,simpleFeatureData:string) {
+    let feature = this.wktFormat.readFeature(simpleFeatureData, {
+      dataProjection: 'EPSG:3857',
+      featureProjection: 'EPSG:3857'
+    });
+
+    feature.set('number', number);
+    feature.set('name', number + ' ' + name);
+    feature.setId(number);
+    this.source.addFeature(feature);
+    this.title.setTitle(number + ' ' + name);
+
+    this.territoryData.streetList.forEach(street => {
+      let value: boolean = this.local.get(this.territoryData.number + ' ' + street.streetName);
+      if (value == null) value = false;
+      street.checked = value;
     });
   }
 

diff --git a/server/src/main/territoryMap/src/app/domains/Dashboard.ts b/server/src/main/territoryMap/src/app/domains/Dashboard.ts
@@ -11,4 +11,5 @@ export class TerritoryInfos {
   returnDate:Date|undefined;
   registerRequest:Date|undefined;
   returnRequest:Date|undefined;
+  simpleFeatureData: string = '';
 }
diff --git a/server/src/main/territoryMap/src/app/domains/TerritoryData.ts b/server/src/main/territoryMap/src/app/domains/TerritoryData.ts
@@ -33,7 +33,7 @@ export class TerritoryData {
   UUID:string = '';
   preacherUUID:string = '';
   simpleFeatureData: string = '';
-  number: number = 0;
+  number: string = '';
   name: string = '';
   notes: string = '';
   lastUpdate: Date = new Date();

diff --git a/server/src/main/ui2/src/app/components/designer/designer.component.ts b/server/src/main/ui2/src/app/components/designer/designer.component.ts
@@ -186,7 +186,11 @@ export class DesignerComponent implements OnInit, AfterViewInit {
 
         if (!(feature.get('imported') || feature.get('residentialUnit'))) {
           // @ts-ignore
-          if (that.map.getView().getZoom() > 14) {
+          if (that.map.getView().getZoom() > 14 && feature.get('additionalNote')) {
+            style.getText().setText(feature.get('name') + "\n" + feature.get('additionalNote'));
+          } else
+            // @ts-ignore
+            if (that.map.getView().getZoom() > 14) {
             style.getText().setText(feature.get('name'));
           } else {
             style.getText().setText('');
@@ -294,6 +298,9 @@ export class DesignerComponent implements OnInit, AfterViewInit {
     this.mapDesign = mapDesign;
 
     let format = new WKT();
+    let territories = this.congregation.territoriesAssigned;
+    territories = territories.concat(this.congregation.territoriesOlder4Months)
+    territories = territories.concat(this.congregation.territoriesOlder8Months)
 
     mapDesign.territoryMapList.forEach(territoryMap => {
 
@@ -307,6 +314,8 @@ export class DesignerComponent implements OnInit, AfterViewInit {
       feature.set('name', '' + territoryMap.territoryNumber);
       feature.set('draft', territoryMap.draft);
       feature.setId(territoryMap.territoryNumber);
+      let territory = territories.find(terr => terr.number == territoryMap.territoryNumber)
+      if (territory) feature.set('additionalNote', territory.registryEntryList[territory.registryEntryList.length - 1].preacher.name)
       this.source.addFeature(feature);
 
       if (territoryMap.residentialUnits) {