Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Issue fixes & updates

Browse Source
master-Api2.0
haroon amjad 11 months ago
parent b20e0a8c7b
commit cdd56b2a5a
6 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File

2
android/build.gradle
Unescape Escape View File

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1.7.20' ext.kotlin_version = '1.8.20'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()

91
lib/ui/leave_balance/leave_balance_screen.dart
Unescape Escape View File

@ -64,47 +64,56 @@ class _LeaveBalanceState extends State<LeaveBalance> {
context, context,
title: LocaleKeys.leaveBalance.tr(), title: LocaleKeys.leaveBalance.tr(),
), ),
body: absenceTransList == null body: Column(
? const SizedBox() children: [
: (absenceTransList!.isEmpty Padding(
? Utils.getNoDataWidget(context).paddingOnly(top: 50) padding: const EdgeInsets.all(21.0),
: ListView( child: BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true, selectedEmp: employeeId, showLoading: false),
physics: const BouncingScrollPhysics(), ),
padding: const EdgeInsets.all(21), 12.height,
children: [ absenceTransList == null
BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true, selectedEmp: employeeId, showLoading: false), ? const SizedBox()
12.height, : (absenceTransList!.isEmpty
ListView.separated( ? Utils.getNoDataWidget(context).paddingOnly(top: 50)
physics: const NeverScrollableScrollPhysics(), : ListView(
shrinkWrap: true, physics: const BouncingScrollPhysics(),
padding: EdgeInsets.zero, padding: const EdgeInsets.all(21),
itemBuilder: (cxt, int index) => Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, // BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true, selectedEmp: employeeId, showLoading: false),
mainAxisSize: MainAxisSize.min, // 12.height,
children: [ ListView.separated(
ItemDetailGrid( physics: const NeverScrollableScrollPhysics(),
ItemDetailViewCol(LocaleKeys.startDateT.tr(), absenceTransList![index].sTARTDATE ?? ""), shrinkWrap: true,
ItemDetailViewCol(LocaleKeys.endDateT.tr(), absenceTransList![index].eNDDATE ?? ""), padding: EdgeInsets.zero,
), itemBuilder: (cxt, int index) => Column(
ItemDetailGrid( crossAxisAlignment: CrossAxisAlignment.start,
ItemDetailViewCol(LocaleKeys.absenceType.tr(), absenceTransList![index].aBSENCETYPE ?? ""), mainAxisSize: MainAxisSize.min,
ItemDetailViewCol(LocaleKeys.absenceCategory.tr(), absenceTransList![index].aBSENCECATEGORY ?? ""), children: [
), ItemDetailGrid(
ItemDetailGrid( ItemDetailViewCol(LocaleKeys.startDateT.tr(), absenceTransList![index].sTARTDATE ?? ""),
ItemDetailViewCol(LocaleKeys.days.tr(), absenceTransList![index].aBSENCEDAYS?.toString() ?? ""), ItemDetailViewCol(LocaleKeys.endDateT.tr(), absenceTransList![index].eNDDATE ?? ""),
ItemDetailViewCol(LocaleKeys.hours.tr(), absenceTransList![index].aBSENCEHOURS?.toString() ?? ""), ),
), ItemDetailGrid(
ItemDetailGrid( ItemDetailViewCol(LocaleKeys.absenceType.tr(), absenceTransList![index].aBSENCETYPE ?? ""),
ItemDetailViewCol(LocaleKeys.approvalStatus.tr(), absenceTransList![index].aPPROVALSTATUS ?? ""), ItemDetailViewCol(LocaleKeys.absenceCategory.tr(), absenceTransList![index].aBSENCECATEGORY ?? ""),
ItemDetailViewCol(LocaleKeys.absenceStatus.tr(), absenceTransList![index].aBSENCESTATUS ?? ""), ),
isItLast: true, ItemDetailGrid(
), ItemDetailViewCol(LocaleKeys.days.tr(), absenceTransList![index].aBSENCEDAYS?.toString() ?? ""),
], ItemDetailViewCol(LocaleKeys.hours.tr(), absenceTransList![index].aBSENCEHOURS?.toString() ?? ""),
).objectContainerView(), ),
separatorBuilder: (cxt, index) => 12.height, ItemDetailGrid(
itemCount: absenceTransList!.length), ItemDetailViewCol(LocaleKeys.approvalStatus.tr(), absenceTransList![index].aPPROVALSTATUS ?? ""),
], ItemDetailViewCol(LocaleKeys.absenceStatus.tr(), absenceTransList![index].aBSENCESTATUS ?? ""),
)), isItLast: true,
),
],
).objectContainerView(),
separatorBuilder: (cxt, index) => 12.height,
itemCount: absenceTransList!.length),
],
)),
],
),
floatingActionButton: Container( floatingActionButton: Container(
height: 54, height: 54,
width: 54, width: 54,

37
lib/ui/login/login_screen.dart
Unescape Escape View File

@ -30,6 +30,7 @@ import 'package:mohem_flutter_app/models/member_login_list_model.dart';
import 'package:mohem_flutter_app/models/privilege_list_model.dart'; import 'package:mohem_flutter_app/models/privilege_list_model.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:mohem_flutter_app/widgets/input_widget.dart'; import 'package:mohem_flutter_app/widgets/input_widget.dart';
import 'package:safe_device/safe_device.dart';
// import 'package:safe_device/safe_device.dart'; // import 'package:safe_device/safe_device.dart';
import 'package:wifi_iot/wifi_iot.dart'; import 'package:wifi_iot/wifi_iot.dart';
@ -70,26 +71,26 @@ class _LoginScreenState extends State<LoginScreen> {
super.initState(); super.initState();
// hmsApiAvailability = HmsApiAvailability(); // hmsApiAvailability = HmsApiAvailability();
// checkFirebaseToken(); // checkFirebaseToken();
// if (kReleaseMode) { if (kReleaseMode) {
// checkDeviceSafety(); checkDeviceSafety();
// } }
} }
// void checkDeviceSafety() async { void checkDeviceSafety() async {
// try { try {
// isJailBroken = await SafeDevice.isJailBroken; isJailBroken = await SafeDevice.isJailBroken;
// isRealDevice = await SafeDevice.isRealDevice; isRealDevice = await SafeDevice.isRealDevice;
// if (Platform.isAndroid) { if (Platform.isAndroid) {
// isOnExternalStorage = await SafeDevice.isOnExternalStorage; isOnExternalStorage = await SafeDevice.isOnExternalStorage;
// isDevelopmentModeEnable = await SafeDevice.isDevelopmentModeEnable; isDevelopmentModeEnable = await SafeDevice.isDevelopmentModeEnable;
// } }
// if (isJailBroken || !isRealDevice || isOnExternalStorage || isDevelopmentModeEnable) { if (isJailBroken || !isRealDevice || isOnExternalStorage || isDevelopmentModeEnable) {
// Navigator.pushNamedAndRemoveUntil(context, AppRoutes.unsafeDeviceScreen, (_) => false); Navigator.pushNamedAndRemoveUntil(context, AppRoutes.unsafeDeviceScreen, (_) => false);
// } }
// } catch (error) { } catch (error) {
// print(error); print(error);
// } }
// } }
@override @override
void dispose() { void dispose() {

2
lib/ui/work_list/itg_detail_screen.dart
Unescape Escape View File

@ -84,6 +84,7 @@ class _ItgDetailScreenState extends State<ItgDetailScreen> {
controller.jumpToPage(0); controller.jumpToPage(0);
}); });
} catch (ex) { } catch (ex) {
setState(() {});
Utils.hideLoading(context); Utils.hideLoading(context);
Utils.handleException(ex, context, null); Utils.handleException(ex, context, null);
} }
@ -534,6 +535,7 @@ class _ItgDetailScreenState extends State<ItgDetailScreen> {
Utils.handleException(ex, context, null); Utils.handleException(ex, context, null);
} }
} }
void performAnswerAction(String requestType, taskId, itemId, String employeeNumber, String comments) async { void performAnswerAction(String requestType, taskId, itemId, String employeeNumber, String comments) async {
try { try {
Utils.showLoading(context); Utils.showLoading(context);

2
lib/ui/work_list/worklist_fragments/actions_fragment.dart
Unescape Escape View File

@ -167,7 +167,7 @@ class ActionsFragment extends StatelessWidget {
Duration duration = DateTime.now().difference(dateTimeFrom); Duration duration = DateTime.now().difference(dateTimeFrom);
return "Action duration: " + DateUtil.formatDuration(duration); return "Action duration: " + DateUtil.formatDuration(duration);
} else { } else {
if (actionHistoryList[index].nOTIFICATIONDATE!.isEmpty) { if (actionHistoryList[index].nOTIFICATIONDATE!.isEmpty || actionHistoryList[index].aCTIONCODE! == "NO ACTION") {
return ""; return "";
} else { } else {
DateTime dateTimeTo = DateUtil.convertSimpleStringDateToDate(actionHistoryList[index].nOTIFICATIONDATE!); DateTime dateTimeTo = DateUtil.convertSimpleStringDateToDate(actionHistoryList[index].nOTIFICATIONDATE!);

1
pubspec.yaml
Unescape Escape View File

@ -82,6 +82,7 @@ dependencies:
# Marathon Card Swipe # Marathon Card Swipe
appinio_swiper: ^1.1.1 appinio_swiper: ^1.1.1
expandable: ^5.0.1 expandable: ^5.0.1
safe_device: ^1.1.9
# networkImage # networkImage
cached_network_image: ^3.2.2 cached_network_image: ^3.2.2

Write Preview
Loading…
Cancel
Save