diff --git a/lib/main.dart b/lib/main.dart index 05e4028..e932cb1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,8 +5,6 @@ import 'package:get_time_ago/get_time_ago.dart'; import 'utilities/app_session_manager.dart'; import 'utilities/custom_timeago_messages.dart'; -import 'utilities/fcm_notifications.dart'; -import 'utilities/notification_util.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/view/screens/profile/view_profile_screen.dart b/lib/view/screens/profile/view_profile_screen.dart index 5113b49..f263df5 100644 --- a/lib/view/screens/profile/view_profile_screen.dart +++ b/lib/view/screens/profile/view_profile_screen.dart @@ -209,44 +209,44 @@ class _ViewProfileScreenState extends State { // SingleItem( // heading: "Next of kin", // value: detail.kin ?? ""), - SingleItem( - heading: "Total Holidays Left", - value: - "${detail.staffWorkLoads?.firstOrNull?.holidayAlwnNoOfDys ?? "0"} Days (${detail.staffWorkLoads?.firstOrNull?.holidayAlwnNoOfHours ?? "0"} hours)", - onTap: () { - if (detail.staffWorkLoads?.firstOrNull != - null) {} - _onTotalHolidaysBoxTap( - detail.staffWorkLoads!.first); - }, - ), - SingleItem( - heading: "", - value: "Training", - onTap: () { - Get.toNamed( - CustomRouteNames.kTrainingsScreen); - }), + // SingleItem( + // heading: "Total Holidays Left", + // value: + // "${detail.staffWorkLoads?.firstOrNull?.holidayAlwnNoOfDys ?? "0"} Days (${detail.staffWorkLoads?.firstOrNull?.holidayAlwnNoOfHours ?? "0"} hours)", + // onTap: () { + // if (detail.staffWorkLoads?.firstOrNull != + // null) {} + // _onTotalHolidaysBoxTap( + // detail.staffWorkLoads!.first); + // }, + // ), // SingleItem( // heading: "", - // value: "COVID Checks", - // onTap: () {}), - 12.verticalSpace, - Obx(() { - return Align( - alignment: Alignment.centerLeft, - child: IgnorePointer( - ignoring: true, - child: CustomCheckBox( - checkBoxValue: controller.covidCheck(), - titleText: "COVID Check", - onTap: () { - // controller.covidCheck.toggle(); - }, - ), - ), - ); - }), + // value: "Training", + // onTap: () { + // Get.toNamed( + // CustomRouteNames.kTrainingsScreen); + // }), + // // SingleItem( + // // heading: "", + // // value: "COVID Checks", + // // onTap: () {}), + // 12.verticalSpace, + // Obx(() { + // return Align( + // alignment: Alignment.centerLeft, + // child: IgnorePointer( + // ignoring: true, + // child: CustomCheckBox( + // checkBoxValue: controller.covidCheck(), + // titleText: "COVID Check", + // onTap: () { + // // controller.covidCheck.toggle(); + // }, + // ), + // ), + // ); + // }), ], ), ), diff --git a/lib/web_services/http_request_client.dart b/lib/web_services/http_request_client.dart index a5450d0..9377d04 100644 --- a/lib/web_services/http_request_client.dart +++ b/lib/web_services/http_request_client.dart @@ -661,6 +661,7 @@ class HttpRequestClient { final statusFail = (map['status'] is String && (map['status'] as String).toLowerCase() == "fail"); final status400 = (map['status'] is int && map['status'] == 400); + if (map.containsKey('status') && (statusFail || status400)) { return ResponseModel.named( statusCode: 0,