@fleetbase/fleetops-engine 0.3.8 → 0.4.0

package/addon/controllers/operations/orders/index/new.js

@@ -13,7 +13,6 @@ import findClosestWaypoint from '@fleetbase/ember-core/utils/find-closest-waypoi
 import isNotEmpty from '@fleetbase/ember-core/utils/is-not-empty';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 import groupBy from '@fleetbase/ember-core/utils/macros/group-by';
-import extractCoordinates from '@fleetbase/ember-core/utils/extract-coordinates';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 
 L.Bounds.prototype.intersects = function (bounds) {
@@ -213,7 +212,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
         return (
             this.routePreviewArray
                 // .filter((place) => place.get('hasValidCoordinates'))
-                .map((place) => place.get('extractedLatLng'))
+                .map((place) => place.get('latlng'))
         );
     }
 
@@ -580,7 +579,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
             });
         } else {
             // setup interface when livemap is ready
-            this.universe.on('fleetops.livemap.ready', () => {
+            this.universe.on('fleet-ops.live-map.ready', () => {
                 this.setupInterface();
             });
         }
@@ -749,7 +748,7 @@ export default class OperationsOrdersIndexNewController extends BaseController {
     }
 
     @action createCoordinatesFromRoutePlaceArray(array) {
-        return array.filter((place) => place.get('hasValidCoordinates')).map((place) => place.get('extractedLatLng'));
+        return array.filter((place) => place.get('hasValidCoordinates')).map((place) => place.get('latlng'));
     }
 
     @action previewDraftOrderRoute(payload, waypoints, isMultipleDropoffOrder = false) {
@@ -875,7 +874,8 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                     const waypointModel = findClosestWaypoint(optimizedWaypointLatitude, optimizedWaypointLongitude, this.waypoints);
                     // eslint-disable-next-line no-undef
                     // const optimizedWaypointMarker = new L.Marker(optimizedWaypoint.location.reverse()).addTo(leafletMap);
-                    const optimizedWaypointMarker = new L.Marker(extractCoordinates(optimizedWaypoint.location)).addTo(leafletMap);
+                    const [longitude, latitude] = getWithDefault(optimizedWaypoint.location, 'coordiantes', [0, 0]);
+                    const optimizedWaypointMarker = new L.Marker([latitude, longitude]).addTo(leafletMap);
 
                     sortedWaypoints.pushObject(waypointModel);
                     optimizedRouteMarkers.pushObject(optimizedWaypointMarker);

package/addon/controllers/operations/orders/index/view.js

@@ -19,13 +19,6 @@ export default class OperationsOrdersIndexViewController extends BaseController
      */
     @controller('operations.orders.index') ordersController;
 
-    /**
-     * Inject the `operations.orders.index` controller
-     *
-     * @var {Controller}
-     */
-    @controller('management.places.index') placesController;
-
     /**
      * Inject the `management.contacts.index` controller
      *
@@ -248,14 +241,14 @@ export default class OperationsOrdersIndexViewController extends BaseController
         };
 
         // re-display order routes when livemap has coordinates
-        this.universe.on('fleetops.livemap.has_coordinates', this, displayOrderRoute);
+        this.universe.on('fleet-ops.live-map.has_coordinates', this, displayOrderRoute);
 
         // when transitioning away kill event listener
         this.hostRouter.on('routeWillChange', () => {
-            const isListening = this.universe.has('fleetops.livemap.has_coordinates');
+            const isListening = this.universe.has('fleet-ops.live-map.has_coordinates');
 
             if (isListening) {
-                this.universe.off('fleetops.livemap.has_coordinates', this, displayOrderRoute);
+                this.universe.off('fleet-ops.live-map.has_coordinates', this, displayOrderRoute);
             }
         });
 
@@ -472,9 +465,12 @@ export default class OperationsOrdersIndexViewController extends BaseController
             isOptimizingRoute: false,
             editPlace: async (place) => {
                 await this.modalsManager.done();
-                this.placesController.editPlace(place, {
-                    onFinish: () => {
-                        this.editOrderRoute(order);
+
+                this.contextPanel.focus(place, 'editing', {
+                    args: {
+                        onClose: () => {
+                            this.editOrderRoute(order);
+                        },
                     },
                 });
             },

package/addon/helpers/format-point.js

@@ -1,13 +1,16 @@
 import { helper } from '@ember/component/helper';
 import { isArray } from '@ember/array';
-import extractCoordinates from '../utils/extract-coordinates';
 
 export default helper(function formatPoint([point]) {
+    // array assumes  [latitude, longitude]
     if (isArray(point)) {
         return `(${point[0]}, ${point[1]})`;
     }
 
-    const [latitude, longitude] = extractCoordinates(point.coordinates);
+    let [longitude, latitude] = [0, 0];
+    if (point && isArray(point.coordinates)) {
+        [longitude, latitude] = point.coordinates;
+    }
 
     return `(${latitude}, ${longitude})`;
 });

package/addon/helpers/point-to-coordinates.js

@@ -1,8 +1,12 @@
 import { helper } from '@ember/component/helper';
-import extractCoordinates from '../utils/extract-coordinates';
+import { isArray } from '@ember/array';
 
 export default helper(function pointToCoordinates([point, format = 'array']) {
-    const [latitude, longitude] = extractCoordinates(point?.coordinates);
+    let [longitude, latitude] = [0, 0];
+
+    if (point && isArray(point.coordinates)) {
+        [longitude, latitude] = point.coordinates;
+    }
 
     if (format === 'array') {
         return [latitude, longitude];

package/addon/services/context-panel.js

@@ -2,6 +2,7 @@ import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import getModelName from '@fleetbase/ember-core/utils/get-model-name';
+import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 
 /**
  * Service for managing the state and interactions of the context panel.
@@ -19,81 +20,81 @@ export default class ContextPanelService extends Service {
         driver: {
             viewing: {
                 component: 'driver-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
             editing: {
                 component: 'driver-form-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
         },
         vehicle: {
             viewing: {
                 component: 'vehicle-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
             editing: {
                 component: 'vehicle-form-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
         },
         fleet: {
             viewing: {
                 component: 'fleet-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
             editing: {
                 component: 'fleet-form-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
         },
         fuelReport: {
             viewing: {
                 component: 'fuel-report-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
             editing: {
                 component: 'fuel-report-form-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
         },
         vendor: {
             viewing: {
                 component: 'vendor-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
             editing: {
                 component: 'vendor-form-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
         },
         contact: {
             viewing: {
                 component: 'contact-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
             editing: {
                 component: 'contact-form-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
         },
         place: {
             viewing: {
                 component: 'place-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
             editing: {
                 component: 'place-form-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
         },
         issue: {
             viewing: {
                 component: 'issue-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
             editing: {
                 component: 'issue-form-panel',
-                componentArguments: [{ isResizable: true }, { width: '600px' }],
+                componentArguments: [{ isResizable: true }, { width: '500px' }],
             },
         },
     };
@@ -137,11 +138,12 @@ export default class ContextPanelService extends Service {
     @action focus(model, intent = 'viewing', options = {}) {
         const modelName = getModelName(model);
         const registry = this.registry[modelName];
+        const dynamicArgs = getWithDefault(options, 'args', {});
 
         if (registry && registry[intent]) {
             this.currentContext = model;
             this.currentContextRegistry = registry[intent];
-            this.currentContextComponentArguments = this.createDynamicArgsFromRegistry(registry[intent], model);
+            this.currentContextComponentArguments = this.createDynamicArgsFromRegistry(registry[intent], model, dynamicArgs);
             this.contextOptions = options;
         }
     }
@@ -212,7 +214,7 @@ export default class ContextPanelService extends Service {
      * @param {Object} model - The model object.
      * @returns {Object} The dynamic arguments.
      */
-    createDynamicArgsFromRegistry(registry, model) {
+    createDynamicArgsFromRegistry(registry, model, additionalArgs = {}) {
         // Generate dynamic arguments object
         const dynamicArgs = {};
         const componentArguments = registry.componentArguments || [];
@@ -228,6 +230,9 @@ export default class ContextPanelService extends Service {
             }
         });
 
+        // Merge additional args
+        Object.assign(dynamicArgs, additionalArgs);
+
         return dynamicArgs;
     }
 }

package/addon/services/driver-actions.js

@@ -0,0 +1,107 @@
+import Service, { inject as service } from '@ember/service';
+import leafletIcon from '@fleetbase/ember-core/utils/leaflet-icon';
+import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
+import config from '../config/environment';
+
+export default class DriverActionsService extends Service {
+    @service modalsManager;
+    @service universe;
+    @service crud;
+
+    assignOrder(driver, options = {}) {
+        this.modalsManager.show('modals/driver-assign-order', {
+            title: `Assign Order to this Driver`,
+            acceptButtonText: 'Assign Order',
+            acceptButtonIcon: 'check',
+            acceptButtonIconPrefix: 'fas',
+            acceptButtonDisabled: true,
+            hideDeclineButton: true,
+            selectedOrder: null,
+            selectOrder: (order) => {
+                this.modalsManager.setOption('selectedOrder', order);
+                this.modalsManager.setOption('acceptButtonDisabled', false);
+            },
+            driver,
+            confirm: (modal) => {
+                const selectedOrder = modal.getOption('selectedOrder');
+                if (!selectedOrder) {
+                    this.notifications.warning('No order selected!');
+                    return;
+                }
+
+                modal.startLoading();
+                driver.set('current_job_uuid', selectedOrder.id);
+
+                return driver
+                    .save()
+                    .then(() => {
+                        this.notifications.success(`${driver.name} assigned to order.`);
+                    })
+                    .catch((error) => {
+                        driver.rollbackAttributes();
+                        modal.stopLoading();
+                        this.notifications.serverError(error);
+                    });
+            },
+            ...options,
+        });
+    }
+
+    assignVehicle(driver, options = {}) {
+        this.modalsManager.show('modals/driver-assign-vehicle', {
+            title: `Assign Vehicle to this Driver`,
+            acceptButtonText: 'Confirm & Create',
+            acceptButtonIcon: 'check',
+            acceptButtonIconPrefix: 'fas',
+            hideDeclineButton: true,
+            driver,
+            confirm: (modal) => {
+                modal.startLoading();
+
+                return driver
+                    .save()
+                    .then((driver) => {
+                        this.notifications.success(`${driver.name} assigned to vehicle.`);
+                    })
+                    .catch((error) => {
+                        driver.rollbackAttributes();
+                        modal.stopLoading();
+                        this.notifications.serverError(error);
+                    });
+            },
+            ...options,
+        });
+    }
+
+    locate(driver, options = {}) {
+        const { location } = driver;
+        const [latitude, longitude] = location.coordinates;
+
+        this.modalsManager.show('modals/point-map', {
+            title: `Current Location of ${driver.name}`,
+            acceptButtonText: 'Done',
+            acceptButtonIcon: 'check',
+            acceptButtonIconPrefix: 'fas',
+            modalClass: 'modal-md',
+            hideDeclineButton: true,
+            latitude,
+            longitude,
+            location,
+            popupText: `${driver.name} (${driver.public_id})`,
+            icon: leafletIcon({
+                iconUrl: getWithDefault(driver, 'vehicle_avatar', getWithDefault(config, 'defaultValues.vehicleAvatar')),
+                iconSize: [40, 40],
+            }),
+            ...options,
+        });
+    }
+
+    delete(driver, options = {}) {
+        this.crud.delete(driver, {
+            onSuccess: () => {
+                this.universe.trigger('fleet-ops.driver.deleted', driver);
+            },
+            ...options,
+        });
+    }
+}

package/addon/services/vehicle-actions.js

@@ -0,0 +1,42 @@
+import Service, { inject as service } from '@ember/service';
+import leafletIcon from '@fleetbase/ember-core/utils/leaflet-icon';
+import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
+import config from '../config/environment';
+
+export default class VehicleActionsService extends Service {
+    @service modalsManager;
+    @service universe;
+    @service crud;
+
+    locate(vehicle, options = {}) {
+        const { location } = vehicle;
+        const [latitude, longitude] = location.coordinates;
+
+        this.modalsManager.show('modals/point-map', {
+            title: `Current Location of ${vehicle.displayName}`,
+            acceptButtonText: 'Done',
+            acceptButtonIcon: 'check',
+            acceptButtonIconPrefix: 'fas',
+            modalClass: 'modal-md',
+            hideDeclineButton: true,
+            latitude,
+            longitude,
+            location,
+            popupText: `${vehicle.displayName} (${vehicle.public_id})`,
+            icon: leafletIcon({
+                iconUrl: getWithDefault(vehicle, 'avatar', getWithDefault(config, 'defaultValues.vehicleAvatar')),
+                iconSize: [40, 40],
+            }),
+            ...options,
+        });
+    }
+
+    delete(vehicle, options = {}) {
+        this.crud.delete(vehicle, {
+            onSuccess: () => {
+                this.universe.trigger('fleet-ops.vehicle.deleted', vehicle);
+            },
+            ...options,
+        });
+    }
+}

package/addon/styles/fleetops-engine.css

@@ -34,19 +34,29 @@ body[data-theme='dark'] .scheduler-left-sidebar {
     overflow: visible !important;
 }
 
+.next-content-panel-body > .next-content-panel-body-inner > a.next-nav-item > .next-nav-item-icon-container > svg.online-status,
+.next-content-panel-body > .next-content-panel-body-inner > a.next-nav-item > .next-nav-item-icon-container > svg.text-green-500,
 .next-fleet-summary-fleet .next-content-panel-body > .next-content-panel-body-inner > a.next-nav-item > .next-nav-item-icon-container > svg.text-green-500 {
     color: rgb(34 197 94) !important;
 }
 
+.next-content-panel-body > .next-content-panel-body-inner > a.next-nav-item > .next-nav-item-icon-container > svg.idle-status,
+.next-content-panel-body > .next-content-panel-body-inner > a.next-nav-item > .next-nav-item-icon-container > svg.text-yellow-200,
 .next-fleet-summary-fleet .next-content-panel-body > .next-content-panel-body-inner > a.next-nav-item > .next-nav-item-icon-container > svg.text-yellow-200 {
     color: rgb(254 240 138) !important;
 }
 
 .next-fleet-summary {
-    --fleet-summary-toggle-base-padding: 2rem;
-    --fleet-summary-nav-item-base-padding: 1.25rem;
+    --fleet-summary-toggle-base-padding: 1.5rem;
+    --fleet-summary-nav-item-base-padding: 1.5rem;
 }
 
+.next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-toggle,
 .next-sidebar .next-sidebar-panel-container.next-fleet-summary > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-toggle {
     padding-left: 2rem;
 }
+
+.next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-content-panel-body .next-nav-item,
+.next-sidebar .next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-body .next-nav-item.driver-nav-item {
+    padding-left: 3.5rem;
+}

package/addon/templates/operations/orders/index/new.hbs

@@ -256,7 +256,7 @@
 
                             <div class="flex-row space-x-2 pr-0.5">
                                 {{#if this.payload.pickup}}
-                                    <a href="javascript:;" {{on "click" (fn this.placesController.editPlace this.payload.pickup)}}>
+                                    <a href="javascript:;" {{on "click" (fn this.editPlace this.payload.pickup)}}>
                                         <FaIcon @icon="edit" />
                                     </a>
                                     <a href="javascript:;" {{on "click" (fn this.setPayloadPlace "pickup" null)}}>
@@ -287,7 +287,7 @@
 
                             <div class="flex-row space-x-2 pr-0.5">
                                 {{#if this.payload.dropoff}}
-                                    <a href="javascript:;" {{on "click" (fn this.placesController.editPlace this.payload.dropoff)}}>
+                                    <a href="javascript:;" {{on "click" (fn this.editPlace this.payload.dropoff)}}>
                                         <FaIcon @icon="edit" />
                                     </a>
                                     <a href="javascript:;" {{on "click" (fn this.setPayloadPlace "dropoff" null)}}>
@@ -317,7 +317,7 @@
                             <label>Return</label>
 
                             {{#if this.payload.return}}
-                                <a href="javascript:;" {{on "click" (fn this.placesController.editPlace this.payload.return)}}>Edit Address</a>
+                                <a href="javascript:;" {{on "click" (fn this.editPlace this.payload.return)}}>Edit Address</a>
                             {{/if}}
                         </div>
 

package/addon/utils/fly-to-leaflet-layer.js

@@ -1,3 +1,5 @@
+import { isBlank } from '@ember/utils';
+
 export default function flyToLeafletLayer(map, layer, zoom, options = {}) {
     if (!map || !layer) {
         return;
@@ -18,6 +20,11 @@ export default function flyToLeafletLayer(map, layer, zoom, options = {}) {
         }
     }
 
+    // set `flyTo` duration
+    if (isBlank(options.duration)) {
+        options.duration = 5.5;
+    }
+
     // Check if we have a valid LatLng
     if (targetLatLng) {
         map.flyTo(targetLatLng, zoom, options);

package/app/components/layout/fleet-ops-sidebar/driver-listing.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/layout/fleet-ops-sidebar/driver-listing';

package/app/services/driver-actions.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/services/driver-actions';

package/app/services/vehicle-actions.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/services/vehicle-actions';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.3.8",
+    "version": "0.4.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "fleetbase/core-api": "^1.3.6",
+        "fleetbase/core-api": "^1.3.10",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.3.8",
+    "version": "0.4.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.3.8",
+    "version": "0.4.0",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",
@@ -42,9 +42,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.1.9",
-        "@fleetbase/ember-ui": "^0.2.8",
-        "@fleetbase/fleetops-data": "^0.1.6",
+        "@fleetbase/ember-core": "^0.2.0",
+        "@fleetbase/ember-ui": "^0.2.9",
+        "@fleetbase/fleetops-data": "^0.1.7",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",

package/server/src/Console/Commands/FixDriverCompanies.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Fleetbase\FleetOps\Console\Commands;
+
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\Models\Company;
+use Fleetbase\Models\CompanyUser;
+use Illuminate\Console\Command;
+
+class FixDriverCompanies extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fleetops:fix-driver-companies';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This is a command which checks driver\'s users to make sure they are assigned to company, if not it assigns the user to the drivers company';
+
+    /**
+     * Execute the console command.
+     *
+     * This method is responsible for the main logic of the command.
+     * It fetches dispatchable orders, notifies about the current time and number of orders,
+     * and then dispatches each order if there are nearby drivers.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $drivers = Driver::whereHas('user', function ($query) {
+            $query->whereNull('company_uuid');
+            $query->withTrashed();
+        })->with(['user'])->get();
+
+        // Fix these drivers
+        foreach ($drivers as $driver) {
+            $user = $driver->user;
+            if ($user) {
+                $this->line('Found user ' . $user->name . ' (' . $user->email . ') which has no company assigned');
+                // Get company from driver profile
+                $company = Company::where('uuid', $driver->company_uuid)->first();
+                if ($company) {
+                    $user->assignCompany($company);
+
+                    // create company user
+                    CompanyUser::create([
+                        'user_uuid'    => $user->uuid,
+                        'company_uuid' => $company->uuid,
+                        'status'       => 'active',
+                    ]);
+
+                    // Inform
+                    $this->line('User ' . $user->email . ' was assigned to company: ' . $company->name);
+                }
+            }
+        }
+    }
+}