- [x] Fix document link not complete even when non collapsed forms ar…

…e filled
younginnovations · Sep 6, 2024 · 5d377b6 · 5d377b6
1 parent f630d5d
commit 5d377b6
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 45 deletions.
diff --git a/app/IATI/Data/elementJsonSchema.json b/app/IATI/Data/elementJsonSchema.json
@@ -1569,7 +1569,7 @@
             "type": "textarea",
             "placeholder": "Type narrative",
             "required": true,
-            "criteria": "mandatory",
+            "criteria": "",
             "add_more": true,
             "attr": {
               "row": 4
@@ -1584,7 +1584,7 @@
                 "placeholder": "Select language",
                 "choices": "Activity/Language.json",
                 "required": false,
-                "criteria": "recommended",
+                "criteria": "",
                 "hover_text": "A code specifying the language of text in this element. It is recommended that wherever possible only codes from ISO 639-1 are used. If not present, the default language is assumed. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/description/narrative/'>For more information</a>",
                 "help_text": "If no language is selected, your default language is assumed."
               }
@@ -1607,7 +1607,7 @@
             "placeholder": "Select code",
             "choices": "Activity/Language.json",
             "required": true,
-            "criteria": "mandatory",
+            "criteria": "",
             "hover_text": "A code specifying the language of text in this element. It is recommended that wherever possible only codes from ISO 639-1 are used. If not present, the default language is assumed. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/description/narrative/'>For more information</a>",
             "help_text": "Select the language of the document or webpage."
           }
@@ -1627,7 +1627,7 @@
             "type": "date",
             "placeholder": "YYYY-MM-DD",
             "required": true,
-            "criteria": "mandatory",
+            "criteria": "",
             "hover_text": "The date of publication of the document that is being linked to. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/document-link/document-date/'>For more information</a>",
             "help_text": "Provide the date of publication for the document or webpage, or provide the date that it was last updated."
           }
@@ -2897,7 +2897,7 @@
                 "type": "textarea",
                 "placeholder": "Type narrative",
                 "required": true,
-                "criteria": "mandatory",
+                "criteria": "",
                 "add_more": true,
                 "attr": {
                   "row": 4
@@ -2912,7 +2912,7 @@
                     "placeholder": "Select language",
                     "choices": "Activity/Language.json",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "hover_text": "A code specifying the language of text in this element. It is recommended that wherever possible only codes from ISO 639-1 are used. If not present, the default language is assumed. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/document-link/description/narrative/'>For more information</a>",
                     "help_text": "If no language is selected, your default language is assumed."
                   }
@@ -2935,7 +2935,7 @@
                 "placeholder": "Select code",
                 "choices": "Activity/Language.json",
                 "required": true,
-                "criteria": "mandatory",
+                "criteria": "",
                 "hover_text": "ISO 639-1 language code. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/document-link/language/'>For more information</a>",
                 "help_text": "Select the language that the document is written in."
               }
@@ -2955,7 +2955,7 @@
                 "type": "date",
                 "placeholder": "YYYY-MM-DD",
                 "required": true,
-                "criteria": "mandatory",
+                "criteria": "",
                 "hover_text": "The date of publication of the document that is being linked to. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/document-link/document-date/'>For more information</a>",
                 "help_text": "Provide the date for when the document was published."
               }
@@ -3235,7 +3235,7 @@
                 "type": "textarea",
                 "placeholder": "Type narrative",
                 "required": true,
-                "criteria": "mandatory",
+                "criteria": "",
                 "add_more": true,
                 "attr": {
                   "row": 4
@@ -3250,7 +3250,7 @@
                     "placeholder": "Select language",
                     "choices": "Activity/Language.json",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "hover_text": "A code specifying the language of text in this element. It is recommended that wherever possible only codes from ISO 639-1 are used. If not present, the default language is assumed. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/document-link/description/narrative/'>For more information</a>",
                     "help_text": "If no language is selected, your default language is assumed."
                   }
@@ -3273,7 +3273,7 @@
                 "placeholder": "Select code",
                 "choices": "Activity/Language.json",
                 "required": true,
-                "criteria": "mandatory",
+                "criteria": "",
                 "hover_text": "ISO 639-1 language code. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/document-link/language/'>For more information</a>",
                 "help_text": "Select the language that the document is written in."
               }
@@ -3293,7 +3293,7 @@
                 "type": "date",
                 "placeholder": "YYYY-MM-DD",
                 "required": true,
-                "criteria": "mandatory",
+                "criteria": "",
                 "hover_text": "The date of publication of the document that is being linked to.<a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/document-link/document-date/'>For more information</a>",
                 "help_text": "Provide the date of publication for the document."
               }
@@ -3556,7 +3556,7 @@
                     "type": "textarea",
                     "placeholder": "Type narrative",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "add_more": true,
                     "attr": {
                       "row": 4
@@ -3571,7 +3571,7 @@
                         "placeholder": "Select language",
                         "choices": "Activity/Language.json",
                         "required": true,
-                        "criteria": "mandatory",
+                        "criteria": "",
                         "hover_text": "A code specifying the language of text in this element. It is recommended that wherever possible only codes from ISO 639-1 are used. If not present, the default language is assumed. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/baseline/document-link/description/narrative/'>For more information</a>",
                         "help_text": "If no language is selected, your default language is assumed."
                       }
@@ -3594,7 +3594,7 @@
                     "placeholder": "Select code",
                     "choices": "Activity/Language.json",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "hover_text": "ISO 639-1 language code. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/baseline/document-link/language/'>For more information</a>",
                     "help_text": ""
                   }
