Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-28 19:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,343 Commits 97 Branches 0 Tags
6115d7d7829bcfc08e94de96d50e1fd8e0e7ebac
Commit Graph

1249 Commits

Author SHA1 Message Date
yaschalew
3c4e5b283a Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 17:00:02 +03:00
natib21
69d1d3073f style: standardize dashboard padding 
All fleet pages now use consistent layout:
- Container size: xl
- Vertical padding: xl

Pages updated:
- FleetDashboard: size="xl" py="xl" (unchanged)
- FuelPurchasePage: lg → xl
- FuelStatsPage: lg → xl
- MaintenancePage: Added Container wrapper (xl, xl)
- FinancialReportsPage: Added Container wrapper (xl, xl)

Uniform spacing across all fleet management dashboards.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 13:59:20 +00:00
hagiye
98d1065f11 Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover 2026-06-30 16:53:54 +03:00
yaschalew
ca827c54a0 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 16:53:37 +03:00
natib21
5af7f0606b style: apply consistent branding across fleet pages 
Import freightBrand theme from @/theme/freight-brand

Color updates:
- Primary buttons: color="edr-green"
- Stat cards: top border #1B9E7A (freightBrand.primary)
- Status badges:
  * Active/Completed: edr-green
  * In Progress: edr-amber-soft
  * Maintenance: edr-amber-soft
  * Overdue: edr-red
  * Unassigned: edr-slate
