src/app/components/pab-table/pab-table.component.html

@@ -65,12 +65,13 @@
                     {{ h.title }}
                 </th>
             </tr>
-            <tr>
-                <th *ngFor="let col of columns" (click)="toggleSelection(col, $event)"
-                    (mousedown)="preventCtrlClickBorder($event)" [class.selectable-cell]="isSelectable(col)"
-                    [class.selected-cell]="isSelected(col)">
+            <tr *ngFor="let col of columns">
+                <th *ngFor="let cell of col.cells" (click)="toggleSelection(cell, $event)"
+                    (mousedown)="preventCtrlClickBorder($event)" [class.selectable-cell]="isSelectable(cell)"
+                    [class.selected-cell]="isSelected(cell)" [attr.rowspan]="rowSpan(cell)"
+                    [attr.colspan]="colSpan(cell)" [title]="cellTitle(cell)">
 
-                    {{ col.title }}
+                    {{ cell.title }}
                 </th>
             </tr>
         </ng-template>

src/locale/messages.en.json

@@ -470,7 +470,7 @@
     "INFO_PAB_OUVRAGES": "Devices",
     "INFO_PAB_EDIT_VALUES": "Modify values",
     "INFO_CALCULATE_FIRST": "Calculate this module first",
-    "INFO_PAB_NUM_BASSIN": "Basin #",
+    "INFO_PAB_NUM_BASSIN": "Basin/wall #",
     "INFO_PAB_HEADER_TYPE": "Type",
     "INFO_PAB_HEADER_PARAMETERS": "Parameters",
     "INFO_PAB_HEADER_VALUES": "Values",

src/locale/messages.fr.json

@@ -471,7 +471,7 @@
     "INFO_PAB_OUVRAGES": "Ouvrages",
     "INFO_PAB_EDIT_VALUES": "Modifier les valeurs",
     "INFO_CALCULATE_FIRST": "Calculer ce module d'abord",
-    "INFO_PAB_NUM_BASSIN": "N° de bassin",
+    "INFO_PAB_NUM_BASSIN": "N° de bassin/cloison",
     "INFO_PAB_HEADER_TYPE": "Type",
     "INFO_PAB_HEADER_PARAMETERS": "Paramètres",
     "INFO_PAB_HEADER_VALUES": "Valeurs",