Default to recipient org relationship #3340

AtlasOfLivingAustralia · Oct 4, 2024 · 8f6b7f6 · 8f6b7f6
1 parent 9388c91
commit 8f6b7f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/grails-app/assets/components/template/associated-orgs.html b/grails-app/assets/components/template/associated-orgs.html
@@ -67,7 +67,7 @@ <h4 class="modal-title" id="title">Organisation relationship</h4>
                 <div class="form-group">
                     <label class="required" for="relationship-description">Relationship</label>
                     <!-- ko if:$parent.relationshipTypes -->
-                    <select id="relationship-description" name="description" class="form-control form-control-sm" data-bind="enable:organisationId(), optionsCaption:'Please select...', options:$parent.relationshipTypes, value:description"></select>
+                    <select id="relationship-description" name="description" class="form-control form-control-sm" data-bind="enable:organisationId(), options:$parent.relationshipTypes, value:description"></select>
                     <!-- /ko -->
                     <!-- ko if:!$parent.relationshipTypes -->
                     <input type="text" id="relationship-description" name="description" class="form-control form-control-sm" data-bind="enable:organisationId(), value:description"></input>

diff --git a/src/main/groovy/au/org/ala/merit/GmsMapper.groovy b/src/main/groovy/au/org/ala/merit/GmsMapper.groovy
@@ -312,25 +312,10 @@ class GmsMapper {
                 }
             }
             if (!error) {
-                // Find the organisation relationship to use based on the program
-                String description = 'Service provider'
-                if (program?.fundingType) {
-                    switch (program.fundingType) {
-                        case 'SPP':
-                            description = 'Recipient'
-                            break
-                        case 'Grant':
-                            description = 'Grantee'
-                            break
-                        case 'Procurement':
-                            description = 'Service provider'
-
-                    }
-                } else if (program?.config && program.config.organisationRelationship) {
-                    description = program.config.organisationRelationship
-                }
+                // We are standardising on "Recipient" as the default organisation relationship
+                String description = 'Recipient'
                 project.associatedOrgs = [
-                        [organisationId:organisation.organisationId, name: contractName ?: organisation.name, organisationName:organisation.name, description:description]] // Fix description
+                        [organisationId:organisation.organisationId, name: contractName ?: organisation.name, organisationName:organisation.name, description:description]]
             }
         } else {
             error = "Please supply an organisationId (ORG_ID) or ABN (ABN) for the project"