From ac4a19841d9e7db10bea81692b4f45a2a1aa7254 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Tue, 16 Feb 2021 15:40:20 +0100 Subject: [PATCH 1/2] Added shrink for date --- front/core/components/table/style.scss | 3 +++ modules/claim/front/index/index.html | 2 +- modules/invoiceOut/front/index/index.html | 4 ++-- modules/order/front/index/index.html | 4 ++-- modules/route/front/index/index.html | 2 +- modules/ticket/front/index/index.html | 4 ++-- modules/travel/front/index/index.html | 4 ++-- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss index 7d90d4db68..c02e6df237 100644 --- a/front/core/components/table/style.scss +++ b/front/core/components/table/style.scss @@ -81,6 +81,9 @@ vn-table { width: 1px; text-align: center; } + &[shrink-date] { + width: 100px; + } &[expand] { max-width: 400px; min-width: 0; diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html index 1688cf7c05..ef13d47cb1 100644 --- a/modules/claim/front/index/index.html +++ b/modules/claim/front/index/index.html @@ -29,7 +29,7 @@ {{::claim.name}} - {{::claim.created | date:'dd/MM/yyyy'}} + {{::claim.created | date:'dd/MM/yyyy'}} {{::invoiceOut.ref | dashIfEmpty}} - {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}} + {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}} {{::invoiceOut.amount | currency: 'EUR': 2 | dashIfEmpty}} {{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}} {{::invoiceOut.companyCode | dashIfEmpty}} - {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}} + {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}} - {{::order.created | date: 'dd/MM/yyyy HH:mm'}} - + {{::order.created | date: 'dd/MM/yyyy HH:mm'}} + {{::order.landed | date:'dd/MM/yyyy'}} diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index 7bbadefe46..517a291568 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -44,7 +44,7 @@ {{::route.agencyName | dashIfEmpty}} {{::route.vehiclePlateNumber | dashIfEmpty}} - {{::route.created | dashIfEmpty | date:'dd/MM/yyyy'}} + {{::route.created | dashIfEmpty | date:'dd/MM/yyyy'}} {{::route.m3 | dashIfEmpty}} {{::route.description | dashIfEmpty}} diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 4243ef1ab9..8ba5911f75 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -80,12 +80,12 @@ {{::ticket.userName | dashIfEmpty}} - + {{::ticket.shipped | date: 'dd/MM/yyyy'}} - {{::ticket.shipped | date: 'HH:mm'}} + {{::ticket.shipped | date: 'HH:mm'}} {{::ticket.zoneLanding | date: 'HH:mm'}} {{::travel.ref}} {{::travel.agencyModeName}} {{::travel.warehouseOutName}} - + {{::travel.shipped | date:'dd/MM/yyyy'}} {{::travel.warehouseInName}} - + {{::travel.landed | date:'dd/MM/yyyy'}} From aaf77677d1b58cb7a0db0e5aa7fb8faed75cb0a6 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Tue, 16 Feb 2021 15:50:48 +0100 Subject: [PATCH 2/2] Aligned title with column --- modules/claim/front/index/index.html | 2 +- modules/order/front/index/index.html | 4 ++-- modules/route/front/index/index.html | 2 +- modules/ticket/front/index/index.html | 2 +- modules/travel/front/index/index.html | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html index ef13d47cb1..c8f7e994c2 100644 --- a/modules/claim/front/index/index.html +++ b/modules/claim/front/index/index.html @@ -10,7 +10,7 @@ Id Client - Created + Created Worker State diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index c7a808757d..d90b59f893 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -14,7 +14,7 @@ Client Confirmed Created - Landed + Landed Hour Agency Total @@ -47,7 +47,7 @@ {{::order.created | date: 'dd/MM/yyyy HH:mm'}} - + {{::order.landed | date:'dd/MM/yyyy'}} diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index 517a291568..6331537f8f 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -17,7 +17,7 @@ Worker Agency Vehicle - Date + Date Description diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 8ba5911f75..dec4e00f45 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -16,7 +16,7 @@ Id Salesperson - Date + Date Hour Closure Alias diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html index 1f299b052d..26b7e132b5 100644 --- a/modules/travel/front/index/index.html +++ b/modules/travel/front/index/index.html @@ -13,10 +13,10 @@ Reference Agency Warehouse Out - Shipped + Shipped Delivered Warehouse In - Landed + Landed Received