fix issue

faiz_marathon_signalR_critical
Fatimah Alshammari 3 years ago
parent 058e287b25
commit d1cc9bd468

@ -17,9 +17,11 @@ import 'package:mohem_flutter_app/models/get_po_notification_body_list_model.dar
import 'package:mohem_flutter_app/models/get_quotation_analysis_list_model.dart';
import 'package:mohem_flutter_app/models/get_stamp_ms_notification_body_list_model.dart';
import 'package:mohem_flutter_app/models/get_stamp_ns_notification_body_list_model.dart';
import 'package:mohem_flutter_app/models/get_user_item_type_list.dart';
import 'package:mohem_flutter_app/models/itg_forms_models/itg_request_model.dart';
import 'package:mohem_flutter_app/models/member_information_list_model.dart';
import 'package:mohem_flutter_app/models/notification_get_respond_attributes_list_model.dart';
import 'package:mohem_flutter_app/models/update_user_item_type_list.dart';
import 'package:mohem_flutter_app/models/worklist/get_favorite_replacements_model.dart';
import 'package:mohem_flutter_app/models/worklist/hr/eit_otification_body_model.dart';
import 'package:mohem_flutter_app/models/worklist/hr/get_basic_det_ntf_body_list_model.dart';
@ -445,4 +447,29 @@ class WorkListApiClient {
return responseData;
}, url, postParams);
}
Future<List<GetUserItemTypesList>?> getUserItemTypes() async {
String url = "${ApiConsts.erpRest}GET_USER_ITEM_TYPES";
Map<String, dynamic> postParams = {
};
postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) {
GenericResponseModel responseData = GenericResponseModel.fromJson(json);
return responseData.getUserItemTypesList;
}, url, postParams);
}
Future<UpdateUserItemTypesList?> updateUserItemTypes() async {
String url = "${ApiConsts.erpRest}UPDATE_USER_ITEM_TYPES";
Map<String, dynamic> postParams = {
};
postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) {
GenericResponseModel responseData = GenericResponseModel.fromJson(json);
return responseData.updateUserItemTypesList;
}, url, postParams);
}
}

