@fleetbase/fleetops-engine 0.3.1 → 0.3.3

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/contact-form-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/contact-form-panel';

package/app/components/contact-panel/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/contact-panel/details';

package/app/components/contact-panel.js

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

package/app/components/{full-calendar/draggable.js → fleet-listing-panel.js}

@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops-engine/components/full-calendar/draggable';
+export { default } from '@fleetbase/fleetops-engine/components/fleet-listing-panel';

package/app/components/fleet-panel/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/fleet-panel/details';

package/app/components/fleet-panel/driver-listing.js

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

package/app/components/fleet-panel/vehicle-listing.js

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

package/app/components/fuel-report-form-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/fuel-report-form-panel';

package/app/components/{full-calendar.js → fuel-report-panel.js}

@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops-engine/components/full-calendar';
+export { default } from '@fleetbase/fleetops-engine/components/fuel-report-panel';

package/app/components/issue-form-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/issue-form-panel';

package/app/components/issue-panel.js

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

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/components/place-form-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/place-form-panel';

package/app/components/place-panel.js

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

package/app/components/vendor-form-panel/create-form.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vendor-form-panel/create-form';

package/app/components/vendor-form-panel/edit-form.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vendor-form-panel/edit-form';

package/app/components/vendor-form-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vendor-form-panel';

package/app/components/vendor-panel/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vendor-panel/details';

package/app/components/vendor-panel.js

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

package/app/controllers/management/contacts/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/contacts/index/details';

package/app/controllers/management/contacts/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/contacts/index/edit';

package/app/controllers/management/contacts/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/contacts/index/new';

package/app/controllers/management/fuel-reports/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/fuel-reports/index/details';

package/app/controllers/management/fuel-reports/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/fuel-reports/index/edit';

package/app/controllers/management/fuel-reports/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/fuel-reports/index/new';

package/app/controllers/management/issues/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/issues/index/details';

package/app/controllers/management/issues/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/issues/index/edit';

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/issues/index/new';

package/app/controllers/management/places/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/places/index/details';

package/app/controllers/management/places/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/places/index/edit';

package/app/controllers/management/places/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/places/index/new';

package/app/controllers/management/vendors/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vendors/index/edit';

package/app/controllers/management/vendors/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vendors/index/new';

package/app/routes/addon/routes/management/places/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/addon/routes/management/places/index/new';

package/app/routes/management/contacts/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/contacts/index/details';

package/app/routes/management/contacts/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/contacts/index/edit';

package/app/routes/management/contacts/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/contacts/index/new';

package/app/routes/management/fuel-reports/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/fuel-reports/index/details';

package/app/routes/management/fuel-reports/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/fuel-reports/index/edit';

package/app/routes/management/fuel-reports/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/fuel-reports/index/new';

package/app/routes/management/issues/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/issues/index/details';

package/app/routes/management/issues/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/issues/index/edit';

package/app/routes/management/issues/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/issues/index/new';

package/app/routes/management/places/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/places/index/details';

package/app/routes/management/places/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/places/index/edit';

package/app/routes/management/places/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/places/index/new';

package/app/routes/management/vendors/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/vendors/index/details';

package/app/routes/management/vendors/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/vendors/index/edit';

package/app/routes/management/vendors/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/vendors/index/new';

package/app/templates/addon/routes/management/places/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/addon/routes/management/places/index/new';

package/app/templates/management/contacts/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/contacts/index/details';

package/app/templates/management/contacts/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/contacts/index/edit';

package/app/templates/management/contacts/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/contacts/index/new';

package/app/templates/management/fuel-reports/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/fuel-reports/index/details';

package/app/templates/management/fuel-reports/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/fuel-reports/index/edit';

package/app/templates/management/fuel-reports/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/fuel-reports/index/new';

package/app/templates/management/issues/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/issues/index/details';

package/app/templates/management/issues/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/issues/index/edit';

package/app/templates/management/issues/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/issues/index/new';

package/app/templates/management/places/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/places/index/details';

package/app/templates/management/places/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/places/index/edit';

package/app/templates/management/places/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/places/index/new';

package/app/templates/management/vendors/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/vendors/index/details';

package/app/templates/management/vendors/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/vendors/index/edit';

package/app/templates/management/vendors/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/vendors/index/new';

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.1",
+    "version": "0.3.3",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/config/environment.js

