temp

openfoodfacts · Oct 26, 2024 · 12a4cf4 · 12a4cf4
1 parent 1dafd62
commit 12a4cf4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/components/LocationInputRow.vue b/src/components/LocationInputRow.vue
@@ -4,6 +4,17 @@
       <h3 class="required mb-1">
         {{ $t('AddPriceSingle.WhereWhen.Location') }}
       </h3>
+
+      <!-- current/recent locations -->
+      <v-chip
+        v-if="currentLocation"
+        class="mb-2"
+        :style="isSelectedLocation(currentLocation) ? 'border: 1px solid #4CAF50' : 'border: 1px solid transparent'"
+        @click="setLocationData(currentLocation)"
+      >
+        <v-icon start :icon="isSelectedLocation(currentLocation) ? 'mdi-check-circle-outline' : 'mdi-history'" :color="isSelectedLocation(currentLocation) ? 'green' : ''" />
+        {{ getLocationTitle(currentLocation, true, true, true) }}
+      </v-chip>
       <v-chip
         v-for="location in recentLocations"
         :key="getLocationUniqueID(location)"
@@ -14,7 +25,9 @@
         <v-icon start :icon="isSelectedLocation(location) ? 'mdi-check-circle-outline' : 'mdi-history'" :color="isSelectedLocation(location) ? 'green' : ''" />
         {{ getLocationTitle(location, true, true, true) }}
       </v-chip>
-      <br v-if="recentLocations.length">
+
+      <!-- CTA -->
+      <br v-if="currentLocation || recentLocations.length">
       <v-btn class="mb-2" size="small" prepend-icon="mdi-magnify" @click="locationSelectorDialog = true">
         {{ $t('AddPriceSingle.WhereWhen.Find') }}
       </v-btn>
@@ -50,6 +63,10 @@ export default {
         location_osm_type: null
       })
     },
+    currentLocation: {
+      type: Object,
+      default: null
+    },
     maxRecentLocations: {
       type: Number,
       default: 3

diff --git a/src/components/ProofEditDialog.vue b/src/components/ProofEditDialog.vue
@@ -15,6 +15,7 @@
 
       <v-card-text>
         <ProofTypeInputRow :proofTypeForm="updateProofForm" />
+        <LocationInputRow :locationForm="updateProofForm" :currentLocation="proof.location" maxRecentLocations="1" />
         <ProofMetadataInputRow :proofType="updateProofForm.type" :proofMetadataForm="updateProofForm" />
       </v-card-text>
 
@@ -44,6 +45,7 @@ export default {
   components: {
     ProofCard: defineAsyncComponent(() => import('../components/ProofCard.vue')),
     ProofTypeInputRow: defineAsyncComponent(() => import('../components/ProofTypeInputRow.vue')),
+    LocationInputRow: defineAsyncComponent(() => import('../components/LocationInputRow.vue')),
     ProofMetadataInputRow: defineAsyncComponent(() => import('../components/ProofMetadataInputRow.vue')),
   },
   props: {
@@ -57,6 +59,9 @@ export default {
     return {
       updateProofForm: {
         type: null,
+        location_id: null,
+        location_osm_id: null,
+        location_osm_type: null,
         date: null,
         currency: null,
         receipt_price_count: null,
@@ -67,8 +72,9 @@ export default {
   },
   computed: {
     formFilled() {
-      let keys = ['type', 'date', 'currency']
-      return Object.values(this.updateProofForm).filter(k => keys.includes(k)).every(k => !!this.updateProofForm[k])
+      let keysOSM = Object.keys(this.updateProofForm).filter(k => !['location_id', 'receipt_price_count', 'receipt_price_total'].includes(k))
+      let keysONLINE = Object.keys(this.updateProofForm).filter(k => !['location_osm_id', 'location_osm_type', 'receipt_price_count', 'receipt_price_total'].includes(k))
+      return Object.keys(this.updateProofForm).filter(k => keysOSM.includes(k)).every(k => !!this.updateProofForm[k]) || Object.keys(this.updateProofForm).filter(k => keysONLINE.includes(k)).every(k => !!this.updateProofForm[k])
     },
   },
   mounted() {