From d87e8809f4f5f9a7519d64588a8e9da35acb7dff Mon Sep 17 00:00:00 2001
From: Jacobe2169 <jacques.fize@ecrins-parcnational.fr>
Date: Fri, 8 Mar 2024 17:40:07 +0100
Subject: [PATCH] fix rebase error

---
 .../occhab-map-list.component.html            | 353 +++++++-----------
 1 file changed, 144 insertions(+), 209 deletions(-)

diff --git a/contrib/gn_module_occhab/frontend/app/components/occhab-map-list/occhab-map-list.component.html b/contrib/gn_module_occhab/frontend/app/components/occhab-map-list/occhab-map-list.component.html
index cf511c1d40..66d602f7f4 100644
--- a/contrib/gn_module_occhab/frontend/app/components/occhab-map-list/occhab-map-list.component.html
+++ b/contrib/gn_module_occhab/frontend/app/components/occhab-map-list/occhab-map-list.component.html
@@ -41,226 +41,161 @@
       <div class="row">
         <div class="col">
           <ngx-datatable
-          (window:resize)="onResize($event)"
-          #dataTable
-          class="material striped margin-top-xs table-size expandable"
-          [rows]="mapListService.tableData"
-          [rowHeight]="40"
-          [selected]="mapListService.selectedRow"
-          [selectionType]="'single'"
-          [rowClass]="mapListService.getRowClass"
-          [count]="mapListService.tableData.length"
-          [limit]="rowNumber"
-          [footerHeight]="50"
-          [headerHeight]="50"
-          (select)="mapListService.onRowSelect($event)"
-          data-qa="pnx-occhab-map-list-datatable"
-        >
-          <ngx-datatable-row-detail #myDetailRow rowHeight="100">
-            <ng-template ngx-datatable-row-detail-template let-row="row" let-expanded="expanded">
-              <div><strong>ID station : </strong>{{ row.id_station }}</div>
-              <ng-container *ngIf="row.comment !== null && row?.comment.trim() !== ''">
-                <div><strong>Commentaire : </strong>{{ row.comment }}</div>
-              </ng-container>
-              <div>
-                <strong>Altitude : </strong
-                >{{
-                  row.altitude_min == row.altitude_max
-                    ? row.altitude_min
-                    : row.altitude_min + ' - ' + row.altitude_max
-                }}
-              </div>
-              <div><strong>Observé par: </strong></div>
-              <div style="margin-left: 20px">
-                <div *ngFor="let obs of displayObservateursTooltip(row)">
-                  {{ obs }}
+            (window:resize)="onResize($event)"
+            #dataTable
+            class="material striped margin-top-xs table-size expandable"
+            [rows]="mapListService.tableData"
+            [rowHeight]="40"
+            [selected]="mapListService.selectedRow"
+            [selectionType]="'single'"
+            [rowClass]="mapListService.getRowClass"
+            [count]="mapListService.tableData.length"
+            [limit]="rowNumber"
+            [footerHeight]="50"
+            [headerHeight]="50"
+            (select)="mapListService.onRowSelect($event)"
+            data-qa="pnx-occhab-map-list-datatable"
+          >
+            <ngx-datatable-row-detail #myDetailRow rowHeight="100">
+              <ng-template ngx-datatable-row-detail-template let-row="row" let-expanded="expanded">
+                <div><strong>ID station : </strong>{{ row.id_station }}</div>
+                <ng-container *ngIf="row.comment !== null && row?.comment.trim() !== ''">
+                  <div><strong>Commentaire : </strong>{{ row.comment }}</div>
+                </ng-container>
+                <div>
+                  <strong>Altitude : </strong
+                  >{{
+                    row.altitude_min == row.altitude_max
+                      ? row.altitude_min
+                      : row.altitude_min + ' - ' + row.altitude_max
+                  }}
                 </div>
-              </div>
-              <div><strong>Habitats(s): </strong></div>
-              <div style="margin-left: 20px">
-                <div *ngFor="let hab of displayHabTooltip(row)">
-                  {{ hab }}
+                <div><strong>Observé par: </strong></div>
+                <div style="margin-left: 20px">
+                  <div *ngFor="let obs of displayObservateursTooltip(row)">
+                    {{ obs }}
+                  </div>
                 </div>
