Merge pull request #3029 from AtlasOfLivingAustralia/feature/issue3005

Move reports to top of org Reporting tab, update declaration #3005
AtlasOfLivingAustralia · Nov 13, 2023 · 4dd2ed4 · 4dd2ed4
2 parents e4ce849 + 65ad777
commit 4dd2ed4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/grails-app/assets/javascripts/dataSets.js b/grails-app/assets/javascripts/dataSets.js
@@ -112,7 +112,7 @@ var DataSetViewModel = function(dataSet, projectService, options) {
         }
     });
 
-    self.collectionApp = ko.observable(dataSet.collectionApp);
+    self.collectionApp = ko.observable();
     self.location = ko.observable(dataSet.location);
     self.siteId = ko.observable(dataSet.siteId);
     self.siteUrl = options.viewSiteUrl + '/' + dataSet.siteId;
@@ -135,6 +135,7 @@ var DataSetViewModel = function(dataSet, projectService, options) {
             self.publicationUrl('Biodiversity Data Repository (URL pending)');
         }
     });
+    self.collectionApp(dataSet.collectionApp); // Set this after declaration to trigger the subscription above.
 
     if (dataSet.sensitivities && !_.isArray(dataSet.sensitivities)) {
         dataSet.sensitivities = [dataSet.sensitivities];

diff --git a/grails-app/controllers/au/org/ala/merit/OrganisationController.groovy b/grails-app/controllers/au/org/ala/merit/OrganisationController.groovy
@@ -104,7 +104,7 @@ class OrganisationController {
         Map projectGroups = projectGroupingHelper.groupProjectsByProgram(projects, programGroups, ["organisationId:"+organisation.organisationId], true)
 
         [about     : [label: 'About', visible: true, stopBinding: false, type:'tab', default:!reportingVisible, displayedPrograms:projectGroups.displayedPrograms, servicesDashboard:[visible:true]],
-         projects : [label: 'Reporting', template:"/shared/projectListByProgram", visible: reportingVisible, stopBinding:true, default:reportingVisible, type: 'tab', reports:organisation.reports, adHocReportTypes:adHocReportTypes, reportOrder:reportOrder, hideDueDate:true, displayedPrograms:projectGroups.displayedPrograms],
+         projects : [label: 'Reporting', template:"/shared/projectListByProgram", visible: reportingVisible, stopBinding:true, default:reportingVisible, type: 'tab', reports:organisation.reports, adHocReportTypes:adHocReportTypes, reportOrder:reportOrder, hideDueDate:true, displayedPrograms:projectGroups.displayedPrograms, reportsFirst:true, declarationType:SettingPageType.RDP_REPORT_DECLARATION],
          sites     : [label: 'Sites', visible: reportingVisible, type: 'tab', stopBinding:true, projectCount:organisation.projects?.size()?:0, showShapefileDownload:hasAdminAccess],
          dashboard : [label: 'Dashboard', visible: reportingVisible, stopBinding:true, type: 'tab', template:'/shared/dashboard', reports:dashboardReports],
          admin     : [label: 'Admin', visible: hasAdminAccess, type: 'tab', template:'admin', showEditAnnoucements:showEditAnnoucements, availableReportCategories:availableReportCategories]]

diff --git a/grails-app/views/shared/_categorizedReportsAndDeclaration.gsp b/grails-app/views/shared/_categorizedReportsAndDeclaration.gsp
@@ -0,0 +1,5 @@
+<!-- ko stopBinding:true -->
+<g:render template="/shared/categorizedReporting"/>
+
+<g:render template="/shared/declaration_bs4" model="${[declarationType:declarationType ?: au.org.ala.merit.SettingPageType.RLP_REPORT_DECLARATION]}"/>
+<!-- /ko -->
diff --git a/grails-app/views/shared/_projectListByProgram.gsp b/grails-app/views/shared/_projectListByProgram.gsp
@@ -1,4 +1,6 @@
-
+<g:if test="${reportsFirst}">
+    <g:render template="/shared/categorizedReportsAndDeclaration"/>
+</g:if>
 <div class="projects-wrapper d-none d-md-block">
     <g:if test="${displayedPrograms}">
         <g:each var="programDetails" status="i" in="${displayedPrograms}">
@@ -32,8 +34,6 @@
     </g:if>
 </div>
 
-<!-- ko stopBinding:true -->
-<g:render template="/shared/categorizedReporting"/>
-
-<g:render template="/shared/declaration_bs4" model="${[declarationType:au.org.ala.merit.SettingPageType.RLP_REPORT_DECLARATION]}"/>
-<!-- /ko -->
+<g:if test="${!reportsFirst}">
+    <g:render template="/shared/categorizedReportsAndDeclaration"/>
+</g:if>