Merge pull request #319 from lahirulakruwan/main

Daily duty attendance report changes added
avinyafoundation · Nov 20, 2023 · 0e6ed67 · 0e6ed67
2 parents b512379 + de4e0d6
commit 0e6ed67
Show file tree

Hide file tree

Showing 9 changed files with 818 additions and 272 deletions.
diff --git a/campus/frontend/assets/config/dev.json b/campus/frontend/assets/config/dev.json
@@ -1,6 +1,6 @@
 {
-    "campusProfileBffApiUrl" : "http://10.110.0.173:9090",
-    "campusAttendanceBffApiUrl" : "http://10.110.0.173:9091",
+    "campusProfileBffApiUrl" : "http://192.168.1.101:9090",
+    "campusAttendanceBffApiUrl" : "http://192.168.1.101:9091",
     "campusPctiNotesBffApiUrl" : "http://localhost:9092",
     "campusPctiFeedbackBffApiUrl" : "http://localhost:9093",
     "campusAssetsBffApiUrl" : "http://localhost:9094",

diff --git a/campus/frontend/lib/avinya/attendance/lib/app.dart b/campus/frontend/lib/avinya/attendance/lib/app.dart
@@ -54,7 +54,8 @@ class _CampusAttendanceManagementSystemState
         '/duty_participants',
         '/duty_attendance_marker',
         '/late_attendance_report',
-        '/qr_attendance_marker'
+        '/qr_attendance_marker',
+        '/daily_duty_attendance_report'
       ],
       guard: _guard,
       initialRoute: '/attendance_marker',
@@ -134,6 +135,9 @@ class _CampusAttendanceManagementSystemState
 
     final qrAttendanceMarkerRoute =
         ParsedRoute('/qr_attendance_marker', '/qr_attendance_marker', {}, {});
+
+    final dailyDutyAttendanceReportRoute =
+        ParsedRoute('/daily_duty_attendance_report', '/daily_duty_attendance_report', {}, {});
 
     // // Go to /apply if the user is not signed in
     log("_guard signed in $signedIn");
@@ -163,6 +167,8 @@ class _CampusAttendanceManagementSystemState
       return lateAttendanceReportRoute;
     } else if (signedIn && from == qrAttendanceMarkerRoute) {
       return qrAttendanceMarkerRoute;
+    } else if (signedIn && from == dailyDutyAttendanceReportRoute) {
+      return dailyDutyAttendanceReportRoute;
     }
     // Go to /application if the user is signed in and tries to go to /signin.
     else if (signedIn && from == signInRoute) {

diff --git a/campus/frontend/lib/avinya/attendance/lib/data/activity_attendance.dart b/campus/frontend/lib/avinya/attendance/lib/data/activity_attendance.dart
@@ -104,7 +104,7 @@ Future<int> deleteActivityAttendance(int id) async {
   if (response.statusCode > 199 && response.statusCode < 300) {
     return int.parse(response.body);
   } else {
-    throw Exception('Failed to create Activity Participant Attendance.');
+    throw Exception('Failed to delete Activity Participant Attendance.');
   }
 }
 

diff --git a/campus/frontend/lib/avinya/attendance/lib/screens/daily_duty_attendance_report.dart b/campus/frontend/lib/avinya/attendance/lib/screens/daily_duty_attendance_report.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:gallery/avinya/attendance/lib/widgets/daily_duty_attendance_report.dart';
+
+class DailyDutyAttendanceReportScreen extends StatefulWidget {
+  const DailyDutyAttendanceReportScreen({super.key});
+
+  @override
+  State<DailyDutyAttendanceReportScreen> createState() => _DailyDutyAttendanceReportScreenState();
+}
+
+class _DailyDutyAttendanceReportScreenState extends State<DailyDutyAttendanceReportScreen> {
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        title: Text("Daily Duty Attendance Report"),
+      ),
+      body: SingleChildScrollView(
+        child: Container(
+            child: DailyDutyAttendanceReport(),
+        ),
+      ),
+    );
+  }
+}
diff --git a/campus/frontend/lib/avinya/attendance/lib/screens/scaffold.dart b/campus/frontend/lib/avinya/attendance/lib/screens/scaffold.dart
@@ -16,6 +16,7 @@ class SMSScaffold extends StatelessWidget {
     '/late_attendance_report',
     '/weekly_payment_report',
     '/duty_participants',
+    '/daily_duty_attendance_report',
   ];
 
   static const studentPageNames = [
@@ -67,6 +68,10 @@ class SMSScaffold extends StatelessWidget {
           title: 'Assign duties',
           icon: Icons.work,
         ),
+        AdaptiveScaffoldDestination(
+          title: 'Daily Duty Attendance Report',
+          icon: Icons.work_history,
+        ),
       ];
     }else if(campusAppsPortalInstance.isStudent 
       && campusAppsPortalInstance.getLeaderParticipant().role == 'leader'){
@@ -101,7 +106,7 @@ class SMSScaffold extends StatelessWidget {
 
     return Scaffold(
       body: AdaptiveNavigationScaffold(
-        bottomNavigationOverflow: 7,
+        bottomNavigationOverflow: 10,
         selectedIndex: selectedIndex,
         appBar: AppBar(
           title: const Text('Avinya Academy - Campus Attendance Portal'),

diff --git a/campus/frontend/lib/avinya/attendance/lib/screens/scaffold_body.dart b/campus/frontend/lib/avinya/attendance/lib/screens/scaffold_body.dart
@@ -3,6 +3,7 @@ import 'package:attendance/screens/avinya_types.dart';
 import 'package:attendance/screens/attendance_marker.dart';
 import 'package:attendance/screens/bulk_attendance_marker.dart';
 import 'package:attendance/screens/daily_attendance_report.dart';
+import 'package:attendance/screens/daily_duty_attendance_report.dart';
 
 import 'package:flutter/material.dart';
 import 'package:attendance/screens/weekly_payment_report.dart';
@@ -89,6 +90,11 @@ class SMSScaffoldBody extends StatelessWidget {
             key: ValueKey('duty_participants_attendance_marker'),
             child: DutyAttendanceMarkerScreen(),                                
           )
+        else if (currentRoute.pathTemplate.startsWith('/daily_duty_attendance_report'))
+          const FadeTransitionPage<void>(
+            key: ValueKey('daily_duty_attendance_report'),
+            child: DailyDutyAttendanceReportScreen(),                                
+          )
         // Avoid building a Navigator with an empty `pages` list when the
         // RouteState is set to an unexpected path, such as /signin.
         //