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

Merge remote-tracking branch 'origin/development_sikander' into development_sikander

Browse Source 
# Conflicts:
#	lib/ui/leave_balance/add_leave_balance_screen.dart
merge-requests/1/merge
Sikander Saleem 2 years ago
parent a14103b859 d5c8604f32
commit 2278a1e98f
3 changed files with 165 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
lib/models/leave_balance/get_absence_transaction_list_model.dart
Unescape Escape View File

@ -37,10 +37,12 @@ class GetAbsenceTransactionList {
this.uPDATEBUTTON});
GetAbsenceTransactionList.fromJson(Map<String, dynamic> json) {
print("json:$json");
print("type:ABSENCE_DAYS:${(json['ABSENCE_DAYS']).runtimeType}");
aBSENCEATTENDANCEID = json['ABSENCE_ATTENDANCE_ID'];
aBSENCEATTENDANCETYPEID = json['ABSENCE_ATTENDANCE_TYPE_ID'];
aBSENCECATEGORY = json['ABSENCE_CATEGORY'];
aBSENCEDAYS = json['ABSENCE_DAYS'];
aBSENCEDAYS = double.parse(json['ABSENCE_DAYS'].toString() ?? "0.0");
aBSENCEHOURS = json['ABSENCE_HOURS'];
aBSENCESTATUS = json['ABSENCE_STATUS'];
aBSENCETYPE = json['ABSENCE_TYPE'];

144
lib/ui/leave_balance/add_leave_balance_screen.dart
Unescape Escape View File

@ -1,11 +1,20 @@
import 'dart:io';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/leave_balance_api_client.dart';
import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/leave_balance/get_absence_attendance_types_list_model.dart';
import 'package:mohem_flutter_app/models/leave_balance/get_absence_dff_structure_list_model.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
import 'package:mohem_flutter_app/widgets/bottom_sheets/search_employee_bottom_sheet.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
class AddLeaveBalanceScreen extends StatefulWidget {
AddLeaveBalanceScreen({Key? key}) : super(key: key);
@ -20,6 +29,13 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
List<GetAbsenceDffStructureList> absenceDff = [];
List<GetAbsenceAttendanceTypesList> absenceList = [];
GetAbsenceAttendanceTypesList? selectedAbsenceType;
DateTime? startTime;
DateTime? endTime;
int totalDays = 0;
String comment = "";
ReplacementList? selectedReplacementEmployee;
@override
void initState() {
super.initState();
@ -64,6 +80,134 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
context,
title: LocaleKeys.leaveBalance.tr(),
),
body: Column(
children: [
ListView(
padding: const EdgeInsets.all(21),
children: [
PopupMenuButton(
child: DynamicTextFieldWidget(
LocaleKeys.absenceType.tr() + "*",
selectedAbsenceType == null ? LocaleKeys.selectTypeT.tr() : selectedAbsenceType!.aBSENCEATTENDANCETYPENAME!,
isEnable: false,
isPopup: true,
),
itemBuilder: (_) => <PopupMenuItem<int>>[
for (int i = 0; i < absenceList.length; i++) PopupMenuItem<int>(value: i, child: Text(absenceList[i].aBSENCEATTENDANCETYPENAME!)),
],
onSelected: (int popupIndex) {
if (selectedAbsenceType == absenceList[popupIndex]) {
return;
}
selectedAbsenceType = absenceList[popupIndex];
setState(() {});
},
),
12.height,
DynamicTextFieldWidget(
LocaleKeys.startDateT.tr() + "*",
startTime == null ? "Select date" : startTime.toString(),
suffixIconData: Icons.calendar_today,
isEnable: false,
onTap: () async {
var start = await _selectDate(context, startTime);
if (start != startTime) {
startTime = start;
setState(() {});
}
},
),
12.height,
DynamicTextFieldWidget(
LocaleKeys.endDateT.tr() + "*",
endTime == null ? "Select date" : endTime.toString(),
suffixIconData: Icons.calendar_today,
isEnable: false,
onTap: () async {
var end = await _selectDate(context, endTime);
if (end != endTime) {
endTime = end;
setState(() {});
}
},
),
12.height,
DynamicTextFieldWidget(
"totla dsays",
"days",
isInputTypeNum: true,
onChange: (input) {
totalDays = int.parse(input);
},
),
12.height,
DynamicTextFieldWidget(
LocaleKeys.selectEmployee.tr(),
selectedReplacementEmployee == null ? LocaleKeys.searchForEmployee.tr() : selectedReplacementEmployee!.employeeDisplayName ?? "",
isEnable: false,
onTap: () {
showMyBottomSheet(
context,
child: SearchEmployeeBottomSheet(
title: LocaleKeys.searchForEmployee.tr(),
apiMode: LocaleKeys.delegate.tr(),
onSelectEmployee: (_selectedEmployee) {
// Navigator.pop(context);
selectedReplacementEmployee = _selectedEmployee;
setState(() {});
},
),
);
},
),
12.height,
DynamicTextFieldWidget(
LocaleKeys.comments.tr(),
LocaleKeys.writeComment.tr(),
lines: 2,
onChange: (input) {
comment = input;
},
),
],
).expanded,
DefaultButton(
LocaleKeys.next.tr(),
(selectedAbsenceType == null || startTime == null || endTime == null) ? null : () {},
).insideContainer
],
),
);
}
Future<DateTime> _selectDate(BuildContext context, DateTime? dateInput) async {
DateTime time = dateInput ?? DateTime.now();
if (Platform.isIOS) {
await showCupertinoModalPopup(
context: context,
builder: (cxt) => Container(
height: 250,
color: Colors.white,
child: CupertinoDatePicker(
backgroundColor: Colors.white,
mode: CupertinoDatePickerMode.date,
onDateTimeChanged: (value) {
if (value != dateInput) {
time = value;
}
},
initialDateTime: dateInput,
),
),
);
} else {
DateTime? picked =
await showDatePicker(context: context, initialDate: dateInput ?? DateTime.now(), initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101));
if (picked != null && picked != dateInput) {
time = picked;
}
}
time = DateTime(time.year, time.month, time.day);
return time;
}
}

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

