@fleetbase/fleetops-engine 0.6.48 → 0.6.49

package/addon/templates/settings/orchestrator.hbs

@@ -9,7 +9,7 @@
         @isLoading={{or this.saveSettings.isRunning this.loadSettings.isRunning}}
     />
 </Layout::Section::Header>
-<Layout::Section::Body class="overflow-y-scroll h-full">
+<Layout::Section::Body class="overflow-y-scroll-i h-full">
     <div class="container mx-auto h-screen">
         <div class="max-w-3xl my-10 mx-auto space-y-6">
             {{#if this.loadSettings.isRunning}}

package/addon/templates/settings/payments/index.hbs

@@ -11,7 +11,7 @@
     {{/if}}
 </Layout::Section::Header>
 
-<Layout::Section::Body class="overflow-y-scroll h-full">
+<Layout::Section::Body class="overflow-y-scroll-i h-full">
     {{#if this.lookupStripeConnectAccount.isRunning}}
         <div class="flex items-center justify-center flex-1 p-4">
             <Spinner @loadingMessage={{t "settings.payments.loading-settings"}} @loadingMessageClass="ml-2 text-black dark:text-white" @wrapperClass="flex flex-row items-center" />

package/addon/templates/settings/payments/onboard.hbs

@@ -1,6 +1,6 @@
 <Layout::Section::Header @title={{t "payment.settings.onboard.header-title"}} />
 
-<Layout::Section::Body class="overflow-y-scroll h-full">
+<Layout::Section::Body class="overflow-y-scroll-i h-full">
     <div class="container">
         <div class="max-w-3xl mx-auto mt-4">
             <div class="content">

package/addon/templates/settings/routing.hbs

@@ -10,7 +10,7 @@
     />
 </Layout::Section::Header>
 
-<Layout::Section::Body class="overflow-y-scroll h-full">
+<Layout::Section::Body class="overflow-y-scroll-i h-full">
     <div class="container mx-auto h-screen">
         <div class="max-w-3xl my-10 mx-auto space-y-6">
             <ContentPanel @title={{t "settings.routing.configure-routing"}} @open={{true}} @wrapperClass="bordered-classic">
@@ -106,10 +106,30 @@
                     </div>
                 {{/if}}
             </ContentPanel>
+            <ContentPanel @title="Operational Alerts" @open={{true}} @wrapperClass="bordered-classic">
+                <InputGroup @name="Late Departures" @helpText="Notify when an order has not departed after the scheduled pickup window plus the configured grace period.">
+                    <Toggle @isToggled={{this.lateDepartureAlertsEnabled}} @onToggle={{fn (mut this.lateDepartureAlertsEnabled)}} />
+                </InputGroup>
+                <InputGroup @name="Late Departure Grace Period" @helpText="Minutes after scheduled pickup before the order is considered late to depart.">
+                    <Input @type="number" @value={{this.lateDepartureGracePeriodMinutes}} min="0" max="1440" class="form-input w-full" />
+                </InputGroup>
+                <InputGroup @name="Route Deviations" @helpText="Notify when tracked vehicle location drifts beyond the configured distance from the active route.">
+                    <Toggle @isToggled={{this.routeDeviationAlertsEnabled}} @onToggle={{fn (mut this.routeDeviationAlertsEnabled)}} />
+                </InputGroup>
+                <InputGroup @name="Route Deviation Threshold" @helpText="Meters from the active route before a deviation alert is eligible.">
+                    <Input @type="number" @value={{this.routeDeviationDistanceThresholdMeters}} min="0" max="100000" class="form-input w-full" />
+                </InputGroup>
+                <InputGroup @name="Prolonged Stoppages" @helpText="Notify when a vehicle remains stopped beyond the configured duration during an active trip.">
+                    <Toggle @isToggled={{this.prolongedStoppageAlertsEnabled}} @onToggle={{fn (mut this.prolongedStoppageAlertsEnabled)}} />
+                </InputGroup>
+                <InputGroup @name="Prolonged Stoppage Duration" @helpText="Minutes stopped before a stoppage alert is eligible.">
+                    <Input @type="number" @value={{this.prolongedStoppageDurationThresholdMinutes}} min="0" max="1440" class="form-input w-full" />
+                </InputGroup>
+            </ContentPanel>
             <RegistryYield @registry="fleet-ops:template:settings:routing" as |RegistryComponent|>
                 <RegistryComponent @controller={{this}} />
             </RegistryYield>
         </div>
+        <Spacer @height="600px" />
     </div>
-    <Spacer @height="600px" />
 </Layout::Section::Body>

package/addon/templates/settings/scheduling.hbs

@@ -9,7 +9,7 @@
         @isLoading={{or this.saveSettings.isRunning this.getSettings.isRunning}}
     />
 </Layout::Section::Header>
-<Layout::Section::Body class="overflow-y-scroll h-full">
+<Layout::Section::Body class="overflow-y-scroll-i h-full">
     <div class="container mx-auto h-screen">
         <div class="max-w-3xl my-10 mx-auto space-y-6">
 

package/addon/utils/live-map-card-content.js

@@ -0,0 +1,171 @@
+import { isArray } from '@ember/array';
+import { dasherize } from '@ember/string';
+import titleize from 'ember-cli-string-helpers/utils/titleize';
+
+function resolveStatusClass(status) {
+    const statusKey = dasherize(status ?? 'default');
+
+    return `status-badge ${statusKey}-status-badge status-badge-${statusKey}`;
+}
+
+function titleizeStatus(status) {
+    if (!status) {
+        return '-';
+    }
+
+    return titleize(`${status}`.replace(/[_-]+/g, ' '));
+}
+
+function buildStatusBadge(status, label = status) {
+    return `
+        <div class="${resolveStatusClass(status)} shadow-none ml-auto">
+            <span class="rounded-full text-[9px] px-1.5 py-0.5">${titleizeStatus(label)}</span>
+        </div>`;
+}
+
+function buildMetaCell(label, value, valueClass = '') {
+    const shouldTruncate = valueClass.split(' ').includes('truncate');
+    const flowClass = shouldTruncate ? 'min-w-0 w-full' : 'whitespace-normal break-words';
+
+    return `
+        <div class="rounded bg-gray-900 shadow-md px-1.5 py-1 min-w-0">
+            <div class="text-[9px] font-semibold uppercase text-gray-400 leading-none">${label}</div>
+            <div class="text-[11px] text-white leading-tight ${flowClass} ${valueClass}">${value ?? '-'}</div>
+        </div>`;
+}
+
+function buildLiveMapCard(content, framed = false) {
+    const frameClasses = framed ? 'relative rounded-lg bg-gray-900 shadow-lg p-1.5 text-white' : '';
+    const closeButton = framed ? '<button type="button" class="fleetops-google-popover__close" data-fleetops-google-popover-close aria-label="Close">&times;</button>' : '';
+
+    return `<div class="w-[280px] max-w-[calc(100vw-2rem)] ${frameClasses}">${closeButton}${content}</div>`;
+}
+
+function resolveDriverStatus(driver) {
+    return driver.meta?.status_label ?? titleizeStatus(driver.status);
+}
+
+function resolveDriverLocation(driver) {
+    return driver.meta?.location_coordinates ?? resolveLocationCoordinates(driver.location);
+}
+
+function resolveDriverSpeed(driver) {
+    return driver.meta?.speed_label ?? `${driver.speed ?? '-'} km/h`;
+}
+
+function resolveDriverHeading(driver) {
+    return driver.meta?.heading_label ?? driver.heading ?? '-';
+}
+
+function resolveDriverId(driver) {
+    return driver.public_id ?? driver.id ?? '-';
+}
+
+function resolveVehicleNumber(vehicle) {
+    return vehicle.internal_id ?? vehicle.public_id ?? vehicle.plate_number ?? vehicle.serial_number ?? vehicle.vin ?? '-';
+}
+
+function resolveVehicleStatus(vehicle) {
+    return vehicle.meta?.status_label ?? vehicle.current_status ?? vehicle.status ?? '-';
+}
+
+function resolveVehicleLocation(vehicle) {
+    return vehicle.meta?.location_coordinates ?? resolveLocationCoordinates(vehicle.location);
+}
+
+function resolveVehicleSpeed(vehicle) {
+    return vehicle.meta?.speed_label ?? `${vehicle.speed ?? '-'} km/h`;
+}
+
+function resolveVehicleHeading(vehicle) {
+    return vehicle.meta?.heading_label ?? vehicle.heading ?? '-';
+}
+
+function resolveLocationCoordinates(location) {
+    if (!location) {
+        return '-';
+    }
+
+    if (location?.coordinates && isArray(location.coordinates)) {
+        const [lng, lat] = location.coordinates;
+        return Number.isFinite(lat) && Number.isFinite(lng) ? `${formatCoordinate(lat)} ${formatCoordinate(lng)}` : '-';
+    }
+
+    if (isArray(location) && location.length >= 2) {
+        const [lat, lng] = location;
+        return Number.isFinite(lat) && Number.isFinite(lng) ? `${formatCoordinate(lat)} ${formatCoordinate(lng)}` : '-';
+    }
+
+    return '-';
+}
+
+function formatCoordinate(coordinate) {
+    return `${Math.round(coordinate * 10000) / 10000}`;
+}
+
+export function buildDriverLiveMapContent(driver, framed = false) {
+    const status = resolveDriverStatus(driver);
+    const onlineClass = driver.online ? 'bg-green-400' : 'bg-red-500';
+
+    return buildLiveMapCard(
+        `
+            <div class="fleetops-google-hover-tooltip__title mb-1.5 flex items-center gap-1.5">
+                <span class="inline-block w-2 h-2 rounded-full ${onlineClass}"></span>
+                <span>${driver.name ?? '-'}</span>
+                ${buildStatusBadge(driver.status, status)}
+            </div>
+            <div class="grid grid-cols-2 gap-1">
+                ${buildMetaCell('ID', resolveDriverId(driver))}
+                ${buildMetaCell('Phone', driver.phone ?? '-')}
+                ${buildMetaCell('Vehicle', driver.vehicle_name ?? '-')}
+                ${buildMetaCell('Email', driver.email ?? '-', 'truncate')}
+                ${buildMetaCell('Order', driver.meta?.current_order_reference ?? '-')}
+                ${buildMetaCell('Speed', resolveDriverSpeed(driver))}
+                ${buildMetaCell('Heading', resolveDriverHeading(driver))}
+                ${buildMetaCell('Location', resolveDriverLocation(driver))}
+            </div>
+        `,
+        framed
+    );
+}
+
+export function buildVehicleLiveMapContent(vehicle, framed = false) {
+    const status = resolveVehicleStatus(vehicle);
+    const onlineClass = vehicle.online ? 'bg-green-400' : 'bg-red-500';
+
+    return buildLiveMapCard(
+        `
+            <div class="fleetops-google-hover-tooltip__title mb-1.5 flex items-center gap-1.5">
+                <span class="inline-block w-2 h-2 rounded-full ${onlineClass}"></span>
+                <span>${vehicle.displayName ?? '-'}</span>
+                ${buildStatusBadge(vehicle.status, status)}
+            </div>
+            <div class="grid grid-cols-2 gap-1">
+                ${buildMetaCell('Vehicle #', resolveVehicleNumber(vehicle))}
+                ${buildMetaCell('Driver', vehicle.driver_name ?? vehicle.driver?.name ?? '-')}
+                ${buildMetaCell('Order', vehicle.meta?.current_order_reference ?? '-')}
+                ${buildMetaCell('Speed', resolveVehicleSpeed(vehicle))}
+                ${buildMetaCell('Heading', resolveVehicleHeading(vehicle))}
+                ${buildMetaCell('Location', resolveVehicleLocation(vehicle))}
+            </div>
+        `,
+        framed
+    );
+}
+
+export function buildPlaceInfoWindowContent(place) {
+    return `
+        <div class="fleetops-google-popover fleetops-google-popover--compact">
+            <div class="fleetops-google-popover__body">
+                <div class="fleetops-google-popover__title">${place.name ?? place.address ?? '-'}</div>
+                <div class="fleetops-google-popover__meta">${place.address ?? ''}</div>
+            </div>
+        </div>`;
+}
+
+export function buildPlaceTooltipContent(place) {
+    return `
+        <div class="fleetops-google-hover-tooltip__title">${place.name ?? place.address ?? '-'}</div>
+        <div class="fleetops-google-hover-tooltip__meta">${place.address ?? ''}</div>
+    `;
+}

package/app/components/widget/fuel-efficiency.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/fuel-efficiency';

package/app/components/widget/geofence-violations.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/geofence-violations';

package/app/components/widget/issues-insights.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/issues-insights';

package/app/components/widget/kpi-active-orders.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/kpi-active-orders';

package/app/components/widget/kpi-aov.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/kpi-aov';

package/app/components/widget/kpi-distance.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/kpi-distance';

package/app/components/widget/kpi-drivers-online.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/kpi-drivers-online';

package/app/components/widget/kpi-earnings.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/kpi-earnings';

package/app/components/widget/kpi-open-issues.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/kpi-open-issues';

package/app/components/widget/kpi-tile.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/kpi-tile';

package/app/components/widget/live-fleet.js

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

package/app/components/widget/maintenance-overview.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/maintenance-overview';

package/app/components/widget/on-time-delivery.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/on-time-delivery';

package/app/components/widget/operations-pulse.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/operations-pulse';

package/app/components/widget/orders-by-status.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/orders-by-status';

package/app/components/widget/revenue-trend.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/revenue-trend';

package/app/components/widget/top-drivers.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/widget/top-drivers';

package/app/utils/live-map-card-content.js

@@ -0,0 +1 @@
+export * from '@fleetbase/fleetops-engine/utils/live-map-card-content';

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.48",
+    "version": "0.6.49",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.48",
+    "version": "0.6.49",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -43,8 +43,8 @@
     "dependencies": {
         "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "^0.3.19",
-        "@fleetbase/ember-ui": "^0.3.29",
-        "@fleetbase/fleetops-data": "^0.1.32",
+        "@fleetbase/ember-ui": "^0.3.30",
+        "@fleetbase/fleetops-data": "^0.1.33",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",

package/pnpm-workspace.yaml

@@ -5,3 +5,4 @@ allowBuilds:
   '@fortawesome/free-solid-svg-icons': false
   core-js: false
   fsevents: false
+minimumReleaseAge: 0

package/server/config/telematics.php

@@ -106,6 +106,116 @@ return [
                 'pagination' => 'cursor',
             ],
         ],
+
+        [
+            'key' => 'afaqy',
+            'label' => 'AFAQY',
+            'type' => 'native',
+            'driver_class' => \Fleetbase\FleetOps\Support\Telematics\Providers\AfaqyProvider::class,
+            'icon' => 'https://api.afaqy.sa/docs/img/favicon.ico',
+            'description' => 'AFAQY AVL REST integration for unit discovery, live position, speed, heading, odometer, fuel, and signal data.',
+            'docs_url' => 'https://api.afaqy.sa/docs/',
+            'required_fields' => [
+                [
+                    'name' => 'base_url',
+                    'label' => 'Base URL',
+                    'type' => 'text',
+                    'placeholder' => 'https://api.afaqy.sa',
+                    'required' => false,
+                    'validation' => 'nullable|url',
+                ],
+                [
+                    'name' => 'username',
+                    'label' => 'Username',
+                    'type' => 'text',
+                    'placeholder' => 'Enter your AFAQY username',
+                    'required' => false,
+                    'validation' => 'required_without:token|string',
+                ],
+                [
+                    'name' => 'password',
+                    'label' => 'Password',
+                    'type' => 'password',
+                    'placeholder' => 'Enter your AFAQY password',
+                    'required' => false,
+                    'validation' => 'required_without:token|string',
+                ],
+                [
+                    'name' => 'token',
+                    'label' => 'Token',
+                    'type' => 'password',
+                    'placeholder' => 'Use an existing AFAQY token',
+                    'required' => false,
+                    'validation' => 'required_without:username|string',
+                ],
+            ],
+            'supports_webhooks' => false,
+            'supports_discovery' => true,
+            'metadata' => [
+                'rate_limit' => 60,
+                'pagination' => 'offset',
+                'capabilities' => ['tracking', 'speed', 'heading', 'odometer', 'fuel_level', 'ignition'],
+            ],
+        ],
+
+        [
+            'key' => 'safee',
+            'label' => 'Safee Tracking',
+            'type' => 'native',
+            'driver_class' => \Fleetbase\FleetOps\Support\Telematics\Providers\SafeeProvider::class,
+            'description' => 'Safee Tracking REST integration for vehicle discovery, last state, live positions, odometer, fuel, and sensor data.',
+            'required_fields' => [
+                [
+                    'name' => 'server_uri',
+                    'label' => 'Server URI',
+                    'type' => 'text',
+                    'placeholder' => 'https://tracking.example.com',
+                    'required' => true,
+                    'validation' => 'required|url',
+                ],
+                [
+                    'name' => 'realm_id',
+                    'label' => 'Realm ID',
+                    'type' => 'text',
+                    'placeholder' => 'Enter Safee realm ID',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'client_id',
+                    'label' => 'Client ID',
+                    'type' => 'text',
+                    'placeholder' => 'Enter Safee client ID',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'client_secret',
+                    'label' => 'Client Secret',
+                    'type' => 'password',
+                    'placeholder' => 'Enter Safee client secret',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'username',
+                    'label' => 'Username',
+                    'type' => 'text',
+                    'placeholder' => 'Enter Safee username',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'password',
+                    'label' => 'Password',
+                    'type' => 'password',
+                    'placeholder' => 'Enter Safee password',
+                    'required' => true,
+                ],
+            ],
+            'supports_webhooks' => false,
+            'supports_discovery' => true,
+            'metadata' => [
+                'rate_limit' => 3000,
+                'pagination' => 'none',
+                'capabilities' => ['tracking', 'speed', 'heading', 'odometer', 'fuel_level', 'ignition'],
+            ],
+        ],
     ]
 ];
-

package/server/migrations/2026_05_18_000001_add_license_expiry_to_drivers_table.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up()
+    {
+        Schema::table('drivers', function (Blueprint $table) {
+            if (!Schema::hasColumn('drivers', 'license_expiry')) {
+                $table->date('license_expiry')->nullable()->after('drivers_license_number')->index();
+            }
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('drivers', function (Blueprint $table) {
+            if (Schema::hasColumn('drivers', 'license_expiry')) {
+                $table->dropColumn('license_expiry');
+            }
+        });
+    }
+};