@fleetbase/fleetops-engine 0.3.9 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/addon/components/admin/navigator-app.hbs +3 -3
- package/addon/components/admin/visibility-controls.hbs +4 -4
- package/addon/components/cell/driver-name.hbs +1 -1
- package/addon/components/contact-form-panel.hbs +15 -15
- package/addon/components/contact-form-panel.js +5 -1
- package/addon/components/contact-panel/details.hbs +7 -7
- package/addon/components/contact-panel.hbs +2 -2
- package/addon/components/display-place.hbs +2 -2
- package/addon/components/driver-card.hbs +1 -1
- package/addon/components/driver-form-panel.hbs +36 -29
- package/addon/components/driver-form-panel.js +5 -1
- package/addon/components/driver-panel/details.hbs +10 -10
- package/addon/components/driver-panel.hbs +5 -5
- package/addon/components/fleet-driver-listing.hbs +5 -5
- package/addon/components/fleet-form-panel.hbs +16 -16
- package/addon/components/fleet-form-panel.js +5 -1
- package/addon/components/fleet-panel/details.hbs +7 -7
- package/addon/components/fleet-panel/driver-listing.hbs +5 -5
- package/addon/components/fleet-panel/driver-listing.js +6 -0
- package/addon/components/fleet-panel/vehicle-listing.hbs +5 -5
- package/addon/components/fleet-panel/vehicle-listing.js +6 -0
- package/addon/components/fleet-vehicle-listing.hbs +5 -5
- package/addon/components/fuel-report-form-panel.hbs +16 -16
- package/addon/components/fuel-report-form-panel.js +5 -1
- package/addon/components/fuel-report-panel/details.hbs +11 -11
- package/addon/components/fuel-report-panel.hbs +3 -3
- package/addon/components/global-search.hbs +1 -1
- package/addon/components/horizontal-route.hbs +1 -1
- package/addon/components/integrated-order-details.hbs +13 -13
- package/addon/components/issue-form-panel.hbs +25 -25
- package/addon/components/issue-form-panel.js +6 -1
- package/addon/components/issue-panel/details.hbs +11 -11
- package/addon/components/issue-panel.hbs +3 -3
- package/addon/components/layout/fleet-ops-sidebar.hbs +2 -2
- package/addon/components/layout/fleet-ops-sidebar.js +28 -12
- package/addon/components/live-map-drawer/driver-listing.hbs +1 -1
- package/addon/components/live-map-drawer/driver-listing.js +16 -10
- package/addon/components/live-map-drawer/place-listing.hbs +1 -1
- package/addon/components/live-map-drawer/place-listing.js +12 -7
- package/addon/components/live-map-drawer/vehicle-listing.hbs +1 -1
- package/addon/components/live-map-drawer/vehicle-listing.js +15 -9
- package/addon/components/live-map.hbs +10 -92
- package/addon/components/live-map.js +29 -24
- package/addon/components/map-container/toolbar/visibility-control-panel.hbs +9 -9
- package/addon/components/map-container/toolbar/zones-panel.hbs +10 -10
- package/addon/components/map-container/toolbar.hbs +6 -6
- package/addon/components/modals/assign-driver.hbs +2 -2
- package/addon/components/modals/clone-config-form.hbs +2 -2
- package/addon/components/modals/contact-details.hbs +6 -6
- package/addon/components/modals/contact-form.hbs +11 -11
- package/addon/components/modals/driver-assign-order.hbs +2 -2
- package/addon/components/modals/driver-assign-vehicle.hbs +2 -2
- package/addon/components/modals/driver-assign-vendor.hbs +2 -2
- package/addon/components/modals/driver-details.hbs +14 -14
- package/addon/components/modals/driver-form.hbs +18 -18
- package/addon/components/modals/edit-meta-form.hbs +2 -2
- package/addon/components/modals/entity-form.hbs +16 -16
- package/addon/components/modals/entity-meta-field-prompt.hbs +1 -1
- package/addon/components/modals/fleet-details.hbs +6 -6
- package/addon/components/modals/fleet-form.hbs +8 -8
- package/addon/components/modals/fuel-report-details.hbs +9 -9
- package/addon/components/modals/fuel-report-form.hbs +8 -8
- package/addon/components/modals/group-details.hbs +4 -4
- package/addon/components/modals/group-form.hbs +6 -6
- package/addon/components/modals/install-prompt.hbs +2 -3
- package/addon/components/modals/issue-details.hbs +8 -8
- package/addon/components/modals/issue-from.hbs +21 -21
- package/addon/components/modals/map-field-form.hbs +2 -2
- package/addon/components/modals/map-field-group-form.hbs +1 -1
- package/addon/components/modals/map-layer-form.hbs +10 -10
- package/addon/components/modals/meta-field-form.hbs +2 -2
- package/addon/components/modals/meta-field-group-form.hbs +1 -1
- package/addon/components/modals/new-order-config.hbs +4 -4
- package/addon/components/modals/order-assign-driver.hbs +2 -2
- package/addon/components/modals/order-config-new-status.hbs +1 -1
- package/addon/components/modals/order-event.hbs +2 -2
- package/addon/components/modals/order-form.hbs +8 -8
- package/addon/components/modals/order-import.hbs +8 -8
- package/addon/components/modals/order-label.hbs +1 -1
- package/addon/components/modals/order-new-activity.hbs +10 -10
- package/addon/components/modals/order-route-form.hbs +17 -17
- package/addon/components/modals/place-assign-vendor.hbs +2 -2
- package/addon/components/modals/place-details.hbs +13 -13
- package/addon/components/modals/place-form.hbs +15 -15
- package/addon/components/modals/policy-form.hbs +5 -5
- package/addon/components/modals/role-form.hbs +3 -3
- package/addon/components/modals/select-payment-method.hbs +1 -1
- package/addon/components/modals/service-area-form.hbs +8 -8
- package/addon/components/modals/set-password.hbs +3 -3
- package/addon/components/modals/uninstall-prompt.hbs +2 -3
- package/addon/components/modals/user-form.hbs +9 -9
- package/addon/components/modals/vehicle-details.hbs +41 -41
- package/addon/components/modals/vehicle-form.hbs +73 -73
- package/addon/components/modals/vendor-details.hbs +10 -10
- package/addon/components/modals/vendor-form.hbs +36 -36
- package/addon/components/modals/view-service-area.hbs +1 -1
- package/addon/components/modals/zone-form.hbs +6 -6
- package/addon/components/order/header.hbs +11 -11
- package/addon/components/order/place-card.hbs +2 -2
- package/addon/components/order/schedule-card.hbs +6 -6
- package/addon/components/order/schedule-card.js +11 -7
- package/addon/components/order-config/activity-flow-editor.hbs +14 -14
- package/addon/components/order-config/activity-flow-editor.js +11 -11
- package/addon/components/order-config/details-editor.hbs +9 -9
- package/addon/components/order-config/entities-editor.hbs +13 -13
- package/addon/components/order-config/entities-editor.js +2 -2
- package/addon/components/order-config/fields-editor.hbs +14 -14
- package/addon/components/order-config/fields-editor.js +13 -12
- package/addon/components/order-config.hbs +9 -9
- package/addon/components/order-config.js +12 -11
- package/addon/components/order-list-overlay.hbs +14 -14
- package/addon/components/place-form-panel.hbs +18 -18
- package/addon/components/place-form-panel.js +6 -1
- package/addon/components/place-panel/details.hbs +10 -10
- package/addon/components/place-panel.hbs +2 -2
- package/addon/components/route-list.hbs +2 -2
- package/addon/components/settings-window.hbs +5 -5
- package/addon/components/settings-window.js +2 -1
- package/addon/components/vehicle-form-panel.hbs +27 -27
- package/addon/components/vehicle-form-panel.js +7 -2
- package/addon/components/vehicle-panel/details.hbs +7 -7
- package/addon/components/vehicle-panel.hbs +4 -4
- package/addon/components/vendor-form-panel/create-form.hbs +34 -33
- package/addon/components/vendor-form-panel/create-form.js +6 -2
- package/addon/components/vendor-form-panel/edit-form.hbs +27 -27
- package/addon/components/vendor-form-panel/edit-form.js +1 -0
- package/addon/components/vendor-form-panel.hbs +6 -6
- package/addon/components/vendor-form-panel.js +6 -1
- package/addon/components/vendor-panel/details.hbs +10 -10
- package/addon/components/vendor-panel.hbs +3 -3
- package/addon/components/widget/fleet-ops-quickstart.hbs +2 -2
- package/addon/components/widget/fleet-ops-quickstart.js +1 -0
- package/addon/components/widget/key-metrics.hbs +12 -12
- package/addon/components/widget/live-order-map.hbs +4 -4
- package/addon/components/widget/recent-orders.hbs +4 -4
- package/addon/components/widget/transactions.hbs +4 -4
- package/addon/controllers/management/contacts/index/edit.js +10 -3
- package/addon/controllers/management/contacts/index/new.js +7 -0
- package/addon/controllers/management/contacts/index.js +23 -16
- package/addon/controllers/management/drivers/index/edit.js +10 -3
- package/addon/controllers/management/drivers/index/new.js +7 -0
- package/addon/controllers/management/drivers/index.js +33 -19
- package/addon/controllers/management/fleets/index/edit.js +10 -3
- package/addon/controllers/management/fleets/index/new.js +7 -0
- package/addon/controllers/management/fleets/index.js +24 -17
- package/addon/controllers/management/fuel-reports/index/edit.js +10 -3
- package/addon/controllers/management/fuel-reports/index/new.js +7 -0
- package/addon/controllers/management/fuel-reports/index.js +20 -13
- package/addon/controllers/management/issues/index/edit.js +10 -3
- package/addon/controllers/management/issues/index/new.js +8 -0
- package/addon/controllers/management/issues/index.js +22 -15
- package/addon/controllers/management/places/index/edit.js +10 -3
- package/addon/controllers/management/places/index/new.js +7 -0
- package/addon/controllers/management/places/index.js +27 -20
- package/addon/controllers/management/vehicles/index/edit.js +10 -3
- package/addon/controllers/management/vehicles/index/new.js +7 -0
- package/addon/controllers/management/vehicles/index.js +22 -15
- package/addon/controllers/management/vendors/index/edit.js +10 -3
- package/addon/controllers/management/vendors/index/new.js +7 -0
- package/addon/controllers/management/vendors/index.js +23 -16
- package/addon/controllers/operations/orders/index/new.js +110 -25
- package/addon/controllers/operations/orders/index/view.js +40 -16
- package/addon/controllers/operations/orders/index.js +34 -27
- package/addon/controllers/operations/scheduler/index.js +3 -2
- package/addon/controllers/operations/service-rates/index/edit.js +9 -1
- package/addon/controllers/operations/service-rates/index/new.js +9 -1
- package/addon/controllers/operations/service-rates/index.js +16 -9
- package/addon/routes/management/places/index.js +1 -1
- package/addon/routes/operations/orders/index/view.js +2 -14
- package/addon/services/driver-actions.js +9 -8
- package/addon/services/vehicle-actions.js +2 -1
- package/addon/templates/management/contacts/index.hbs +6 -6
- package/addon/templates/management/drivers/index.hbs +6 -6
- package/addon/templates/management/fleets/index.hbs +6 -6
- package/addon/templates/management/fuel-reports/index.hbs +7 -7
- package/addon/templates/management/index.hbs +17 -17
- package/addon/templates/management/issues/index.hbs +6 -6
- package/addon/templates/management/places/index.hbs +6 -6
- package/addon/templates/management/vehicles/index.hbs +6 -6
- package/addon/templates/management/vendors/index.hbs +6 -6
- package/addon/templates/operations/orders/index/config/types.hbs +3 -3
- package/addon/templates/operations/orders/index/config.hbs +3 -4
- package/addon/templates/operations/orders/index/new.hbs +72 -72
- package/addon/templates/operations/orders/index/view.hbs +147 -53
- package/addon/templates/operations/orders/index.hbs +13 -13
- package/addon/templates/operations/scheduler/index.hbs +3 -3
- package/addon/templates/operations/service-rates/index/new.hbs +79 -81
- package/addon/templates/operations/service-rates/index.hbs +6 -6
- package/composer.json +2 -2
- package/extension.json +1 -1
- package/package.json +3 -1
- package/server/resources/views/labels/default.php +40 -18
- package/server/resources/views/labels/waypoint-label.php +126 -0
- package/server/src/Console/Commands/FixDriverCompanies.php +65 -0
- package/server/src/Exceptions/IntegratedVendorException.php +11 -12
- package/server/src/Http/Controllers/Api/v1/DriverController.php +41 -32
- package/server/src/Http/Controllers/Api/v1/OrderController.php +1 -1
- package/server/src/Http/Controllers/Internal/v1/DriverController.php +17 -1
- package/server/src/Http/Resources/v1/Driver.php +1 -1
- package/server/src/Http/Resources/v1/Entity.php +2 -2
- package/server/src/Http/Resources/v1/Payload.php +11 -30
- package/server/src/Http/Resources/v1/Place.php +3 -3
- package/server/src/Http/Resources/v1/Waypoint.php +101 -0
- package/server/src/Models/Payload.php +39 -0
- package/server/src/Models/Place.php +5 -2
- package/server/src/Models/Waypoint.php +15 -3
- package/server/src/Providers/FleetOpsServiceProvider.php +1 -0
- package/server/src/Support/Flow.php +19 -2
- package/translations/en-us.yaml +1341 -3
|
@@ -15,6 +15,20 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
15
15
|
*/
|
|
16
16
|
@service notifications;
|
|
17
17
|
|
|
18
|
+
/**
|
|
19
|
+
* Inject the `modals-manager` service
|
|
20
|
+
*
|
|
21
|
+
* @var {Service}
|
|
22
|
+
*/
|
|
23
|
+
@service modalsManager;
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Inject the `intl` service
|
|
27
|
+
*
|
|
28
|
+
* @var {Service}
|
|
29
|
+
*/
|
|
30
|
+
@service intl;
|
|
31
|
+
|
|
18
32
|
/**
|
|
19
33
|
* Inject the `crud` service
|
|
20
34
|
*
|
|
@@ -214,7 +228,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
214
228
|
*/
|
|
215
229
|
@tracked columns = [
|
|
216
230
|
{
|
|
217
|
-
label: '
|
|
231
|
+
label: this.intl.t('fleet-ops.common.name'),
|
|
218
232
|
valuePath: 'name',
|
|
219
233
|
width: '200px',
|
|
220
234
|
cellComponent: 'table/cell/driver-name',
|
|
@@ -225,7 +239,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
225
239
|
filterComponent: 'filter/string',
|
|
226
240
|
},
|
|
227
241
|
{
|
|
228
|
-
label: '
|
|
242
|
+
label: this.intl.t('fleet-ops.common.id'),
|
|
229
243
|
valuePath: 'public_id',
|
|
230
244
|
width: '130px',
|
|
231
245
|
cellComponent: 'click-to-copy',
|
|
@@ -236,7 +250,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
236
250
|
filterComponent: 'filter/string',
|
|
237
251
|
},
|
|
238
252
|
{
|
|
239
|
-
label: '
|
|
253
|
+
label: this.intl.t('fleet-ops.common.internal-id'),
|
|
240
254
|
valuePath: 'internal_id',
|
|
241
255
|
cellComponent: 'click-to-copy',
|
|
242
256
|
width: '130px',
|
|
@@ -246,7 +260,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
246
260
|
filterComponent: 'filter/string',
|
|
247
261
|
},
|
|
248
262
|
{
|
|
249
|
-
label: '
|
|
263
|
+
label: this.intl.t('fleet-ops.common.vendor'),
|
|
250
264
|
cellComponent: 'table/cell/anchor',
|
|
251
265
|
onClick: async (driver) => {
|
|
252
266
|
const vendor = await driver.loadVendor();
|
|
@@ -266,7 +280,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
266
280
|
model: 'vendor',
|
|
267
281
|
},
|
|
268
282
|
{
|
|
269
|
-
label: '
|
|
283
|
+
label: this.intl.t('fleet-ops.common.vehicle'),
|
|
270
284
|
cellComponent: 'table/cell/anchor',
|
|
271
285
|
onClick: (driver) => {
|
|
272
286
|
return driver
|
|
@@ -289,7 +303,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
289
303
|
model: 'vehicle',
|
|
290
304
|
},
|
|
291
305
|
{
|
|
292
|
-
label: '
|
|
306
|
+
label: this.intl.t('fleet-ops.common.fleet'),
|
|
293
307
|
cellComponent: 'table/cell/link-list',
|
|
294
308
|
cellComponentLabelPath: 'name',
|
|
295
309
|
action: (fleet) => {
|
|
@@ -306,7 +320,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
306
320
|
model: 'fleet',
|
|
307
321
|
},
|
|
308
322
|
{
|
|
309
|
-
label: '
|
|
323
|
+
label: this.intl.t('fleet-ops.common.license'),
|
|
310
324
|
valuePath: 'drivers_license_number',
|
|
311
325
|
cellComponent: 'table/cell/base',
|
|
312
326
|
width: '150px',
|
|
@@ -316,7 +330,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
316
330
|
filterComponent: 'filter/string',
|
|
317
331
|
},
|
|
318
332
|
{
|
|
319
|
-
label: '
|
|
333
|
+
label: this.intl.t('fleet-ops.common.phone'),
|
|
320
334
|
valuePath: 'phone',
|
|
321
335
|
cellComponent: 'table/cell/base',
|
|
322
336
|
width: '150px',
|
|
@@ -327,7 +341,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
327
341
|
filterComponent: 'filter/string',
|
|
328
342
|
},
|
|
329
343
|
{
|
|
330
|
-
label: '
|
|
344
|
+
label: this.intl.t('fleet-ops.common.country'),
|
|
331
345
|
valuePath: 'country',
|
|
332
346
|
cellComponent: 'table/cell/country',
|
|
333
347
|
cellClassNames: 'uppercase',
|
|
@@ -345,7 +359,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
345
359
|
multiOptionSearchPlaceholder: 'Search countries...',
|
|
346
360
|
},
|
|
347
361
|
{
|
|
348
|
-
label: '
|
|
362
|
+
label: this.intl.t('fleet-ops.common.status'),
|
|
349
363
|
valuePath: 'status',
|
|
350
364
|
cellComponent: 'table/cell/status',
|
|
351
365
|
width: '10%',
|
|
@@ -356,7 +370,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
356
370
|
filterFetchOptions: 'drivers/statuses',
|
|
357
371
|
},
|
|
358
372
|
{
|
|
359
|
-
label: '
|
|
373
|
+
label: this.intl.t('fleet-ops.common.created-at'),
|
|
360
374
|
valuePath: 'createdAt',
|
|
361
375
|
sortParam: 'created_at',
|
|
362
376
|
filterParam: 'created_at',
|
|
@@ -367,7 +381,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
367
381
|
filterComponent: 'filter/date',
|
|
368
382
|
},
|
|
369
383
|
{
|
|
370
|
-
label: '
|
|
384
|
+
label: this.intl.t('fleet-ops.common.updated-at'),
|
|
371
385
|
valuePath: 'updatedAt',
|
|
372
386
|
sortParam: 'updated_at',
|
|
373
387
|
filterParam: 'updated_at',
|
|
@@ -390,33 +404,33 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
390
404
|
width: '10%',
|
|
391
405
|
actions: [
|
|
392
406
|
{
|
|
393
|
-
label: '
|
|
407
|
+
label: this.intl.t('fleet-ops.management.drivers.index.view-details'),
|
|
394
408
|
fn: this.viewDriver,
|
|
395
409
|
},
|
|
396
410
|
{
|
|
397
|
-
label: '
|
|
411
|
+
label: this.intl.t('fleet-ops.management.drivers.index.edit-details'),
|
|
398
412
|
fn: this.editDriver,
|
|
399
413
|
},
|
|
400
414
|
{
|
|
401
415
|
separator: true,
|
|
402
416
|
},
|
|
403
417
|
{
|
|
404
|
-
label: '
|
|
418
|
+
label: this.intl.t('fleet-ops.management.drivers.index.assign-order-driver'),
|
|
405
419
|
fn: this.assignOrder,
|
|
406
420
|
},
|
|
407
421
|
{
|
|
408
|
-
label: '
|
|
422
|
+
label: this.intl.t('fleet-ops.management.drivers.index.assign-vehicle-driver'),
|
|
409
423
|
fn: this.assignVehicle,
|
|
410
424
|
},
|
|
411
425
|
{
|
|
412
|
-
label: '
|
|
426
|
+
label: this.intl.t('fleet-ops.management.drivers.index.locate-driver-map'),
|
|
413
427
|
fn: this.locateDriver,
|
|
414
428
|
},
|
|
415
429
|
{
|
|
416
430
|
separator: true,
|
|
417
431
|
},
|
|
418
432
|
{
|
|
419
|
-
label: '
|
|
433
|
+
label: this.intl.t('fleet-ops.management.drivers.index.delete-driver'),
|
|
420
434
|
fn: this.deleteDriver,
|
|
421
435
|
},
|
|
422
436
|
],
|
|
@@ -479,7 +493,7 @@ export default class ManagementDriversIndexController extends BaseController {
|
|
|
479
493
|
|
|
480
494
|
this.crud.bulkDelete(selected, {
|
|
481
495
|
modelNamePath: `name`,
|
|
482
|
-
acceptButtonText: '
|
|
496
|
+
acceptButtonText: this.intl.t('fleet-ops.management.drivers.index.delete-button'),
|
|
483
497
|
onSuccess: () => {
|
|
484
498
|
return this.hostRouter.refresh();
|
|
485
499
|
},
|
|
@@ -18,6 +18,13 @@ export default class ManagementFleetsIndexEditController extends BaseController
|
|
|
18
18
|
*/
|
|
19
19
|
@service modalsManager;
|
|
20
20
|
|
|
21
|
+
/**
|
|
22
|
+
* Inject the `intl` service
|
|
23
|
+
*
|
|
24
|
+
* @memberof intl
|
|
25
|
+
*/
|
|
26
|
+
@service intl;
|
|
27
|
+
|
|
21
28
|
/**
|
|
22
29
|
* The overlay component context.
|
|
23
30
|
*
|
|
@@ -98,9 +105,9 @@ export default class ManagementFleetsIndexEditController extends BaseController
|
|
|
98
105
|
*/
|
|
99
106
|
confirmContinueWithUnsavedChanges(fleet, options = {}) {
|
|
100
107
|
return this.modalsManager.confirm({
|
|
101
|
-
title: '
|
|
102
|
-
body: '
|
|
103
|
-
acceptButtonText: '
|
|
108
|
+
title: this.intl.t('fleet-ops.management.drivers.index.edit.title'),
|
|
109
|
+
body: this.intl.t('fleet-ops.management.fleets.index.edit.body'),
|
|
110
|
+
acceptButtonText: this.intl.t('fleet-ops.management.drivers.index.edit.button'),
|
|
104
111
|
confirm: () => {
|
|
105
112
|
fleet.rollbackAttributes();
|
|
106
113
|
return this.transitionToRoute('management.fleets.index.details', fleet);
|
|
@@ -18,6 +18,13 @@ export default class ManagementFleetsIndexNewController extends BaseController {
|
|
|
18
18
|
*/
|
|
19
19
|
@service hostRouter;
|
|
20
20
|
|
|
21
|
+
/**
|
|
22
|
+
* Inject the `intl` service
|
|
23
|
+
*
|
|
24
|
+
* @memberof intl
|
|
25
|
+
*/
|
|
26
|
+
@service intl;
|
|
27
|
+
|
|
21
28
|
/**
|
|
22
29
|
* Inject the `hostRouter` service
|
|
23
30
|
*
|
|
@@ -21,6 +21,13 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
21
21
|
*/
|
|
22
22
|
@service modalsManager;
|
|
23
23
|
|
|
24
|
+
/**
|
|
25
|
+
* Inject the `intl` service
|
|
26
|
+
*
|
|
27
|
+
* @var intl
|
|
28
|
+
*/
|
|
29
|
+
@service intl;
|
|
30
|
+
|
|
24
31
|
/**
|
|
25
32
|
* Inject the `store` service
|
|
26
33
|
*
|
|
@@ -173,7 +180,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
173
180
|
*/
|
|
174
181
|
@tracked columns = [
|
|
175
182
|
{
|
|
176
|
-
label: '
|
|
183
|
+
label: this.intl.t('fleet-ops.common.name'),
|
|
177
184
|
valuePath: 'name',
|
|
178
185
|
width: '150px',
|
|
179
186
|
cellComponent: 'table/cell/anchor',
|
|
@@ -185,7 +192,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
185
192
|
filterComponent: 'filter/string',
|
|
186
193
|
},
|
|
187
194
|
{
|
|
188
|
-
label: '
|
|
195
|
+
label: this.intl.t('fleet-ops.common.service-area'),
|
|
189
196
|
cellComponent: 'table/cell/anchor',
|
|
190
197
|
action: this.viewServiceArea.bind(this),
|
|
191
198
|
valuePath: 'service_area.name',
|
|
@@ -198,7 +205,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
198
205
|
model: 'service-area',
|
|
199
206
|
},
|
|
200
207
|
{
|
|
201
|
-
label: '
|
|
208
|
+
label: this.intl.t('fleet-ops.common.parent-fleet'),
|
|
202
209
|
cellComponent: 'table/cell/anchor',
|
|
203
210
|
// action: this.viewServiceArea.bind(this),
|
|
204
211
|
valuePath: 'parent_fleet.name',
|
|
@@ -211,7 +218,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
211
218
|
model: 'fleet',
|
|
212
219
|
},
|
|
213
220
|
{
|
|
214
|
-
label: '
|
|
221
|
+
label: this.intl.t('fleet-ops.common.vendor'),
|
|
215
222
|
cellComponent: 'table/cell/anchor',
|
|
216
223
|
action: this.viewServiceArea.bind(this),
|
|
217
224
|
valuePath: 'vendor.name',
|
|
@@ -224,7 +231,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
224
231
|
model: 'vendor',
|
|
225
232
|
},
|
|
226
233
|
{
|
|
227
|
-
label: '
|
|
234
|
+
label: this.intl.t('fleet-ops.common.zone'),
|
|
228
235
|
cellComponent: 'table/cell/anchor',
|
|
229
236
|
action: this.viewZone.bind(this),
|
|
230
237
|
valuePath: 'zone.name',
|
|
@@ -237,7 +244,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
237
244
|
model: 'zone',
|
|
238
245
|
},
|
|
239
246
|
{
|
|
240
|
-
label: '
|
|
247
|
+
label: this.intl.t('fleet-ops.common.id'),
|
|
241
248
|
valuePath: 'public_id',
|
|
242
249
|
width: '120px',
|
|
243
250
|
cellComponent: 'click-to-copy',
|
|
@@ -248,7 +255,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
248
255
|
filterComponent: 'filter/string',
|
|
249
256
|
},
|
|
250
257
|
{
|
|
251
|
-
label: '
|
|
258
|
+
label: this.intl.t('fleet-ops.common.manpower'),
|
|
252
259
|
valuePath: 'drivers_count',
|
|
253
260
|
width: '100px',
|
|
254
261
|
resizable: true,
|
|
@@ -256,7 +263,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
256
263
|
filterable: false,
|
|
257
264
|
},
|
|
258
265
|
{
|
|
259
|
-
label: '
|
|
266
|
+
label: this.intl.t('fleet-ops.common.active-manpower'),
|
|
260
267
|
valuePath: 'drivers_online_count',
|
|
261
268
|
width: '120px',
|
|
262
269
|
resizable: true,
|
|
@@ -264,7 +271,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
264
271
|
filterable: false,
|
|
265
272
|
},
|
|
266
273
|
{
|
|
267
|
-
label: '
|
|
274
|
+
label: this.intl.t('fleet-ops.common.task'),
|
|
268
275
|
valuePath: 'task',
|
|
269
276
|
cellComponent: 'table/cell/base',
|
|
270
277
|
width: '120px',
|
|
@@ -274,7 +281,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
274
281
|
filterComponent: 'filter/string',
|
|
275
282
|
},
|
|
276
283
|
{
|
|
277
|
-
label: '
|
|
284
|
+
label: this.intl.t('fleet-ops.common.status'),
|
|
278
285
|
valuePath: 'status',
|
|
279
286
|
cellComponent: 'table/cell/status',
|
|
280
287
|
width: '100px',
|
|
@@ -285,7 +292,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
285
292
|
filterOptions: this.statusOptions,
|
|
286
293
|
},
|
|
287
294
|
{
|
|
288
|
-
label: '
|
|
295
|
+
label: this.intl.t('fleet-ops.common.created-at'),
|
|
289
296
|
valuePath: 'createdAt',
|
|
290
297
|
sortParam: 'created_at',
|
|
291
298
|
width: '120px',
|
|
@@ -295,7 +302,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
295
302
|
filterComponent: 'filter/date',
|
|
296
303
|
},
|
|
297
304
|
{
|
|
298
|
-
label: '
|
|
305
|
+
label: this.intl.t('fleet-ops.common.updated-at'),
|
|
299
306
|
valuePath: 'updatedAt',
|
|
300
307
|
sortParam: 'updated_at',
|
|
301
308
|
width: '120px',
|
|
@@ -317,22 +324,22 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
317
324
|
width: '10%',
|
|
318
325
|
actions: [
|
|
319
326
|
{
|
|
320
|
-
label: '
|
|
327
|
+
label: this.intl.t('fleet-ops.management.fleets.index.view-fleet'),
|
|
321
328
|
fn: this.viewFleet,
|
|
322
329
|
},
|
|
323
330
|
{
|
|
324
|
-
label: '
|
|
331
|
+
label: this.intl.t('fleet-ops.management.fleets.index.edit-fleet'),
|
|
325
332
|
fn: this.editFleet,
|
|
326
333
|
},
|
|
327
334
|
{
|
|
328
|
-
label: '
|
|
335
|
+
label: this.intl.t('fleet-ops.management.fleets.index.assign-driver'),
|
|
329
336
|
fn: () => {},
|
|
330
337
|
},
|
|
331
338
|
{
|
|
332
339
|
separator: true,
|
|
333
340
|
},
|
|
334
341
|
{
|
|
335
|
-
label: '
|
|
342
|
+
label: this.intl.t('fleet-ops.management.fleets.index.delete-fleet'),
|
|
336
343
|
fn: this.deleteFleet,
|
|
337
344
|
},
|
|
338
345
|
],
|
|
@@ -378,7 +385,7 @@ export default class ManagementFleetsIndexController extends BaseController {
|
|
|
378
385
|
|
|
379
386
|
this.crud.bulkDelete(selected, {
|
|
380
387
|
modelNamePath: `name`,
|
|
381
|
-
acceptButtonText: '
|
|
388
|
+
acceptButtonText: this.intl.t('fleet-ops.management.fleets.index.delete-button'),
|
|
382
389
|
onSuccess: () => {
|
|
383
390
|
return this.hostRouter.refresh();
|
|
384
391
|
},
|
|
@@ -18,6 +18,13 @@ export default class ManagementFuelReportsIndexEditController extends BaseContro
|
|
|
18
18
|
*/
|
|
19
19
|
@service modalsManager;
|
|
20
20
|
|
|
21
|
+
/**
|
|
22
|
+
* Inject the `intl` service
|
|
23
|
+
*
|
|
24
|
+
* @memberof intl
|
|
25
|
+
*/
|
|
26
|
+
@service intl;
|
|
27
|
+
|
|
21
28
|
/**
|
|
22
29
|
* The overlay component context.
|
|
23
30
|
*
|
|
@@ -98,9 +105,9 @@ export default class ManagementFuelReportsIndexEditController extends BaseContro
|
|
|
98
105
|
*/
|
|
99
106
|
confirmContinueWithUnsavedChanges(fuelReport, options = {}) {
|
|
100
107
|
return this.modalsManager.confirm({
|
|
101
|
-
title: '
|
|
102
|
-
body: '
|
|
103
|
-
acceptButtonText: '
|
|
108
|
+
title: this.intl.t('fleet-ops.management.drivers.index.edit.title'),
|
|
109
|
+
body: this.intl.t('fleet-ops.management.fuel-reports.index.edit.body'),
|
|
110
|
+
acceptButtonText: this.intl.t('fleet-ops.management.drivers.index.edit.button'),
|
|
104
111
|
confirm: () => {
|
|
105
112
|
fuelReport.rollbackAttributes();
|
|
106
113
|
return this.transitionToRoute('management.fuel-reports.index.details', fuelReport);
|
|
@@ -18,6 +18,13 @@ export default class ManagementFuelReportsIndexNewController extends BaseControl
|
|
|
18
18
|
*/
|
|
19
19
|
@service currentUser;
|
|
20
20
|
|
|
21
|
+
/**
|
|
22
|
+
* Inject the `intl` service
|
|
23
|
+
*
|
|
24
|
+
* @memberof intl
|
|
25
|
+
*/
|
|
26
|
+
@service intl;
|
|
27
|
+
|
|
21
28
|
/**
|
|
22
29
|
* Inject the `hostRouter` service
|
|
23
30
|
*
|
|
@@ -21,6 +21,13 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
21
21
|
*/
|
|
22
22
|
@service modalsManager;
|
|
23
23
|
|
|
24
|
+
/**
|
|
25
|
+
* Inject the `intl` service
|
|
26
|
+
*
|
|
27
|
+
* @var intl
|
|
28
|
+
*/
|
|
29
|
+
@service intl;
|
|
30
|
+
|
|
24
31
|
/**
|
|
25
32
|
* Inject the `crud` service
|
|
26
33
|
*
|
|
@@ -154,7 +161,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
154
161
|
*/
|
|
155
162
|
@tracked columns = [
|
|
156
163
|
{
|
|
157
|
-
label: '
|
|
164
|
+
label: this.intl.t('fleet-ops.common.id'),
|
|
158
165
|
valuePath: 'public_id',
|
|
159
166
|
width: '130px',
|
|
160
167
|
cellComponent: 'click-to-copy',
|
|
@@ -165,7 +172,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
165
172
|
filterComponent: 'filter/string',
|
|
166
173
|
},
|
|
167
174
|
{
|
|
168
|
-
label: '
|
|
175
|
+
label: this.intl.t('fleet-ops.common.reporter'),
|
|
169
176
|
valuePath: 'reporter_name',
|
|
170
177
|
width: '100px',
|
|
171
178
|
cellComponent: 'table/cell/anchor',
|
|
@@ -185,7 +192,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
185
192
|
model: 'user',
|
|
186
193
|
},
|
|
187
194
|
{
|
|
188
|
-
label: '
|
|
195
|
+
label: this.intl.t('fleet-ops.common.driver'),
|
|
189
196
|
valuePath: 'driver_name',
|
|
190
197
|
width: '120px',
|
|
191
198
|
cellComponent: 'table/cell/anchor',
|
|
@@ -205,7 +212,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
205
212
|
model: 'driver',
|
|
206
213
|
},
|
|
207
214
|
{
|
|
208
|
-
label: '
|
|
215
|
+
label: this.intl.t('fleet-ops.common.vehicle'),
|
|
209
216
|
valuePath: 'vehicle_name',
|
|
210
217
|
width: '100px',
|
|
211
218
|
cellComponent: 'table/cell/anchor',
|
|
@@ -226,7 +233,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
226
233
|
modelNamePath: 'displayName',
|
|
227
234
|
},
|
|
228
235
|
{
|
|
229
|
-
label: '
|
|
236
|
+
label: this.intl.t('fleet-ops.common.status'),
|
|
230
237
|
valuePath: 'status',
|
|
231
238
|
cellComponent: 'table/cell/status',
|
|
232
239
|
width: '100px',
|
|
@@ -237,7 +244,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
237
244
|
filterOptions: ['draft', 'pending-approval', 'approved', 'rejected', 'revised', 'submitted', 'in-review', 'confirmed', 'processed', 'archived', 'cancelled'],
|
|
238
245
|
},
|
|
239
246
|
{
|
|
240
|
-
label: 'volume',
|
|
247
|
+
label: this.intl.t('fleet-ops.common.volume'),
|
|
241
248
|
valuePath: 'volume',
|
|
242
249
|
width: '130px',
|
|
243
250
|
cellComponent: 'click-to-copy',
|
|
@@ -248,7 +255,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
248
255
|
filterComponent: 'filter/string',
|
|
249
256
|
},
|
|
250
257
|
{
|
|
251
|
-
label: 'odometer',
|
|
258
|
+
label: this.intl.t('fleet-ops.common.odometer'),
|
|
252
259
|
valuePath: 'odometer',
|
|
253
260
|
width: '130px',
|
|
254
261
|
cellComponent: 'click-to-copy',
|
|
@@ -259,7 +266,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
259
266
|
filterComponent: 'filter/string',
|
|
260
267
|
},
|
|
261
268
|
{
|
|
262
|
-
label: '
|
|
269
|
+
label: this.intl.t('fleet-ops.common.created-at'),
|
|
263
270
|
valuePath: 'createdAt',
|
|
264
271
|
sortParam: 'created_at',
|
|
265
272
|
width: '120px',
|
|
@@ -269,7 +276,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
269
276
|
filterComponent: 'filter/date',
|
|
270
277
|
},
|
|
271
278
|
{
|
|
272
|
-
label: '
|
|
279
|
+
label: this.intl.t('fleet-ops.common.updated-at'),
|
|
273
280
|
valuePath: 'updatedAt',
|
|
274
281
|
sortParam: 'updated_at',
|
|
275
282
|
width: '120px',
|
|
@@ -291,18 +298,18 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
291
298
|
width: '10%',
|
|
292
299
|
actions: [
|
|
293
300
|
{
|
|
294
|
-
label: '
|
|
301
|
+
label: this.intl.t('fleet-ops.management.fuel-reports.index.view'),
|
|
295
302
|
fn: this.viewFuelReport,
|
|
296
303
|
},
|
|
297
304
|
{
|
|
298
|
-
label: '
|
|
305
|
+
label: this.intl.t('fleet-ops.management.fuel-reports.index.edit-fuel'),
|
|
299
306
|
fn: this.editFuelReport,
|
|
300
307
|
},
|
|
301
308
|
{
|
|
302
309
|
separator: true,
|
|
303
310
|
},
|
|
304
311
|
{
|
|
305
|
-
label: '
|
|
312
|
+
label: this.intl.t('fleet-ops.management.fuel-reports.index.delete'),
|
|
306
313
|
fn: this.deleteFuelReport,
|
|
307
314
|
},
|
|
308
315
|
],
|
|
@@ -410,7 +417,7 @@ export default class ManagementFuelReportsIndexController extends BaseController
|
|
|
410
417
|
|
|
411
418
|
this.crud.bulkDelete(selected, {
|
|
412
419
|
modelNamePath: `name`,
|
|
413
|
-
acceptButtonText: '
|
|
420
|
+
acceptButtonText: this.intl.t('fleet-ops.management.fuel-reports.index.delete-button'),
|
|
414
421
|
onSuccess: () => {
|
|
415
422
|
return this.hostRouter.refresh();
|
|
416
423
|
},
|
|
@@ -18,6 +18,13 @@ export default class ManagementIssuesIndexEditController extends BaseController
|
|
|
18
18
|
*/
|
|
19
19
|
@service modalsManager;
|
|
20
20
|
|
|
21
|
+
/**
|
|
22
|
+
* Inject the `intl` service
|
|
23
|
+
*
|
|
24
|
+
* @memberof intl
|
|
25
|
+
*/
|
|
26
|
+
@service intl;
|
|
27
|
+
|
|
21
28
|
/**
|
|
22
29
|
* The overlay component context.
|
|
23
30
|
*
|
|
@@ -98,9 +105,9 @@ export default class ManagementIssuesIndexEditController extends BaseController
|
|
|
98
105
|
*/
|
|
99
106
|
confirmContinueWithUnsavedChanges(issue, options = {}) {
|
|
100
107
|
return this.modalsManager.confirm({
|
|
101
|
-
title: '
|
|
102
|
-
body:
|
|
103
|
-
acceptButtonText: '
|
|
108
|
+
title: this.intl.t('fleet-ops.management.drivers.index.edit.title'),
|
|
109
|
+
body: this.intl.t('fleet-ops.management.issues.index.edit.body'),
|
|
110
|
+
acceptButtonText: this.intl.t('fleet-ops.management.drivers.index.edit.button'),
|
|
104
111
|
confirm: () => {
|
|
105
112
|
issue.rollbackAttributes();
|
|
106
113
|
return this.transitionToRoute('management.issues.index.details', issue);
|
|
@@ -2,6 +2,7 @@ import BaseController from '@fleetbase/fleetops-engine/controllers/base-controll
|
|
|
2
2
|
import { tracked } from '@glimmer/tracking';
|
|
3
3
|
import { inject as service } from '@ember/service';
|
|
4
4
|
import { action } from '@ember/object';
|
|
5
|
+
|
|
5
6
|
export default class ManagementIssuesIndexNewController extends BaseController {
|
|
6
7
|
/**
|
|
7
8
|
* Inject the `store` service
|
|
@@ -17,6 +18,13 @@ export default class ManagementIssuesIndexNewController extends BaseController {
|
|
|
17
18
|
*/
|
|
18
19
|
@service hostRouter;
|
|
19
20
|
|
|
21
|
+
/**
|
|
22
|
+
* Inject the `intl` service
|
|
23
|
+
*
|
|
24
|
+
* @memberof intl
|
|
25
|
+
*/
|
|
26
|
+
@service intl;
|
|
27
|
+
|
|
20
28
|
/**
|
|
21
29
|
* Inject the `currentUser` service
|
|
22
30
|
*
|