Merge pull request #1900 from OpenEnergyPlatform/feature/1899-opr-upd…

…ate-redgreen-progress-indicators-reviewed-fields-on-each-category Update red/green progress indicators on tabs #1899
OpenEnergyPlatform · Jan 22, 2025 · 0604d86 · 0604d86
2 parents 8959eb2 + e3b211f
commit 0604d86
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/dataedit/static/peer_review/opr_reviewer.js b/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");

diff --git a/versions/changelogs/current.md b/versions/changelogs/current.md
@@ -8,12 +8,16 @@
 
 - Removed the outdated & unmaintained references module that was intended to handle bibtex files and store them in a django model [(#1913)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1913).
 
-- Change sparql endpoint for OEKG to use the http post method to match the expected usage  [(#1913)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1913).
+- Change sparql endpoint for OEKG to use the http post method to match the expected usage [(#1913)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1913).
 
 - Extract header/footer template [(#1914)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1914)
 
 ## Features
 
+- 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