Merge branch 'dev' into 8673-viewEntryNotesField

src/components/ui/VnLinkPhone.vue

@@ -57,4 +57,5 @@ function handleClick() {
             {{ capitalize(type).replace('-', '') }}
         </QTooltip>
     </QBtn>
+    {{ phoneNumber }}
 </template>

src/components/ui/VnLv.vue

@@ -43,7 +43,7 @@ const val = computed(() => $props.value);
                     <span style="color: var(--vn-label-color)">{{ label }}</span>
                 </slot>
             </div>
-            <div class="value">
+            <div class="value" v-if="value || $slots.value">
                 <slot name="value">
                     <span :title="value" style="text-overflow: ellipsis">
                         {{ dash ? dashIfEmpty(value) : value }}

src/i18n/locale/en.yml

@@ -842,6 +842,7 @@ travel:
         availabledHour: Availabled hour
         thermographs: Thermographs
         hb: HB
+        roundedCc: Rounded CC
     basicData:
         daysInForward: Automatic movement (Raid)
         isRaid: Raid

src/i18n/locale/es.yml

@@ -925,6 +925,7 @@ travel:
         availabled: F. Disponible
         availabledHour: Hora Disponible
         hb: HB
+        roundedCc: CC redondeado
     basicData:
         daysInForward: Desplazamiento automatico (redada)
         isRaid: Redada

src/pages/Entry/Card/EntryCard.vue

@@ -8,6 +8,6 @@ import filter from './EntryFilter.js';
         data-key="Entry"
         url="Entries"
         :descriptor="EntryDescriptor"
-        :filter="filter"
+        :filter="{ ...filter, where: { id: $route.params.id } }"
     />
 </template>

src/pages/Entry/EntryList.vue

@@ -249,7 +249,6 @@ function getBadgeAttrs(row) {
     let timeDiff = today - timeTicket;
 
     if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
-    if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
     switch (row.entryTypeCode) {
         case 'regularization':
         case 'life':
@@ -274,6 +273,7 @@ function getBadgeAttrs(row) {
         default:
             break;
     }
+    if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
     return { color: 'transparent' };
 }
 

src/pages/Ticket/Card/TicketSummary.vue

@@ -216,27 +216,23 @@ onMounted(async () => {
                             :value="toDate(entity.landed)"
                         />
                         <VnLv :label="t('globals.packages')" :value="entity.packages" />
-                        <VnLv :value="entity.address.phone">
-                            <template #label>
-                                {{ t('ticket.summary.consigneePhone') }}
+                        <VnLv :label="t('ticket.summary.consigneePhone')">
+                            <template #value>
                                 <VnLinkPhone :phone-number="entity.address.phone" />
                             </template>
                         </VnLv>
-                        <VnLv :value="entity.address.mobile">
-                            <template #label>
-                                {{ t('ticket.summary.consigneeMobile') }}
+                        <VnLv :label="t('ticket.summary.consigneeMobile')">
+                            <template #value>
                                 <VnLinkPhone :phone-number="entity.address.mobile" />
                             </template>
                         </VnLv>
-                        <VnLv :value="entity.client.phone">
-                            <template #label>
-                                {{ t('ticket.summary.clientPhone') }}
+                        <VnLv :label="t('ticket.summary.clientPhone')">
+                            <template #value>
                                 <VnLinkPhone :phone-number="entity.client.phone" />
                             </template>
                         </VnLv>
-                        <VnLv :value="entity.client.mobile">
-                            <template #label>
-                                {{ t('ticket.summary.clientMobile') }}
+                        <VnLv :label="t('ticket.summary.clientMobile')">
+                            <template #value>
                                 <VnLinkPhone :phone-number="entity.client.mobile" />
                             </template>
                         </VnLv>

src/pages/Travel/Card/TravelSummary.vue

@@ -89,6 +89,13 @@ const entriesTableColumns = computed(() => {
             showValue: true,
         },
         { label: 'CC', field: 'cc', name: 'cc', align: 'left', showValue: true },
+        {
+            label: t('travel.summary.roundedCc'),
+            field: 'cc',
+            name: 'roundedCc',
+            align: 'left',
+            showValue: true,
+        },
         {
             label: 'Pallet',
             field: 'pallet',
@@ -191,14 +198,15 @@ const entriesTotals = computed(() => {
         freightValue: 0,
         packageValue: 0,
         cc: 0,
+        roundedCc: 0,
         pallet: 0,
         m3: 0,
     };
 
     entriesTableRows.value.forEach((row) => {
         for (const key in totals) {
-            if (key === 'cc') {
-                totals[key] += Math.ceil(row[key] || 0);
+            if (key === 'roundedCc') {
+                totals['roundedCc'] += Math.ceil(row['cc'] || 0);
             } else {
                 totals[key] += row[key] || 0;
             }
@@ -210,6 +218,7 @@ const entriesTotals = computed(() => {
         freight: toCurrency(totals.freightValue),
         packageValue: toCurrency(totals.packageValue),
         cc: totals.cc.toFixed(2),
+        roundedCc: totals.roundedCc,
         pallet: totals.pallet.toFixed(2),
         m3: totals.m3.toFixed(2),
     };
@@ -374,6 +383,11 @@ onMounted(async () => {
                             </QBtn>
                         </QTd>
                     </template>
+                    <template #body-cell-roundedCc="{ col, value }">
+                        <QTd>
+                            {{ Math.ceil(value) || 0 }}
+                        </QTd>
+                    </template>
                     <template #body-cell-observation="{ value }">
                         <QTd>
                             <QIcon name="insert_drive_file" color="primary" size="24px">
@@ -390,6 +404,7 @@ onMounted(async () => {
                         <QTd class="text-bold">{{ entriesTotals.freight }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.packageValue }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.cc }}</QTd>
+                        <QTd class="text-bold">{{ entriesTotals.roundedCc }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.pallet }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.m3 }}</QTd>
                     </template>