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

mowadhafhi improvement.

Browse Source
merge-requests/1/merge
Sikander Saleem 3 years ago
parent 9b50c2cf31
commit fc6b923fc4
3 changed files with 169 additions and 271 deletions
Show Stats Download Patch File Download Diff File

6
lib/config/routes.dart
Unescape Escape View File

@ -18,13 +18,15 @@ import 'package:mohem_flutter_app/ui/payslip/monthly_pay_slip_screen.dart';
import 'package:mohem_flutter_app/ui/profile/add_update_family_member.dart'; import 'package:mohem_flutter_app/ui/profile/add_update_family_member.dart';
import 'package:mohem_flutter_app/ui/profile/basic_details.dart'; import 'package:mohem_flutter_app/ui/profile/basic_details.dart';
import 'package:mohem_flutter_app/ui/profile/contact_details.dart'; import 'package:mohem_flutter_app/ui/profile/contact_details.dart';
import 'package:mohem_flutter_app/ui/profile/delete_family_member.dart';
import 'package:mohem_flutter_app/ui/profile/dynamic_screens/dynamic_input_address_screen.dart'; import 'package:mohem_flutter_app/ui/profile/dynamic_screens/dynamic_input_address_screen.dart';
import 'package:mohem_flutter_app/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart'; import 'package:mohem_flutter_app/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart';
import 'package:mohem_flutter_app/ui/profile/family_members.dart'; import 'package:mohem_flutter_app/ui/profile/family_members.dart';
import 'package:mohem_flutter_app/ui/profile/personal_info.dart'; import 'package:mohem_flutter_app/ui/profile/personal_info.dart';
import 'package:mohem_flutter_app/ui/profile/profile_screen.dart';
import 'package:mohem_flutter_app/ui/screens/announcements/announcement_details.dart'; import 'package:mohem_flutter_app/ui/screens/announcements/announcement_details.dart';
import 'package:mohem_flutter_app/ui/screens/announcements/announcements.dart'; import 'package:mohem_flutter_app/ui/screens/announcements/announcements.dart';
import 'package:mohem_flutter_app/ui/profile/delete_family_member.dart';
// import 'package:mohem_flutter_app/ui/my_attendance/work_from_home_screen.dart'; // import 'package:mohem_flutter_app/ui/my_attendance/work_from_home_screen.dart';
import 'package:mohem_flutter_app/ui/screens/eit/add_eit.dart'; import 'package:mohem_flutter_app/ui/screens/eit/add_eit.dart';
import 'package:mohem_flutter_app/ui/screens/mowadhafhi/mowadhafhi_home.dart'; import 'package:mohem_flutter_app/ui/screens/mowadhafhi/mowadhafhi_home.dart';
@ -32,7 +34,6 @@ import 'package:mohem_flutter_app/ui/screens/mowadhafhi/mowadhafhi_hr_request.da
import 'package:mohem_flutter_app/ui/screens/mowadhafhi/request_details.dart'; import 'package:mohem_flutter_app/ui/screens/mowadhafhi/request_details.dart';
import 'package:mohem_flutter_app/ui/screens/pending_transactions/pending_transactions.dart'; import 'package:mohem_flutter_app/ui/screens/pending_transactions/pending_transactions.dart';
import 'package:mohem_flutter_app/ui/screens/pending_transactions/pending_transactions_details.dart'; import 'package:mohem_flutter_app/ui/screens/pending_transactions/pending_transactions_details.dart';
import 'package:mohem_flutter_app/ui/profile/profile_screen.dart';
import 'package:mohem_flutter_app/ui/screens/submenu_screen.dart'; import 'package:mohem_flutter_app/ui/screens/submenu_screen.dart';
import 'package:mohem_flutter_app/ui/work_list/item_history_screen.dart'; import 'package:mohem_flutter_app/ui/work_list/item_history_screen.dart';
import 'package:mohem_flutter_app/ui/work_list/itg_detail_screen.dart'; import 'package:mohem_flutter_app/ui/work_list/itg_detail_screen.dart';
@ -70,6 +71,7 @@ class AppRoutes {
static const String addDynamicInputProfile = 'addDynamicInputProfile'; static const String addDynamicInputProfile = 'addDynamicInputProfile';
static const String addDynamicAddressScreen = 'addDynamicAddressProfile'; static const String addDynamicAddressScreen = 'addDynamicAddressProfile';
//Attendance //Attendance
static const String attendance = "/attendance"; static const String attendance = "/attendance";
static const String monthlyAttendance = "/monthlyAttendance"; static const String monthlyAttendance = "/monthlyAttendance";

111
lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_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/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/mowadhafhi/get_tickets_list.dart'; import 'package:mohem_flutter_app/models/mowadhafhi/get_tickets_list.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
@ -20,7 +21,7 @@ class MowadhafhiHome extends StatefulWidget {
} }
class _MowadhafhiHomeState extends State<MowadhafhiHome> { class _MowadhafhiHomeState extends State<MowadhafhiHome> {
List<GetTicketsByEmployeeList> getTicketsByEmployeeList = []; List<GetTicketsByEmployeeList>? getTicketsByEmployeeList;
@override @override
void initState() { void initState() {
@ -28,6 +29,19 @@ class _MowadhafhiHomeState extends State<MowadhafhiHome> {
super.initState(); super.initState();
} }
void getOpenTickets() async {
try {
Utils.showLoading(context);
getTicketsByEmployeeList?.clear();
getTicketsByEmployeeList = await MowadhafhiApiClient().getTicketsByEmployee();
Utils.hideLoading(context);
setState(() {});
} catch (ex) {
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -36,109 +50,56 @@ class _MowadhafhiHomeState extends State<MowadhafhiHome> {
context, context,
title: LocaleKeys.mowadhafhiRequest.tr(), title: LocaleKeys.mowadhafhiRequest.tr(),
), ),
body: Container( body: getTicketsByEmployeeList == null
margin: const EdgeInsets.only(top: 10.0), ? const SizedBox()
child: Column( : (getTicketsByEmployeeList!.isEmpty)
? Utils.getNoDataWidget(context)
: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Expanded( ListView.separated(
child: ListView.separated(
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
shrinkWrap: true, padding: const EdgeInsets.all(21),
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return InkWell( return InkWell(
onTap: () { onTap: () {
openRequestDetails(getTicketsByEmployeeList[index].ticketId!); Navigator.pushNamed(context, AppRoutes.mowadhafhiDetails, arguments: getTicketsByEmployeeList![index].ticketId);
}, },
child: Container(
width: double.infinity,
// height: 100.0,
padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10),
margin: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
getTicketsByEmployeeList[index].ticketTypeName!.toText14(color: MyColors.grey57Color), getTicketsByEmployeeList![index].ticketTypeName!.toText14(color: MyColors.darkTextColor).expanded,
getTicketsByEmployeeList[index].created!.split(" ")[0].toText12(color: MyColors.grey70Color), getTicketsByEmployeeList![index].created!.split(" ")[0].toText12(color: MyColors.grey70Color),
], ],
), ),
Container( getTicketsByEmployeeList![index].description!.toText12(color: MyColors.grey57Color),
padding: const EdgeInsets.only(top: 10.0), Row(
child: getTicketsByEmployeeList[index].description!.toText12(color: MyColors.grey57Color),
),
Container(
padding: const EdgeInsets.only(top: 10.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
getTicketsByEmployeeList[index].ticketStatusInternalName!.toText14(color: MyColors.gradiantEndColor), getTicketsByEmployeeList![index].ticketStatusInternalName!.toText14(color: MyColors.textMixColor),
SvgPicture.asset( SvgPicture.asset(
"assets/images/arrow_next.svg", "assets/images/arrow_next.svg",
color: MyColors.darkIconColor, color: MyColors.darkIconColor,
) )
], ],
), ),
),
], ],
), ).objectContainerView(),
),
); );
}, },
separatorBuilder: (BuildContext context, int index) => 12.height, separatorBuilder: (BuildContext context, int index) => 12.height,
itemCount: getTicketsByEmployeeList.length ?? 0)), itemCount: getTicketsByEmployeeList!.length)
80.height .expanded,
], DefaultButton(LocaleKeys.createRequest.tr(), () async {
), await Navigator.pushNamed(context, AppRoutes.mowadhafhiHRRequest);
), getOpenTickets();
bottomSheet: Container( }).insideContainer
decoration: const BoxDecoration(
color: MyColors.white,
boxShadow: [
BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 3),
], ],
), ),
child: DefaultButton(LocaleKeys.createRequest.tr(), () async { );
openHRRequest();
}).insideContainer,
));
}
void openRequestDetails(String itgTicketID) async {
await Navigator.pushNamed(context, AppRoutes.mowadhafhiDetails, arguments: itgTicketID);
}
void openHRRequest() async {
await Navigator.pushNamed(context, AppRoutes.mowadhafhiHRRequest).then((value) {
getOpenTickets();
});
}
void getOpenTickets() async {
try {
Utils.showLoading(context);
getTicketsByEmployeeList.clear();
getTicketsByEmployeeList = await MowadhafhiApiClient().getTicketsByEmployee();
Utils.hideLoading(context);
setState(() {});
} catch (ex) {
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
} }
} }

