dev into main

src/dashboard/app/src/app/dashboard/dashboard.component.html

@@ -28,18 +28,26 @@
                     Toevoegen onderstaande regel in witte stuk onder inputTableId=0 zorgt voor eindeloos flikkeren van tabel-selecties ...
                                             [inputOtherTableSelection]="displayObject.tableFields[1]"
                     -->
-                    <app-select-table-value [inputTableSelection]="displayObject.tableFields[0]"
+                    <app-select-table-value
+                                            [inputTableSelection]="displayObject.tableFields[0]"
                                             [inputTableId]="0"
                                             [inputUseCase]="useCase" [inputUseCaseData]="useCaseData"
                                             [region]="displayObject.tableFields[0].tableRegionLevel"
 
+                                            (updateRegionLevelFromSelect)="updateRegionLevelFromSelect($event)"
                                             (updateTableValueFromSelect)="updateTableFieldFromSelect($event)"  >
                     </app-select-table-value>
-                    <app-select-table-value *ngIf="displayObject.tableFields.length > 1" [inputTableSelection]="displayObject.tableFields[1]"
+                    <app-select-table-value *ngIf="displayObject.tableFields.length > 1"
+                                            [inputTableSelection]="displayObject.tableFields[1]"
                                             [inputTableId]="1"
                                             [inputUseCase]="useCase" [inputUseCaseData]="useCaseData"
-                                            [inputOtherTableSelection]="displayObject.tableFields[0]"
+
+                                            [region]="displayObject.tableFields[0].tableRegionLevel"
+
                                             (updateTableValueFromSelect)="updateTableFieldFromSelect($event)"  >
+                                            <!--
+                                            [inputOtherTableSelection]="displayObject.tableFields[0]"
+                                            -->
                     </app-select-table-value>
                 </div>
 

src/dashboard/app/src/app/dashboard/dashboard.component.ts

@@ -249,8 +249,17 @@ export class DashboardComponent implements OnInit{
         }
     } // END FUNCTION panelLeftStatusChange
 
