Skip to content

Commit

Permalink
Rename component
Browse files Browse the repository at this point in the history
  • Loading branch information
amandine-sahl authored and TheoLechemia committed Jun 19, 2024
1 parent 9f85e96 commit 12d766c
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
15 changes: 7 additions & 8 deletions frontend/app/gnModule.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -88,8 +88,7 @@ const routes: Routes = [
},
{
path: ':id',
// TODO : POURQUOI le composant est nomé visite ??
component: MonitoringVisitsComponent,
component: MonitoringSitesDetailComponent,
},
],
},
Expand All @@ -115,7 +114,7 @@ const routes: Routes = [
children: [
{
path: '',
component: MonitoringSitesComponent,
component: MonitoringSitesgroupsDetailComponent,
},
{
path: 'create',
Expand All @@ -126,7 +125,7 @@ const routes: Routes = [
},
{
path: 'site/:id',
component: MonitoringVisitsComponent,
component: MonitoringSitesDetailComponent,
},
],
},
Expand Down Expand Up @@ -165,14 +164,14 @@ const routes: Routes = [
MonitoringDatatableComponent,
MonitoringMapListComponent,
MonitoringSitesGroupsComponent,
MonitoringSitesComponent,
MonitoringSitesgroupsDetailComponent,
MonitoringDatatableGComponent,
MonitoringPropertiesGComponent,
MonitoringFormComponentG,
MonitoringSitesGroupsCreateComponent,
MonitoringSitesCreateComponent,
BtnSelectComponent,
MonitoringVisitsComponent,
MonitoringSitesDetailComponent,
OptionListButtonComponent,
MatErrorMessagesDirective,
PageNotFoundComponent,
Expand Down

0 comments on commit 12d766c

Please sign in to comment.