@fleetbase/fleetops-engine 0.6.38 → 0.6.40

package/addon/components/vehicle/details.hbs

@@ -407,6 +407,28 @@
                 </div>
             </div>
 
+            <div class="field-info-container">
+                <div class="field-name">Payload Volume</div>
+                <div class="field-value">
+                    {{#if @resource.payload_capacity_volume}}
+                        {{@resource.payload_capacity_volume}}
+                        m³
+                    {{else}}
+                        {{n-a @resource.payload_capacity_volume}}
+                    {{/if}}
+                </div>
+            </div>
+
+            <div class="field-info-container">
+                <div class="field-name">Pallet Capacity</div>
+                <div class="field-value">{{n-a @resource.payload_capacity_pallets}}</div>
+            </div>
+
+            <div class="field-info-container">
+                <div class="field-name">Parcel Capacity</div>
+                <div class="field-value">{{n-a @resource.payload_capacity_parcels}}</div>
+            </div>
+
             <div class="field-info-container">
                 <div class="field-name">Passenger Volume</div>
                 <div class="field-value">
@@ -613,6 +635,36 @@
     {{! CUSTOM FIELDS (view mode) }}
     <CustomField::Yield @subject={{@resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
 
+    {{! ORCHESTRATOR CONSTRAINTS (read-only view) }}
+    {{#if (or @resource.skills.length @resource.time_window_start @resource.time_window_end @resource.max_tasks)}}
+        <ContentPanel @title="Orchestrator Constraints" @open={{true}} @wrapperClass="bordered-top">
+            <div class="grid grid-cols-2 gap-2 text-xs dark:text-gray-100">
+                {{#if @resource.skills.length}}
+                    <div class="field-info-container col-span-2">
+                        <div class="field-name">Skills & Capabilities</div>
+                        <div class="field-value">{{join @resource.skills ", "}}</div>
+                    </div>
+                {{/if}}
+                {{#if (or @resource.time_window_start @resource.time_window_end)}}
+                    <div class="field-info-container">
+                        <div class="field-name">Available From</div>
+                        <div class="field-value">{{n-a @resource.time_window_start}}</div>
+                    </div>
+                    <div class="field-info-container">
+                        <div class="field-name">Available Until</div>
+                        <div class="field-value">{{n-a @resource.time_window_end}}</div>
+                    </div>
+                {{/if}}
+                {{#if @resource.max_tasks}}
+                    <div class="field-info-container">
+                        <div class="field-name">Max Tasks</div>
+                        <div class="field-value">{{@resource.max_tasks}}</div>
+                    </div>
+                {{/if}}
+            </div>
+        </ContentPanel>
+    {{/if}}
+
     {{! AVATAR }}
     <ContentPanel @title={{t "common.avatar"}} @open={{true}} @wrapperClass="bordered-top">
         <div class="flex px-1">

package/addon/components/vehicle/form.hbs

@@ -403,6 +403,18 @@
                     <UnitInput class="w-full" @value={{@resource.cargo_volume}} @unit="L" @placeholder="Cargo Volume" />
                 </InputGroup>
 
+                <InputGroup @name="Payload Volume (m³)" @helpText="The maximum cargo volume this vehicle can carry, in cubic metres.">
+                    <Input @value={{@resource.payload_capacity_volume}} @type="number" class="form-input w-full" placeholder="e.g. 40" disabled={{cannot-write @resource}} />
+                </InputGroup>
+
+                <InputGroup @name="Pallet Capacity" @helpText="The maximum number of standard pallets this vehicle can carry.">
+                    <Input @value={{@resource.payload_capacity_pallets}} @type="number" class="form-input w-full" placeholder="e.g. 20" disabled={{cannot-write @resource}} />
+                </InputGroup>
+
+                <InputGroup @name="Parcel Capacity" @helpText="The maximum number of parcels or packages this vehicle can carry.">
+                    <Input @value={{@resource.payload_capacity_parcels}} @type="number" class="form-input w-full" placeholder="e.g. 200" disabled={{cannot-write @resource}} />
+                </InputGroup>
+
                 <InputGroup @name="Passenger Volume">
                     <UnitInput class="w-full" @value={{@resource.passenger_volume}} @unit="L" @placeholder="Passenger Volume" />
                 </InputGroup>
@@ -542,6 +554,45 @@
         </div>
     </ContentPanel>
 
+    {{! ORCHESTRATOR CONSTRAINTS }}
+    <ContentPanel @title="Orchestrator Constraints" @open={{true}} @wrapperClass="bordered-top">
+        <div class="grid grid-cols-1 gap-2 lg:grid-cols-2 lg:gap-2 no-input-group-padding text-xs">
+            <div class="col-span-1 lg:col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-1">
+                Skills & Capabilities
+            </div>
+            <div class="col-span-1 lg:col-span-2">
+                <InputGroup @name="Vehicle Skills" @helpText="Skills this vehicle can fulfil (e.g. refrigerated, hazmat). Used by the Orchestrator for order matching.">
+                    <MultiSelect
+                        @options={{get-fleet-ops-options "vehicleSkills"}}
+                        @selected={{@resource.skills}}
+                        @onChange={{fn (mut @resource.skills)}}
+                        @placeholder="Select skills…"
+                        @triggerClass="form-select form-input"
+                        @disabled={{cannot-write @resource}}
+                        as |option|
+                    >
+                        {{option.label}}
+                    </MultiSelect>
+                </InputGroup>
+            </div>
+            <div class="col-span-1 lg:col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-3">
+                Availability Window
+            </div>
+            <InputGroup @name="Available From" @helpText="Earliest time this vehicle is available for dispatch (HH:MM).">
+                <Input @value={{@resource.time_window_start}} @type="time" class="form-input w-full" placeholder="HH:MM" disabled={{cannot-write @resource}} />
+            </InputGroup>
+            <InputGroup @name="Available Until" @helpText="Latest time this vehicle should complete its last stop (HH:MM).">
+                <Input @value={{@resource.time_window_end}} @type="time" class="form-input w-full" placeholder="HH:MM" disabled={{cannot-write @resource}} />
+            </InputGroup>
+            <div class="col-span-1 lg:col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-3">
+                Task Limits
+            </div>
+            <InputGroup @name="Max Tasks" @helpText="Maximum number of stops/orders this vehicle can be assigned per Orchestrator run. Leave blank for no limit.">
+                <Input @value={{@resource.max_tasks}} @type="number" class="form-input w-full" placeholder="e.g. 20" disabled={{cannot-write @resource}} />
+            </InputGroup>
+        </div>
+    </ContentPanel>
+
     {{! CUSTOM FIELDS, REGISTRY, AVATAR, METADATA }}
     <CustomField::Yield @subject={{@resource}} @wrapperClass="bordered-top" />
 

package/addon/components/vehicle/panel-header.hbs

@@ -2,7 +2,14 @@
     <div class="flex flex-1 flex-row items-start justify-between">
         <div class="flex flex-row space-x-3">
             <div class="flex items-start justify-start rounded-full">
-                <Image src={{@resource.photo_url}} @fallbackSrc={{config "defaultValues.driverImage"}} alt={{@resource.displayName}} height="48" width="48" class="h-14 w-14 rounded-full shadow-sm" />
+                <Image
+                    src={{@resource.photo_url}}
+                    @fallbackSrc={{config "defaultValues.driverImage"}}
+                    alt={{@resource.displayName}}
+                    height="48"
+                    width="48"
+                    class="h-14 w-14 rounded-full shadow-sm"
+                />
                 <Attach::Tooltip @class="clean" @animation="scale" @placement="top">
                     <InputInfo @text={{@resource.displayName}} />
                 </Attach::Tooltip>
@@ -25,55 +32,18 @@
             </div>
         </div>
         <div class="next-view-header-right">
-            <div class="flex flex-row flex-1 justify-end space-x-2">
+            <Layout::Resource::Panel::HeaderActions
+                @resource={{@resource}}
+                @saveTask={{@saveTask}}
+                @saveOptions={{@saveOptions}}
+                @saveDisabled={{@saveDisabled}}
+                @pojoResource={{@pojoResource}}
+                @authSchema={{@authSchema}}
+                @actionButtons={{@actionButtons}}
+                @onPressCancel={{@onPressCancel}}
+            >
                 {{yield}}
-                {{#if @saveTask}}
-                    <Button
-                        @type="primary"
-                        @icon={{if @resource.isNew "check" "save"}}
-                        @text={{if @resource.isNew (concat "Create " this.modelName) "Save Changes"}}
-                        @onClick={{perform @saveTask @resource}}
-                        @disabled={{cannot-write @resource schema=@authSchema}}
-                        @isLoading={{@saveTask.isRunning}}
-                    />
-                {{/if}}
-                {{#each @actionButtons as |actionButton|}}
-                    <Button
-                        @type={{actionButton.type}}
-                        @text={{actionButton.text}}
-                        @onClick={{if actionButton.perform (perform actionButton.perform) (or actionButton.onClick actionButton.fn)}}
-                        @size={{actionButton.size}}
-                        @buttonType={{actionButton.buttonType}}
-                        @disabled={{actionButton.disabled}}
-                        @exampleText={{actionButton.exampleText}}
-                        @helpText={{actionButton.helpText}}
-                        @icon={{actionButton.icon}}
-                        @iconClass={{actionButton.iconClass}}
-                        @iconFlip={{actionButton.iconFlip}}
-                        @iconPrefix={{actionButton.iconPrefix}}
-                        @iconRotation={{actionButton.iconRotation}}
-                        @iconSize={{actionButton.iconSize}}
-                        @isLoading={{actionButton.isLoading}}
-                        @outline={{actionButton.outline}}
-                        @permission={{actionButton.permission}}
-                        @wrapperClass={{actionButton.wrapperClass}}
-                        @textClass={{actionButton.textClass}}
-                        @tooltipPlacement={{actionButton.tooltipPlacement}}
-                        @visible={{actionButton.visible}}
-                    />
-                {{/each}}
-                {{#if @onPressCancel}}
-                    <button
-                        type="button"
-                        class="next-content-overlay-panel-cancel-button {{@cancelButtonClass}}"
-                        {{set-height @cancelButtonHeight}}
-                        {{set-width @cancelButtonWidth}}
-                        {{on "click" @onPressCancel}}
-                    >
-                        <FaIcon @icon={{or @cancelIcon "times"}} @size={{@iconSize}} @prefix={{or @iconPrefix "fas"}} class={{@iconClass}} />
-                    </button>
-                {{/if}}
-            </div>
+            </Layout::Resource::Panel::HeaderActions>
         </div>
     </div>
 </div>

package/addon/components/warranty/details.hbs

@@ -55,7 +55,8 @@
                     {{#if @resource.is_expired}}
                         <Badge @status="danger">Expired</Badge>
                     {{else if @resource.days_remaining}}
-                        {{@resource.days_remaining}} days
+                        {{@resource.days_remaining}}
+                        days
                         {{#if (lt @resource.days_remaining 30)}}
                             <Badge @status="warning">Expiring Soon</Badge>
                         {{/if}}
@@ -78,4 +79,4 @@
     </ContentPanel>
 
     <CustomField::Yield @subject={{@resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
-</div>
+</div>

package/addon/components/warranty/form.hbs

@@ -47,25 +47,11 @@
             </InputGroup>
 
             <InputGroup @name="Terms" @wrapperClass="col-span-2">
-                <Textarea
-                    @value={{@resource.terms}}
-                    aria-label="Terms"
-                    class="w-full form-input"
-                    disabled={{cannot-write @resource}}
-                    placeholder="Warranty Terms"
-                    rows={{5}}
-                />
+                <Textarea @value={{@resource.terms}} aria-label="Terms" class="w-full form-input" disabled={{cannot-write @resource}} placeholder="Warranty Terms" rows={{5}} />
             </InputGroup>
 
             <InputGroup @name="Policy Document" @wrapperClass="col-span-2">
-                <Textarea
-                    @value={{@resource.policy}}
-                    aria-label="Policy"
-                    class="w-full form-input"
-                    disabled={{cannot-write @resource}}
-                    placeholder="Policy Document"
-                    rows={{5}}
-                />
+                <Textarea @value={{@resource.policy}} aria-label="Policy" class="w-full form-input" disabled={{cannot-write @resource}} placeholder="Policy Document" rows={{5}} />
             </InputGroup>
 
             <RegistryYield @registry="fleet-ops:component:warranty:form:details" as |RegistryComponent|>
@@ -79,4 +65,4 @@
     <RegistryYield @registry="fleet-ops:component:warranty:form" as |RegistryComponent|>
         <RegistryComponent @resource={{@resource}} @controller={{@controller}} @permission={{get-write-permission @resource}} />
     </RegistryYield>
-</div>
+</div>

package/addon/components/work-order/details.hbs

@@ -1,18 +1,36 @@
-<div class="details-wrapper" ...attributes>
-    <ContentPanel @title="Details" @open={{true}} @wrapperClass="bordered-top">
-        <div class="grid grid-cols-1 lg:grid-cols-3 gap-2">
+<div class="next-content-panel-wrapper" ...attributes>
+
+    {{! ===== OVERVIEW ===== }}
+    <ContentPanel @title="Overview" @open={{true}} @wrapperClass="bordered-top">
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-2 text-xs dark:text-gray-100">
+
+            {{! — Identity — }}
+            <div class="col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-1">
+                Identity
+            </div>
             <div class="field-info-container">
                 <div class="field-name">Code</div>
-                <div class="field-value">{{n-a @resource.code}}</div>
+                <ClickToCopy @value={{@resource.code}} class="field-value font-mono">{{n-a @resource.code}}</ClickToCopy>
+            </div>
+            <div class="field-info-container">
+                <div class="field-name">ID</div>
+                <ClickToCopy @value={{@resource.public_id}} class="field-value font-mono">{{n-a @resource.public_id}}</ClickToCopy>
+            </div>
+            <div class="field-info-container col-span-2">
+                <div class="field-name">Subject</div>
+                <div class="field-value">{{n-a @resource.subject}}</div>
             </div>
 
+            {{! — Status & Priority — }}
+            <div class="col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-3">
+                Status & Priority
+            </div>
             <div class="field-info-container">
                 <div class="field-name">Status</div>
                 <div class="field-value">
                     <Badge @status={{@resource.status}}>{{smart-humanize @resource.status}}</Badge>
                 </div>
             </div>
-
             <div class="field-info-container">
                 <div class="field-name">Priority</div>
                 <div class="field-value">
@@ -28,66 +46,143 @@
                 </div>
             </div>
 
-            <div class="field-info-container col-span-3">
-                <div class="field-name">Subject</div>
-                <div class="field-value">{{n-a @resource.subject}}</div>
+            {{! — Assignment — }}
+            <div class="col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-3">
+                Assignment
             </div>
-
             <div class="field-info-container">
-                <div class="field-name">Target</div>
-                <div class="field-value">{{n-a @resource.target_name}}</div>
+                <div class="field-name">Target Asset</div>
+                <div class="field-value">{{n-a (or @resource.target.displayName @resource.target.name @resource.target_name)}}</div>
             </div>
-
             <div class="field-info-container">
-                <div class="field-name">Assignee</div>
-                <div class="field-value">{{n-a @resource.assignee_name}}</div>
+                <div class="field-name">Assigned Vendor</div>
+                <div class="field-value">{{n-a (or @resource.assignee.displayName @resource.assignee.name @resource.assignee_name)}}</div>
             </div>
+            {{#if @resource.schedule}}
+                <div class="field-info-container">
+                    <div class="field-name">Linked Schedule</div>
+                    <div class="field-value">{{n-a @resource.schedule.name}}</div>
+                </div>
+            {{/if}}
 
-            <div class="field-info-container">
-                <div class="field-name">Completion</div>
-                <div class="field-value">{{n-a @resource.completion_percentage}}%</div>
+            {{! — Scheduling — }}
+            <div class="col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-3">
+                Scheduling
             </div>
-
             <div class="field-info-container">
                 <div class="field-name">Opened At</div>
-                <div class="field-value">{{format-date @resource.opened_at}}</div>
+                <div class="field-value">{{n-a (format-date-fns @resource.opened_at "dd MMM yyyy, HH:mm")}}</div>
             </div>
-
             <div class="field-info-container">
                 <div class="field-name">Due At</div>
-                <div class="field-value">{{format-date @resource.due_at}}</div>
+                <div class="field-value">{{n-a (format-date-fns @resource.due_at "dd MMM yyyy, HH:mm")}}</div>
             </div>
-
             <div class="field-info-container">
                 <div class="field-name">Closed At</div>
-                <div class="field-value">{{format-date @resource.closed_at}}</div>
+                <div class="field-value">{{n-a (format-date-fns @resource.closed_at "dd MMM yyyy, HH:mm")}}</div>
             </div>
+        </div>
+    </ContentPanel>
 
-            {{#if @resource.is_overdue}}
+    {{! ===== BUDGET ===== }}
+    <ContentPanel @title="Budget" @open={{true}} @wrapperClass="bordered-top">
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-2 text-xs dark:text-gray-100">
+            <div class="field-info-container">
+                <div class="field-name">Estimated Cost</div>
+                <div class="field-value">{{format-currency @resource.estimated_cost @resource.currency}}</div>
+            </div>
+            <div class="field-info-container">
+                <div class="field-name">Approved Budget</div>
+                <div class="field-value">{{format-currency @resource.approved_budget @resource.currency}}</div>
+            </div>
+            <div class="field-info-container">
+                <div class="field-name">Actual Cost</div>
+                <div class="field-value font-semibold">{{format-currency @resource.actual_cost @resource.currency}}</div>
+            </div>
+            {{#if @resource.cost_center}}
                 <div class="field-info-container">
-                    <div class="field-name">Overdue Status</div>
-                    <div class="field-value">
-                        <Badge @status="danger">Overdue</Badge>
-                    </div>
+                    <div class="field-name">Cost Centre</div>
+                    <div class="field-value">{{n-a @resource.cost_center}}</div>
                 </div>
-            {{else if @resource.days_until_due}}
+            {{/if}}
+            {{#if @resource.budget_code}}
                 <div class="field-info-container">
-                    <div class="field-name">Days Until Due</div>
-                    <div class="field-value">{{@resource.days_until_due}} days</div>
+                    <div class="field-name">Budget Code</div>
+                    <div class="field-value font-mono">{{n-a @resource.budget_code}}</div>
                 </div>
             {{/if}}
-
             <div class="field-info-container">
-                <div class="field-name">Estimated Duration</div>
-                <div class="field-value">{{n-a @resource.estimated_duration}}</div>
-            </div>
-
-            <div class="field-info-container col-span-3">
-                <div class="field-name">Instructions</div>
-                <div class="field-value">{{n-a @resource.instructions}}</div>
+                <div class="field-name">Currency</div>
+                <div class="field-value">{{n-a @resource.currency}}</div>
             </div>
         </div>
     </ContentPanel>
 
+    {{! ===== INSTRUCTIONS ===== }}
+    {{#if @resource.instructions}}
+        <ContentPanel @title="Instructions" @open={{false}} @wrapperClass="bordered-top">
+            <div class="text-xs text-gray-700 dark:text-gray-300 whitespace-pre-wrap">
+                {{@resource.instructions}}
+            </div>
+        </ContentPanel>
+    {{/if}}
+
+    {{! ===== COMPLETION & COST BREAKDOWN (only when closed) ===== }}
+    {{#if (eq @resource.status "closed")}}
+        <ContentPanel @title="Completion & Cost Breakdown" @open={{true}} @wrapperClass="bordered-top">
+            <div class="grid grid-cols-1 lg:grid-cols-2 gap-2 text-xs dark:text-gray-100">
+
+                <div class="col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-1">
+                    Asset Readings at Completion
+                </div>
+                <div class="field-info-container">
+                    <div class="field-name">Odometer</div>
+                    <div class="field-value">
+                        {{#if @resource.meta.completion_data.odometer}}
+                            {{@resource.meta.completion_data.odometer}}
+                            km
+                        {{else}}
+                            —
+                        {{/if}}
+                    </div>
+                </div>
+                <div class="field-info-container">
+                    <div class="field-name">Engine Hours</div>
+                    <div class="field-value">{{n-a @resource.meta.completion_data.engine_hours}}</div>
+                </div>
+
+                <div class="col-span-2 text-[11px] uppercase tracking-wide text-gray-500 font-semibold mt-3">
+                    Cost Breakdown
+                </div>
+                <div class="field-info-container">
+                    <div class="field-name">Labour Cost</div>
+                    <div class="field-value">{{format-currency @resource.meta.completion_data.labor_cost @resource.meta.completion_data.currency}}</div>
+                </div>
+                <div class="field-info-container">
+                    <div class="field-name">Parts Cost</div>
+                    <div class="field-value">{{format-currency @resource.meta.completion_data.parts_cost @resource.meta.completion_data.currency}}</div>
+                </div>
+                <div class="field-info-container">
+                    <div class="field-name">Tax</div>
+                    <div class="field-value">{{format-currency @resource.meta.completion_data.tax @resource.meta.completion_data.currency}}</div>
+                </div>
+                <div class="field-info-container col-span-2 border-t border-gray-200 dark:border-gray-700 pt-2 mt-1">
+                    <div class="field-name font-semibold">Total Cost</div>
+                    <div class="field-value font-semibold">{{format-currency @resource.meta.completion_data.total_cost @resource.meta.completion_data.currency}}</div>
+                </div>
+
+                {{#if @resource.meta.completion_data.notes}}
+                    <div class="field-info-container col-span-2 mt-2">
+                        <div class="field-name">Completion Notes</div>
+                        <div class="field-value whitespace-pre-wrap">{{@resource.meta.completion_data.notes}}</div>
+                    </div>
+                {{/if}}
+            </div>
+        </ContentPanel>
+    {{/if}}
+
+    {{! ===== CUSTOM FIELDS ===== }}
     <CustomField::Yield @subject={{@resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
-</div>
+
+    <Spacer @height="200px" />
+</div>