Gestion des géométries (création/edition pour site et groupe de site) #68

andriacap · 2023-05-30T15:57:39Z

Création/Edition de géometrie de site lorsqu'on en renseigne geometry_type dans le fichier de config site.json
Rendre possible la création de groupe de site si l'utilisateur précise qu'il veut renseigner une géometrie

Du travail issu des autres PR (feat/display datatable , chainInput et breadcrumb) a été ré-utilisé pour rendre plus cohérent les tests de l'implémentation de cette fonctionnalité de gestion de géométries

In the site entry part

- Get all information from loading component to build breadcrumb information - Fix call twice siteService (delete the one with snake_case) - Use logic from observable and snapshot url to satisfy all case to access to route (by component, directly by url etc) Reviewed-by: andriacap

Need dev to the two other branches Try to add logic into map-list-component Check if it is the best way to manage map Reviewed-by: andriac

Subscription to initConfig useless Reviewed-by: andricap

Merge work from branch breadcrumb branhc and resolve problem with other feature like problem initialization of sites groups (resolver) Reviewed-by: andriacap

Back component as it was Reviewed-by: andriacap

Put back alert to create geometry if geometry_type precise in config (json) Reviewed-by: andricap

Create into formService an observable and subscribe into mapListComponent to load and connect the form with geometry info Reviewed-by: andriacap

- Change the name of form Object for homogeneity - Fix problem to load config of siteService in sitesComponents Reviewed-by: andriacap

Reviewed-by: andriacap

Alternative to the "resolver" in order to load config and necessary items to display site properties and data table Reviewed-by: andriacap

- description when delete object - change selectedObject on component site - remove duplicate "bEdit" - add "ngIf=!bEdit" on site component (to prevent display datatable on edition) - fix upper case letter in variable Reviewed-by: andriacap

- change the way to load config on visit-component (=site/:id) - fix problem on mergeMap that doesn't complete (wrong observable called) Reviewed-by: andriacap

- keep trying to send geometry to "objForm" object (FormGroup) Reviewed-by: andriacap

Reviewed-by: andriacap

Fix request DELETE in backend for site and change the way to get_sites_group_by_id by using the custom query get_or_404 Reviewed-by: andriacap

When trying to add siteGroup's site child data no pass between the form component and the component of sites-groups . Creation of resolver to load information of siteGroup selected in order to updateBreadCrumb but also to specify the siteGroup Parent. Reviewed-by: andriac

Create new method in form component to redirect to the good url according the fact we delete site. Reviewed-by: andriac

Specific properties were not loaded , add check specific schema to load if specific properties exist Reviewed-by: andriac

Add page not found in order to manage into monitoring module Reviewed-by: andriac

Reviewed-by:andriac

Display types_site label into data-table component and properties-component Reviewed-by: andriac

mvergez

Merci beaucoup pour tous ces développements !!!!
Peu de corrections à faire je pense, quelques remarques de choses à faire plus tard.

mvergez · 2023-07-04T11:57:04Z

backend/gn_module_monitoring/routes/monitoring.py

