From ae669fb28e72936f01186e102461fae1c0a408d4 Mon Sep 17 00:00:00 2001
From: JAGFx <contact@jagfx.fr>
Date: Sun, 3 Apr 2022 19:11:21 +0200
Subject: [PATCH] :bug: [feat/rework-scania] #78 finalizing somme adjustment on
 skins

---
 package-lock.json                                         | 1 +
 src/assets/scss/dashboard/shared/_map.scss                | 2 +-
 src/components/dashboards/DefaultDashboard.vue            | 8 +++++++-
 src/components/dashboards/jagfx/Zone/JagfxTruck.vue       | 2 +-
 .../dashboards/scania/display/ScaniaDisplay.vue           | 2 +-
 src/components/dashboards/shared/Map.vue                  | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index db502d9a..5d5297d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,6 +67,7 @@
       }
     },
     "lib": {
+      "name": "ets2-dashboard-lib",
       "version": "0.0.1",
       "license": "MIT",
       "dependencies": {
diff --git a/src/assets/scss/dashboard/shared/_map.scss b/src/assets/scss/dashboard/shared/_map.scss
index 5d746922..4e9c33b3 100644
--- a/src/assets/scss/dashboard/shared/_map.scss
+++ b/src/assets/scss/dashboard/shared/_map.scss
@@ -281,7 +281,7 @@
 				
 				.unit { font-size: .7rem; }
 				
-				width: 5.5rem;
+				width: 6rem;
 			}
 			
 			.truck-gears {
diff --git a/src/components/dashboards/DefaultDashboard.vue b/src/components/dashboards/DefaultDashboard.vue
index e7098980..e70d5330 100644
--- a/src/components/dashboards/DefaultDashboard.vue
+++ b/src/components/dashboards/DefaultDashboard.vue
@@ -172,7 +172,13 @@
             <th>{{ $t('Deadline in') }}:</th>
             <td>
               <span class="job-remainingTime">
-                {{ telemetry2.job.remainingTimeForDeliveryTime }}
+                {{
+                  $dateTimeLocalized(
+                    telemetry2.navigation.etaDueDate,
+                    DATE_FORMAT_LONG,
+                    TIME_FORMAT_SHORT
+                  )
+                }}
               </span>
               <span class="_jobIncome">
                 (<span class="job-income">
diff --git a/src/components/dashboards/jagfx/Zone/JagfxTruck.vue b/src/components/dashboards/jagfx/Zone/JagfxTruck.vue
index 51c35e05..350fce7c 100644
--- a/src/components/dashboards/jagfx/Zone/JagfxTruck.vue
+++ b/src/components/dashboards/jagfx/Zone/JagfxTruck.vue
@@ -53,7 +53,7 @@
             telemetry2.truck.ignitionIsTurnedOn
           "
         >
-          {{ telemetry2.truck.cruiseControlSpeed }}
+          {{ telemetry2.truck.cruiseControlSpeed.toFixed(0) }}
           {{ $unitReadable('unit_speed') }}
         </span>
         <span v-else />
diff --git a/src/components/dashboards/scania/display/ScaniaDisplay.vue b/src/components/dashboards/scania/display/ScaniaDisplay.vue
index 1fc903fe..ccf1fd0b 100644
--- a/src/components/dashboards/scania/display/ScaniaDisplay.vue
+++ b/src/components/dashboards/scania/display/ScaniaDisplay.vue
@@ -42,7 +42,7 @@
           <span
             v-if="telemetry2.symbols.cruiseControlIsEnabled"
             class="value pb-2"
-            >{{ telemetry2.truck.cruiseControlSpeed }}</span
+            >{{ telemetry2.truck.cruiseControlSpeed.toFixed(0) }}</span
           >
           <span v-else class="value pb-2">-</span>
           <span class="unit">{{ $unitReadable('unit_speed') }}</span>
diff --git a/src/components/dashboards/shared/Map.vue b/src/components/dashboards/shared/Map.vue
index 969c2054..ef078b08 100644
--- a/src/components/dashboards/shared/Map.vue
+++ b/src/components/dashboards/shared/Map.vue
@@ -63,7 +63,7 @@
             >{{ $t('OFF') }}</span
           >
           <span v-else class="pl-2">
-            {{ telemetry2.truck.speed.toFixed(0) }}
+            {{ telemetry2.truck.cruiseControlSpeed.toFixed(0) }}
             {{ $unitReadable('unit_speed') }}
           </span>
         </div>