@fleetbase/fleetops-engine 0.3.2 → 0.3.4

package/addon/controllers/management/fuel-reports/index.js

@@ -68,7 +68,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'vehicle', 'driver', 'created_by', 'updated_by', 'status'];
+    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'vehicle', 'driver', 'created_by', 'updated_by', 'status', 'country', 'volume', 'odometer'];
 
     /**
      * The current page of data being viewed
@@ -119,6 +119,27 @@ export default class ManagementFuelReportsIndexController extends Controller {
      */
     @tracked vehicle;
 
+    /**
+     * The filterable param `vehicle`
+     *
+     * @var {String}
+     */
+    @tracked reporter;
+
+    /**
+     * The filterable param `vehicle`
+     *
+     * @var {String}
+     */
+    @tracked volume;
+
+    /**
+     * The filterable param `vehicle`
+     *
+     * @var {String}
+     */
+    @tracked odometer;
+
     /**
      * The filterable param `status`
      *
@@ -135,14 +156,34 @@ export default class ManagementFuelReportsIndexController extends Controller {
         {
             label: 'ID',
             valuePath: 'public_id',
-            width: '120px',
-            cellComponent: 'table/cell/anchor',
-            action: this.viewFuelReport,
+            width: '130px',
+            cellComponent: 'click-to-copy',
             resizable: true,
             sortable: true,
             filterable: true,
+            hidden: false,
             filterComponent: 'filter/string',
         },
+        {
+            label: 'Reporter',
+            valuePath: 'reporter_name',
+            width: '100px',
+            cellComponent: 'table/cell/anchor',
+            onClick: async (issue) => {
+                let reporter = await issue.loadDReporter();
+
+                if (reporter) {
+                    this.contextPanel.focus(reporter);
+                }
+            },
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select reporter',
+            filterParam: 'reporter',
+            model: 'user',
+        },
         {
             label: 'Driver',
             valuePath: 'driver_name',
@@ -166,10 +207,10 @@ export default class ManagementFuelReportsIndexController extends Controller {
         {
             label: 'Vehicle',
             valuePath: 'vehicle_name',
-            width: '120px',
+            width: '100px',
             cellComponent: 'table/cell/anchor',
-            onClick: async (fuelReport) => {
-                let vehicle = await fuelReport.loadVehicle();
+            onClick: async (issue) => {
+                let vehicle = await issue.loadVehicle();
 
                 if (vehicle) {
                     this.contextPanel.focus(vehicle);
@@ -182,34 +223,46 @@ export default class ManagementFuelReportsIndexController extends Controller {
             filterComponentPlaceholder: 'Select vehicle',
             filterParam: 'vehicle',
             model: 'vehicle',
+            modelNamePath: 'displayName',
         },
         {
-            label: 'Country',
-            valuePath: 'country',
-            cellComponent: 'table/cell/base',
+            label: 'Status',
+            valuePath: 'status',
+            cellComponent: 'table/cell/status',
             width: '100px',
             resizable: true,
             sortable: true,
-            hidden: true,
             filterable: true,
+            filterComponent: 'filter/multi-option',
+            filterOptions: ['draft', 'pending-approval', 'approved', 'rejected', 'revised', 'submitted', 'in-review', 'confirmed', 'processed', 'archived', 'cancelled'],
+        },
+        {
+            label: 'volume',
+            valuePath: 'volume',
+            width: '130px',
+            cellComponent: 'click-to-copy',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            hidden: false,
             filterComponent: 'filter/string',
         },
         {
-            label: 'Status',
-            valuePath: 'status',
-            cellComponent: 'table/cell/status',
-            width: '100px',
+            label: 'odometer',
+            valuePath: 'odometer',
+            width: '130px',
+            cellComponent: 'click-to-copy',
             resizable: true,
             sortable: true,
             filterable: true,
-            filterComponent: 'filter/multi-option',
-            filterOptions: this.statusOptions,
+            hidden: false,
+            filterComponent: 'filter/string',
         },
         {
             label: 'Created At',
             valuePath: 'createdAt',
             sortParam: 'created_at',
-            width: '150px',
+            width: '120px',
             resizable: true,
             sortable: true,
             filterable: true,
@@ -219,7 +272,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
             label: 'Updated At',
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
-            width: '150px',
+            width: '120px',
             resizable: true,
             sortable: true,
             hidden: true,
@@ -348,7 +401,7 @@ export default class ManagementFuelReportsIndexController extends Controller {
     @action bulkDeleteFuelReports() {
         const selected = this.table.selectedRows;
 
-        this.crud.bulkFuelReports(selected, {
+        this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
             acceptButtonText: 'Delete Fuel Reports',
             onSuccess: () => {

package/addon/controllers/management/issues/index/new.js

@@ -43,7 +43,7 @@ export default class ManagementIssuesIndexNewController extends Controller {
      *
      * @var {issueModel}
      */
