🐛 [feat/rework-scania] #78 finalizing somme adjustment on skins

JAGFx · JAGFx · commit ae669fb28e72 · 2022-04-03T19:11:21.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@`
`281`	`281`
`282`	`282`	`.unit { font-size: .7rem; }`
`283`	`283`
`284`		`- width: 5.5rem;`
	`284`	`+ width: 6rem;`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`.truck-gears {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`telemetry2.truck.ignitionIsTurnedOn`
`54`	`54`	`"`
`55`	`55`	`>`
`56`		`- {{ telemetry2.truck.cruiseControlSpeed }}`
	`56`	`+ {{ telemetry2.truck.cruiseControlSpeed.toFixed(0) }}`
`57`	`57`	`{{ $unitReadable('unit_speed') }}`
`58`	`58`	`</span>`
`59`	`59`	`<span v-else />`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`<span`
`43`	`43`	`v-if="telemetry2.symbols.cruiseControlIsEnabled"`
`44`	`44`	`class="value pb-2"`
`45`		`- >{{ telemetry2.truck.cruiseControlSpeed }}</span`
	`45`	`+ >{{ telemetry2.truck.cruiseControlSpeed.toFixed(0) }}</span`
`46`	`46`	`>`
`47`	`47`	`<span v-else class="value pb-2">-</span>`
`48`	`48`	`<span class="unit">{{ $unitReadable('unit_speed') }}</span>`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`>{{ $t('OFF') }}</span`
`64`	`64`	`>`
`65`	`65`	`<span v-else class="pl-2">`
`66`		`- {{ telemetry2.truck.speed.toFixed(0) }}`
	`66`	`+ {{ telemetry2.truck.cruiseControlSpeed.toFixed(0) }}`
`67`	`67`	`{{ $unitReadable('unit_speed') }}`
`68`	`68`	`</span>`
`69`	`69`	`</div>`