@ -35,15 +35,15 @@ class _LeaveBalanceState extends State<LeaveBalance> {
}
void getAbsenceTransactions() async {
try {
Utils.showLoading(context);
absenceTransList = await LeaveBalanceApiClient().getAbsenceTransactions(-999);
Utils.hideLoading(context);
setState(() {});
} catch (ex) {
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
// try {
Utils.showLoading(context);
absenceTransList = await LeaveBalanceApiClient().getAbsenceTransactions(-999);
Utils.hideLoading(context);
setState(() {});
// } catch (ex) {
// Utils.hideLoading(context);
// Utils.handleException(ex, context, null);
// }
}
@override
@ -61,18 +61,18 @@ class _LeaveBalanceState extends State<LeaveBalance> {
: ListView.separated(
physics: const BouncingScrollPhysics(),
padding: const EdgeInsets.all(21),
itemBuilder: (cxt, int parentIndex) => Column(
itemBuilder: (cxt, int index) => Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
ItemDetailView(LocaleKeys.startDateT.tr(), ""),
ItemDetailView(LocaleKeys.endDateT.tr(), ""),
ItemDetailView(LocaleKeys.absenceType.tr(), ""),
ItemDetailView(LocaleKeys.absenceCategory.tr(), ""),
ItemDetailView(LocaleKeys.days.tr(), ""),
ItemDetailView(LocaleKeys.hours.tr(), ""),
ItemDetailView(LocaleKeys.approvalStatus.tr(), ""),
ItemDetailView(LocaleKeys.absenceStatus.tr(), ""),
ItemDetailView(LocaleKeys.startDateT.tr(), absenceTransList![index].sTARTDATE ?? ""),
ItemDetailView(LocaleKeys.endDateT.tr(), absenceTransList![index].eNDDATE ?? ""),
ItemDetailView(LocaleKeys.absenceType.tr(), absenceTransList![index].aBSENCETYPE ?? ""),
ItemDetailView(LocaleKeys.absenceCategory.tr(), absenceTransList![index].aBSENCECATEGORY ?? ""),
ItemDetailView(LocaleKeys.days.tr(), absenceTransList![index].aBSENCEDAYS?.toString() ?? ""),
ItemDetailView(LocaleKeys.hours.tr(), absenceTransList![index].aBSENCEHOURS?.toString() ?? ""),
ItemDetailView(LocaleKeys.approvalStatus.tr(), absenceTransList![index].aPPROVALSTATUS ?? ""),
ItemDetailView(LocaleKeys.absenceStatus.tr(), absenceTransList![index].aBSENCESTATUS ?? ""),
],
).objectContainerView(),
separatorBuilder: (cxt, index) => 12.height,

Write Preview
Loading…
Cancel
Save