fix: vehicle time window

blackbirdem · blackbirdem · commit 7676494c8861 · 2024-05-06T16:00:24.000+02:00
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/EditDialog.vue b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/EditDialog.vue
@@ -72,7 +72,7 @@
                 <v-item-group v-if="vehiclesBox" style="margin: 10px 15px 0 0; border: solid lightgray 1px; padding: 10px">
                   <v-layout class="profile-options-wrapper">
                     <v-item v-for="profile in profilesMapping" :key="profile.slug">
-                      <v-flex style="min-width:45px">
+                      <v-flex style="min-width: 48px">
                         <profile-selector-option @profileSelected="profileSelected" :profile="profile"
                                                  :active-profile-slug="vehicleProfile(i)" :active-vehicle-type="editData[i].profile"
                                                  :is-vehicle="true">
@@ -83,8 +83,11 @@
                 </v-item-group>
                 <v-text-field v-if="vehiclesBox" v-model.number="editData[i].capacity[0]" type="number" style="width: 50%" :persistent-hint="true" :hint="'Capacity'"></v-text-field>
               </v-layout>
-              <v-text-field v-if="jobsBox" v-model.number="editData[i].service" :persistent-hint="true" :hint="'Service time (in seconds)'"></v-text-field>
-              <v-text-field v-if="vehiclesBox" v-model="editData[i].time_window" :persistent-hint="true" :hint="'Working time window (in seconds passed since 00:00 or timestamp)'"></v-text-field>
+              <v-text-field v-if="jobsBox" v-model.number="editData[i].service" :persistent-hint="true" :hint="$t('editDialog.service')"></v-text-field>
+              <v-layout row-wrap>
+                <v-text-field v-if="vehiclesBox" v-model.number="editData[i].time_window[0]" style="padding-right: 10px" :persistent-hint="true" :hint="$t('editDialog.start') + $t('editDialog.timeWindow')"></v-text-field>
+                <v-text-field v-if="vehiclesBox" v-model.number="editData[i].time_window[1]" style="padding-right: 10px" :persistent-hint="true" :hint="$t('editDialog.end') + $t('editDialog.timeWindow')"></v-text-field>
+              </v-layout>
 
               <v-select v-model="editData[i].skills" :items="editSkills" :item-text="'name'" :item-value="'id'" return-object chips deletable-chips
                         :persistent-hint="true" :hint="content.skills" multiple :menu-props="{'closeOnContentClick':true}">
@@ -99,7 +102,7 @@
             </div>
           </v-card-text>
         </v-card>
-        <v-alert v-if="editData.length >= content.maxLength" :value="true" type="warning" style="color:black" >
+        <v-alert v-if="editData.length > content.maxLength" :value="true" type="warning" style="color:black" >
           {{ content.maxWarning }}
         </v-alert>
         <v-layout row :wrap="$lowResolution">
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/edit-dialog.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/edit-dialog.js
@@ -73,7 +73,7 @@ export default {
           item: 'Job',
           class: Job,
           maxLength: 50,
-          maxWarning: this.$t('optimization.maxWarning') + '50' + this.$t('optimization.jobs'),
+          maxWarning: this.$t('optimization.maxWarning') + '50 ' + this.$t('optimization.jobs'),
           import: this.$t('optimization.import') + this.$t('optimization.jobs'),
           edit: this.$t('optimization.edit') + this.$t('optimization.job'),
           add: this.$t('optimization.add') + this.$t('optimization.job'),
@@ -91,7 +91,7 @@ export default {
           item: 'Vehicle',
           class: Vehicle,
           maxLength: 3,
-          maxWarning: this.$t('optimization.maxWarning') + '3' + this.$t('optimization.vehicles'),
+          maxWarning: this.$t('optimization.maxWarning') + '3 ' + this.$t('optimization.vehicles'),
           import: this.$t('optimization.import') + this.$t('optimization.vehicles'),
           edit: this.$t('optimization.edit') + this.$t('optimization.vehicle'),
           add: this.$t('optimization.add') + this.$t('optimization.vehicle'),
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.cs-cz.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.cs-cz.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.de-de.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.de-de.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.en-us.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.en-us.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.es-es.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.es-es.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.fr-fr.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.fr-fr.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.hu-hu.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.hu-hu.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.it-it.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.it-it.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.pt-br.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.pt-br.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.ro-ro.js b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/i18n/edit-dialog.i18n.ro-ro.js
@@ -1,5 +1,9 @@
 export default {
   editDialog: {
     keepEdits: 'Keep edits',
+    service: 'Service time (in seconds)',
+    timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',
+    start: 'Start',
+    end: 'End'
   }
 }
diff --git a/src/fragments/forms/map-form/components/optimization/components/vehicle-list/VehicleList.vue b/src/fragments/forms/map-form/components/optimization/components/vehicle-list/VehicleList.vue
@@ -4,7 +4,7 @@
       <v-card-title style="padding-bottom: 0;"><v-icon :color="vehicleColors(v.id)" style="padding: 0 5px 0 0">{{vehicleIcon(v.profile)}}</v-icon><b>Vehicle {{v.id}} ({{v.profile}})</b></v-card-title>
       <v-card-text>
           <template v-for="prop in ['capacity','skills','time_window']">
-            <v-chip v-if="v[prop] && prop === 'time_window' && v[prop].length" style="flex: auto">{{ $t(`optimization.${prop}`) }}: {{ v[prop] }}</v-chip>
+            <v-chip v-if="v[prop] && prop === 'time_window' && v[prop][0] !== 0 " style="flex: auto">{{ $t(`optimization.${prop}`) }}: {{ v[prop][0] }} - {{ v[prop][1] }}</v-chip>
             <v-chip v-else-if="v[prop] && prop === 'capacity'" style="flex: auto">{{ $t(`optimization.${prop}`) }}: {{ v[prop][0] }}</v-chip>
             <v-chip v-else-if="v[prop] && prop === 'skills' && v[prop].length" style="flex: auto">
               {{ $t(`optimization.${prop}`) }}: {{ skillIds(v) }}
diff --git a/src/models/vehicle.js b/src/models/vehicle.js
@@ -13,7 +13,7 @@ class Vehicle extends Place {
     this.profile = options.profile || 'driving-car'
     this.capacity = options.capacity || [5]
     this.skills = options.skills || []
-    this.time_window = options.time_window || []
+    this.time_window = options.time_window || [0, 0]
   }
 
   static fromPlace(place) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`export default {`
`2`	`2`	`editDialog: {`
`3`	`3`	`keepEdits: 'Keep edits',`
	`4`	`+ service: 'Service time (in seconds)',`
	`5`	`+ timeWindow: ' of time window (in seconds passed since 00:00 or timestamp)',`
	`6`	`+ start: 'Start',`
	`7`	`+ end: 'End'`
`4`	`8`	`}`
`5`	`9`	`}`