@@ -3614,7 +3614,7 @@
                     "type": "date",
                     "placeholder": "YYYY-MM-DD",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "hover_text": "The date of publication of the document that is being linked to. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/baseline/document-link/document-date/'>For more information</a>",
                     "help_text": "Provide the date for when the document was published."
                   }
@@ -3882,7 +3882,7 @@
                     "type": "textarea",
                     "placeholder": "Type narrative",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "add_more": true,
                     "attr": {
                       "row": 4
@@ -3897,7 +3897,7 @@
                         "placeholder": "Select language",
                         "choices": "Activity/Language.json",
                         "required": true,
-                        "criteria": "mandatory",
+                        "criteria": "",
                         "hover_text": "A code specifying the language of text in this element. It is recommended that wherever possible only codes from ISO 639-1 are used. If not present, the default language is assumed. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/period/target/document-link/description/narrative/'>For more information</a>",
                         "help_text": "If no language is selected, your default language is assumed."
                       }
@@ -3921,7 +3921,7 @@
                     "placeholder": "Select code",
                     "choices": "Activity/Language.json",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "hover_text": "ISO 639-1 language code.<a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/period/target/document-link/language/'>For more information</a>",
                     "help_text": "Select the language that the document is written in."
                   }
@@ -3941,7 +3941,7 @@
                     "type": "date",
                     "placeholder": "YYYY-MM-DD",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "hover_text": "The date of publication of the document that is being linked to. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/period/target/document-link/document-date/'>For more information</a>",
                     "help_text": "Provide the date for when the document was published."
                   }
@@ -4160,7 +4160,7 @@
                     "type": "textarea",
                     "placeholder": "Type narrative",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "add_more": true,
                     "attr": {
                       "row": 4
@@ -4175,7 +4175,7 @@
                         "placeholder": "Select language",
                         "choices": "Activity/Language.json",
                         "required": true,
-                        "criteria": "mandatory",
+                        "criteria": "",
                         "hover_text": "A code specifying the language of text in this element. It is recommended that wherever possible only codes from ISO 639-1 are used. If not present, the default language is assumed. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/period/actual/document-link/description/narrative/'>For more information</a>",
                         "help_text": "If no language is selected, your default language is assumed."
                       }
@@ -4199,7 +4199,7 @@
                     "placeholder": "Select code",
                     "choices": "Activity/Language.json",
                     "required": false,
-                    "criteria": "recommended",
+                    "criteria": "",
                     "hover_text": "ISO 639-1 language code. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/period/actual/document-link/language/'>For more information</a>",
                     "help_text": "Select the language that the document is written in."
                   }
@@ -4219,7 +4219,7 @@
                     "type": "date",
                     "placeholder": "YYYY-MM-DD",
                     "required": true,
-                    "criteria": "mandatory",
+                    "criteria": "",
                     "hover_text": "The date of publication of the document that is being linked to. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/result/indicator/period/actual/document-link/document-date/'>For more information</a>",
                     "help_text": "Provide the date for when the document was published."
                   }

diff --git a/app/IATI/Data/organizationElementJsonSchema.json b/app/IATI/Data/organizationElementJsonSchema.json
@@ -1435,7 +1435,7 @@
             "type": "textarea",
             "placeholder": "Type narrative",
             "required": true,
-            "criteria": "mandatory",
+            "criteria": "",
             "add_more": true,
             "attr": {
               "row": 4
@@ -1451,7 +1451,7 @@
                 "choices": "Activity/Language.json",
                 "placeholder": "Select language",
                 "required": true,
-                "criteria": "mandatory",
+                "criteria": "",
                 "hover_text": "A code specifying the language of text in this element. It is recommended that wherever possible only codes from ISO 639-1 are used. If not present, the default language is assumed. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/organisation-standard/iati-organisations/iati-organisation/document-link/title/narrative/'>For more information</a>",
                 "help_text": "If no language is selected, your default language is assumed."
               }
@@ -1476,7 +1476,7 @@
             "choices": "Activity/Language.json",
             "placeholder": "Select code",
             "required": true,
-            "criteria": "mandatory",
+            "criteria": "",
             "hover_text": "ISO 639-1 language code. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/organisation-standard/iati-organisations/iati-organisation/document-link/language/'>For more information</a>",
             "help_text": "Select the language of the document or webpage"
           }
@@ -1496,7 +1496,7 @@
             "type": "date",
             "placeholder": "YYYY-MM-DD",
             "required": true,
-            "criteria": "mandatory",
+            "criteria": "",
             "hover_text": "This attribute is required. This value must be of type xsd:date. <a target='_blank' href='https://iatistandard.org/en/iati-standard/203/organisation-standard/iati-organisations/iati-organisation/document-link/document-date/'>For more information</a>",
             "help_text": "Provide the date of publication for the document or webpage, or provide the date that it was last updated."
           }

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -6,5 +6,5 @@
     "/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
     "/css/webportal-app.css": "/css/webportal-app.css?id=adf7341f839de37a534011a906ba0d3f",
     "/css/app.css": "/css/app.css?id=47ba95be7ce52d1c1abeb3771d376b5f",
-    "/js/vendor.js": "/js/vendor.js?id=4bc14d205e7246ecfa4d3c4399aa3afe"
+    "/js/vendor.js": "/js/vendor.js?id=f5b6df2a08df1db55bad9b73494fb5e8"
 }
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;
 }