[#1879] Use max of 100% for updatePeriodValues()

akvo · Nov 3, 2015 · a2b7cd6 · a2b7cd6
1 parent 43d6a33
commit a2b7cd6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/akvo/rsr/static/scripts-src/project-main.js b/akvo/rsr/static/scripts-src/project-main.js
@@ -657,6 +657,7 @@ if (firstAccordionChild !== null) {
                   displayAddButton(periodId, true);
               } else {
                   periodNode.querySelector('.expand-indicator-period').click();
+                  periodNode.querySelector('.expand-indicator-period').click();
               }
           });
 
@@ -1163,6 +1164,8 @@ if (firstAccordionChild !== null) {
         var newValue = oldActual + change;
         var completionPercentage = ((newValue - baseline) / (target - baseline)) * 100;
 
+        if (completionPercentage > 100) completionPercentage = 100;
+
         period.setAttribute('period-start', oldStart + change);
         period.setAttribute('period-actual', newValue);
         period.querySelector('.indicator-bar-progress-text').textContent = newValue;

diff --git a/akvo/rsr/static/scripts-src/project-main.jsx b/akvo/rsr/static/scripts-src/project-main.jsx
@@ -657,6 +657,7 @@ if (firstAccordionChild !== null) {
                   displayAddButton(periodId, true);
               } else {
                   periodNode.querySelector('.expand-indicator-period').click();
+                  periodNode.querySelector('.expand-indicator-period').click();
               }
           });
 
@@ -1163,6 +1164,8 @@ if (firstAccordionChild !== null) {
         var newValue = oldActual + change;
         var completionPercentage = ((newValue - baseline) / (target - baseline)) * 100;
 
+        if (completionPercentage > 100) completionPercentage = 100;
+
         period.setAttribute('period-start', oldStart + change);
         period.setAttribute('period-actual', newValue);
         period.querySelector('.indicator-bar-progress-text').textContent = newValue;

diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css
@@ -2711,7 +2711,7 @@ body.translationBarActive div.skiptranslate ~ article, body.translationBarActive
                 width: 0px;
                 position: absolute;
                 bottom: -5px;
-                left: 9px;
+                left: 10px;
                 border-left: 5px solid transparent;
                 border-right: 5px solid transparent;
                 border-top: 5px solid #007ab8; }

diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss
@@ -3430,7 +3430,7 @@ body {
                                     width: 0px;
                                     position: absolute;
                                     bottom: -5px;
-                                    left: 9px;
+                                    left: 10px;
                                     border-left: 5px solid transparent;
                                     border-right: 5px solid transparent;
                                     border-top: 5px solid rgb(0, 122, 184);