From 12d766c1e4c2e74570dfd81e595f0d2d4806b195 Mon Sep 17 00:00:00 2001 From: amandine-sahl Date: Tue, 18 Jun 2024 17:14:12 +0200 Subject: [PATCH] Rename component --- .../monitoring-map-list.component.ts | 1 - .../monitoring-sites-detail.component.css} | 0 .../monitoring-sites-detail.component.html} | 0 .../monitoring-sites-detail.component.ts} | 8 ++++---- .../monitoring-sitesgroups-detail.component.css} | 0 .../monitoring-sitesgroups-detail.component.html} | 0 .../monitoring-sitesgroups-detail.component.ts} | 8 ++++---- frontend/app/gnModule.module.ts | 15 +++++++-------- 8 files changed, 15 insertions(+), 17 deletions(-) rename frontend/app/components/{monitoring-sites/monitoring-sites.component.css => monitoring-sites-detail/monitoring-sites-detail.component.css} (100%) rename frontend/app/components/{monitoring-visits/monitoring-visits.component.html => monitoring-sites-detail/monitoring-sites-detail.component.html} (100%) rename frontend/app/components/{monitoring-visits/monitoring-visits.component.ts => monitoring-sites-detail/monitoring-sites-detail.component.ts} (98%) rename frontend/app/components/{monitoring-visits/monitoring-visits.component.css => monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.css} (100%) rename frontend/app/components/{monitoring-sites/monitoring-sites.component.html => monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.html} (100%) rename frontend/app/components/{monitoring-sites/monitoring-sites.component.ts => monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.ts} (97%) diff --git a/frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts b/frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts index 8c0cb6aa6..cdc8773c2 100644 --- a/frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts +++ b/frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts @@ -1,7 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { tap, mergeMap, map, distinctUntilChanged } from 'rxjs/operators'; import { SiteSiteGroup } from '../../interfaces/objObs'; -import { MonitoringSitesComponent } from '../monitoring-sites/monitoring-sites.component'; import { FormService } from '../../services/form.service'; import { ApiGeomService } from '../../services/api-geom.service'; import { ConfigJsonService } from '../../services/config-json.service'; diff --git a/frontend/app/components/monitoring-sites/monitoring-sites.component.css b/frontend/app/components/monitoring-sites-detail/monitoring-sites-detail.component.css similarity index 100% rename from frontend/app/components/monitoring-sites/monitoring-sites.component.css rename to frontend/app/components/monitoring-sites-detail/monitoring-sites-detail.component.css diff --git a/frontend/app/components/monitoring-visits/monitoring-visits.component.html b/frontend/app/components/monitoring-sites-detail/monitoring-sites-detail.component.html similarity index 100% rename from frontend/app/components/monitoring-visits/monitoring-visits.component.html rename to frontend/app/components/monitoring-sites-detail/monitoring-sites-detail.component.html diff --git a/frontend/app/components/monitoring-visits/monitoring-visits.component.ts b/frontend/app/components/monitoring-sites-detail/monitoring-sites-detail.component.ts similarity index 98% rename from frontend/app/components/monitoring-visits/monitoring-visits.component.ts rename to frontend/app/components/monitoring-sites-detail/monitoring-sites-detail.component.ts index fa5db5615..05c056621 100644 --- a/frontend/app/components/monitoring-visits/monitoring-visits.component.ts +++ b/frontend/app/components/monitoring-sites-detail/monitoring-sites-detail.component.ts @@ -30,11 +30,11 @@ import { MonitoringObjectService } from '../../services/monitoring-object.servic import { MonitoringObject } from '../../class/monitoring-object'; @Component({ - selector: 'monitoring-visits', - templateUrl: './monitoring-visits.component.html', - styleUrls: ['./monitoring-visits.component.css'], + selector: 'monitoring-sites-detail', + templateUrl: './monitoring-sites-detail.component.html', + styleUrls: ['./monitoring-sites-detail.component.css'], }) -export class MonitoringVisitsComponent extends MonitoringGeomComponent implements OnInit { +export class MonitoringSitesDetailComponent extends MonitoringGeomComponent implements OnInit { @Input() visits: IVisit[]; @Input() page: IPage; // colsname: typeof columnNameVisit = columnNameVisit; diff --git a/frontend/app/components/monitoring-visits/monitoring-visits.component.css b/frontend/app/components/monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.css similarity index 100% rename from frontend/app/components/monitoring-visits/monitoring-visits.component.css rename to frontend/app/components/monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.css diff --git a/frontend/app/components/monitoring-sites/monitoring-sites.component.html b/frontend/app/components/monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.html similarity index 100% rename from frontend/app/components/monitoring-sites/monitoring-sites.component.html rename to frontend/app/components/monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.html diff --git a/frontend/app/components/monitoring-sites/monitoring-sites.component.ts b/frontend/app/components/monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.ts similarity index 97% rename from frontend/app/components/monitoring-sites/monitoring-sites.component.ts rename to frontend/app/components/monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.ts index d1adb338a..c1bb47eac 100644 --- a/frontend/app/components/monitoring-sites/monitoring-sites.component.ts +++ b/frontend/app/components/monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component.ts @@ -26,11 +26,11 @@ import { PermissionService } from '../../services/permission.service'; const LIMIT = 10; @Component({ - selector: 'monitoring-sites', - templateUrl: './monitoring-sites.component.html', - styleUrls: ['./monitoring-sites.component.css'], + selector: 'monitoring-sitesgroups-detail', + templateUrl: './monitoring-sitesgroups-detail.component.html', + styleUrls: ['./monitoring-sitesgroups-detail.component.css'], }) -export class MonitoringSitesComponent extends MonitoringGeomComponent implements OnInit { +export class MonitoringSitesgroupsDetailComponent extends MonitoringGeomComponent implements OnInit { siteGroupId: number; sites: ISite[]; sitesGroup: ISitesGroup; diff --git a/frontend/app/gnModule.module.ts b/frontend/app/gnModule.module.ts index b65cedee1..99106a802 100644 --- a/frontend/app/gnModule.module.ts +++ b/frontend/app/gnModule.module.ts @@ -38,7 +38,7 @@ import { MonitoringSitesGroupsComponent } from './components/monitoring-sitesgro import { DataTableService } from './services/data-table.service'; import { MonitoringPropertiesGComponent } from './components/monitoring-properties-g/monitoring-properties-g.component'; import { GeoJSONService } from './services/geojson.service'; -import { MonitoringSitesComponent } from './components/monitoring-sites/monitoring-sites.component'; +import { MonitoringSitesgroupsDetailComponent } from './components/monitoring-sitesgroups-detail/monitoring-sitesgroups-detail.component'; import { MonitoringMapListComponent } from './components/monitoring-map-list/monitoring-map-list.component'; import { MonitoringFormComponentG } from './components/monitoring-form-g/monitoring-form.component-g'; import { FormService } from './services/form.service'; @@ -53,7 +53,7 @@ import { import { MonitoringSitesGroupsCreateComponent } from './components/monitoring-sitesgroups-create/monitoring-sitesgroups-create.component'; import { MonitoringSitesCreateComponent } from './components/monitoring-sites-create/monitoring-sites-create.component'; import { BtnSelectComponent } from './components/btn-select/btn-select.component'; -import { MonitoringVisitsComponent } from './components/monitoring-visits/monitoring-visits.component'; +import { MonitoringSitesDetailComponent } from './components/monitoring-sites-detail/monitoring-sites-detail.component'; import { OptionListButtonComponent } from './components/option-list-btn/option-list-btn.component'; import { MatErrorMessagesDirective } from './utils/matErrorMessages.directive'; import { SitesGroupsReslver } from './resolver/sites-groups.resolver'; @@ -88,8 +88,7 @@ const routes: Routes = [ }, { path: ':id', - // TODO : POURQUOI le composant est nomé visite ?? - component: MonitoringVisitsComponent, + component: MonitoringSitesDetailComponent, }, ], }, @@ -115,7 +114,7 @@ const routes: Routes = [ children: [ { path: '', - component: MonitoringSitesComponent, + component: MonitoringSitesgroupsDetailComponent, }, { path: 'create', @@ -126,7 +125,7 @@ const routes: Routes = [ }, { path: 'site/:id', - component: MonitoringVisitsComponent, + component: MonitoringSitesDetailComponent, }, ], }, @@ -165,14 +164,14 @@ const routes: Routes = [ MonitoringDatatableComponent, MonitoringMapListComponent, MonitoringSitesGroupsComponent, - MonitoringSitesComponent, + MonitoringSitesgroupsDetailComponent, MonitoringDatatableGComponent, MonitoringPropertiesGComponent, MonitoringFormComponentG, MonitoringSitesGroupsCreateComponent, MonitoringSitesCreateComponent, BtnSelectComponent, - MonitoringVisitsComponent, + MonitoringSitesDetailComponent, OptionListButtonComponent, MatErrorMessagesDirective, PageNotFoundComponent,