Merge pull request #1565 from younginnovations/1558-unpopulated-point…

…-sub-element-causing-error-in-activity-location-xml-code Review: 1558-unpopulated-point-sub-element-causing-error-in-activity-location-xml-code
younginnovations · Sep 19, 2024 · b82c232 · b82c232
2 parents 14f4b7d + 67a7737
commit b82c232
Show file tree

Hide file tree

Showing 5 changed files with 372 additions and 521 deletions.
diff --git a/app/IATI/Services/Activity/LocationService.php b/app/IATI/Services/Activity/LocationService.php
@@ -121,20 +121,15 @@ public function getXmlData(Activity $activity): array
             foreach ($locations as $location) {
                 $point = [];
 
-                if ((Arr::get($location, 'point.0.pos.0.latitude', '') !== '') && (Arr::get(
-                    $location,
-                    'point.0.pos.0.longitude',
-                    ''
-                ) !== '')) {
+                $latitude = Arr::get($location, 'point.0.pos.0.latitude');
+                $longitude = Arr::get($location, 'point.0.pos.0.longitude');
+
+                if ($latitude && $longitude) {
                     $point = [
                         '@attributes' => [
                             'srsName' => Arr::get($location, 'point.0.srs_name', null),
                         ],
-                        'pos'         => sprintf(
-                            '%s %s',
-                            Arr::get($location, 'point.0.pos.0.latitude', ''),
-                            Arr::get($location, 'point.0.pos.0.longitude', '')
-                        ),
+                        'pos' => sprintf('%s %s', $latitude, $longitude),
                     ];
                 }
 

diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=e03430425f6eabeef7ecea408336c8cb",
+    "/js/app.js": "/js/app.js?id=1442b175b62fb001438805b3cb638433",
     "/js/script.js": "/js/script.js?id=486f329f14e1f080305e7c109ca928ac",
     "/js/webportal-script.js": "/js/webportal-script.js?id=fd5980061c5c73a9d216570039251afa",
     "/js/formbuilder.js": "/js/formbuilder.js?id=85537cfbc99853ea9793f54c417c10f9",

diff --git a/resources/assets/js/views/activity/bulk-publish/bulkPublishModal/BulkPublish.vue b/resources/assets/js/views/activity/bulk-publish/bulkPublishModal/BulkPublish.vue
@@ -301,4 +301,4 @@ watchEffect(() => {
     store.state.isPublishedModalMinimized = sharedMinimize.value;
   }
 });
-</script>
+</script>
diff --git a/storage/test.xml b/storage/test.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iati-activities version="2.03" generated-datetime="2024-09-10T11:32:35+00:00">
-  <iati-activity last-updated-datetime="2024-09-10T11:32:35+00:00" xml:lang="aa">
-    <iati-identifier>AF-CBR-8888-12313</iati-identifier>
-    <reporting-org type="11" ref="AF-CBR-8888" secondary-reporter="1">
-      <narrative xml:lang="aa">My org's name - editted</narrative>
+<iati-activities version="2.03" generated-datetime="2024-09-18T04:21:33+00:00">
+  <iati-activity last-updated-datetime="2024-09-18T04:21:33+00:00" xml:lang="ne" default-currency="NPR" humanitarian="1" hierarchy="1">
+    <iati-identifier>NP-IRD-qareg1-test-location</iati-identifier>
+    <reporting-org type="10" ref="NP-IRD-qareg1" secondary-reporter="1">
+      <narrative xml:lang="ne">report org name 1</narrative>
     </reporting-org>
     <title>
-      <narrative xml:lang="aa">yipl testing-edit</narrative>
+      <narrative xml:lang="ne">test-location</narrative>
     </title>
+    <location>
+      <name>
+        <narrative xml:lang="ne">ok this is name</narrative>
+      </name>
+      <point>
+        <pos> </pos>
+      </point>
+    </location>
+    <default-flow-type code="10"/>
+    <default-finance-type code="1"/>
+    <default-aid-type code="A01" vocabulary="1"/>
+    <default-tied-status code="3"/>
   </iati-activity>
 </iati-activities>