Default value

Author: amandine-sahl

frontend/app/components/monitoring-form-g/monitoring-form-g.component.ts

@@ -61,11 +61,13 @@ export class MonitoringFormGComponent implements OnInit, AfterViewInit {
   ) {}
 
   ngAfterViewInit() {
-    this.formValues(this.object).subscribe((formValue) => {
-      if (this.object) {
-        this.form.patchValue(formValue);
-      }
-      this.setDefaultFormValue();
+    if (this.object) {
+      this.form.patchValue(this.object);
+    }
+    this.setDefaultFormValue();
+
+    this.formValues(this.form.value).subscribe((formValue) => {
+      this.form.patchValue(formValue);
       if (this.config['geometry_type']) {
         this._formService.changeFormMapObj({
           frmGp: this.form.controls['geometry'] as FormControl,
@@ -106,7 +108,7 @@ export class MonitoringFormGComponent implements OnInit, AfterViewInit {
           this.object.geometry = null;
         } else {
           // TODO pourquoi la conversion en JSON ici ?
-          this.object.geometry = JSON.parse(this.object.geometry);
+          this.object.geometry = this.object.geometry;
         }
       }
     }
@@ -126,14 +128,16 @@ export class MonitoringFormGComponent implements OnInit, AfterViewInit {
   setDefaultFormValue() {
     const value = this.form.value;
     const date = new Date();
+    const isoDate =
+      date.getFullYear() +
+      '-' +
+      String(date.getMonth() + 1).padStart(2, '0') +
+      '-' +
+      String(date.getDate()).padStart(2, '0');
     const defaultValue = {
       id_digitiser: value['id_digitiser'] || this.currentUser.id_role,
       id_inventor: value['id_inventor'] || this.currentUser.id_role,
-      first_use_date: value['first_use_date'] || {
-        year: date.getUTCFullYear(),
-        month: date.getUTCMonth() + 1,
-        day: date.getUTCDate(),
-      },
+      first_use_date: value['first_use_date'] || isoDate,
     };
     this.form.patchValue(defaultValue);
   }
@@ -225,8 +229,10 @@ export class MonitoringFormGComponent implements OnInit, AfterViewInit {
     return formDef;
   }
   formValues(objData): Observable<any> {
+    if (!objData) {
+      return of(true);
+    }
     let schema = this.config['fields'];
-
     const properties = Utils.copy(objData);
     const observables = {};
 
@@ -235,6 +241,9 @@ export class MonitoringFormGComponent implements OnInit, AfterViewInit {
       if (!(elem || [])['type_widget']) {
         continue;
       }
+      if (!(attribut_name in properties)) {
+        continue;
+      }
       observables[attribut_name] = this._formUtils.toForm(elem, properties[attribut_name]);
     }
 

frontend/app/components/monitoring-site-form-g/monitoring-site-form-g.component.ts

@@ -14,6 +14,7 @@ import { DataUtilsService } from '../../services/data-utils.service';
 import { JsonData } from '../../types/jsondata';
 import { GeoJSONService } from '../../services/geojson.service';
 import { NavigationService } from '../../services/navigation.service';
+import { MonitoringObjectService } from '../../services/monitoring-object.service';
 
 @Component({
   selector: 'pnx-monitoring-site-form-g',
@@ -38,6 +39,7 @@ export class MonitoringSiteFormGComponent extends MonitoringFormGComponent {
     _geojsonService: GeoJSONService,
     _navigationService: NavigationService,
     _route: ActivatedRoute,
+    _formUtils: MonitoringObjectService,
     translate: TranslateService
   ) {
     super(
@@ -50,6 +52,7 @@ export class MonitoringSiteFormGComponent extends MonitoringFormGComponent {
       _geojsonService,
       _navigationService,
       _route,
+      _formUtils,
       translate
     );
   }

frontend/app/components/monitoring-sites-create/monitoring-sites-create.component.ts

@@ -37,11 +37,11 @@ export class MonitoringSitesCreateComponent implements OnInit {
 
   ngOnInit() {
     this.moduleCode = this._route.snapshot.data.createSite.moduleCode;
-    this.siteService.setModuleCode(this.moduleCode);
 
+    this.currentUser = this._auth.getCurrentUser();
     this.moduleConfig = this._configServiceG.config();
     this.form = this._formBuilder.group({});
-    this.currentUser = this._auth.getCurrentUser();
+
     // Création d'un nouveau site
     this.site = null;
 

frontend/app/interfaces/geom.ts

@@ -44,7 +44,7 @@ export interface ISite extends IGeomObject {
   types_site: JsonData[];
   medias: JsonData[];
   id_sites_group: number;
-  id_inventor: string[];
+  id_inventor: number;
   inventor: string[];
 }