153
lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart
Unescape Escape View File

@ -21,7 +21,6 @@ import 'package:mohem_flutter_app/widgets/app_bar_widget.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/button/simple_button.dart'; import 'package:mohem_flutter_app/widgets/button/simple_button.dart';
import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart'; import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
import 'package:mohem_flutter_app/widgets/radio/show_radio.dart';
class MowadhafhiHRRequest extends StatefulWidget { class MowadhafhiHRRequest extends StatefulWidget {
const MowadhafhiHRRequest({Key? key}) : super(key: key); const MowadhafhiHRRequest({Key? key}) : super(key: key);
@ -42,7 +41,9 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
GetSectionTopics? selectedTopic; GetSectionTopics? selectedTopic;
List<File> attachmentFiles = []; List<File> attachmentFiles = [];
String selectedServiceType = ""; GetTicketTypes? selectedServiceType;
// String selectedServiceType = "";
String description = ""; String description = "";
int? projectID; int? projectID;
@ -58,69 +59,40 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget( appBar: AppBarWidget(
context, context,
title: LocaleKeys.mowadhafhiRequest.tr(), title: LocaleKeys.createRequest.tr(),
),
body: SingleChildScrollView(
child: getTicketTypesList.isNotEmpty
? Container(
width: double.infinity,
padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10),
margin: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
), ),
child: Column( body: getTicketTypesList.isNotEmpty
crossAxisAlignment: CrossAxisAlignment.start, ? Column(
children: [ children: [
LocaleKeys.serviceType.tr().toText16(), ListView(
12.height, padding: const EdgeInsets.all(21),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
SizedBox( PopupMenuButton(
height: 40, child: DynamicTextFieldWidget(
child: ListView.separated( LocaleKeys.serviceType.tr(),
itemBuilder: (context, index) { selectedServiceType?.typeName ?? LocaleKeys.selectTypeT.tr(),
return Container( isEnable: false,
padding: const EdgeInsets.only(right: 6, top: 8, bottom: 8), isPopup: true,
child: ShowRadio( isInputTypeNum: true,
title: getTicketTypesList[index].typeName!, isReadOnly: false,
value: getTicketTypesList[index].ticketTypeId!.toString(),
groupValue: selectedServiceType,
selectedColor: MyColors.gradiantStartColor),
).onPress(() {
selectedServiceType = getTicketTypesList[index].ticketTypeId!.toString();
setState(() {});
});
},
separatorBuilder: (context, index) => 1.width,
shrinkWrap: true,
itemCount: getTicketTypesList.length ?? 0,
scrollDirection: Axis.horizontal,
),
), ),
itemBuilder: (_) => <PopupMenuItem<int>>[
for (int i = 0; i < getTicketTypesList.length; i++) PopupMenuItem<int>(child: Text(getTicketTypesList[i].typeName!), value: i),
], ],
), onSelected: (int popupIndex) {
12.height, selectedServiceType = getTicketTypesList[popupIndex]; //.ticketTypeId!.toString();
LocaleKeys.departmentName.tr().toText16(), setState(() {});
}),
12.height, 12.height,
PopupMenuButton( PopupMenuButton(
child: DynamicTextFieldWidget( child: DynamicTextFieldWidget(
LocaleKeys.selectDepartment.tr(), LocaleKeys.departmentName.tr(),
selectedDepartment?.departmentName ?? "", selectedDepartment?.departmentName ?? LocaleKeys.selectDepartment.tr(),
isEnable: false, isEnable: false,
isPopup: true, isPopup: true,
isInputTypeNum: true, isInputTypeNum: true,
isReadOnly: false, isReadOnly: false,
).paddingOnly(bottom: 12), ),
itemBuilder: (_) => <PopupMenuItem<int>>[ itemBuilder: (_) => <PopupMenuItem<int>>[
for (int i = 0; i < getProjectDepartmentsList!.length; i++) PopupMenuItem<int>(child: Text(getProjectDepartmentsList![i].departmentName!), value: i), for (int i = 0; i < getProjectDepartmentsList!.length; i++) PopupMenuItem<int>(child: Text(getProjectDepartmentsList![i].departmentName!), value: i),
], ],
@ -130,17 +102,15 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
setState(() {}); setState(() {});
}), }),
12.height, 12.height,
LocaleKeys.relatedSection.tr().toText16(),
12.height,
PopupMenuButton( PopupMenuButton(
child: DynamicTextFieldWidget( child: DynamicTextFieldWidget(
LocaleKeys.selectSection.tr(), LocaleKeys.relatedSection.tr(),
selectedSection?.sectionName ?? "", selectedSection?.sectionName ?? LocaleKeys.selectSection.tr(),
isEnable: false, isEnable: false,
isPopup: true, isPopup: true,
isInputTypeNum: true, isInputTypeNum: true,
isReadOnly: false, isReadOnly: false,
).paddingOnly(bottom: 12), ),
itemBuilder: (_) => <PopupMenuItem<int>>[ itemBuilder: (_) => <PopupMenuItem<int>>[
for (int i = 0; i < getDepartmentSectionsList!.length; i++) PopupMenuItem<int>(child: Text(getDepartmentSectionsList![i].sectionName!), value: i), for (int i = 0; i < getDepartmentSectionsList!.length; i++) PopupMenuItem<int>(child: Text(getDepartmentSectionsList![i].sectionName!), value: i),
], ],
@ -150,35 +120,29 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
setState(() {}); setState(() {});
}), }),
12.height, 12.height,
LocaleKeys.relatedTopic.tr().toText16(),
12.height,
PopupMenuButton( PopupMenuButton(
child: DynamicTextFieldWidget( child: DynamicTextFieldWidget(
LocaleKeys.selectTopic.tr(), LocaleKeys.relatedTopic.tr(),
selectedTopic?.topicName ?? "", selectedTopic?.topicName ?? LocaleKeys.selectTopic.tr(),
isEnable: false, isEnable: false,
isPopup: true, isPopup: true,
isInputTypeNum: true, isInputTypeNum: true,
isReadOnly: false, isReadOnly: false,
).paddingOnly(bottom: 12), ),
itemBuilder: (_) => <PopupMenuItem<int>>[ itemBuilder: (_) => <PopupMenuItem<int>>[
for (int i = 0; i < getSectionTopicsList!.length; i++) PopupMenuItem<int>(child: Text(getSectionTopicsList![i].topicName!), value: i), for (int i = 0; i < getSectionTopicsList.length; i++) PopupMenuItem<int>(child: Text(getSectionTopicsList[i].topicName!), value: i),
], ],
onSelected: (int popupIndex) { onSelected: (int popupIndex) {
selectedTopic = getSectionTopicsList![popupIndex]; selectedTopic = getSectionTopicsList[popupIndex];
// getDepartmentSections(selectedSection?.departmentSectionId); // getDepartmentSections(selectedSection?.departmentSectionId);
setState(() {}); setState(() {});
}), }),
12.height, 12.height,
LocaleKeys.supportingDocument.tr().toText16(), attachmentView("Attachments").objectContainerView(title: LocaleKeys.supportingDocument.tr()),
12.height,
attachmentView("Attachments"),
12.height,
LocaleKeys.description.tr().toText16(),
12.height, 12.height,
DynamicTextFieldWidget( DynamicTextFieldWidget(
"", LocaleKeys.description.tr(),
"", LocaleKeys.writeAMessage.tr(),
isEnable: true, isEnable: true,
isPopup: false, isPopup: false,
lines: 4, lines: 4,
@ -189,22 +153,9 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
description = value; description = value;
}, },
), ),
50.height
], ],
), ).expanded,
) DefaultButton(
: Container(),
),
bottomSheet: Container(
padding: const EdgeInsets.only(top: 8.0, bottom: 8.0),
decoration: const BoxDecoration(
color: MyColors.white,
),
child: Row(
children: [
12.width,
Expanded(
child: DefaultButton(
LocaleKeys.submit.tr(), LocaleKeys.submit.tr(),
!checkValidation() !checkValidation()
? null ? null
@ -212,17 +163,15 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
submitHRRequest(); submitHRRequest();
}, },
color: const Color(0xFFD02127), color: const Color(0xFFD02127),
), ).insideContainer
),
12.width,
], ],
), )
), : Container(),
); );
} }
bool checkValidation() { bool checkValidation() {
if (selectedServiceType == "" || selectedDepartment == null || selectedSection == null || selectedTopic == null) { if (selectedServiceType == null || selectedDepartment == null || selectedSection == null || selectedTopic == null) {
return false; return false;
} else { } else {
return true; return true;
@ -230,20 +179,7 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
} }
Widget attachmentView(String title) { Widget attachmentView(String title) {
return Container( return Column(
padding: const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(15),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -292,7 +228,6 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
separatorBuilder: (cxt, index) => 6.height, separatorBuilder: (cxt, index) => 6.height,
itemCount: attachmentFiles.length), itemCount: attachmentFiles.length),
], ],
),
); );
} }
@ -376,7 +311,7 @@ class _MowadhafhiHRRequestState extends State<MowadhafhiHRRequest> {
} }
} }
int? messageStatus = await MowadhafhiApiClient().submitRequest(selectedDepartment?.projectDepartmentId, description, projectID, selectedSection?.departmentSectionId.toString(), int? messageStatus = await MowadhafhiApiClient().submitRequest(selectedDepartment?.projectDepartmentId, description, projectID, selectedSection?.departmentSectionId.toString(),
selectedTopic?.sectionTopicId.toString(), int.parse(selectedServiceType), list); selectedTopic?.sectionTopicId.toString(), selectedServiceType!.ticketTypeId, list);
Utils.showToast(LocaleKeys.requestCreatedSuccessfully.tr()); Utils.showToast(LocaleKeys.requestCreatedSuccessfully.tr());
Utils.hideLoading(context); Utils.hideLoading(context);
Navigator.pop(context); Navigator.pop(context);

Write Preview
Loading…
Cancel
Save