From 803b8d508d7d1170059c639ae52b3a354498b15e Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 13 Jan 2025 11:27:00 +0100
Subject: [PATCH 1/3] feat: refs #8381 add initial and final temperature fields
 to entry forms and summaries

---
 src/components/common/VnInput.vue       |  1 -
 src/i18n/locale/en.yml                  |  2 ++
 src/i18n/locale/es.yml                  |  2 ++
 src/pages/Entry/Card/EntryBasicData.vue | 16 ++++++++++++++++
 src/pages/Entry/Card/EntrySummary.vue   | 15 ++++++++++++++-
 src/pages/Entry/EntryList.vue           | 14 ++++++++++++++
 src/pages/Travel/Card/TravelSummary.vue | 14 ++++++++++++++
 7 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 4c7445aab..99613ed92 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -45,7 +45,6 @@ const $props = defineProps({
 });
 
 const vnInputRef = ref(null);
-const showPassword = ref(false);
 const value = computed({
     get() {
         return $props.modelValue;
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index bf001c9ba..4a4041049 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -429,6 +429,8 @@ entry:
         observation: Observation
         booked: Booked
         excludedFromAvailable: Inventory
+        initialTemperature: Initial Temp.
+        finalTemperature: Final Temp.
     buys:
         observations: Observations
         packagingFk: Box
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 2c95f936c..b7a6c3086 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -430,6 +430,8 @@ entry:
         commission: Comisión
         booked: Asentado
         excludedFromAvailable: Inventario
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observaciónes
         packagingFk: Embalaje
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 147287837..46c831349 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -141,6 +141,22 @@ const onFilterTravelSelected = (formData, id) => {
                     min="0"
                 />
             </VnRow>
+            <VnRow>
+                <QInput
+                    v-model="data.initialTemperature"
+                    name="initialTemperature"
+                    :label="t('entry.basicData.initialTemperature')"
+                    type="number"
+                    step="0.1"
+                />
+                <QInput
+                    v-model="data.finalTemperature"
+                    name="finalTemperature"
+                    :label="t('entry.basicData.finalTemperature')"
+                    type="number"
+                    step="0.1"
+                />
+            </VnRow>
             <VnRow>
                 <QInput
                     :label="t('entry.basicData.observation')"
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 39dad672c..46569755c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -189,6 +189,16 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.invoiceNumber')"
                     :value="entry.invoiceNumber"
                 />
+                <VnLv
+                    :label="t('entry.basicData.initialTemperature')"
+                    :value="
+                        entry.initialTemperature ? `${entry.initialTemperature}°` : ''
+                    "
+                />
+                <VnLv
+                    :label="t('entry.basicData.finalTemperature')"
+                    :value="entry.finalTemperature ? `${entry.finalTemperature}°` : ''"
+                />
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
@@ -207,7 +217,10 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.travelAgency')"
                     :value="entry.travel.agency?.name"
                 />
-                <VnLv :label="t('globals.shipped')" :value="toDate(entry.travel.shipped)" />
+                <VnLv
+                    :label="t('globals.shipped')"
+                    :value="toDate(entry.travel.shipped)"
+                />
                 <VnLv
                     :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 7e92fe051..1d1301154 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -157,6 +157,20 @@ const columns = computed(() => [
         name: 'invoiceAmount',
         cardVisible: true,
     },
+    {
+        align: 'left',
+        name: 'initialTemperature',
+        label: t('entry.basicData.initialTemperature'),
+        field: 'initialTemperature',
+        format: (row) => (row.initialTemperature ? `${row.initialTemperature}°` : ''),
+    },
+    {
+        align: 'left',
+        name: 'finalTemperature',
+        label: t('entry.basicData.finalTemperature'),
+        field: 'finalTemperature',
+        format: (row) => (row.finalTemperature ? `${row.finalTemperature}°` : ''),
+    },
     {
         label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
         name: 'isExcludedFromAvailable',
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 59c3a8a91..62aabd761 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -96,6 +96,20 @@ const entriesTableColumns = computed(() => {
             showValue: true,
         },
         { label: 'm³', field: 'm3', name: 'm3', align: 'left', showValue: true },
+        {
+            label: t('entry.basicData.initialTemperature'),
+            field: 'initialTemperature',
+            name: 'initialTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
+        {
+            label: t('entry.basicData.finalTemperature'),
+            field: 'finalTemperature',
+            name: 'finalTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
         {
             label: '',
             field: 'observation',

From 8c7747999d776b8d4dd0753e979319f51615c7d2 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 16 Jan 2025 09:09:05 +0100
Subject: [PATCH 2/3] feat: refs #8381 add toCelsius filter and update
 temperature fields in entry forms and summaries

---
 src/filters/index.js                         |  2 +
 src/filters/toCelsius.js                     |  3 ++
 src/pages/Entry/Card/EntryBasicData.vue      | 47 ++++++++++----------
 src/pages/Entry/Card/EntrySummary.vue        |  8 ++--
 src/pages/Entry/EntryList.vue                |  6 +--
 src/pages/Travel/Card/TravelSummary.vue      | 10 ++---
 src/pages/Travel/Card/TravelThermographs.vue |  6 +--
 7 files changed, 43 insertions(+), 39 deletions(-)
 create mode 100644 src/filters/toCelsius.js

diff --git a/src/filters/index.js b/src/filters/index.js
index a92d2eb07..bf1429aee 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -16,6 +16,7 @@ import getUpdatedValues from './getUpdatedValues';
 import getParamWhere from './getParamWhere';
 import parsePhone from './parsePhone';
 import isDialogOpened from './isDialogOpened';
+import toCelsius from './toCelsius';
 
 export {
     getUpdatedValues,
@@ -36,4 +37,5 @@ export {
     dashIfEmpty,
     dateRange,
     getParamWhere,
+    toCelsius,
 };
diff --git a/src/filters/toCelsius.js b/src/filters/toCelsius.js
new file mode 100644
index 000000000..83cab32ca
--- /dev/null
+++ b/src/filters/toCelsius.js
@@ -0,0 +1,3 @@
+export default function toCelsius(value) {
+    return value ? `${value}°C` : '';
+}
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 46c831349..68d666fc0 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useRole } from 'src/composables/useRole';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -11,7 +10,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
-
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
 
 const route = useRoute();
@@ -26,6 +25,7 @@ const onFilterTravelSelected = (formData, id) => {
     formData.travelFk = id;
 };
 </script>
+
 <template>
     <FetchData
         ref="companiesRef"
@@ -93,14 +93,13 @@ const onFilterTravelSelected = (formData, id) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection>
-                                <QItemLabel
-                                    >{{ scope.opt?.agencyModeName }} -
-                                    {{ scope.opt?.warehouseInName }} ({{
-                                        toDate(scope.opt?.shipped)
-                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
-                                        toDate(scope.opt?.landed)
-                                    }})</QItemLabel
-                                >
+                                <QItemLabel>
+                                    {{ scope.opt?.agencyModeName }} -
+                                    {{ scope.opt?.warehouseInName }}
+                                    ({{ toDate(scope.opt?.shipped) }}) →
+                                    {{ scope.opt?.warehouseOutName }}
+                                    ({{ toDate(scope.opt?.landed) }})
+                                </QItemLabel>
                             </QItemSection>
                         </QItem>
                     </template>
@@ -126,6 +125,13 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
+                <VnInputNumber
+                    :label="t('entry.summary.commission')"
+                    v-model="data.commission"
+                    step="1"
+                    autofocus
+                    :positive="false"
+                />
                 <VnSelect
                     :label="t('entry.summary.currency')"
                     v-model="data.currencyFk"
@@ -133,28 +139,23 @@ const onFilterTravelSelected = (formData, id) => {
                     option-value="id"
                     option-label="code"
                 />
-                <QInput
-                    :label="t('entry.summary.commission')"
-                    v-model="data.commission"
-                    type="number"
-                    autofocus
-                    min="0"
-                />
             </VnRow>
             <VnRow>
-                <QInput
+                <VnInputNumber
                     v-model="data.initialTemperature"
                     name="initialTemperature"
                     :label="t('entry.basicData.initialTemperature')"
-                    type="number"
-                    step="0.1"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
                 />
-                <QInput
+                <VnInputNumber
                     v-model="data.finalTemperature"
                     name="finalTemperature"
                     :label="t('entry.basicData.finalTemperature')"
-                    type="number"
-                    step="0.1"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
                 />
             </VnRow>
             <VnRow>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 46569755c..05b809e33 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -7,7 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
-import { toDate, toCurrency } from 'src/filters';
+import { toDate, toCurrency, toCelsius } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
@@ -191,13 +191,11 @@ const fetchEntryBuys = async () => {
                 />
                 <VnLv
                     :label="t('entry.basicData.initialTemperature')"
-                    :value="
-                        entry.initialTemperature ? `${entry.initialTemperature}°` : ''
-                    "
+                    :value="toCelsius(entry.initialTemperature)"
                 />
                 <VnLv
                     :label="t('entry.basicData.finalTemperature')"
-                    :value="entry.finalTemperature ? `${entry.finalTemperature}°` : ''"
+                    :value="toCelsius(entry.finalTemperature)"
                 />
             </QCard>
             <QCard class="vn-one">
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 1d1301154..378bf8ae0 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -5,7 +5,7 @@ import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
-import { toDate } from 'src/filters';
+import { toCelsius, toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
@@ -162,14 +162,14 @@ const columns = computed(() => [
         name: 'initialTemperature',
         label: t('entry.basicData.initialTemperature'),
         field: 'initialTemperature',
-        format: (row) => (row.initialTemperature ? `${row.initialTemperature}°` : ''),
+        format: (row) => toCelsius(row.initialTemperature),
     },
     {
         align: 'left',
         name: 'finalTemperature',
         label: t('entry.basicData.finalTemperature'),
         field: 'finalTemperature',
-        format: (row) => (row.finalTemperature ? `${row.finalTemperature}°` : ''),
+        format: (row) => toCelsius(row.finalTemperature),
     },
     {
         label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 62aabd761..bf8d321e5 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -9,7 +9,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import { toDate, toCurrency } from 'src/filters';
+import { toDate, toCurrency, toCelsius } from 'src/filters';
 import axios from 'axios';
 
 const $props = defineProps({
@@ -101,14 +101,14 @@ const entriesTableColumns = computed(() => {
             field: 'initialTemperature',
             name: 'initialTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('entry.basicData.finalTemperature'),
             field: 'finalTemperature',
             name: 'finalTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: '',
@@ -140,14 +140,14 @@ const thermographsTableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.state'),
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 2bf3293a6..85781a6a4 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -10,7 +10,7 @@ import FetchData from 'src/components/FetchData.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { toDate } from 'src/filters';
+import { toDate, toCelsius } from 'src/filters';
 import { downloadFile } from 'src/composables/downloadFile';
 
 const route = useRoute();
@@ -52,14 +52,14 @@ const TableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.state'),

From 545cb19dcebaeac4eeec933b522d61ea03d5cc3e Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 21 Jan 2025 07:46:14 +0100
Subject: [PATCH 3/3] feat: refs #8381 add initial and final temperature labels
 in English and Spanish locales

---
 src/pages/Entry/locale/en.yml | 2 ++
 src/pages/Entry/locale/es.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index ff83de0ab..97a3be32b 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -40,6 +40,8 @@ entry:
         observation: Observation
         booked: Booked
         excludedFromAvailable: Inventory
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observations
         packagingFk: Box
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 72072f6ab..993913417 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -41,6 +41,8 @@ entry:
         commission: Comisión
         booked: Asentado
         excludedFromAvailable: Inventario
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observaciónes
         packagingFk: Embalaje