https://github.com/CrisisCleanup/crisiscleanup-3-api/issues/724

#1485
CrisisCleanup · Sep 23, 2022 · f845485 · f845485
1 parent f020db5
commit f845485
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/src/components/IncidentApprovalTable.vue b/src/components/IncidentApprovalTable.vue
@@ -22,7 +22,7 @@
           v-if="slotProps.item.organization_profile_completed"
         />
         <badge
-          v-if="slotProps.item.org_verified"
+          v-if="slotProps.item.is_verified"
           width="18px"
           height="18px"
           class="text-white bg-green-500 mx-1"
@@ -52,7 +52,7 @@
         <base-button
           :text="$t('actions.approve')"
           :alt="$t('actions.approve')"
-          v-if="slotProps.item.org_verified"
+          v-if="slotProps.item.is_verified"
           variant="solid"
           size="small"
           class="mx-2"
@@ -68,7 +68,7 @@
           variant="outline"
           size="small"
           class="mx-2"
-          v-if="slotProps.item.org_verified"
+          v-if="slotProps.item.is_verified"
           :action="
             () => {
               rejectRequest(slotProps.item.id);

diff --git a/src/components/LocationViewer.vue b/src/components/LocationViewer.vue
@@ -21,6 +21,9 @@ export default {
         return {};
       },
     },
+    useGoogleMaps: {
+      type: Boolean,
+    },
   },
   methods: {
     createTileLayer() {
@@ -58,7 +61,11 @@ export default {
       this.map = L.map('map', {
         zoomControl: false,
       }).setView([35.7465122599185, -96.41150963125656], 3);
-      this.createTileLayer().addTo(this.map);
+      if (this.useGoogleMaps) {
+        L.gridLayer.googleMutant({ type: 'roadmap' }).addTo(this.map);
+      } else {
+        this.createTileLayer().addTo(this.map);
+      }
       this.markerLayer.addTo(this.map);
       this.addMarkerToMap();
     });

diff --git a/src/components/OrganizationApprovalTable.vue b/src/components/OrganizationApprovalTable.vue
@@ -17,7 +17,7 @@
           v-if="slotProps.item.profile_completed"
         />
         <badge
-          v-if="slotProps.item.org_verified"
+          v-if="slotProps.item.is_verified"
           width="18px"
           height="18px"
           class="text-white bg-green-500 mx-1"

diff --git a/src/components/admin/OrganizationsTable.vue b/src/components/admin/OrganizationsTable.vue
@@ -17,7 +17,7 @@
           v-if="slotProps.item.profile_completed"
         />
         <badge
-          v-if="slotProps.item.org_verified"
+          v-if="slotProps.item.is_verified"
           :title="$t('adminOrganization.org_verified')"
           width="18px"
           height="18px"

diff --git a/src/pages/admin/AdminDashboard.vue b/src/pages/admin/AdminDashboard.vue
@@ -546,7 +546,7 @@ export default {
       if (this.$can('move_orgs')) {
         try {
           const response = await this.$http.get(
-            `${process.env.VUE_APP_API_BASE_URL}/admins/incident_requests?organization__org_verified=true`,
+            `${process.env.VUE_APP_API_BASE_URL}/admins/incident_requests?organization__is_verified=true`,
           );
           if (response.data) {
             this.incident_requests = [...response.data.results];

diff --git a/src/pages/admin/AdminOrganization.vue b/src/pages/admin/AdminOrganization.vue
@@ -142,7 +142,7 @@
             </base-checkbox>
             <base-checkbox
               class="mb-4 sm:mb-0"
-              v-model="organization.org_verified"
+              v-model="organization.is_verified"
             >
               Org Verified
             </base-checkbox>
@@ -529,7 +529,7 @@
                 </div>
                 <div class="flex" :key="`${request.id}`">
                   <base-button
-                    v-if="request.org_verified"
+                    v-if="request.is_verified"
                     :text="$t('actions.approve')"
                     variant="solid"
                     size="small"
@@ -545,7 +545,7 @@
                     variant="outline"
                     size="small"
                     class="mx-2 w-24"
-                    v-if="request.org_verified"
+                    v-if="request.is_verified"
                     :action="
                       () => {
                         rejectIncidentRequest(request.id);

diff --git a/src/pages/admin/sds.vue b/src/pages/admin/sds.vue
@@ -806,7 +806,7 @@ export default {
       if (this.$can('move_orgs')) {
         try {
           const response = await this.$http.get(
-            `${process.env.VUE_APP_API_BASE_URL}/admins/incident_requests?organization__org_verified=true`,
+            `${process.env.VUE_APP_API_BASE_URL}/admins/incident_requests?organization__is_verified=true`,
           );
           if (response.data) {
             this.incident_requests = [...response.data.results];

diff --git a/src/pages/unauthenticated/Survivors.vue b/src/pages/unauthenticated/Survivors.vue
@@ -198,6 +198,7 @@
           :key="JSON.stringify(survivorToken.worksite.location)"
           class="h-84 mt-4 w-full"
           @updatedLocation="(latLng) => geocodeWorksite(latLng.lat, latLng.lng)"
+          use-google-maps
         />
       </div>