Merge branch 'develop' into feature-1890-http-api-schenario-bundle-scenario-dataset

Author: jh-RLI

dataedit/static/peer_review/opr_reviewer.js

@@ -764,6 +764,7 @@ function checkReviewComplete() {
 
   for (let field of fields) {
     const fieldState = getFieldState(field.fieldName);
+
     const reviewed = current_review["reviews"].find((review) => review.key === field.fieldName);
 
     if (!reviewed && fieldState !== 'ok' && !isEmptyValue(field.fieldValue)) {
@@ -901,22 +902,22 @@ function updateTabClasses() {
 
     let fields = Array.from(document.querySelectorAll('#' + tabName + ' .field'));
 
-    let allOkOrEmpty = fields.every(field => {
+    let allReviewed = fields.every(field => {
       let fieldValue = $(field).find('.value').text().replace(/\s+/g, ' ').trim();
       let fieldState = getFieldState(field.id.replace('field_', ''));
-      return isEmptyValue(fieldValue) || fieldState === 'ok';
+      return isEmptyValue(fieldValue) || ['ok', 'suggest', 'rejected'].includes(fieldState);
     });
 
-    if (allOkOrEmpty) {
+    if (allReviewed) {
       tab.classList.add('status');
       tab.classList.add('status--done');
     } else {
       tab.classList.add('status');
+      tab.classList.remove('status--done');
     }
   }
 }
 
-
 window.addEventListener('DOMContentLoaded', function() {
   updateTabClasses();
   // updatePercentageDisplay() ;
@@ -949,6 +950,7 @@ function updatePercentageDisplay() {
 }
 
 
+
 function updateTabProgressIndicatorClasses() {
   const tabNames = ['general', 'spatiotemporal', 'source', 'license'];
 
@@ -960,21 +962,20 @@ function updateTabProgressIndicatorClasses() {
     let fieldsInTab = Array.from(document.querySelectorAll('#' + tabName + ' .field'));
     let values = getAllFieldsAndValues();
 
-    let allOkOrEmpty = fieldsInTab.every((field, index) => {
-      let currentValue = values[index].fieldValue;
+    let allReviewed = fieldsInTab.every((field, index) => {
+      let fieldValue = $(field).find('.value').text().replace(/\s+/g, ' ').trim();
       let fieldState = getFieldState(field.id.replace('field_', ''));
-      return isEmptyValue(currentValue) || fieldState === 'ok';
+      return isEmptyValue(fieldValue) || ['ok', 'suggestion', 'rejected'].includes(fieldState);
     });
 
-    if (allOkOrEmpty) {
+    if (allReviewed) {
       tab.classList.add('status--done');
     } else {
-      tab.classList.add('status');
+      tab.classList.remove('status--done');
     }
   }
 }
 
-
 summaryTab.addEventListener('click', function() {
   toggleReviewControls(false);
   reviewContent.classList.toggle("tab-pane--100");

versions/changelogs/current.md

@@ -16,6 +16,10 @@
 
 - Implement new API Endpoint to add new datasets to a scenario bundle -> scenario -> input or output datasets. This eases bulk adding datasets. The API provides extensive error messages. Datasets listed in the scenario topic on the OEP and external datasets registered on the databus.openenergyplatform.org can be used. [(#1914)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1894)
 
+- divide metadata builder flow into subsections [(#1747)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1747)
+
+- update tab indicators once all fields in a specific metadata category are reviewed [(#1900)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1900)
+
 ## Bugs
 
 ## Documentation updates