@@ -127,7 +127,7 @@ def create_or_update_object_api_sites_sites_group(module_code, object_type, id=N
    else:
        module = {"id_module": "generic"}
        # TODO : A enlever une fois que le post_data contiendra geometry et type depuis le front
-        if object_type == "site":
+        if object_type == "site" and not 'geometry' in post_data:
            post_data["geometry"] = {"type": "Point", "coordinates": [2.5, 50]}


C'est pour tester le "coordinates": [2.5, 50] ?

mvergez · 2023-07-04T11:58:32Z

frontend/app/components/breadcrumbs/breadcrumbs.component.ts

+import { IBreadCrumb } from "../../interfaces/object";
+
+export const breadCrumbElementBase: IBreadCrumb = {
+  "description":"Liste des groupes de site",


Je rajouterai un "s" à site car un groupe est composé souvent de plusieurs sites. Ou alors un "(s)"

mvergez · 2023-07-04T13:02:09Z

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

+            })
+          );
+        }),
+        mergeMap((frmCtrl) => {


Comme vu ensemble, peut-être mettre un switchMap pour récupérer la dernière valeur de l'observable... ça ne règle pas le souci du form qui se met à jour plusieurs fois mais ça peut temporiser pour préserver le backend

mvergez · 2023-07-06T08:58:10Z

frontend/app/components/monitoring-map-list/monitoring-map-list.component.css

+
+
+  :host ::ng-deep .hide-draw-form .leaflet-top.leaflet-left {


Faire gaffe que ça casse pas la map sur d'autres vues mais normalement ça devrait le faire

mvergez · 2023-07-06T08:59:13Z

frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts

  displayMap: boolean = true;
-  constructor() {}
+  siteSiteGroup: SiteSiteGroup | null = null;
+  apiService: ApiGeomService;


Besoin de tout ça ?
Mais peut-être que cette partie là est en cours ? C'est lié à la modification de la géométrie ?

mvergez · 2023-07-06T09:01:48Z

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

@@ -35,6 +37,10 @@ export class MonitoringSitesComponent extends MonitoringGeomComponent implements
  objForm: FormGroup;
  objectType: IobjObs<ISite>;
  objParent: any;
+  breadCrumbElemnt: IBreadCrumb = { label: 'Groupe de site', description: '' };


typo ici.
A voir si ce n'est pas généralisables via héritage de composants par exemple, mais à voir plus tard

mvergez · 2023-07-06T09:06:01Z

frontend/app/components/monitoring-sitesgroups/monitoring-sitesgroups.component.ts

@@ -33,6 +36,7 @@ export class MonitoringSitesGroupsComponent
  objectType: IobjObs<ISitesGroup>;
  objForm: FormGroup;
  objInitForm: Object = {};
+  breadCrumbElementBase: IBreadCrumb = breadCrumbElementBase;
  // siteGroupEmpty={
  //   "comments" :'',
  //   sites_group_code: string;


Retirer les commentaires de ce fichier s'ils ne sont pas utilisés

mvergez · 2023-07-06T09:09:12Z

frontend/app/resolver/sites-groups.resolver.ts

+import { IPaginated } from '../interfaces/page';
+import { IobjObs } from '../interfaces/objObs';
+import { map } from 'rxjs/operators';
+const LIMIT = 10;


Utiliser plutôt le fichier constants/api (https://github.com/naturalsolutions/gn_module_monitoring/blob/52f359ee158bf66b2b51d4eca45eb9876a38860c/frontend/app/constants/api.ts).

Ce const est défini dans d'autres fichiers, il faudrait le remplacer partout

mvergez · 2023-07-06T09:11:33Z

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

+        })
+      )
+      .subscribe(({data, objectObs}) => {
+        console.log(data);


Console.log à supprimer

mvergez · 2023-07-06T09:12:00Z

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

@@ -15,6 +15,8 @@ import {
 } from "../../services/api-geom.service";
 import { ObjectService } from "../../services/object.service";
 import { IobjObs } from "../../interfaces/objObs";
+import { IBreadCrumb } from "../../interfaces/object";
+import { breadCrumbElementBase } from "../breadcrumbs/breadcrumbs.component";

 const LIMIT = 10;


Utiliser le constants/api.ts plutôt (https://github.com/naturalsolutions/gn_module_monitoring/blob/52f359ee158bf66b2b51d4eca45eb9876a38860c/frontend/app/constants/api.ts)

Maxime Vergez and others added 11 commits May 4, 2023 12:01

feat(front): try to make breadcrumb work

6b0d947

In the site entry part

feat(wip): merge chainInput and display-data-info

21900b2

Need dev to the two other branches Try to add logic into map-list-component Check if it is the best way to manage map Reviewed-by: andriac

feat: remove unused function

f4ebd20

Subscription to initConfig useless Reviewed-by: andricap

fix: put outside updateBreadCrumb in sitegp comp

849afd2

Merge work from branch breadcrumb branhc and resolve problem with other feature like problem initialization of sites groups (resolver) Reviewed-by: andriacap

feat: remove onInit to mapListComponent

0bde3ba

Back component as it was Reviewed-by: andriacap

feat(wip): manage geometry type into form

838db26

Put back alert to create geometry if geometry_type precise in config (json) Reviewed-by: andricap

feat(wip) change way to manage map obj component

18e312c

Create into formService an observable and subscribe into mapListComponent to load and connect the form with geometry info Reviewed-by: andriacap

fix: rename obj Form and fix pb load confi obj

cf5d431

- Change the name of form Object for homogeneity - Fix problem to load config of siteService in sitesComponents Reviewed-by: andriacap

fix: remove unused edit site component

2ed2008

Reviewed-by: andriacap

fix: loading config object site

1429320

Alternative to the "resolver" in order to load config and necessary items to display site properties and data table Reviewed-by: andriacap

andriacap force-pushed the feat/crud-map branch from 36535f6 to 1429320 Compare June 1, 2023 07:46

andriacap added 3 commits June 1, 2023 18:41

fix: existing little problem

5133540

- description when delete object - change selectedObject on component site - remove duplicate "bEdit" - add "ngIf=!bEdit" on site component (to prevent display datatable on edition) - fix upper case letter in variable Reviewed-by: andriacap

fix: problem to load specific site

d4705e3

- change the way to load config on visit-component (=site/:id) - fix problem on mergeMap that doesn't complete (wrong observable called) Reviewed-by: andriacap

feat(wip) : manage map

8b630c7

- keep trying to send geometry to "objForm" object (FormGroup) Reviewed-by: andriacap

andriacap force-pushed the feat/crud-map branch from 79d305a to 8b630c7 Compare June 1, 2023 16:56

andriacap added 6 commits June 1, 2023 20:28

fix: error on form with obj properties/config

0d33303

Reviewed-by: andriacap

fix(css): height of form zone scrollable

82fb775

fix: problem when delete site child

a8bc1e2

Fix request DELETE in backend for site and change the way to get_sites_group_by_id by using the custom query get_or_404 Reviewed-by: andriacap

fix: problem redirection on delete site action

a856e4c

Create new method in form component to redirect to the good url according the fact we delete site. Reviewed-by: andriac

fix: untracked gitlab-ci.yml

65303ae

andriacap force-pushed the feat/crud-map branch from 83dea7c to 65303ae Compare June 27, 2023 16:18

andriacap and others added 7 commits June 29, 2023 12:02

fix: load specific properties obj

bb40d7a

Specific properties were not loaded , add check specific schema to load if specific properties exist Reviewed-by: andriac

feat: page not found specific to monitoring

110d970

Add page not found in order to manage into monitoring module Reviewed-by: andriac

feat: not found working for request status 404

81df188

Reviewed-by:andriac

fix: change format scc to css not-found comp

b5adc4d

feat: display types_site label in table and prop

a6ed3dc

Display types_site label into data-table component and properties-component Reviewed-by: andriac

feat(api): return label of nomenclature type site

2a0969c

style(config): types site attribut label

52f359e

mvergez suggested changes Jul 6, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gestion des géométries (création/edition pour site et groupe de site) #68

Gestion des géométries (création/edition pour site et groupe de site) #68

andriacap commented May 30, 2023 •

edited

Loading

mvergez left a comment

mvergez Jul 4, 2023

mvergez Jul 4, 2023

mvergez Jul 4, 2023

mvergez Jul 6, 2023

mvergez Jul 6, 2023

mvergez Jul 6, 2023

mvergez Jul 6, 2023

mvergez Jul 6, 2023

mvergez Jul 6, 2023

mvergez Jul 6, 2023

Gestion des géométries (création/edition pour site et groupe de site) #68

Are you sure you want to change the base?

Gestion des géométries (création/edition pour site et groupe de site) #68

Conversation

andriacap commented May 30, 2023 • edited Loading

mvergez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andriacap commented May 30, 2023 •

edited

Loading