Merge pull request #2033 from AtlasOfLivingAustralia/hotfix/1.54.1

Hotfix/1.54.1
AtlasOfLivingAustralia · May 28, 2020 · a002798 · a002798
2 parents 2c0df60 + 555230f
commit a002798
Show file tree

Hide file tree

Showing 14 changed files with 493 additions and 379 deletions.
diff --git a/application.properties b/application.properties
@@ -2,5 +2,5 @@
 #Tue Jun 20 09:06:54 EST 2017
 app.grails.version=2.5.6
 app.name=fieldcapture
-app.version=1.54
+app.version=1.54.1-SNAPSHOT
 
diff --git a/grails-app/assets/javascripts/meriplan.js b/grails-app/assets/javascripts/meriplan.js
@@ -921,6 +921,7 @@ function ObjectiveViewModel(o, programObjectives) {
         self.simpleObjectives.otherValue = ko.observable(otherObjectives.length > 0 ? otherObjectives[0] : undefined);
         self.simpleObjectives.otherChecked.subscribe(function (value) {
             if (!value) {
+                self.simpleObjectives(self.simpleObjectives()); // This clears the other value.
                 self.simpleObjectives.otherValue(undefined);
             }
         });

diff --git a/grails-app/views/project/meriPlanReadOnly/_activities.gsp b/grails-app/views/project/meriPlanReadOnly/_activities.gsp
@@ -1,4 +1,4 @@
-<div id="activity-list">
+<div id="activity-list-view">
 <g:if test="${title}">
     <h4>${title}</h4>
 </g:if>

diff --git a/grails-app/views/project/meriPlanReadOnly/_adaptiveManagement.gsp b/grails-app/views/project/meriPlanReadOnly/_adaptiveManagement.gsp
@@ -3,5 +3,5 @@
     <h4>${title}</h4>
 </g:if>
     <p>Methods and processes that will enable adaptive management during the lifetime of this project</p>
-    <span data-bind="value:details.adaptiveManagement"></span>
+    <span data-bind="text:details.adaptiveManagement"></span>
 </div>
diff --git a/grails-app/views/project/meriPlanReadOnly/_assets.gsp b/grails-app/views/project/meriPlanReadOnly/_assets.gsp
@@ -1,5 +1,5 @@
 <h4>Project assets</h4>
-<table class="table">
+<table class="table assets-view">
     <thead>
     <tr>
         <th class="index"></th>
@@ -9,7 +9,7 @@
     <tbody data-bind="foreach:details.assets">
     <tr>
         <td class="index" data-bind="text:$index()+1"></td>
-        <td class="outcome">
+        <td class="asset">
             <span data-bind="text:description"></span>
         </td>
     </tr>

diff --git a/grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp b/grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp
@@ -1,7 +1,7 @@
 <g:if test="${title}">
     <h4>${title}</h4>
 </g:if>
-<table class="table">
+<table class="table meri-monitoring-indicators">
     <thead>
     <tr>
         <th class="index"></th>

diff --git a/grails-app/views/project/meriPlanReadOnly/_objectivesList.gsp b/grails-app/views/project/meriPlanReadOnly/_objectivesList.gsp
@@ -1,13 +1,12 @@
 <div id="objectives-list-view" class="well well-small">
     <g:if test="${title}">
-    <h4>${title}s</h4>
+    <h4>${title}</h4>
     </g:if>
-    <ul data-bind="visible:details.objectives.simpleObjectives().length > 0 || details.objectives.simpleObjectives.otherChecked()">
-        <!-- ko foreach:details.objectives.simpleObjectives -->
-        <li><span data-bind="text:$data"></span></li>
+    <ul data-bind="visible:details.objectives.rows1().length > 0">
+        <!-- ko foreach:details.objectives.rows1 -->
+        <li><span data-bind="text:description"></span></li>
         <!-- /ko -->
-        <li data-bind="visible:details.objectives.simpleObjectives.otherChecked(), text:details.objectives.simpleObjectives.otherValue()"></li>
     </ul>
 
-    <span data-bind="visible:details.objectives.simpleObjectives().length == 0 && !details.objectives.simpleObjectives.otherChecked()">No objectives have been nominated for this project</span>
+    <span data-bind="visible:details.objectives.rows1().length == 0">No objectives have been nominated for this project</span>
 </div>
diff --git a/grails-app/views/project/meriPlanReport.gsp b/grails-app/views/project/meriPlanReport.gsp
@@ -56,6 +56,8 @@
         config.useRlpTemplate = services.length > 0;
         var programName = '${(config.program?.acronym?:project.associatedSubProgram) ?: project.associatedProgram}';
         config.programName = programName;
+        config.programObjectives = ${config.program?.config?.objectives ?: '[]'};
+        config.programActivities = ${config.program?.config?.activities ?: '[]'};
         var viewModel = new ReadOnlyMeriPlan(project, new ProjectService(project, config), config);
         viewModel.name = project.name;
         viewModel.description = project.description;