@@ -11,7 +11,8 @@ module.exports = function (environment) {
             driverImage: getenv('DEFAULT_DRIVER_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
             userImage: getenv('DEFAULT_USER_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
             contactImage: getenv('DEFAULT_CONTACT_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
-            vehicleImage: getenv('DEFAULT_VEHICLE_IMAGE', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/vehicle-icons/light_commercial_van.svg'),
+            vendorImage: getenv('DEFAULT_VENDOR_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
+            vehicleImage: getenv('DEFAULT_VEHICLE_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/vehicle-placeholder.png'),
             vehicleAvatar: getenv('DEFAUL_VEHICLE_AVATAR', 'https://flb-assets.s3-ap-southeast-1.amazonaws.com/static/vehicle-icons/mini_bus.svg'),
         },
     };

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.3.1",
+    "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.1",
+    "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.2",
-        "@fleetbase/fleetops-data": "^0.1.1",
+        "@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",
@@ -56,6 +56,7 @@
         "ember-intl": "^6.0.0-beta.6",
         "ember-leaflet": "^5.1.1",
         "ember-radio-button": "^3.0.0-beta.1",
+        "ember-tag-input": "^3.1.0",
         "ember-wormhole": "^0.6.0",
         "leaflet": "^1.9.4",
         "leaflet-contextmenu": "^1.4.0",

package/server/migrations/2023_11_03_072503_refactor_issues_table_columns.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RefactorIssuesTableColumns extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('issues', function (Blueprint $table) {
+            $table->dropColumn(['longitude', 'latitude', 'odometer']);
+            $table->string('category')->nullable()->after('type');
+            $table->json('tags')->nullable()->after('priority');
+            $table->json('meta')->nullable()->after('priority');
+            $table->mediumText('report')->change();
+            $table->foreignUuid('reported_by_uuid')->nullable()->after('assigned_to_uuid')->references('uuid')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('issues', function (Blueprint $table) {
+            $table->string('longitude')->nullable()->after('location');
+            $table->string('latitude')->nullable()->after('location');
+            $table->string('odometer')->nullable()->after('location');
+            $table->string('report')->change();
+            $table->dropForeign(['reported_by_uuid']);
+            $table->dropColumn(['reported_by_uuid', 'meta', 'tags', 'category']);
+        });
+    }
+}

package/server/migrations/2023_11_06_040645_refactor_fuel_reports_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RefactorFuelReportsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('fuel_reports', function (Blueprint $table) {
+            $table->dropColumn(['longitude', 'latitude']);
+            $table->json('meta')->nullable()->after('metric_unit');
+            $table->mediumText('report')->nullable()->after('vehicle_uuid');
+            $table->foreignUuid('reported_by_uuid')->nullable()->after('vehicle_uuid')->references('uuid')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('fuel_reports', function (Blueprint $table) {
+            $table->string('longitude')->nullable()->after('location');
+            $table->string('latitude')->nullable()->after('location');
+            $table->dropForeign(['reported_by_uuid']);
+            $table->dropColumn(['reported_by_uuid', 'meta', 'report']);
+        });
+    }
+}

package/server/src/Casts/Point.php

@@ -59,7 +59,21 @@ class Point implements CastsAttributes
             return $point;
         }
 
-        return new SpatialExpression(new Point(0, 0));
+        return static::createEmptySpatialExpression();
+    }
+
+    /**
+     * Creates an empty Point as a SpatialExpression.
+     */
+    public static function createEmptySpatialExpression(): SpatialExpression
+    {
+        $value = json_encode([
+            'type'        => 'Point',
+            'coordinates' => [0, 0],
+            'bbox'        => [0, 0, 0, 0],
+        ]);
+
+        return Utils::createSpatialExpressionFromGeoJson($value);
     }
 
     /**

package/server/src/Http/Controllers/Internal/v1/DriverController.php

@@ -51,17 +51,26 @@ class DriverController extends FleetOpsController
             // outside organization: invite to join organization AS DRIVER
             if ($validator->errors()->hasAny(['phone', 'email'])) {
                 // get existing user
-                $existingUser = User::where(
-                    function ($q) use ($input) {
-                        if (!empty($input['phone'])) {
-                            $q->orWhere('phone', $input['phone']);
-                        }
-
-                        if (!empty($input['email'])) {
-                            $q->orWhere('email', $input['email']);
-                        }
+                $existingUser = null;
+
+                // if values provided for user lookup
+                if (!empty($input['phone']) || !empty($input['email'])) {
+                    $existingUserQuery = User::query();
+
+                    if (!empty($input['phone']) && is_string($input['phone'])) {
+                        $existingUserQuery->orWhere(function ($q) use ($input) {
+                            $q->where('phone', $input['phone'])->whereNotNull('phone');
+                        });
                     }
-                )->first();
+
+                    if (!empty($input['email']) && is_string($input['email'])) {
+                        $existingUserQuery->orWhere(function ($q) use ($input) {
+                            $q->where('email', $input['email'])->whereNotNull('email');
+                        });
+                    }
+
+                    $existingUser = $existingUserQuery->first();
+                }
 
                 if ($existingUser) {
                     // if exists in organization create driver profile for user
@@ -69,7 +78,7 @@ class DriverController extends FleetOpsController
 
                     // create driver profile for user
                     $input = collect($input)
-                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta'])
+                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta', 'avatar_uuid', 'photo_uuid'])
                         ->filter()
                         ->toArray();
 
@@ -116,12 +125,17 @@ class DriverController extends FleetOpsController
                     $input = collect($input);
 
                     $userInput = $input
-                        ->only(['name', 'password', 'email', 'phone', 'status'])
+                        ->only(['name', 'password', 'email', 'phone', 'status', 'avatar_uuid'])
                         ->filter()
                         ->toArray();
 
+                    // handle `photo_uuid`
+                    if (isset($input['photo_uuid']) && Str::isUuid($input['photo_uuid'])) {
+                        $userInput['avatar_uuid'] = $input['photo_uuid'];
+                    }
+
                     $input = $input
-                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta'])
+                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta', 'avatar_uuid', 'photo_uuid'])
                         ->filter()
                         ->toArray();
 
@@ -198,8 +212,12 @@ class DriverController extends FleetOpsController
                 function (&$request, &$driver, &$input) {
                     $driver->load(['user']);
                     $input     = collect($input);
-                    $userInput = $input->only(['name', 'password', 'email', 'phone'])->toArray();
-                    $input     = $input->except(['name', 'password', 'email', 'phone', 'location', 'meta'])->toArray();
+                    $userInput = $input->only(['name', 'password', 'email', 'phone', 'avatar_uuid'])->toArray();
+                    // handle `photo_uuid`
+                    if (isset($input['photo_uuid']) && Str::isUuid($input['photo_uuid'])) {
+                        $userInput['avatar_uuid'] = $input['photo_uuid'];
+                    }
+                    $input     = $input->except(['name', 'password', 'email', 'phone', 'location', 'meta', 'avatar_uuid', 'photo_uuid'])->toArray();
 
                     $driver->user->update($userInput);
                     $driver->flushAttributesCache();

package/server/src/Http/Filter/FleetFilter.php

@@ -24,6 +24,13 @@ class FleetFilter extends Filter
         });
     }
 
+    public function parentsOnly(bool $parentsOnly = false)
+    {
+        if ($parentsOnly) {
+            $this->builder->whereNull('parent_fleet_uuid');
+        }
+    }
+
     public function serviceArea(?string $serviceArea)
     {
         $this->builder->whereHas(

package/server/src/Http/Filter/FuelReportFilter.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Filter\Filter;
+use Illuminate\Support\Str;
+
+class FuelReportFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+
+    public function publicId(?string $publicId)
+    {
+        $this->builder->searchWhere('public_id', $publicId);
+    }
+
+    public function reporter(?string $reporter)
+    {
+        $this->builder->whereHas('reportedBy', function ($q) use ($reporter) {
+            if (Str::isUuid($reporter)) {
+                $q->where('uuid', $reporter);
+            } else {
+                $q->search($reporter);
+            }
+        });
+    }
+
+    public function createdAt($createdAt)
+    {
+        $createdAt = Utils::dateRange($createdAt);
+
+        if (is_array($createdAt)) {
+            $this->builder->whereBetween('created_at', $createdAt);
+        } else {
+            $this->builder->whereDate('created_at', $createdAt);
+        }
+    }
+
+    public function updatedAt($updatedAt)
+    {
+        $updatedAt = Utils::dateRange($updatedAt);
+
+        if (is_array($updatedAt)) {
+            $this->builder->whereBetween('updated_at', $updatedAt);
+        } else {
+            $this->builder->whereDate('updated_at', $updatedAt);
+        }
+    }
+}