@fleetbase/fleetops-engine 0.3.2 → 0.3.3

package/addon/templates/operations/scheduler/index.hbs

@@ -1,10 +1,18 @@
 <Layout::Section::Header @title="Scheduler" />
 
-{{!-- <div>
-    <div class="p-6">
-        <div class="grid grid-cols-3 gap-4">
-            <div class="space-y-4">
-                <ContentPanel @title="Unscheduled Orders" @titleStatuRight={{this.unscheduledOrders.length}} @titleStatuRightClass="info-status-badge" @hideStatusDot={{true}} @open={{this.unscheduledOrders.length}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<Layout::Section::Body class="overflow-y-scroll h-screen">
+    <div class="h-screen">
+        <div class="grid grid-cols-1 lg:grid-cols-3">
+            <div class="scheduler-left-sidebar">
+                <ContentPanel
+                    @title="Unscheduled Orders"
+                    @titleStatuRight={{this.unscheduledOrders.length}}
+                    @titleStatuRightClass="info-status-badge"
+                    @hideStatusDot={{true}}
+                    @open={{true}}
+                    @pad={{true}}
+                    @panelBodyClass="bg-white dark:bg-gray-900"
+                >
                     <div class="space-y-4">
                         {{#each this.unscheduledOrders as |order|}}
                             <FullCalendar::Draggable @eventData={{json-hash id=order.id title=order.eventTitle allDay=true}}>
@@ -13,7 +21,15 @@
                         {{/each}}
                     </div>
                 </ContentPanel>
-                <ContentPanel @title="Scheduled Orders" @titleStatuRight={{this.scheduledOrders.length}} @titleStatusRightClass="info-status-badge" @hideStatusDot={{true}} @open={{this.scheduledOrders.length}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+                <ContentPanel
+                    @title="Scheduled Orders"
+                    @titleStatuRight={{this.scheduledOrders.length}}
+                    @titleStatusRightClass="info-status-badge"
+                    @hideStatusDot={{true}}
+                    @open={{true}}
+                    @pad={{true}}
+                    @panelBodyClass="bg-white dark:bg-gray-900"
+                >
                     <div class="space-y-4">
                         {{#each this.scheduledOrders as |order|}}
                             <Order::ScheduleCard @order={{order}} @titleClass="cursor-pointer" @onTitleClick={{fn this.viewEvent order}} />
@@ -22,9 +38,17 @@
                 </ContentPanel>
             </div>
 
-            <div class="col-span-2">
-                <FullCalendar @events={{this.events}} @onDrop={{this.scheduleEventFromDrop}} @onEventReceive={{this.receivedEvent}} @onEventDrop={{this.rescheduleEventFromDrag}} @onEventClick={{this.viewOrderAsEvent}} />
+            <div class="col-span-2 p-4">
+                <FullCalendar
+                    @events={{this.events}}
+                    @editable={{true}}
+                    @onDrop={{this.scheduleEventFromDrop}}
+                    @onEventReceive={{this.receivedEvent}}
+                    @onEventDrop={{this.rescheduleEventFromDrag}}
+                    @onEventClick={{this.viewOrderAsEvent}}
+                    @onInit={{this.setCalendarApi}}
+                />
             </div>
         </div>
     </div>
-</div> --}}
+</Layout::Section::Body>

package/addon/utils/create-full-calendar-event-from-order.js

@@ -0,0 +1,8 @@
+export default function createFullCalendarEventFromOrder(order) {
+    return {
+        id: order.id,
+        title: `${order.scheduledAtTime} - ${order.public_id}`,
+        start: order.scheduled_at,
+        allDay: true,
+    };
+}

package/app/components/live-map-drawer/driver-listing.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/live-map-drawer/driver-listing';

package/app/components/live-map-drawer/place-listing.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/live-map-drawer/place-listing';

package/app/components/live-map-drawer/vehicle-listing.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/live-map-drawer/vehicle-listing';

package/app/components/live-map-drawer.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/live-map-drawer';

package/app/utils/create-full-calendar-event-from-order.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/create-full-calendar-event-from-order';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.3.2",
+    "version": "0.3.3",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.3.2",
+    "version": "0.3.3",
     "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.2",
+    "version": "0.3.3",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",
@@ -39,9 +39,9 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.1.6",
-        "@fleetbase/ember-ui": "^0.2.3",
-        "@fleetbase/fleetops-data": "^0.1.2",
+        "@fleetbase/ember-core": "^0.1.7",
+        "@fleetbase/ember-ui": "^0.2.4",
+        "@fleetbase/fleetops-data": "^0.1.3",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",

package/server/src/Models/FuelReport.php

@@ -99,7 +99,7 @@ class FuelReport extends Model
      *
      * @var array
      */
-    protected $filterParams = ['type', 'reporter'];
+    protected $filterParams = ['type', 'status', 'reporter'];
 
     /**
      * Set the parcel fee as only numbers.

package/server/src/Models/Order.php

@@ -947,6 +947,28 @@ class Order extends Model
         $this->customer_type = Utils::getModelClassName($model);
     }
 
+    public function setCustomerTypeAttribute($type)
+    {
+        if (is_string($type)) {
+            if ($type === 'customer' || $type === 'vendor' || !Str::startsWith($type, 'fleet-ops')) {
+                $type = 'fleet-ops:' . $type;
+            }
+
+            $this->attributes['customer_type'] = Utils::getMutationType($type);
+        }
+    }
+
+    public function setFacilitatorTypeAttribute($type)
+    {
+        if (is_string($type)) {
+            if ($type === 'customer' || $type === 'vendor' || !Str::startsWith($type, 'fleet-ops')) {
+                $type = 'fleet-ops:' . $type;
+            }
+
+            $this->attributes['facilitator_type'] = Utils::getMutationType($type);
+        }
+    }
+
     public function setDriverLocationAsPickup($force = false)
     {
         if ($force === true) {

package/server/src/Models/VehicleDevice.php

@@ -82,7 +82,7 @@ class VehicleDevice extends Model
      */
     public function vehicle()
     {
-        return $this->belongsTo(Vehicle::class);
+        return $this->belongsTo(Vehicle::class)->without(['events']);
     }
 
     /**

package/server/src/Models/VehicleDeviceEvent.php

@@ -89,6 +89,6 @@ class VehicleDeviceEvent extends Model
      */
     public function device()
     {
-        return $this->belongsTo(VehicleDevice::class);
+        return $this->belongsTo(VehicleDevice::class, 'vehicle_device_uuid');
     }
 }

package/server/src/Observers/FleetObserver.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Fleetbase\FleetOps\Observers;
+
+use Fleetbase\FleetOps\Models\Fleet;
+
+class FleetObserver
+{
+    /**
+     * Handle the Driver "deleted" event.
+     *
+     * @return void
+     */
+    public function deleted(Fleet $fleet)
+    {
+        // If the fleet being deleted is set as parent fleet, remove it as the parent fleet
+        $subFleets = Fleet::where(['parent_fleet_uuid' => $fleet->uuid])->update(['parent_fleet_uuid' => null]);
+    }
+}

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -31,6 +31,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Models\TrackingNumber::class => \Fleetbase\FleetOps\Observers\TrackingNumberObserver::class,
         \Fleetbase\FleetOps\Models\Driver::class         => \Fleetbase\FleetOps\Observers\DriverObserver::class,
         \Fleetbase\FleetOps\Models\Vehicle::class        => \Fleetbase\FleetOps\Observers\VehicleObserver::class,
+        \Fleetbase\FleetOps\Models\Fleet::class          => \Fleetbase\FleetOps\Observers\FleetObserver::class,
         \Fleetbase\Models\User::class                    => \Fleetbase\FleetOps\Observers\UserObserver::class,
     ];
 

package/addon/components/full-calendar/draggable.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/console/components/full-calendar/draggable';

package/addon/components/full-calendar.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/console/components/full-calendar';

package/app/components/full-calendar/draggable.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/components/full-calendar/draggable';

package/app/components/full-calendar.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/components/full-calendar';