Merge pull request #1430 from younginnovations/1409-limit-document-li…

…nk-category-codelists-for-organisation-vs-activity-data Review: 1409-limit-document-link-category-codelists-for-organisation-vs-activity-data
younginnovations · Apr 16, 2024 · 4c5ccb0 · 4c5ccb0
2 parents ea14730 + b66a99d
commit 4c5ccb0
Show file tree

Hide file tree

Showing 15 changed files with 248,397 additions and 167 deletions.
diff --git a/app/Console/Commands/SetAppDataJsonCache.php b/app/Console/Commands/SetAppDataJsonCache.php
@@ -104,6 +104,7 @@ public function handle(): void
             'Organization' => [
                 'Country.json',
                 'Currency.json',
+                'DocumentCategory.json',
                 'Language.json',
                 'OrganisationElements.json',
                 'OrganisationElementsGroup.json',

diff --git a/app/Exports/XlsExportTemplate/activity_options.json b/app/Exports/XlsExportTemplate/activity_options.json
diff --git a/app/Exports/XlsExportTemplate/indicator_options.json b/app/Exports/XlsExportTemplate/indicator_options.json
diff --git a/app/Exports/XlsExportTemplate/period_options.json b/app/Exports/XlsExportTemplate/period_options.json
diff --git a/app/Exports/XlsExportTemplate/result_options.json b/app/Exports/XlsExportTemplate/result_options.json
diff --git a/app/Http/Requests/Organization/DocumentLink/DocumentLinkRequest.php b/app/Http/Requests/Organization/DocumentLink/DocumentLinkRequest.php
@@ -123,7 +123,7 @@ public function getWarningForDocumentCategory($formFields, $formIndex): array
         $rules[sprintf('%s.category', $formIndex)] = 'unique_category';
 
         foreach ($formFields as $documentCategoryIndex => $documentCategory) {
-            $rules[sprintf('%s.category.%s.code', $formIndex, $documentCategoryIndex)] = sprintf('nullable|in:%s', implode(',', array_keys(getCodeList('DocumentCategory', 'Activity'))));
+            $rules[sprintf('%s.category.%s.code', $formIndex, $documentCategoryIndex)] = sprintf('nullable|in:%s', implode(',', array_keys(getCodeList('DocumentCategory', 'Organization'))));
         }
 
         return $rules;

diff --git a/app/IATI/Data/organizationElementJsonSchema.json b/app/IATI/Data/organizationElementJsonSchema.json
@@ -1449,7 +1449,7 @@
             "label": "code",
             "type": "select",
             "multiSelect": false,
-            "choices": "Activity/DocumentCategory.json",
+            "choices": "Organization/DocumentCategory.json",
             "placeholder": "Select code",
             "required": true,
             "criteria": "mandatory",

diff --git a/app/IATI/Services/Organization/OrganizationService.php b/app/IATI/Services/Organization/OrganizationService.php
@@ -159,7 +159,7 @@ public function getOrganizationTypes(): array
         return [
             'budgetType' => getCodeList('BudgetStatus', 'Activity', false),
             'languages' => getCodeList('Language', 'Organization', false),
-            'documentCategory' => getCodeList('DocumentCategory', 'Activity', false),
+            'documentCategory' => getCodeList('DocumentCategory', 'Organization', false),
             'organizationType' => getCodeList('OrganizationType', 'Organization', false),
             'country' => getCodeList('Country', 'Organization', false),
             'regionVocabulary' => getCodeList('RegionVocabulary', 'Activity', false),

diff --git a/public/AppData/Data/Activity/DocumentCategory.json b/public/AppData/Data/Activity/DocumentCategory.json
@@ -99,150 +99,6 @@
       "language": "en",
       "category-description": "The document is relevant to a specific activity",
       "category-name": "Activity Level"
-    },
-    {
-      "category": "B",
-      "code": "B01",
-      "name": "Annual report",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B02",
-      "name": "Institutional Strategy paper",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B03",
-      "name": "Country strategy paper",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B04",
-      "name": "Aid Allocation Policy",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B05",
-      "name": "Procurement Policy and Procedure",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B06",
-      "name": "Institutional Audit Report",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B07",
-      "name": "Country Audit Report",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B08",
-      "name": "Exclusions Policy",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B09",
-      "name": "Institutional Evaluation Report",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B10",
-      "name": "Country Evaluation Report",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B11",
-      "name": "Sector strategy",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B12",
-      "name": "Thematic strategy",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B13",
-      "name": "Country-level Memorandum of Understanding",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B14",
-      "name": "Evaluations policy",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B15",
-      "name": "General Terms and Conditions",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B16",
-      "name": "Organisation web page",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B17",
-      "name": "Country/Region web page",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
-    },
-    {
-      "category": "B",
-      "code": "B18",
-      "name": "Sector web page",
-      "language": "en",
-      "category-description": "The document is relevant to the organisation as a whole",
-      "category-name": "Organisation Level"
     }
   ]
 }