-              </div>
-            </ng-template>
-          </ngx-datatable-row-detail>
-          <ngx-datatable-column
-            [width]="10"
-            [resizeable]="false"
-            [sortable]="false"
-            [draggable]="false"
-            [canAutoResize]="false"
-          >
-          </a>
-        </ng-template>
-      </ngx-datatable-column>
-      <ngx-datatable-column maxWidth="10" [sortable]="false">
-        <ng-template let-row="row" ngx-datatable-cell-template>
-          <button
-            [matTooltip]="row.id_station"
-            [routerLink]="['info', row.id_station]"
-            class="btn btn-outline-shadow btn-no-padding btn-ghost"
-          >
-            <i class="fa fa-info-circle" aria-hidden="true"></i>
-            {{ row.id_station }}
-          </button>
-        </ng-template>
-      </ngx-datatable-column>
+                <div><strong>Habitats(s): </strong></div>
+                <div style="margin-left: 20px">
+                  <div *ngFor="let hab of displayHabTooltip(row)">
+                    {{ hab }}
+                  </div>
+                </div>
+              </ng-template>
+            </ngx-datatable-row-detail>
+            <ngx-datatable-column
+              [width]="10"
+              [resizeable]="false"
+              [sortable]="false"
+              [draggable]="false"
+              [canAutoResize]="false"
+            >
+              <ng-template ngx-datatable-cell-template let-row="row" let-expanded="expanded">
+                <a
+                  href="javascript:void(0)"
+                  matTooltip="Ouvrir/fermer le détail"
+                  [class.datatable-icon-right]="!expanded"
+                  [class.datatable-icon-down]="expanded"
+                  (click)="toggleExpandRow(row)"
+                >
+                </a>
+              </ng-template>
+            </ngx-datatable-column>
+            <ngx-datatable-column maxWidth="10" [sortable]="false">
+              <ng-template let-row="row" ngx-datatable-cell-template>
+                <button
+                  [matTooltip]="row.id_station"
+                  [routerLink]="['info', row.id_station]"
+                  class="btn btn-outline-shadow btn-no-padding btn-ghost"
+                >
+                  <i class="fa fa-info-circle" aria-hidden="true"></i>
+                  {{ row.id_station }}
+                </button>
+              </ng-template>
+            </ngx-datatable-column>
 
-      <ngx-datatable-column maxWidth="10" [sortable]="false">
-        <ng-template let-row="row" ngx-datatable-cell-template>
-          <button 
-            class="btn btn-outline-shadow btn-no-padding btn-ghost"
-            [routerLink]="['edit', row.id_station]"
-            [disabled]="!row.cruved.U"
-          >
-            <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
-          </button>
-        </ng-template>
-      </ngx-datatable-column>
+            <ngx-datatable-column maxWidth="10" [sortable]="false">
+              <ng-template let-row="row" ngx-datatable-cell-template>
+                <button
+                  class="btn btn-outline-shadow btn-no-padding btn-ghost"
+                  [routerLink]="['edit', row.id_station]"
+                  [disabled]="!row.cruved.U"
+                >
+                  <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
+                </button>
+              </ng-template>
+            </ngx-datatable-column>
 
-      <ngx-datatable-column maxWidth="10" [sortable]="false">
-        <ng-template let-row="row" ngx-datatable-cell-template>
-          <button
-            class="btn btn-outline-shadow btn-no-padding btn-ghost"
-            (click)="openDeleteModal(row, deleteModal)"
-            [disabled]="!row.cruved.D"
-          >
-            <i class="fa fa-trash-o" aria-hidden="true"></i>
-          </button>
-        </ng-template>
-      </ngx-datatable-column>
+            <ngx-datatable-column maxWidth="10" [sortable]="false">
+              <ng-template let-row="row" ngx-datatable-cell-template>
+                <button
+                  class="btn btn-outline-shadow btn-no-padding btn-ghost"
+                  (click)="openDeleteModal(row, deleteModal)"
+                  [disabled]="!row.cruved.D"
+                >
+                  <i class="fa fa-trash-o" aria-hidden="true"></i>
+                </button>
+              </ng-template>
+            </ngx-datatable-column>
 
-      <ngx-datatable-column name="Habitat">
-        <ng-template ngx-datatable-cell-template let-row="row">
-          <span [matTooltip]="displayHabTooltip(row).join('\n')" matTooltipPosition="left">
-            <span>
-              <span class="badge badge-dark"> {{ row.habitats?.length }} </span>
-              {{ displayHabTooltip(row) }}
-            </span>
-          </span>
-        </ng-template>
-      </ngx-datatable-column>
+            <ngx-datatable-column name="Habitat">
+              <ng-template ngx-datatable-cell-template let-row="row">
+                <span [matTooltip]="displayHabTooltip(row).join('\n')" matTooltipPosition="left">
+                  <span>
+                    <span class="badge badge-dark"> {{ row.habitats?.length }} </span>
+                    {{ displayHabTooltip(row) }}
+                  </span>
+                </span>
+              </ng-template>
+            </ngx-datatable-column>
 
-      <ngx-datatable-column name="Date min">
-        <ng-template ngx-datatable-cell-template let-row="row" maxWidth="50">
-          <span matTooltip="{{ row.date_min | date : 'dd-MM-yyyy' }}">
-            {{ row.date_min | date : 'dd-MM-yyyy' }}
-          </span>
-        </ng-template>
-      </ngx-datatable-column>
+            <ngx-datatable-column name="Date min">
+              <ng-template ngx-datatable-cell-template let-row="row" maxWidth="50">
+                <span matTooltip="{{ row.date_min | date : 'dd-MM-yyyy' }}">
+                  {{ row.date_min | date : 'dd-MM-yyyy' }}
+                </span>
+              </ng-template>
+            </ngx-datatable-column>
 
