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

create request by manager in my team, improvements

Browse Source
merge-requests/4/head
Sikander Saleem 3 years ago
parent 9ce042e7d3
commit 9a0131277b
6 changed files with 93 additions and 68 deletions
Show Stats Download Patch File Download Diff File

17
lib/api/my_team/my_team_api_client.dart
Unescape Escape View File

@ -1,5 +1,3 @@
import 'package:mohem_flutter_app/api/api_client.dart'; import 'package:mohem_flutter_app/api/api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/consts.dart'; import 'package:mohem_flutter_app/classes/consts.dart';
@ -19,7 +17,6 @@ class MyTeamApiClient {
factory MyTeamApiClient() => _instance; factory MyTeamApiClient() => _instance;
Future<List<GetEmployeeSubordinatesList>> getEmployeeSubordinates(String searchEmpEmail, String searchEmpName, String searchEmpNo) async { Future<List<GetEmployeeSubordinatesList>> getEmployeeSubordinates(String searchEmpEmail, String searchEmpName, String searchEmpNo) async {
String url = "${ApiConsts.erpRest}GET_EMPLOYEE_SUBORDINATES"; String url = "${ApiConsts.erpRest}GET_EMPLOYEE_SUBORDINATES";
Map<String, dynamic> postParams = { Map<String, dynamic> postParams = {
@ -72,7 +69,6 @@ class MyTeamApiClient {
}, url, postParams); }, url, postParams);
} }
Future<GetAttendanceTracking?> getAttendanceTracking(String? empID) async { Future<GetAttendanceTracking?> getAttendanceTracking(String? empID) async {
String url = "${ApiConsts.erpRest}GET_Attendance_Tracking"; String url = "${ApiConsts.erpRest}GET_Attendance_Tracking";
Map<String, dynamic> postParams = {}; Map<String, dynamic> postParams = {};
@ -104,10 +100,7 @@ class MyTeamApiClient {
Future<List<GetMenuEntriesList>> employeeSubordinatesRequest(String? empID) async { Future<List<GetMenuEntriesList>> employeeSubordinatesRequest(String? empID) async {
String url = "${ApiConsts.erpRest}GET_MENU_ENTRIES"; String url = "${ApiConsts.erpRest}GET_MENU_ENTRIES";
Map<String, dynamic> postParams = { Map<String, dynamic> postParams = {"P_MENU_TYPE": "M", "P_SELECTED_RESP_ID": -999};
"P_MENU_TYPE": "M",
"P_SELECTED_RESP_ID": -999,
};
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);
postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID; postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
return await ApiClient().postJsonForObject((json) { return await ApiClient().postJsonForObject((json) {
@ -118,8 +111,7 @@ class MyTeamApiClient {
Future<List<GetFavoriteReplacements>?> getFavoriteReplacement() async { Future<List<GetFavoriteReplacements>?> getFavoriteReplacement() async {
String url = "${ApiConsts.erpRest}Mohemm_GetFavoriteReplacements"; String url = "${ApiConsts.erpRest}Mohemm_GetFavoriteReplacements";
Map<String, dynamic> postParams = { Map<String, dynamic> postParams = {};
};
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) { return await ApiClient().postJsonForObject((json) {
GenericResponseModel responseData = GenericResponseModel.fromJson(json); GenericResponseModel responseData = GenericResponseModel.fromJson(json);
@ -138,7 +130,7 @@ class MyTeamApiClient {
}; };
Map<String, dynamic> postParams = { Map<String, dynamic> postParams = {
"Mohemm_ChangeReplacementsInputList": [postParamsObj], "Mohemm_ChangeReplacementsInputList": [postParamsObj],
//postParams["Mohemm_ChangeReplacementsInputList"] = list; //postParams["Mohemm_ChangeReplacementsInputList"] = list;
}; };
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) { return await ApiClient().postJsonForObject((json) {
@ -151,7 +143,7 @@ class MyTeamApiClient {
String url = "${ApiConsts.erpRest}GET_SUBORDINATES_LEAVES_TOTAL_VACATIONS"; String url = "${ApiConsts.erpRest}GET_SUBORDINATES_LEAVES_TOTAL_VACATIONS";
Map<String, dynamic> postParams = { Map<String, dynamic> postParams = {
"P_DATE_FROM": dateFrom, "P_DATE_FROM": dateFrom,
"P_DATE_TO": dateTo, "P_DATE_TO": dateTo,
}; };
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) { return await ApiClient().postJsonForObject((json) {
@ -160,4 +152,3 @@ class MyTeamApiClient {
}, url, postParams); }, url, postParams);
} }
} }

59
lib/ui/my_attendance/dynamic_screens/dynamic_listview_screen.dart
Unescape Escape View File

@ -70,34 +70,37 @@ class _DynamicListViewScreenState extends State<DynamicListViewScreen> {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget(context, title: dynamicParams!.title), appBar: AppBarWidget(context, title: dynamicParams!.title),
body: ListView( body: Center(
physics: const BouncingScrollPhysics(), child: ListView(
padding: const EdgeInsets.all(21), physics: const BouncingScrollPhysics(),
children: [ shrinkWrap: true,
// HMG_TKT_NEW_EIT_SS Id used for ticket balance dashboard padding: const EdgeInsets.all(21),
if (dynamicParams!.dynamicId == "HMG_TKT_NEW_EIT_SS") ...[const BalancesDashboardWidget("Current Ticket Balance", false), 12.height], children: [
getEITTransactionList == null // HMG_TKT_NEW_EIT_SS Id used for ticket balance dashboard
? const SizedBox() if (dynamicParams!.dynamicId == "HMG_TKT_NEW_EIT_SS") ...[const BalancesDashboardWidget("Current Ticket Balance", false), 12.height],
: (getEITTransactionList!.isEmpty getEITTransactionList == null
? Utils.getNoDataWidget(context) ? const SizedBox()
: ListView.separated( : (getEITTransactionList!.isEmpty
physics: const NeverScrollableScrollPhysics(), ? Utils.getNoDataWidget(context)
shrinkWrap: true, : ListView.separated(
itemBuilder: (cxt, int parentIndex) => getEITTransactionList![parentIndex].collectionTransaction!.isEmpty physics: const NeverScrollableScrollPhysics(),
? const SizedBox() shrinkWrap: true,
: Column( itemBuilder: (cxt, int parentIndex) => getEITTransactionList![parentIndex].collectionTransaction!.isEmpty
crossAxisAlignment: CrossAxisAlignment.start, ? const SizedBox()
mainAxisSize: MainAxisSize.min, : Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
for (int t = 0; t < (getEITTransactionList![parentIndex].collectionTransaction ?? []).length; t++) mainAxisSize: MainAxisSize.min,
if (getEITTransactionList![parentIndex].collectionTransaction![t].dISPLAYFLAG == "Y") children: [
ItemDetailView(getEITTransactionList![parentIndex].collectionTransaction![t].sEGMENTPROMPT!, for (int t = 0; t < (getEITTransactionList![parentIndex].collectionTransaction ?? []).length; t++)
getEITTransactionList![parentIndex].collectionTransaction![t].sEGMENTVALUEDSP ?? ""), if (getEITTransactionList![parentIndex].collectionTransaction![t].dISPLAYFLAG == "Y")
], ItemDetailView(getEITTransactionList![parentIndex].collectionTransaction![t].sEGMENTPROMPT!,
).objectContainerView(), getEITTransactionList![parentIndex].collectionTransaction![t].sEGMENTVALUEDSP ?? ""),
separatorBuilder: (cxt, index) => 12.height, ],
itemCount: getEITTransactionList!.length)), ).objectContainerView(),
], separatorBuilder: (cxt, index) => 12.height,
itemCount: getEITTransactionList!.length)),
],
),
), ),
floatingActionButton: Container( floatingActionButton: Container(
height: 54, height: 54,

3
lib/ui/my_attendance/services_menu_list_screen.dart
Unescape Escape View File

@ -51,6 +51,9 @@ class ServicesMenuListScreen extends StatelessWidget {
Navigator.pushNamed(context, AppRoutes.familyMembers); Navigator.pushNamed(context, AppRoutes.familyMembers);
} }
return; return;
} else if (servicesMenuData.list[index].requestType == "ABSENCE") {
Navigator.pushNamed(context, AppRoutes.leaveBalance);
return;
} }
Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(servicesMenuData.list[index].prompt!, servicesMenuData.list[index].functionName!)); Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(servicesMenuData.list[index].prompt!, servicesMenuData.list[index].functionName!));

74
lib/ui/my_team/create_request.dart
Unescape Escape View File

@ -1,5 +1,3 @@
import 'dart:ui';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
@ -12,32 +10,34 @@ import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_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/dashboard/menu_entries.dart'; import 'package:mohem_flutter_app/models/dashboard/menu_entries.dart';
import 'package:mohem_flutter_app/models/dashboard/menus.dart';
import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart'; import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart';
import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
import 'package:mohem_flutter_app/ui/my_attendance/dynamic_screens/dynamic_listview_screen.dart'; import 'package:mohem_flutter_app/ui/my_attendance/dynamic_screens/dynamic_listview_screen.dart';
import 'package:mohem_flutter_app/ui/my_attendance/services_menu_list_screen.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
class CreateRequest extends StatefulWidget { class CreateRequest extends StatefulWidget {
const CreateRequest ({Key? key}) : super(key: key); const CreateRequest({Key? key}) : super(key: key);
@override @override
_CreateRequestState createState() => _CreateRequestState(); _CreateRequestState createState() => _CreateRequestState();
} }
class _CreateRequestState extends State<CreateRequest> { class _CreateRequestState extends State<CreateRequest> {
String searchEmpEmail =""; String searchEmpEmail = "";
String searchEmpName =""; String searchEmpName = "";
String searchEmpNo = ""; String searchEmpNo = "";
String? empId; String? empId;
List<GetEmployeeSubordinatesList> getEmployeeSubordinatesList = []; List<GetEmployeeSubordinatesList> getEmployeeSubordinatesList = [];
// late DashboardProviderModel data; // late DashboardProviderModel data;
List<GetMenuEntriesList> getMenuEntriesList = []; List<GetMenuEntriesList> getMenuEntriesList = [];
GetEmployeeSubordinatesList? getEmployeeSubordinates; GetEmployeeSubordinatesList? getEmployeeSubordinates;
List<Menus>? homeMenus;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
// data.fetchMenuEntries();
employeeSubRequest(); employeeSubRequest();
} }
@ -46,6 +46,7 @@ class _CreateRequestState extends State<CreateRequest> {
Utils.showLoading(context); Utils.showLoading(context);
getEmployeeSubordinatesList = await MyTeamApiClient().getEmployeeSubordinates(searchEmpEmail.toString(), searchEmpName.toString(), searchEmpNo.toString()); getEmployeeSubordinatesList = await MyTeamApiClient().getEmployeeSubordinates(searchEmpEmail.toString(), searchEmpName.toString(), searchEmpNo.toString());
getMenuEntriesList = await MyTeamApiClient().employeeSubordinatesRequest(getEmployeeSubordinates?.eMPLOYEENUMBER); getMenuEntriesList = await MyTeamApiClient().employeeSubordinatesRequest(getEmployeeSubordinates?.eMPLOYEENUMBER);
homeMenus = parseMenus(getMenuEntriesList);
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
} catch (ex) { } catch (ex) {
@ -54,42 +55,65 @@ class _CreateRequestState extends State<CreateRequest> {
} }
} }
List<Menus> parseMenus(List<GetMenuEntriesList> getMenuEntriesList) {
List<Menus> menus = [];
for (int i = 0; i < getMenuEntriesList.length; i++) {
if (getMenuEntriesList[i].parentMenuName!.isEmpty) {
menus.add(Menus(getMenuEntriesList[i], getMenuEntriesList.where((element) => getMenuEntriesList[i].menuName == element.parentMenuName).toList()));
}
}
return menus;
}
void handleOnPress(context, Menus menu) {
if (menu.menuEntry.menuEntryType == "FUNCTION") {
if (menu.menuEntry.requestType == "EIT") {
Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(menu.menuEntry.prompt!, menu.menuEntry.functionName!));
} else {}
} else {
Navigator.pushNamed(context, AppRoutes.servicesMenuListScreen, arguments: ServicesMenuListScreenParams(menu.menuEntry.prompt!, menu.menuEntiesList));
}
return;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
getEmployeeSubordinates ??= ModalRoute.of(context)?.settings.arguments as GetEmployeeSubordinatesList; getEmployeeSubordinates ??= ModalRoute.of(context)?.settings.arguments as GetEmployeeSubordinatesList;
print(getMenuEntriesList.length);
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget( appBar: AppBarWidget(
context, context,
title: LocaleKeys.createRequest.tr(), title: LocaleKeys.createRequest.tr(),
), ),
body: SizedBox( body: SizedBox(
width: double.infinity, width: double.infinity,
height: double.infinity, height: double.infinity,
child: getMenuEntriesList.isEmpty child: homeMenus == null
? Utils.getNoDataWidget(context) ? const SizedBox()
: ListView.separated( : (homeMenus!.isEmpty
padding: const EdgeInsets.all(21), ? Utils.getNoDataWidget(context)
itemBuilder: (cxt, index) => itemView("assets/images/pdf.svg", getMenuEntriesList[index].prompt!, index).onPress(() { : ListView.separated(
Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(getMenuEntriesList[index].prompt!, getMenuEntriesList[index].functionName!)); padding: const EdgeInsets.all(21),
}), itemBuilder: (cxt, index) => itemView("assets/images/pdf.svg", homeMenus![index].menuEntry.prompt!, index).onPress(() {
separatorBuilder: (cxt, index) => 12.height, handleOnPress(context, homeMenus![index]);
itemCount: getMenuEntriesList.length), }),
), separatorBuilder: (cxt, index) => 12.height,
itemCount: homeMenus!.length)),
),
); );
} }
Widget itemView(String icon, String title, index) { Widget itemView(String icon, String title, index) {
return getMenuEntriesList[index].parentMenuName !=""? Row( return Row(
children: [ children: [
(title).toText16().expanded, 12.width, (title).toText16().expanded,
12.width,
SvgPicture.asset( SvgPicture.asset(
"assets/images/arrow_next.svg", "assets/images/arrow_next.svg",
color: MyColors.darkIconColor, color: MyColors.darkIconColor,
) )
], ],
).objectContainerView() : SizedBox(); ).objectContainerView();
} }
} }