+    updateRegionLevelFromSelect(regionLevel: any) {
+      // console.log('* * * updateRegionLevelFromSelect() ...', regionLevel, typeof regionLevel);
+
+      this.displayObject.tableFields[0].tableRegionLevel = regionLevel;
+
+    } // END FUNCTION updateRegionLevelFromSelect
+
 
     updateTableFieldFromSelect(tableField: DisplayTableValueObject) {
+        // console.log(' * * * ' + tableField.tableId.toString() + ' updateTableFieldFromSelect() ... ');
+
         let tableId = tableField.tableId;
 
         let showOnlyOneTableId = -1;
@@ -259,6 +268,7 @@ export class DashboardComponent implements OnInit{
 
 
         if (this.displayObject.numberTableFields > 1  &&  tableField.tableShowOnlyThisTable) {
+            // console.log(' * * * ' + tableId.toString() + ' AAA');
             if (tableField.tableSelectionComplete) {
                 console.log('show only table ', tableField.tableId);
                 showOnlyOneTableId = tableField.tableId;
@@ -273,16 +283,19 @@ export class DashboardComponent implements OnInit{
 
 
         } else {
+            // console.log(' * * * ' + tableId.toString() + ' BBB');
 
             this.displayObject.displayType = this.displayObject.formType;
             this.displayObject.displayTableId = -1;
 
             if (tableField.tableId === 0 && this.displayObject.formType === 'bivariate') {
                 this.displayObject.tableFields[1].tableRegionLevel = this.displayObject.tableFields[0].tableRegionLevel;
+                /* 20250224 TURN OFF DIFFERENT YEARS, because outcome year not depending on predictor year anymore /
                 this.displayObject.tableFields[1].tableYear = this.displayObject.tableFields[0].tableYear;
                 if (this.displayObject.tableFields[0].tableName === '') {
                     this.displayObject.tableFields[1].tableName = '';
                 }
+                /* */
             }
 
             // console.log('CHECK HIER???');
@@ -303,6 +316,8 @@ export class DashboardComponent implements OnInit{
             }
 
             // console.log(' - - doCollectDataForSelection ???');
+            // console.log(' * * * ' + tableId.toString() + ' CCC', doCollectDataForSelection);
+
             if (doCollectDataForSelection) {
                 this.collectDataForSelection(tableId);
                 // SJOERD: tijdelijk UIT gezet
@@ -360,7 +375,7 @@ export class DashboardComponent implements OnInit{
 
 
     collectDataForSelection(tableId = 0) {
-        console.log('CALLED collectDataForSelection() ... ', tableId);
+        console.log(' **  **  **  CALLED collectDataForSelection() ... ', tableId, (tableId === 0 ? 'LEFT' : 'RIGHT'));
 
         // if (this.displayObject.displayType === 'bivariate'  &&  this.displayObject.tableFields.length > 1  &&  tableId === 0) {
         if (tableId === 999) {
@@ -401,7 +416,7 @@ export class DashboardComponent implements OnInit{
                         y_json['conditions'] = y_conditions;
 
                         //console.log('before abc    NET VOOR AANROEP getXYData (bivariate versie)');
-                        this.dashboardFeatureService.getXYData(this.displayObject.tableFields[0].tableRegionLevel, this.displayObject.tableFields[0].tableYear, JSON.stringify(x_json), JSON.stringify(y_json)).subscribe(data => {
+                        this.dashboardFeatureService.getXYData(this.displayObject.tableFields[0].tableRegionLevel, this.displayObject.tableFields[0].tableYear, this.displayObject.tableFields[1].tableYear, JSON.stringify(x_json), JSON.stringify(y_json)).subscribe(data => {
                             //console.log('before abc    A. DISPLAY DATA COLLECTED! (bivariate)', data);
                             this.displayData = data;
                             this.displayDataUpdated = !this.displayDataUpdated;

src/dashboard/app/src/app/select-table-value/select-table-value.component.html

@@ -8,7 +8,7 @@
         </mat-card-header>
 
         <mat-card-content>
-            <div [id]="'divTableDescr_' + tableSelection.tableId">
+            <div [id]="'divTableDescr_' + tableSelection.tableId" class="divTableDescr">
                 {{tableSelection.tableDescr}}
             </div>
 
@@ -22,11 +22,15 @@
                 <mat-select *ngIf="tableSelection.tableId === 0" [(value)]="tableSelection.tableRegionLevel" (valueChange)="regionLevelChanged()">
                     <mat-option [value]="regionLevel" *ngFor="let regionLevel of availableRegionLevels">{{regionLevel}} - <i>{{regionLevelsText[regionLevel]}}</i></mat-option>
                 </mat-select>
+                <!--
                 <mat-hint *ngIf="tableSelection.tableId === 0">0: countries / 1: large regions / 2: base regions / 3: small regions</mat-hint>
+                -->
 
                 <mat-label *ngIf="tableSelection.tableId === 1">Region Level</mat-label>
                 <input matInput type="text" *ngIf="tableSelection.tableId === 1" readonly [value]="(tableSelection.tableRegionLevel !== '-1' ? tableSelection.tableRegionLevel : '')" [disabled]="true">
+                <!--
                 <mat-hint *ngIf="tableSelection.tableId === 1">(filled automatically)</mat-hint>
+                -->
             </mat-form-field>
 
 
@@ -50,7 +54,9 @@
                         <div class="optionLine2">{{option.f_resource}}</div>
                     </mat-option>
                 </mat-autocomplete>
+                <!--
                 <mat-hint  *ngIf="this.tableSelection.tableName !== ''">This table is available at region level(s): {{availableRegionLevelsForTable}}</mat-hint>
+                -->
             </mat-form-field>
 
 
@@ -60,11 +66,22 @@
                     <mat-option [value]="year" *ngFor="let year of availableYears">{{year}}</mat-option>
                 </mat-select>
 
+                <mat-label *ngIf="tableSelection.tableId === 1">Select year</mat-label>
+                <!--
                 <mat-label *ngIf="tableSelection.tableId === 1">Year</mat-label>
                 <input matInput type="text" *ngIf="tableSelection.tableId === 1" readonly [value]="(tableSelection.tableYear !== '-1' ? tableSelection.tableYear : '')" [disabled]="true">
+                <mat-select *ngIf="tableSelection.tableId === 1" [(value)]="tableSelection.tableYear" (valueChange)="checkTableValueSelectionComplete()">
+                -->
+                <mat-select *ngIf="tableSelection.tableId === 1" [(value)]="tableSelection.tableYear" (valueChange)="getFieldsForTableForYearAndRegionLevel()">
+                  <mat-option [value]="year" *ngFor="let year of availableYears">{{year}}</mat-option>
+                </mat-select>
+                <!--
                 <mat-hint  *ngIf="tableSelection.tableId === 1">(filled automatically)</mat-hint>
+                -->
             </mat-form-field>
+            <!--
             <div *ngIf="availableYears.length > 0"><div class="textSmall">Available years: <i>{{availableYears.join(', ')}}</i></div><div class="divWhiteSpace"></div></div>
+            -->