BAIP-165 features added

bringauto · Dec 6, 2023 · 094072a · 094072a
1 parent b8c0017
commit 094072a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/FE/src/code/enums/carEnums.js b/FE/src/code/enums/carEnums.js
@@ -12,27 +12,27 @@ export const CarState = Object.freeze({
 export const CarStateFormated = [
   {
     status: CarState.WAITING,
-    trans: i18n.tc("satuses.waiting"),
+    trans: i18n.tc("statuses.waiting"),
   },
   {
     status: CarState.ACCEPTIONORDER,
-    trans: i18n.tc("satuses.acceptionOrder"),
+    trans: i18n.tc("statuses.acceptionOrder"),
   },
   {
     status: CarState.DRIVING,
-    trans: i18n.tc("satuses.driving"),
+    trans: i18n.tc("statuses.driving"),
   },
   {
     status: CarState.WAITFORLOAD,
-    trans: i18n.tc("satuses.waitingForLoad"),
+    trans: i18n.tc("statuses.waitingForLoad"),
   },
   {
     status: CarState.OUTOFSERVICE,
-    trans: i18n.tc("satuses.outOfService"),
+    trans: i18n.tc("statuses.outOfService"),
   },
   {
     status: CarState.CHARGING,
-    trans: i18n.tc("satuses.charging"),
+    trans: i18n.tc("statuses.charging"),
   },
 ];
 

diff --git a/FE/src/code/enums/orderEnums.js b/FE/src/code/enums/orderEnums.js
@@ -11,23 +11,23 @@ export const OrderState = Object.freeze({
 export const OrderStateFormated = [
   {
     status: OrderState.TOACCEPT,
-    trans: i18n.tc("satuses.toAccept"),
+    trans: i18n.tc("statuses.toAccept"),
   },
   {
     status: OrderState.ACCEPTED,
-    trans: i18n.tc("satuses.accepted"),
+    trans: i18n.tc("statuses.accepted"),
   },
   {
     status: OrderState.INPROGRESS,
-    trans: i18n.tc("satuses.inProgress"),
+    trans: i18n.tc("statuses.inProgress"),
   },
   {
     status: OrderState.DONE,
-    trans: i18n.tc("satuses.done"),
+    trans: i18n.tc("statuses.done"),
   },
   {
     status: OrderState.CANCELED,
-    trans: i18n.tc("satuses.canceled"),
+    trans: i18n.tc("statuses.canceled"),
   },
 ];
 

diff --git a/FE/src/components/CarCard.vue b/FE/src/components/CarCard.vue
@@ -13,7 +13,7 @@
             <v-btn class="mb-2" color="success" large @click="$router.push('new-order')"
               >{{ $t("general.order") }}
             </v-btn>
-            <v-dialog v-model="showOrder" width="800">
+            <v-dialog v-model="showOrder" width="1000">
               <template #activator="{}">
                 <v-btn color="primary" large text @click="showOrder = !showOrder"
                   >{{ $t("general.showOrders") }}

diff --git a/FE/src/components/TeleopCard.vue b/FE/src/components/TeleopCard.vue
@@ -65,7 +65,7 @@
           </v-card-title>
 
           <v-card-text class="pt-10">
-            <v-row class="align-baseline box-wrapper mb-5" no-gutters>
+            <v-row class="align-baseline box-wrapper mb-4" no-gutters>
               <template v-if="sortOrders && sortOrders.length > 0">
                 <template v-for="order in sortOrders">
                   <v-col :key="order.id" cols="12">
@@ -82,13 +82,13 @@
                           </span>
                         </p>
                       </v-col>
-                      <v-col cols="12" sm="4">
+                      <v-col align="left" cols="12" sm="4">
                         <v-select
                           :append-icon="isAdmin ? '$dropdown' : ''"
-                          :disabled="!isAdmin"
                           :items="OrderStateFormated"
                           :label="$t('general.status')"
                           :value="order.status"
+                          disabled
                           class="mb-2"
                           dense
                           hide-details
@@ -98,6 +98,14 @@
                           @input="$emit('set-order-status', { status: $event, order, car })"
                         />
                       </v-col>
+                      <v-col align="center" cols="12" sm="3">
+                        <v-btn
+                          color="error"
+                          @click="$emit('set-order-status', { status: 'Canceled', order, car })"
+                        >
+                          {{ $t("orders.cancel") }}
+                        </v-btn>
+                      </v-col>
                       <v-col align="center" cols="12" sm="1">
                         <v-btn
                           :icon="!$vuetify.breakpoint.mobile"

diff --git a/FE/src/plugins/i18n/translations.js b/FE/src/plugins/i18n/translations.js
@@ -70,7 +70,7 @@ const translations = {
       longitude: "Zeměpisná délka",
       position: "Zeměpisná poloha",
     },
-    satuses: {
+    statuses: {
       waiting: "Čekání",
       acceptionOrder: "Příjmání objednávky",
       driving: "V jízdě",
@@ -116,6 +116,7 @@ const translations = {
       to: "Do stanice",
       in: "v",
       asap: "co nejdříve",
+      cancel: "Zrušit objednávku",
     },
     notifications: {
       order: {
@@ -255,7 +256,7 @@ const translations = {
       longitude: "Longitude",
       position: "Geographical location",
     },
-    satuses: {
+    statuses: {
       waiting: "Waiting",
       acceptionOrder: "Accepting an order",
       driving: "In ride",
@@ -301,6 +302,7 @@ const translations = {
       to: "To",
       in: "in",
       asap: "As soon as possible",
+      cancel: "Cancel order",
     },
     notifications: {
       order: {