7
lib/ui/work_list/worklist_detail_screen.dart
Unescape Escape View File

@ -487,10 +487,13 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
"P_FORWARD_TO_USER_NAME": "", "P_FORWARD_TO_USER_NAME": "",
"P_NOTIFICATION_ID": workListData!.nOTIFICATIONID, "P_NOTIFICATION_ID": workListData!.nOTIFICATIONID,
"RespondAttributeList": [ "RespondAttributeList": [
if (notificationNoteInput != null) {notificationNoteInput!.attributeName: note} if (notificationNoteInput != null)
{
"ATTRIBUTE_NAME": notificationNoteInput!.attributeName,
if (notificationNoteInput!.attributeType == "number") "ATTRIBUTE_NUMBER_VALUE": note else if (notificationNoteInput!.attributeType == "VARCHAR2") "ATTRIBUTE_TEXT_VALUE": note
}
], ],
}; };
performNotificationAction(payload); performNotificationAction(payload);
}, },
), ),

1
lib/widgets/dialogs/accept_reject_input_dialog.dart
Unescape Escape View File

@ -66,6 +66,7 @@ class AcceptRejectInputDialog extends StatelessWidget {
notificationGetRespond!.attributeDisplayName!, notificationGetRespond!.attributeDisplayName!,
TextEditingController(), TextEditingController(),
isBackgroundEnable: true, isBackgroundEnable: true,
isInputTypeNum: notificationGetRespond!.attributeType == "number",
lines: 3, lines: 3,
onChange: (String note) { onChange: (String note) {
this.note = note; this.note = note;

Write Preview
Loading…
Cancel
Save