- Ring progress:
  * Fuel: edr-accent (#F2A516)
  * Maintenance: edr-red
- Progress bars: edr-green, edr-red, edr-amber-soft
- Icons: Use edr-green, edr-blue, edr-accent, edr-red per metric

Pages updated:
- FleetDashboard: All metrics, progress bars, badges
- FuelPurchasePage: Record button
- MaintenancePage: Schedule button, badges
- FinancialReportsPage: Ring progress colors

Consistent palette across all fleet pages.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 13:52:27 +00:00
hagiye
156747f42f Approve delivery button for customer to sign or acknowlegde delivery 2026-06-30 16:48:08 +03:00
yaschalew
13a175a1ef Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 16:47:36 +03:00
natib21
6a4a3d464a improve: fleet dashboard UI + add drivers 
UI Improvements:
- Better card design with gradient icons
- Added title + description section
- Improved stat card layout (gradient backgrounds)
- Added change percentage badges
- Better color scheme (blue, cyan, orange, red)
- Striped + highlight on hover for tables
- Tab interface for vehicles/drivers

Driver Management:
- Fetch drivers from /drivers API
- Display driver list in table
- Show driver name, license, contact info
- Display assigned/unassigned status
- Count total drivers + assigned drivers in metrics

Metrics now show:
1. Total Vehicles
2. Total Drivers (NEW)
3. Fuel Spend
4. Maintenance Spend
5. Status breakdowns
6. Cost breakdown pie chart

Tabs show:
- Vehicles with registration, plate, model, status
- Drivers with name, license, contact, assignment

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 13:46:58 +00:00
yaschalew
e2bc5aab83 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 16:39:17 +03:00
natib21
814db8a17d feat: fleet dashboard page 
Shows fleet overview + key metrics:
- Total vehicles, active count
- Total fuel spending
- Total maintenance spending
- Average fuel efficiency
- Fleet status (active/idle/maintenance)
- Operating cost breakdown (fuel vs maintenance pie chart)
- Fleet vehicle list (first 10)

Route: /dashboard/fleet-dashboard
Sidebar: Added to Fleet Management section

Metrics aggregate from:
- /vehicles (fleet size)
- /fuel/stats (fuel spending + efficiency)
- /maintenance/stats (maintenance spending)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 13:38:35 +00:00
yaschalew
cb0deb0268 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 16:11:16 +03:00
natib21
8e0cc7d5ee fix: vehicles data extraction in maintenance + financial pages 
Both MaintenancePage and FinancialReportsPage were calling
vehiclesService.getAll() but not extracting res.data property.
Result was vehicles being undefined, causing .map error.

Fixed to match FuelPurchasePage pattern:
  const res = await vehiclesService.getAll()
  return res.data || []

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 13:10:47 +00:00
yaschalew
c455264da4 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 16:07:27 +03:00
natib21
373c0356f2 feat: maintenance + financial reports frontend 
MaintenancePage:
- Schedule maintenance (PREVENTIVE/CORRECTIVE/INSPECTION/REPAIR)
- View upcoming by vehicle
- Modal form with date, cost, provider, notes

FinancialReportsPage:
- Aggregate fuel + maintenance costs
- Period selector (3/6/12 months)
- Cost breakdown (percentages, ring progress)
- Operating insights (purchases, efficiency, items, avg cost)
- Cost per month calculation

Routes:
- /dashboard/maintenance
- /dashboard/financial-reports

Sidebar:
- "Maintenance" in Fleet Management
- "Financial Reports" in Fleet Management

QUERY_KEYS:
- FUEL, MAINTENANCE, FINANCIAL_REPORTS cache patterns

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 12:41:23 +00:00
Nathnael
3eb4a24199 fix: terminal clearing int vite 2026-06-30 11:29:28 +00:00
ghost2023
48340f5e0a fix: the hardcoded api url 2026-06-30 14:05:28 +03:00
ghost2023
9619fbd9b0 fix: the hardcoded api url 2026-06-30 13:58:57 +03:00
ghost2023
fdb77a7036 fix: testing the env 2026-06-30 13:49:52 +03:00
yaschalew
7c48f02a15 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 13:16:20 +03:00
natib21
f27f00d480 fix: use vehiclesService and add VEHICLES QUERY_KEYS 
- Add VEHICLES to QUERY_KEYS constant
- Use vehiclesService.getAll() instead of direct API call
- Remove duplicate Vehicle type definitions
- Fix TypeScript type references

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 10:15:43 +00:00
yaschalew
dc3f6797c9 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 13:12:02 +03:00
natib21
3f81bb77ad feat: add fuel management frontend pages 
- FuelPurchasePage: Record fuel purchases, calculate total costs
- FuelStatsPage: View fuel consumption stats, efficiency metrics
- Routes: /dashboard/fuel-purchases and /dashboard/fuel-stats
- Sidebar menu items in Fleet Management section

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 10:11:13 +00:00
ghost2023
0f762172bf fix: api url backoffice 2026-06-30 09:19:32 +03:00
ghost2023
004c40059f fix: api url 2026-06-30 09:13:48 +03:00
hagiye
831ac59a8e Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover 2026-06-30 07:20:10 +03:00
hagiye
9f5c22c1ee Goods recieved notes and Booking delivery 2026-06-30 07:19:12 +03:00
yaschalew
fc82c5c636 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 07:05:53 +03:00
natib21
360e61ac15 fix: use byId() instead of detail() in QUERY_KEYS 
QUERY_KEYS.FIRST_MILE and QUERY_KEYS.LAST_MILE have byId() not detail().

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 04:04:56 +00:00
natib21
0bc9534172 fix: replace apiClient with api in FirstMilePage 
Use correct import 'api' from '@/auth/http' instead of undefined 'apiClient'.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 04:03:29 +00:00
yaschalew
a3741c45bf fix 2026-06-30 07:01:32 +03:00
natib21
b142552f17 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 03:46:26 +00:00
natib21
b1d9045d0b fix: remove isPostPaymentCompleted filter check 
Property removed from entities until migration creates column.
Temporarily skip this filter until feature is fully implemented.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
 2026-06-30 03:15:58 +00:00
marshal
d05f634948 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-30 05:22:10 +03:00
Marshal
a072f04450 Enhance contract and booking request handling 2026-06-30 02:20:32 +00:00
marshal
abce3da6ce merge conflict 2026-06-30 05:17:56 +03:00
yaschalew
1193e2bfa9 fix commit 2026-06-29 18:35:51 +03:00
yaschalew
690753154f fix 2026-06-29 18:29:24 +03:00
natib21
9b11eeb623 fix 2026-06-29 14:54:34 +00:00
natib21
6fa315db0f fix 2026-06-29 14:45:22 +00:00
Nathnael
feae27d0c3 feat: improve the invoices in the portal 2026-06-29 14:26:25 +00:00
Nathnael Wondisha
4cf8e89780 Merge branch 'dev' into freight/feat/invoice 2026-06-29 17:24:29 +03:00
Nathnael
e9f9450b0f fix: types 2026-06-29 14:10:10 +00:00
Nathnael
6d40d185d6 feat: setup the invoice page in the portal 2026-06-29 13:54:14 +00:00
marshal
69df391f90 Update payment service and API base URL for local development 2026-06-29 16:03:53 +03:00
marshal
d22fb6bb22 Merge pull request #338 from Tria-plc/freight_feature/contrat 
payemnt
 2026-06-29 15:10:57 +03:00
marshal
a83a686f37 payemnt 2026-06-29 15:09:19 +03:00
marshal
1795bb8830 Merge pull request #335 from Tria-plc/freight_feature/contrat 
Freight feature/contrat
 2026-06-29 15:07:25 +03:00
marshal
211301b7ce Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 15:06:23 +03:00
marshal
1491db304b payemnt 2026-06-29 15:04:01 +03:00
yaschalew10
db7f0cb601 Merge pull request #334 from Tria-plc/freight/feature/last_mile_invoice 
Freight/feature/last mile invoice
 2026-06-29 15:03:00 +03:00