Merge pull request #1523 from younginnovations/1519-uploading-activit…

…ies-via-xls-file-in-staging-of-iati-publisher-is-failing Review: 1519-uploading-activities-via-xls-file-in-staging-of-iati-publisher-is-failing
younginnovations · Aug 12, 2024 · 4e6ac28 · 4e6ac28
2 parents 90fdd02 + f8e94a1
commit 4e6ac28
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/app/XlsImporter/Foundation/Mapper/Activity.php b/app/XlsImporter/Foundation/Mapper/Activity.php
@@ -321,7 +321,7 @@ public function defaultValues($data): void
             $secondary_reporter = '';
 
             if ($this->checkRowNotEmpty($row)) {
-                $elementActivityIdentifier = trim(Arr::get($row, 'activity_identifier'));
+                $elementActivityIdentifier = trim((string) Arr::get($row, 'activity_identifier'));
 
                 if (is_null($elementActivityIdentifier)) {
                     $this->globalErrors[] = 'Error detected on ' . $this->sheetName . ' sheet, cell A' . $this->rowCount . ': Identifier is missing.';
@@ -412,7 +412,7 @@ public function singleValuedFields($data): void
 
         foreach ($data as $index => $row) {
             if ($this->checkRowNotEmpty($row)) {
-                $elementActivityIdentifier = trim(Arr::get($row, 'activity_identifier'));
+                $elementActivityIdentifier = trim((string) Arr::get($row, 'activity_identifier'));
 
                 if (is_null($elementActivityIdentifier)) {
                     $this->globalErrors[] = 'Error detected on ' . $this->sheetName . ' sheet, cell A' . $this->rowCount . ': Identifier is missing.';
@@ -475,7 +475,7 @@ public function columnToFieldMapper($element, $data = []): void
                         $elementData = [];
                     }
 
-                    $elementActivityIdentifier = trim(Arr::get($row, 'activity_identifier') ?? $elementActivityIdentifier);
+                    $elementActivityIdentifier = trim((string) Arr::get($row, 'activity_identifier') ?? $elementActivityIdentifier);
                 }
 
                 foreach ($elementMapper as $xlsColumnName => $systemName) {

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;
 }