Hot-fix: Handle case attendance new day

hieutbui · Jan 2, 2025 · 7c002d4 · 7c002d4
1 parent 557216f
commit 7c002d4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/lib/data/datasource/employee_datasource.dart b/lib/data/datasource/employee_datasource.dart
@@ -54,7 +54,7 @@ abstract class EmployeeDataSource {
     required String clockOut,
     required String date,
   });
-  Future<Map<String, dynamic>> getEmployeeAttendance({
+  Future<Map<String, dynamic>?> getEmployeeAttendance({
     required String employeeId,
   });
   Future<Map<String, dynamic>> saveAttendanceToXlsx({

diff --git a/lib/data/datasource_impl/employee_datasource_impl.dart b/lib/data/datasource_impl/employee_datasource_impl.dart
@@ -259,7 +259,7 @@ class EmployeeDataSourceImpl extends EmployeeDataSource {
   }
 
   @override
-  Future<Map<String, dynamic>> getEmployeeAttendance({
+  Future<Map<String, dynamic>?> getEmployeeAttendance({
     required String employeeId,
   }) async {
     const table = EmployeeAttendanceTable();
@@ -272,7 +272,7 @@ class EmployeeDataSourceImpl extends EmployeeDataSource {
         .select()
         .eq(table.employeeId, employeeId)
         .eq(table.date, dateFormatter.format(now))
-        .single();
+        .maybeSingle();
   }
 
   @override

diff --git a/lib/data/repository/employee_repository_impl.dart b/lib/data/repository/employee_repository_impl.dart
@@ -122,7 +122,7 @@ class EmployeeRepositoryImpl implements EmployeeRepository {
   }
 
   @override
-  Future<Map<String, dynamic>> getEmployeeAttendance({
+  Future<Map<String, dynamic>?> getEmployeeAttendance({
     required String employeeId,
   }) {
     return _dataSource.getEmployeeAttendance(employeeId: employeeId);

diff --git a/lib/domain/repository/employee_repository.dart b/lib/domain/repository/employee_repository.dart
@@ -58,7 +58,7 @@ abstract class EmployeeRepository {
     required String date,
   });
 
-  Future<Map<String, dynamic>> getEmployeeAttendance({
+  Future<Map<String, dynamic>?> getEmployeeAttendance({
     required String employeeId,
   });
 

diff --git a/lib/domain/usecase/employee/get_employee_attendance_status_interactor.dart b/lib/domain/usecase/employee/get_employee_attendance_status_interactor.dart
@@ -21,7 +21,7 @@ class GetEmployeeAttendanceStatusInteractor with InteractorLoggy {
         employeeId: employeeId,
       );
 
-      if (result.isEmpty) {
+      if (result == null || result.isEmpty) {
         yield const Right(GetEmployeeAttendanceStatusEmpty());
       } else {
         final employeeAttendance = EmployeeAttendance.fromJson(result);

diff --git a/lib/pages/live_overview/live_overview_view.dart b/lib/pages/live_overview/live_overview_view.dart
@@ -515,6 +515,7 @@ Widget? _buildCheckInButton(
   return ValueListenableBuilder(
     valueListenable: controller.getEmployeeAttendanceStatusStateNotifier,
     builder: (context, statusState, child) {
+      print('statusState: $statusState');
       if (statusState is GetEmployeeAttendanceStatusInitial) {
         return TextButton.icon(
           onPressed: controller.onCheckInPressed,
@@ -579,7 +580,7 @@ Widget? _buildCheckInButton(
           builder: (context, state, child) {
             if (state is CheckInInitial) {
               return TextButton.icon(
-                onPressed: () {},
+                onPressed: controller.onCheckInPressed,
                 label: Text(
                   'Check in',
                   style: Theme.of(context).textTheme.headlineMedium!.copyWith(
@@ -626,7 +627,7 @@ Widget? _buildCheckInButton(
 
             if (state is CheckInFailure) {
               return TextButton.icon(
-                onPressed: () {},
+                onPressed: controller.onCheckInPressed,
                 label: Text(
                   'Check in: Failed',
                   style: Theme.of(context).textTheme.headlineMedium!.copyWith(