-    @tracked issue = this.store.createRecord('issue', { reporter: this.currentUser.user, status: 'pending', priority: 'low' });
+    @tracked issue = this.store.createRecord('issue', { reporter: this.currentUser.user, status: 'pending', priority: 'low', type: 'operational' });
 
     /**
      * Set the overlay component context object.
@@ -89,6 +89,6 @@ export default class ManagementIssuesIndexNewController extends Controller {
      * @memberof ManagementissuesIndexNewController
      */
     resetForm() {
-        this.issue = this.store.createRecord('issue', { reporter: this.currentUser.user, status: 'pending', priority: 'low' });
+        this.issue = this.store.createRecord('issue', { reporter: this.currentUser.user, status: 'pending', priority: 'low', type: 'operational' });
     }
 }

package/addon/controllers/management/issues/index.js

@@ -5,6 +5,8 @@ import { action } from '@ember/object';
 import { isBlank } from '@ember/object';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
+import getIssueTypes from '../../../utils/get-issue-types';
+import getIssueCategories from '../../../utils/get-issue-categories';
 
 export default class ManagementIssuesIndexController extends Controller {
     /**
@@ -59,19 +61,18 @@ export default class ManagementIssuesIndexController extends Controller {
         'limit',
         'sort',
         'query',
-        'status',
         'public_id',
-        'internal_id',
-        'payload',
-        'tracking_number',
-        'facilitator',
-        'customer',
+        'issue_id',
         'driver',
-        'pickup',
-        'dropoff',
+        'vehicle',
+        'assignee',
+        'reporter',
         'created_by',
         'updated_by',
         'status',
+        'priority',
+        'cateogry',
+        'type',
     ];
 
     /**
@@ -103,81 +104,67 @@ export default class ManagementIssuesIndexController extends Controller {
     @tracked public_id;
 
     /**
-     * The filterable param `internal_id`
-     *
-     * @var {String}
-     */
-    @tracked internal_id;
-
-    /**
-     * The filterable param `tracking` for `tracking_number`
+     * The filterable param `status`
      *
      * @var {String}
      */
-    @tracked tracking;
+    @tracked status;
 
     /**
-     * The filterable param `facilitator`
+     * The filterable param `priority`
      *
-     * @var {String}
+     * @var {Array|String}
      */
-    @tracked facilitator;
+    @tracked priority;
 
     /**
-     * The filterable param `customer`
+     * The filterable param `priority`
      *
-     * @var {String}
+     * @var {Array|String}
      */
-    @tracked customer;
+    @tracked status;
 
     /**
-     * The filterable param `driver`
+     * The filterable param `type`
      *
      * @var {String}
      */
-    @tracked driver;
+    @tracked type;
 
     /**
-     * The filterable param `payload`
+     * The filterable param `category`
      *
      * @var {String}
      */
-    @tracked payload;
+    @tracked category;
 
     /**
-     * The filterable param `pickup`
+     * The filterable param `vehicle`
      *
      * @var {String}
      */
-    @tracked pickup;
+    @tracked vehicle;
 
     /**
-     * The filterable param `dropoff`
+     * The filterable param `driver`
      *
      * @var {String}
      */
-    @tracked dropoff;
+    @tracked driver;
 
     /**
-     * The filterable param `updated_by`
+     * The filterable param `assignee`
      *
      * @var {String}
      */
-    @tracked updated_by;
+    @tracked assignee;
 
     /**
-     * The filterable param `created_by`
+     * The filterable param `reporter`
      *
      * @var {String}
      */
-    @tracked created_by;
-
-    /**
-     * The filterable param `status`
-     *
-     * @var {Array}
-     */
-    @tracked status;
+    @tracked reporter;
 
     /**
      * All columns applicable for orders
@@ -212,7 +199,9 @@ export default class ManagementIssuesIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
-            filterComponent: 'filter/string',
+            filterComponent: 'filter/select',
+            filterOptions: getIssueTypes(),
+            placeholder: 'Select issue type',
         },
         {
             label: 'Category',
@@ -221,21 +210,49 @@ export default class ManagementIssuesIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
-            filterComponent: 'filter/string',
+            filterComponent: 'filter/select',
+            filterOptions: getIssueCategories(),
+            placeholder: 'Select issue category',
         },
         {
             label: 'Reporter',
             valuePath: 'reporter_name',
-            width: '110px',
+            width: '100px',
+            cellComponent: 'table/cell/anchor',
+            onClick: async (issue) => {
+                let reporter = await issue.loadDReporter();
+
+                if (reporter) {
+                    this.contextPanel.focus(reporter);
+                }
+            },
             resizable: true,
             sortable: true,
+            filterable: true,
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select reporter',
+            filterParam: 'reporter',
+            model: 'user',
         },
         {
             label: 'Assignee',
             valuePath: 'assignee_name',
             width: '100px',
+            cellComponent: 'table/cell/anchor',
+            onClick: async (issue) => {
+                let assignee = await issue.loadDAssignee();
+
+                if (assignee) {
+                    this.contextPanel.focus(assignee);
+                }
+            },
             resizable: true,
             sortable: true,
+            filterable: true,
+            filterComponent: 'filter/model',
+            filterComponentPlaceholder: 'Select assignee',
+            filterParam: 'assignee',
+            model: 'user',
         },
         {
             label: 'Driver',
@@ -276,6 +293,7 @@ export default class ManagementIssuesIndexController extends Controller {
             filterComponentPlaceholder: 'Select vehicle',
             filterParam: 'vehicle',
             model: 'vehicle',
+            modelNamePath: 'displayName',
         },
         {
             label: 'Status',
@@ -285,6 +303,8 @@ export default class ManagementIssuesIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
+            filterComponent: 'filter/multi-option',
+            filterOptions: ['pending', 'in-progress', 'backlogged', 'requires-update', 'in-review', 're-opened', 'duplicate', 'pending-review', 'escalated', 'completed', 'canceled'],
         },
         {
             label: 'Created At',

package/addon/controllers/management/places/index.js

@@ -60,7 +60,7 @@ export default class ManagementPlacesIndexController extends Controller {
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'country', 'phone', 'email', 'created_at', 'updated_at'];
+    queryParams = ['name', 'page', 'limit', 'sort', 'query', 'public_id', 'country', 'phone', 'created_at', 'updated_at', 'city', 'neighborhood', 'state'];
 
     /**
      * The current page of data being viewed
@@ -91,11 +91,11 @@ export default class ManagementPlacesIndexController extends Controller {
     @tracked public_id;
 
     /**
-     * The filterable param `internal_id`
+     * The filterable param `public_id`
      *
      * @var {String}
      */
-    @tracked internal_id;
+    @tracked postal_code;
 
     /**
      * The filterable param `phone`
@@ -105,11 +105,18 @@ export default class ManagementPlacesIndexController extends Controller {
     @tracked phone;
 
     /**
-     * The filterable param `email`
+     * The filterable param `city`
+     *
+     * @var {String}
+     */
+    @tracked city;
+
+    /**
+     * The filterable param `name`
      *
      * @var {String}
      */
-    @tracked email;
+    @tracked name;
 
     /**
      * The filterable param `country`
@@ -118,6 +125,13 @@ export default class ManagementPlacesIndexController extends Controller {
      */
     @tracked country;
 
+    /**
+     * The filterable param `country`
+     *
+     * @var {String}
+     */
+    @tracked neighborhood;
+
     /**
      * All columns applicable for orders
      *
@@ -133,6 +147,7 @@ export default class ManagementPlacesIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'name',
             filterComponent: 'filter/string',
         },
         {
@@ -148,34 +163,36 @@ export default class ManagementPlacesIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'ID',
-            valuePath: 'public_id',
-            width: '120px',
-            cellComponent: 'click-to-copy',
+            label: 'State',
+            valuePath: 'state',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewPlace,
+            width: '100px',
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'state',
             filterComponent: 'filter/string',
         },
         {
-            label: 'Internal ID',
-            valuePath: 'internal_id',
-            cellComponent: 'click-to-copy',
-            width: '120px',
+            label: 'City',
+            valuePath: 'city',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewPlace,
+            width: '100px',
             resizable: true,
             sortable: true,
             filterable: true,
-            hidden: true,
+            filterParam: 'city',
             filterComponent: 'filter/string',
         },
         {
-            label: 'Email',
-            valuePath: 'email',
-            cellComponent: 'table/cell/base',
+            label: 'ID',
+            valuePath: 'public_id',
             width: '120px',
+            cellComponent: 'click-to-copy',
             resizable: true,
             sortable: true,
-            hidden: true,
             filterable: true,
             filterComponent: 'filter/string',
         },
@@ -202,6 +219,29 @@ export default class ManagementPlacesIndexController extends Controller {
             filterComponent: 'filter/country',
             filterParam: 'country',
         },
+        {
+            label: 'Neighborhood',
+            valuePath: 'neighborhood',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewPlace,
+            width: '100px',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'neighborhood',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: 'Postal Code',
+            valuePath: 'postal_code',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewPlace,
+            width: '100px',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/string',
+        },
         {
             label: 'Created At',
             valuePath: 'createdAt',
@@ -223,6 +263,7 @@ export default class ManagementPlacesIndexController extends Controller {
             filterable: true,
             filterComponent: 'filter/date',
         },
+
         {
             label: '',
             cellComponent: 'table/cell/dropdown',

package/addon/controllers/management/vehicles/index.js

@@ -69,7 +69,24 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'status', 'created_at', 'updated_at', 'created_by', 'updated_by'];
+    queryParams = [
+        'page',
+        'limit',
+        'sort',
+        'query',
+        'public_id',
+        'status',
+        'created_at',
+        'updated_at',
+        'created_by',
+        'updated_by',
+        'name',
+        'plate_number',
+        'year',
+        'make',
+        'model',
+        'display_name',
+    ];
 
     /**
      * The search query.
@@ -128,18 +145,18 @@ export default class ManagementVehiclesIndexController extends ManagementControl
     @tracked plate_number;
 
     /**
-     * The filterable param `vehicle_make`.
+     * The filterable param `make`.
      *
      * @var {String}
      */
-    @tracked vehicle_make;
+    @tracked make;
 
     /**
-     * The filterable param `vehicle_model`.
+     * The filterable param `model`.
      *
      * @var {String}
      */
-    @tracked vehicle_model;
+    @tracked model;
 
     /**
      * The filterable param `year`.
@@ -148,6 +165,20 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      */
     @tracked year;
 
+    /**
+     * The filterable param `make`.
+     *
+     * @var {String}
+     */
+    @tracked make;
+
+    /**
+     * The filterable param `model`.
+     *
+     * @var {String}
+     */
+    @tracked model;
+
     /**
      * The filterable param `country`.
      *
@@ -176,6 +207,13 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      */
     @tracked driver;
 
+    /**
+     * The filterable param `display_name`.
+     *
+     * @var {String}
+     */
+    @tracked display_name;
+
     /**
      * TableComponent instance.
      *
@@ -214,7 +252,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
             sortable: true,
             filterable: true,
             filterComponent: 'filter/string',
-            filterParam: 'name',
+            filterParam: 'display_name',
             showOnlineIndicator: true,
         },
         {
@@ -264,7 +302,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
             sortable: true,
             hidden: true,
             filterable: true,
-            filterParam: 'vehicle_make',
+            filterParam: 'make',
             filterComponent: 'filter/string',
         },
         {
@@ -276,7 +314,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
             sortable: true,
             hidden: true,
             filterable: true,
-            filterParam: 'vehicle_model',
+            filterParam: 'model',
             filterComponent: 'filter/string',
         },
         {
@@ -490,4 +528,25 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      * @void
      */
     @action assignDriver() {}
+
+    /**
+     * View a place location on map
+     *
+     * @param {PlaceModel} place
+     * @param {Object} options
+     * @void
+     */
+    @action viewOnMap(place, options = {}) {
+        const { latitude, longitude } = place;
+
+        this.modalsManager.show('modals/point-map', {
+            title: `Location of ${place.name}`,
+            acceptButtonText: 'Done',
+            hideDeclineButton: true,
+            latitude,
+            longitude,
+            location: [latitude, longitude],
+            ...options,
+        });
+    }
 }