-      <ngx-datatable-column name="Jeu de données">
-        <ng-template ngx-datatable-cell-template let-row="row">
-          <span matTooltip="{{ row.dataset.dataset_name }}">
-            {{ row.dataset.dataset_name }}
-          </span>
-        </ng-template>
-      </ngx-datatable-column>
-    </ngx-datatable>
-            <ng-template ngx-datatable-cell-template let-row="row" let-expanded="expanded">
-              <a
-                href="javascript:void(0)"
-                matTooltip="Ouvrir/fermer le détail"
-                [class.datatable-icon-right]="!expanded"
-                [class.datatable-icon-down]="expanded"
-                (click)="toggleExpandRow(row)"
-              >
-              </a>
-            </ng-template>
-          </ngx-datatable-column>
-          <ngx-datatable-column maxWidth="10">
-            <ng-template let-row="row" ngx-datatable-cell-template>
-              <button
-                [matTooltip]="row.id_station"
-                [routerLink]="['info', row.id_station]"
-                class="btn btn-outline-shadow btn-no-padding btn-ghost"
-              >
-                <i class="fa fa-info-circle" aria-hidden="true"></i>
-                {{ row.id_station }}
-              </button>
-            </ng-template>
-          </ngx-datatable-column>
-    
-          <ngx-datatable-column maxWidth="10">
-            <ng-template let-row="row" ngx-datatable-cell-template>
-              <button
-                class="btn btn-outline-shadow btn-no-padding btn-ghost"
-                [routerLink]="['edit', row.id_station]"
-              >
-                <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
-              </button>
-            </ng-template>
-          </ngx-datatable-column>
-    
-          <ngx-datatable-column maxWidth="10">
-            <ng-template let-row="row" ngx-datatable-cell-template>
-              <button
-                class="btn btn-outline-shadow btn-no-padding btn-ghost"
-                (click)="openDeleteModal(row, deleteModal)"
-              >
-                <i class="fa fa-trash-o" aria-hidden="true"></i>
-              </button>
-            </ng-template>
-          </ngx-datatable-column>
-    
-          <ngx-datatable-column name="Habitat">
-            <ng-template ngx-datatable-cell-template let-row="row">
-              <span [matTooltip]="displayHabTooltip(row).join('\n')" matTooltipPosition="left">
-                <span>
-                  <span class="badge badge-dark"> {{ row.habitats?.length }} </span>
-                  {{ displayHabTooltip(row) }}
+            <ngx-datatable-column name="Jeu de données">
+              <ng-template ngx-datatable-cell-template let-row="row">
+                <span matTooltip="{{ row.dataset.dataset_name }}">
+                  {{ row.dataset.dataset_name }}
                 </span>
-              </span>
-            </ng-template>
-          </ngx-datatable-column>
-    
-          <ngx-datatable-column name="Date min">
-            <ng-template ngx-datatable-cell-template let-row="row" maxWidth="50">
-              <span matTooltip="{{ row.date_min | date : 'dd-MM-yyyy' }}">
-                {{ row.date_min | date : 'dd-MM-yyyy' }}
-              </span>
-            </ng-template>
-          </ngx-datatable-column>
-    
-          <ngx-datatable-column name="Jeu de données">
-            <ng-template ngx-datatable-cell-template let-row="row">
-              <span matTooltip="{{ row.dataset.dataset_name }}">
-                {{ row.dataset.dataset_name }}
-              </span>
-            </ng-template>
-          </ngx-datatable-column>
-        </ngx-datatable>
-    </div>
-    </div>
-    <div class="row mt-3 justify-content-end">
-      <div class="col-auto">
-        <button
-         *ngIf="canImport"
-          id="upload-btn"
-          mat-raised-button
-          color="primary"
-          class="btn-action uppercase"
-          [routerLink]="['/import', destinationImportCode, 'process', 'upload']"
-        >
-          {{ 'Upload' | translate }}
-          <mat-icon>file_upload</mat-icon>
-        </button>
+              </ng-template>
+            </ngx-datatable-column>
+          </ngx-datatable>
+        </div>
       </div>
-      <div class="col-auto">
-        <button
-          id="download-btn"
-          mat-raised-button
-          color="primary"
-          class="btn-action uppercase"
-          (click)="openModal()"
-        >
-          {{ 'Download' | translate }}
-          <mat-icon>file_download</mat-icon>
-        </button>
+      <div class="row mt-3 justify-content-end">
+        <div class="col-auto">
+          <button
+            *ngIf="canImport"
+            id="upload-btn"
+            mat-raised-button
+            color="primary"
+            class="btn-action uppercase"
+            [routerLink]="['/import', destinationImportCode, 'process', 'upload']"
+          >
+            {{ 'Upload' | translate }}
+            <mat-icon>file_upload</mat-icon>
+          </button>
+        </div>
+        <div class="col-auto">
+          <button
+            id="download-btn"
+            mat-raised-button
+            color="primary"
+            class="btn-action uppercase"
+            (click)="openModal()"
+          >
+            {{ 'Download' | translate }}
+            <mat-icon>file_download</mat-icon>
+          </button>
+        </div>
       </div>
     </div>
-   </div>
   </div>
 </div>