#3430

- renamed autoStateFacet to projectStateFacet and autoElectFacet to projectElectFacet
- removed separate call to get geographic info

Author: temi

grails-app/conf/data/meritHub.json

@@ -1,6 +1,6 @@
 {
   "adminFacets" : [
-    "autoElectFacet",
+    "projectElectFacet",
     "cmzFacet",
     "meriPlanAssetFacet",
     "partnerOrganisationTypeFacet",
@@ -13,14 +13,14 @@
     "associatedProgramFacet",
     "associatedSubProgramFacet",
     "mainThemeFacet",
-    "autoStateFacet",
+    "projectStateFacet",
     "nrmFacet",
     "lgaFacet",
     "mvgFacet",
     "ibraFacet",
     "imcra4_pbFacet",
     "otherFacet",
-    "autoElectFacet",
+    "projectElectFacet",
     "cmzFacet",
     "meriPlanAssetFacet",
     "partnerOrganisationTypeFacet",
@@ -34,12 +34,12 @@
     "organisationFacet",
     "associatedProgramFacet",
     "associatedSubProgramFacet",
-    "autoStateFacet",
+    "projectStateFacet",
     "nrmFacet",
     "lgaFacet",
     "ibraFacet",
     "imcra4_pbFacet",
-    "autoElectFacet",
+    "projectElectFacet",
     "cmzFacet",
     "primaryOutcomeFacet"
   ],

grails-app/controllers/au/org/ala/merit/ProjectController.groovy

@@ -86,10 +86,6 @@ class ProjectController {
             user.hasViewAccess = projectService.canUserViewProject(user.userId, id) ?: false
         }
         def project = projectService.get(id, user,'all')
-        Map stateElectorate = projectService.findStateAndElectorateForProject(project.projectId)
-        if (stateElectorate) {
-            project << stateElectorate
-        }
         Map config = null
         if (project && !project.error) {
             config = projectService.getProgramConfiguration(project)

grails-app/i18n/messages.properties

@@ -275,7 +275,7 @@ label.associatedProgramFacet=Program
 label.associatedSubProgramFacet=Sub Program
 label.assessment=Assessment
 label.stateFacet=State
-label.autoStateFacet=State
+label.projectStateFacet=State
 label.lgaFacet=<abbr title="Local Government Areas">LGA</abbr>
 label.nrmFacet=<abbr title="Natural Resource Management Areas">Management Areas</abbr>
 label.muFacet=<abbr title="Management Unit">Management Unit</abbr>
@@ -286,7 +286,7 @@ label.imcra4_pbFacet=<abbr title="Marine Region">Marine Regions</abbr>
 label.otherFacet=<abbr title="Other areas">Other Regions</abbr>
 label.status=<abbr title="Project status">Project Status</abbr>
 label.electFacet = <abbr title="Project status">Federal Electorates</abbr>
-label.autoElectFacet = <abbr title="Project linked to electorates">Federal Electorates</abbr>
+label.projectElectFacet = <abbr title="Project linked to electorates">Federal Electorates</abbr>
 label.cmzFacet = <abbr title="Conservation Management Zones">CMZ</abbr>
 label.meriPlanAssetFacet=<abbr title="Assets addressed in the MERI plan">Assets Addressed</abbr>
 label.partnerOrganisationTypeFacet=<abbr title="Organisation type of partner organisations">Partner Organisations</abbr>

grails-app/services/au/org/ala/merit/SearchService.groovy

@@ -60,7 +60,7 @@ class SearchService {
         params.fsort = "term"
         params.offset = 0
         params.query = "geo.loc.lat:*"
-        params.facets = "autoStateFacet,nrmFacet,lgaFacet,mvgFacet"
+        params.facets = "projectStateFacet,nrmFacet,lgaFacet,mvgFacet"
         def url = elasticBaseUrl + commonService.buildUrlParamsFromMap(params)
         log.debug "allGeoPoints - $url with $params"
         webService.getJson(url)
@@ -225,7 +225,7 @@ class SearchService {
             params.remove("ids");
             def idList = ids.tokenize(",")
             params.query = "_id:" + idList.join(" OR _id:")
-            params.facets = "autoStateFacet,nrmFacet,lgaFacet,mvgFacet"
+            params.facets = "projectStateFacet,nrmFacet,lgaFacet,mvgFacet"
             def url = grailsApplication.config.getProperty('ecodata.baseUrl') + 'search/elasticPost'
             webService.doPost(url, params)
         } else if (params.query) {

grails-app/services/au/org/ala/merit/SettingService.groovy

@@ -88,9 +88,9 @@ class SettingService {
                     title:'Default',
                     skin:'ala2',
                     urlPath:grailsApplication.config.getProperty('app.default.hub', String, 'default'),
-                    availableFacets: ['status', 'organisationFacet','associatedProgramFacet','associatedSubProgramFacet','mainThemeFacet','autoStateFacet','nrmFacet','lgaFacet','mvgFacet','ibraFacet','imcra4_pbFacet','otherFacet', 'gerSubRegionFacet','autoElectFacet'],
-                    adminFacets: ['autoElectFacet'],
-                    availableMapFacets: ['status', 'organisationFacet','associatedProgramFacet','associatedSubProgramFacet','autoStateFacet','nrmFacet','lgaFacet','mvgFacet','ibraFacet','imcra4_pbFacet','autoElectFacet']
+                    availableFacets: ['status', 'organisationFacet','associatedProgramFacet','associatedSubProgramFacet','mainThemeFacet','projectStateFacet','nrmFacet','lgaFacet','mvgFacet','ibraFacet','imcra4_pbFacet','otherFacet', 'gerSubRegionFacet','projectElectFacet'],
+                    adminFacets: ['projectElectFacet'],
+                    availableMapFacets: ['status', 'organisationFacet','associatedProgramFacet','associatedSubProgramFacet','projectStateFacet','nrmFacet','lgaFacet','mvgFacet','ibraFacet','imcra4_pbFacet','projectElectFacet']
             )
         }
         if (log.isDebugEnabled()) {

src/integration-test/resources/data/meritHub.js

@@ -1,6 +1,6 @@
 var meritHub = {
   "adminFacets" : [
-    "autoElectFacet",
+    "projectElectFacet",
     "cmzFacet",
     "meriPlanAssetFacet",
     "partnerOrganisationTypeFacet",
@@ -14,14 +14,14 @@ var meritHub = {
     "associatedSubProgramFacet",
     "muFacet",
     "mainThemeFacet",
-    "autoStateFacet",
+    "projectStateFacet",
     "nrmFacet",
     "lgaFacet",
     "mvgFacet",
     "ibraFacet",
     "imcra4_pbFacet",
     "otherFacet",
-    "autoElectFacet",
+    "projectElectFacet",
     "cmzFacet",
     "meriPlanAssetFacet",
     "partnerOrganisationTypeFacet",
@@ -35,12 +35,12 @@ var meritHub = {
     "organisationFacet",
     "associatedProgramFacet",
     "associatedSubProgramFacet",
-    "autoStateFacet",
+    "projectStateFacet",
     "nrmFacet",
     "lgaFacet",
     "ibraFacet",
     "imcra4_pbFacet",
-    "autoElectFacet",
+    "projectElectFacet",
     "cmzFacet",
     "primaryOutcomeFacet"
   ],

src/main/scripts/releases/4.2/updateMeritHub.js

@@ -1,5 +1,5 @@
 load( "../../utils/audit.js");
-var oldAndNewFacets = {electFacet: 'autoElectFacet', stateFacet: 'autoStateFacet'}
+var oldAndNewFacets = {electFacet: 'projectElectFacet', stateFacet: 'projectStateFacet'}
 var propsToCheck = ["adminFacets", "availableFacets", "availableMapFacets", "officerFacets"]
 var oldFacets = Object.keys(oldAndNewFacets);
 var adminUserId = "system";