diff --git a/public/AppData/Data/Organization/DocumentCategory.json b/public/AppData/Data/Organization/DocumentCategory.json
@@ -0,0 +1,152 @@
+{
+  "date-last-modified": "2017-07-03T16:29:56.558027+00:00",
+  "version": "",
+  "name": "DocumentCategory",
+  "xml:lang": "en",
+  "DocumentCategory": [
+    {
+      "category": "B",
+      "code": "B01",
+      "name": "Annual report",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B02",
+      "name": "Institutional Strategy paper",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B03",
+      "name": "Country strategy paper",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B04",
+      "name": "Aid Allocation Policy",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B05",
+      "name": "Procurement Policy and Procedure",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B06",
+      "name": "Institutional Audit Report",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B07",
+      "name": "Country Audit Report",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B08",
+      "name": "Exclusions Policy",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B09",
+      "name": "Institutional Evaluation Report",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B10",
+      "name": "Country Evaluation Report",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B11",
+      "name": "Sector strategy",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B12",
+      "name": "Thematic strategy",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B13",
+      "name": "Country-level Memorandum of Understanding",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B14",
+      "name": "Evaluations policy",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B15",
+      "name": "General Terms and Conditions",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B16",
+      "name": "Organisation web page",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B17",
+      "name": "Country/Region web page",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    },
+    {
+      "category": "B",
+      "code": "B18",
+      "name": "Sector web page",
+      "language": "en",
+      "category-description": "The document is relevant to the organisation as a whole",
+      "category-name": "Organisation Level"
+    }
+  ]
+}
diff --git a/public/files/Templates/ActivityXLS.xlsx b/public/files/Templates/ActivityXLS.xlsx
diff --git a/public/files/Templates/IndicatorXLS.xlsx b/public/files/Templates/IndicatorXLS.xlsx
diff --git a/public/files/Templates/PeriodXLS.xlsx b/public/files/Templates/PeriodXLS.xlsx
diff --git a/public/files/Templates/ResultXLS.xlsx b/public/files/Templates/ResultXLS.xlsx
diff --git a/resources/assets/sass/component/_input.scss b/resources/assets/sass/component/_input.scss
@@ -256,41 +256,41 @@ label {
 }
 
 select.select2.default-value-indicator
-  + .select2
-  .selection
-  .select2-selection:not(:focus) {
++ .select2
+.selection
+.select2-selection:not(:focus) {
   border: 2px solid #3f9a7c;
   background-color: #3f9a7c15;
 }
 
 select.select2.default-value-indicator
-  + .select2
-  .selection
-  .select2-selection:not(:focus) {
++ .select2
+.selection
+.select2-selection:not(:focus) {
   border: 2px solid #3f9a7c;
   background-color: #3f9a7c15;
 }
 
 select.select2.default-value-indicator
-  + .select2
-  .selection
-  .select2-selection
-  .select2-selection__placeholder {
++ .select2
+.selection
+.select2-selection
+.select2-selection__placeholder {
   color: var(--bluecoral-50);
 }
 
 select.select2.default-value-indicator
-  + .select2.select2-container--open
-  .selection
-  .select2-selection {
++ .select2.select2-container--open
+.selection
+.select2-selection {
   border: 1px solid #a6b5ba;
   background-color: transparent;
 }
 
 select.select2.default-value-indicator
-  + .select2
-  .selection
-  .select2-selection.select2-selection--clearable {
++ .select2
+.selection
+.select2-selection.select2-selection--clearable {
   border: 1px solid #a6b5ba;
   background-color: transparent;
 }