Merge pull request #399 from YujithIsura/main

vehicle fule consumption module WIP
avinyafoundation · Sep 10, 2024 · a965f9d · a965f9d
2 parents 267e484 + 4a9d9c6
commit a965f9d
Show file tree

Hide file tree

Showing 5 changed files with 1,170 additions and 307 deletions.
diff --git a/campus/frontend/lib/avinya/asset_admin/lib/screens/scaffold.dart b/campus/frontend/lib/avinya/asset_admin/lib/screens/scaffold.dart
@@ -47,10 +47,10 @@ class _SMSScaffoldState extends State<SMSScaffold> {
           tileName: "Consumable Monthly Report",
           route: "/consumable_monthly_report",
           icon: Icons.summarize_sharp),
-      // SideNavigationSectionTile(
-      //     tileName: "Vehicle Fuel Consumption Monthly Report",
-      //     route: "/vehicle_fuel_consumption_monthly_report",
-      //     icon: Icons.local_gas_station_outlined),
+      SideNavigationSectionTile(
+          tileName: "Vehicle Fuel Consumption Monthly Report",
+          route: "/vehicle_fuel_consumption_monthly_report",
+          icon: Icons.local_gas_station_outlined),
     ];
 
     return Scaffold(
@@ -385,47 +385,47 @@ class _SMSScaffoldState extends State<SMSScaffold> {
                           ),
                         ),
                       ),
-                      // MouseRegion(
-                      //   onEnter: (_) {
-                      //     setState(() {
-                      //       isVehicleFuelConsumptionSectionHovered = true;
-                      //     });
-                      //   },
-                      //   onExit: (_) {
-                      //     setState(() {
-                      //       isVehicleFuelConsumptionSectionHovered = false;
-                      //     });
-                      //   },
-                      //   child: Container(
-                      //     decoration: BoxDecoration(
-                      //       color: isVehicleFuelConsumptionSectionHovered
-                      //           ? Colors.white.withOpacity(0.3)
-                      //           : null,
-                      //       borderRadius: BorderRadius.circular(15.0),
-                      //     ),
-                      //     margin: EdgeInsets.all(8.0),
-                      //     child: ListTile(
-                      //       leading: Icon(Icons.local_gas_station_sharp,
-                      //           color: Colors.white, size: 20.0),
-                      //       title: Container(
-                      //         margin: EdgeInsets.only(left: 12.0),
-                      //         transform:
-                      //             Matrix4.translationValues(-25, 0.0, 0.0),
-                      //         child: Text(
-                      //           "Vehicle Fuel Consumption",
-                      //           style: TextStyle(
-                      //             color: Colors.white,
-                      //             fontSize: 12,
-                      //           ),
-                      //         ),
-                      //       ),
-                      //       onTap: () {
-                      //         Navigator.pop(context); // Close the drawer
-                      //         routeState.go('/vehicle_fuel_consumption');
-                      //       },
-                      //     ),
-                      //   ),
-                      // ),
+                      MouseRegion(
+                        onEnter: (_) {
+                          setState(() {
+                            isVehicleFuelConsumptionSectionHovered = true;
+                          });
+                        },
+                        onExit: (_) {
+                          setState(() {
+                            isVehicleFuelConsumptionSectionHovered = false;
+                          });
+                        },
+                        child: Container(
+                          decoration: BoxDecoration(
+                            color: isVehicleFuelConsumptionSectionHovered
+                                ? Colors.white.withOpacity(0.3)
+                                : null,
+                            borderRadius: BorderRadius.circular(15.0),
+                          ),
+                          margin: EdgeInsets.all(8.0),
+                          child: ListTile(
+                            leading: Icon(Icons.local_gas_station_sharp,
+                                color: Colors.white, size: 20.0),
+                            title: Container(
+                              margin: EdgeInsets.only(left: 12.0),
+                              transform:
+                                  Matrix4.translationValues(-25, 0.0, 0.0),
+                              child: Text(
+                                "Vehicle Fuel Consumption",
+                                style: TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 12,
+                                ),
+                              ),
+                            ),
+                            onTap: () {
+                              Navigator.pop(context); // Close the drawer
+                              routeState.go('/vehicle_fuel_consumption');
+                            },
+                          ),
+                        ),
+                      ),
                       SideNavigationSection(
                         initialSectionHoveredValue:
                             isConsumableReportSectionHovered,

diff --git a/campus/frontend/lib/avinya/asset_admin/lib/screens/vehicle_fuel_consumption.dart b/campus/frontend/lib/avinya/asset_admin/lib/screens/vehicle_fuel_consumption.dart
@@ -1,26 +1,32 @@
 import 'package:flutter/material.dart';
-import 'package:gallery/avinya/asset_admin/lib/widgets/vehicle_fuel_consumption.dart';
+import 'package:gallery/avinya/asset_admin/lib/widgets/vehicle_fuel_consumption_table.dart';
 
 class VehicleFuelConsumptionScreen extends StatefulWidget {
   const VehicleFuelConsumptionScreen({super.key});
 
   @override
-  State<VehicleFuelConsumptionScreen> createState() => _VehicleFuelConsumptionScreenState();
+  State<VehicleFuelConsumptionScreen> createState() =>
+      _VehicleFuelConsumptionScreenState();
 }
 
-class _VehicleFuelConsumptionScreenState extends State<VehicleFuelConsumptionScreen> {
-   @override
+class _VehicleFuelConsumptionScreenState
+    extends State<VehicleFuelConsumptionScreen> {
+  @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         automaticallyImplyLeading: false,
         title: Text("Vehicle Fuel Consumption"),
       ),
       body: SingleChildScrollView(
-        child: Container(
-          child: VehicleFuelConsumption(),
+        child: SingleChildScrollView(
+          child: Container(
+            child: VehicleFuelConsumptionTable(
+              title: 'Daily Vehicle FuelConsumption Data',
+            ),
+          ),
         ),
       ),
     );
   }
-}
+}