@ -32,6 +32,7 @@ import 'package:mohem_flutter_app/models/get_schedule_shifts_details_list_model.
import 'package:mohem_flutter_app/models/get_stamp_ms_notification_body_list_model.dart';
import 'package:mohem_flutter_app/models/get_stamp_ns_notification_body_list_model.dart';
import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart';
import 'package:mohem_flutter_app/models/get_user_item_type_list.dart';
import 'package:mohem_flutter_app/models/member_information_list_model.dart';
import 'package:mohem_flutter_app/models/member_login_list_model.dart';
import 'package:mohem_flutter_app/models/monthly_pay_slip/get_deductions_List_model.dart';
@ -61,6 +62,8 @@ import 'package:mohem_flutter_app/models/profile/submit_contact_transaction_list
import 'package:mohem_flutter_app/models/start_eit_approval_process_model.dart';
import 'package:mohem_flutter_app/models/submit_eit_transaction_list_model.dart';
import 'package:mohem_flutter_app/models/subordinates_on_leaves_model.dart';
import 'package:mohem_flutter_app/models/update_item_type_success_list.dart';
import 'package:mohem_flutter_app/models/update_user_item_type_list.dart';
import 'package:mohem_flutter_app/models/vacation_rule/get_item_type_notifications_list_model.dart';
import 'package:mohem_flutter_app/models/vacation_rule/get_notification_reassign_mode_list_model.dart';
import 'package:mohem_flutter_app/models/vacation_rule/get_vacation_rules_list_model.dart';
@ -221,7 +224,7 @@ class GenericResponseModel {
List<GetDepartmentSections>? getDepartmentSections;
List<GetPendingTransactionsFunctions>? getPendingTransactionsFunctions;
List<GetPendingTransactionsDetails>? getPendingTransactionsDetails;
List<String>? getUserItemTypesList;
List<GetUserItemTypesList>? getUserItemTypesList;
List<GetVacationRulesList>? getVacationRulesList;
List<String>? getVaccinationOnHandList;
List<String>? getVaccinationsList;
@ -319,8 +322,8 @@ class GenericResponseModel {
String? tokenID;
String? updateAttachmentList;
String? updateEmployeeImageList;
String? updateItemTypeSuccessList;
String? updateUserItemTypesList;
List<UpdateItemTypeSuccessList>? updateItemTypeSuccessList;
UpdateUserItemTypesList? updateUserItemTypesList;
String? updateVacationRuleList;
String? vHREmployeeLoginList;
String? vHRGetEmployeeDetailsList;
@ -1017,7 +1020,12 @@ class GenericResponseModel {
});
}
getUserItemTypesList = json['GetUserItemTypesList'];
if (json['GetUserItemTypesList'] != null) {
getUserItemTypesList = <GetUserItemTypesList>[];
json['GetUserItemTypesList'].forEach((v) {
getUserItemTypesList!.add(new GetUserItemTypesList.fromJson(v));
});
}
if (json['GetVacationRulesList'] != null) {
getVacationRulesList = <GetVacationRulesList>[];
json['GetVacationRulesList'].forEach((v) {
@ -1180,8 +1188,16 @@ class GenericResponseModel {
tokenID = json['TokenID'];
updateAttachmentList = json['UpdateAttachmentList'];
updateEmployeeImageList = json['UpdateEmployeeImageList'];
updateItemTypeSuccessList = json['UpdateItemTypeSuccessList'];
updateUserItemTypesList = json['UpdateUserItemTypesList'];
if (json['UpdateItemTypeSuccessList'] != null) {
updateItemTypeSuccessList = <UpdateItemTypeSuccessList>[];
json['UpdateItemTypeSuccessList'].forEach((v) {
updateItemTypeSuccessList!
.add(new UpdateItemTypeSuccessList.fromJson(v));
});
}
updateUserItemTypesList = json['UpdateUserItemTypesList'] != null
? new UpdateUserItemTypesList.fromJson(json['UpdateUserItemTypesList'])
: null;
updateVacationRuleList = json['UpdateVacationRuleList'];
vHREmployeeLoginList = json['VHR_EmployeeLoginList'];
vHRGetEmployeeDetailsList = json['VHR_GetEmployeeDetailsList'];
@ -1588,8 +1604,13 @@ class GenericResponseModel {
data['TokenID'] = this.tokenID;
data['UpdateAttachmentList'] = this.updateAttachmentList;
data['UpdateEmployeeImageList'] = this.updateEmployeeImageList;
data['UpdateItemTypeSuccessList'] = this.updateItemTypeSuccessList;
data['UpdateUserItemTypesList'] = this.updateUserItemTypesList;
if (this.updateItemTypeSuccessList != null) {
data['UpdateItemTypeSuccessList'] =
this.updateItemTypeSuccessList!.map((v) => v.toJson()).toList();
}
if (this.updateUserItemTypesList != null) {
data['UpdateUserItemTypesList'] = this.updateUserItemTypesList!.toJson();
}
data['UpdateVacationRuleList'] = this.updateVacationRuleList;
data['VHR_EmployeeLoginList'] = this.vHREmployeeLoginList;
data['VHR_GetEmployeeDetailsList'] = this.vHRGetEmployeeDetailsList;

@ -0,0 +1,30 @@
class GetUserItemTypesList {
String? fYAENABLEDFALG;
String? fYIENABLEDFLAG;
String? iTEMTYPE;
int? uSERITEMTYPEID;
GetUserItemTypesList(
{this.fYAENABLEDFALG,
this.fYIENABLEDFLAG,
this.iTEMTYPE,
this.uSERITEMTYPEID});
GetUserItemTypesList.fromJson(Map<String, dynamic> json) {
fYAENABLEDFALG = json['FYA_ENABLED_FALG'];
fYIENABLEDFLAG = json['FYI_ENABLED_FLAG'];
iTEMTYPE = json['ITEM_TYPE'];
uSERITEMTYPEID = json['USER_ITEM_TYPE_ID'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['FYA_ENABLED_FALG'] = this.fYAENABLEDFALG;
data['FYI_ENABLED_FLAG'] = this.fYIENABLEDFLAG;
data['ITEM_TYPE'] = this.iTEMTYPE;
data['USER_ITEM_TYPE_ID'] = this.uSERITEMTYPEID;
return data;
}
}

@ -0,0 +1,25 @@
class UpdateItemTypeSuccessList {
int? itemID;
Null? updateError;
bool? updateSuccess;
UpdateItemTypeSuccessList(
{this.itemID, this.updateError, this.updateSuccess});
UpdateItemTypeSuccessList.fromJson(Map<String, dynamic> json) {
itemID = json['ItemID'];
updateError = json['UpdateError'];
updateSuccess = json['UpdateSuccess'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ItemID'] = this.itemID;
data['UpdateError'] = this.updateError;
data['UpdateSuccess'] = this.updateSuccess;
return data;
}
}

@ -0,0 +1,20 @@
class UpdateUserItemTypesList {
String? pRETURNMSG;
String? pRETURNSTATUS;
UpdateUserItemTypesList({this.pRETURNMSG, this.pRETURNSTATUS});
UpdateUserItemTypesList.fromJson(Map<String, dynamic> json) {
pRETURNMSG = json['P_RETURN_MSG'];
pRETURNSTATUS = json['P_RETURN_STATUS'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['P_RETURN_MSG'] = this.pRETURNMSG;
data['P_RETURN_STATUS'] = this.pRETURNSTATUS;
return data;
}
}

@ -121,6 +121,7 @@ class _WorkListScreenState extends State<WorkListScreen> {
appBar: AppBarWidget(
context,
title: LocaleKeys.workList.tr(),
showNotificationButton: true,
),
body: SizedBox(
width: double.infinity,

@ -4,7 +4,7 @@ import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
AppBar AppBarWidget(BuildContext context, {required String title, bool showHomeButton = false}) {
AppBar AppBarWidget(BuildContext context, {required String title, bool showHomeButton = false, bool showNotificationButton = false}) {
return AppBar(
leadingWidth: 0,
// leading: GestureDetector(
@ -39,6 +39,17 @@ AppBar AppBarWidget(BuildContext context, {required String title, bool showHomeB
},
icon: const Icon(Icons.home, color: MyColors.darkIconColor),
),
if (showNotificationButton)
IconButton(
onPressed: () {
// Navigator.pushAndRemoveUntil(
// context,
// MaterialPageRoute(builder: (context) => LandingPage()),
// (Route<dynamic> route) => false,
// );
},
icon: const Icon(Icons.notifications, color: MyColors.textMixColor),
),
],
);
}

Loading…
Cancel
Save