master-Api2.0_update3.29
aamir-csol 3 months ago
parent db16a822fc
commit 7252bebd1f

@ -378,11 +378,11 @@ class APIError {
// }
class ApiResponse<T> {
final int? totalItemsCount;
final dynamic totalItemsCount;
final T data;
final int? messageStatus;
final String? errorMessage;
final String? errorEndUserMessage;
final dynamic messageStatus;
final dynamic errorMessage;
final dynamic errorEndUserMessage;
ApiResponse({required this.totalItemsCount, required this.data, required this.messageStatus, this.errorMessage, this.errorEndUserMessage});

@ -73,14 +73,8 @@ class ApiClassMapper {
case 'CheckMobileAppVersion':
return CheckMobileAppVersionModel.fromRawJson(jsonData);
case 'GET_MENU':
{
List<ListMenu> data_ =[];
json.decode(jsonData).map((item) {
data_.add(ListMenu.fromRawJson(json.encode(item)));
});
return data_;
}
List<ListMenu> data = (jsonDecode(jsonEncode(jsonData)) as List).map((item) => ListMenu.fromRawJson(jsonEncode(item))).toList();
return data;
// COCWS endpoints
case 'Mohemm_ITG_GetCategories':
return;
@ -277,11 +271,11 @@ class ApiClassMapper {
case 'ErrorCount_Get':
return;
case 'GET_Menu_Entries':
return GetMenuEntriesList.fromRawJson(jsonData);;
return GetMenuEntriesList.fromRawJson(jsonData);
case 'GET_Open_Notifications':
return GenericResponseModel.fromJson(jsonData);
case 'Get_Open_Missing_Swipes':
return GetOpenMissingSwipes.fromRawJson(jsonData);
case 'GET_OPEN_MISSING_SWIPES':
return GetOpenMissingSwipes.fromJson(jsonData);
case 'GET_CONTACT_COLS_STRUCTURE':
return;
case 'GET_EMPLOYEE_ADDRESS':
@ -379,7 +373,9 @@ class ApiClassMapper {
case 'GET_DEFAULT_VALUE':
return;
case 'GET_ACCRUAL_BALANCES':
return GetAccrualBalancesList();
print(jsonEncode(jsonData));
List<GetAccrualBalancesList> data = (jsonDecode(jsonEncode(jsonData)) as List).map((item) => GetAccrualBalancesList.fromRawJson(jsonEncode(item))).toList();
return data;
case 'DisableSession':
return;
case 'GET_VACATION_RULES':

@ -87,8 +87,8 @@ class DashboardApiClient {
postParams.addAll(AppState().postParamsJson);
dynamic response = await ApiClient().postJsonForObject((json) => json, url, postParams, token: AppState().postParamsObject!.tokenID);
ApiResponse res = ApiResponse.fromJson(response);
GetOpenMissingSwipes ress = await ApiClassMapper().handleApiEndpoint(endpoint: "GET_OPEN_MISSING_SWIPES", jsonData: res.data);
ApiResponse res = ApiResponse.fromJson(response);
GetOpenMissingSwipes? ress = await ApiClassMapper().handleApiEndpoint(endpoint: "GET_OPEN_MISSING_SWIPES", jsonData: res.data);
return ress;
}

@ -1,39 +1,86 @@
// class GetAccrualBalancesList {
// GetAccrualBalancesList({
// this.accrualNetEntitlement,
// this.accrualUsedEntitlement,
// this.accrualYearlyEntitlement,
// this.accuralPlanName,
// this.endDate,
// this.lastAccrualDate,
// this.startDate,
// });
//
// double? accrualNetEntitlement;
// num? accrualUsedEntitlement; //Todo: Add function
// dynamic accrualYearlyEntitlement;
// String? accuralPlanName;
// String? endDate;
// String? lastAccrualDate;
// String? startDate;
//
// factory GetAccrualBalancesList.fromJson(Map<String, dynamic> json) => GetAccrualBalancesList(
// accrualNetEntitlement: json["ACCRUAL_NET_ENTITLEMENT"] == null ? null : json["ACCRUAL_NET_ENTITLEMENT"].toDouble(),
// accrualUsedEntitlement: json["ACCRUAL_USED_ENTITLEMENT"] == null ? null : json["ACCRUAL_USED_ENTITLEMENT"],
// accrualYearlyEntitlement: json["ACCRUAL_YEARLY_ENTITLEMENT"],
// accuralPlanName: json["ACCURAL_PLAN_NAME"] == null ? null : json["ACCURAL_PLAN_NAME"],
// endDate: json["END_DATE"] == null ? null : json["END_DATE"],
// lastAccrualDate: json["LAST_ACCRUAL_DATE"] == null ? null : json["LAST_ACCRUAL_DATE"],
// startDate: json["START_DATE"] == null ? null : json["START_DATE"],
// );
//
// Map<String, dynamic> toJson() => {
// "ACCRUAL_NET_ENTITLEMENT": accrualNetEntitlement == null ? null : accrualNetEntitlement,
// "ACCRUAL_USED_ENTITLEMENT": accrualUsedEntitlement == null ? null : accrualUsedEntitlement,
// "ACCRUAL_YEARLY_ENTITLEMENT": accrualYearlyEntitlement,
// "ACCURAL_PLAN_NAME": accuralPlanName == null ? null : accuralPlanName,
// "END_DATE": endDate == null ? null : endDate,
// "LAST_ACCRUAL_DATE": lastAccrualDate == null ? null : lastAccrualDate,
// "START_DATE": startDate == null ? null : startDate,
// };
// }
import 'dart:convert';
class GetAccrualBalancesList {
String? accuraLPlanName;
DateTime? starTDate;
DateTime? enDDate;
DateTime? lasTAccrualDate;
dynamic accruaLYearlyEntitlement;
double? accruaLNetEntitlement;
int? accruaLUsedEntitlement;
GetAccrualBalancesList({
this.accrualNetEntitlement,
this.accrualUsedEntitlement,
this.accrualYearlyEntitlement,
this.accuralPlanName,
this.endDate,
this.lastAccrualDate,
this.startDate,
this.accuraLPlanName,
this.starTDate,
this.enDDate,
this.lasTAccrualDate,
this.accruaLYearlyEntitlement,
this.accruaLNetEntitlement,
this.accruaLUsedEntitlement,
});
double? accrualNetEntitlement;
num? accrualUsedEntitlement; //Todo: Add function
dynamic accrualYearlyEntitlement;
String? accuralPlanName;
String? endDate;
String? lastAccrualDate;
String? startDate;
factory GetAccrualBalancesList.fromRawJson(String str) => GetAccrualBalancesList.fromJson(json.decode(str));
String toRawJson() => json.encode(toJson());
factory GetAccrualBalancesList.fromJson(Map<String, dynamic> json) => GetAccrualBalancesList(
accrualNetEntitlement: json["ACCRUAL_NET_ENTITLEMENT"] == null ? null : json["ACCRUAL_NET_ENTITLEMENT"].toDouble(),
accrualUsedEntitlement: json["ACCRUAL_USED_ENTITLEMENT"] == null ? null : json["ACCRUAL_USED_ENTITLEMENT"],
accrualYearlyEntitlement: json["ACCRUAL_YEARLY_ENTITLEMENT"],
accuralPlanName: json["ACCURAL_PLAN_NAME"] == null ? null : json["ACCURAL_PLAN_NAME"],
endDate: json["END_DATE"] == null ? null : json["END_DATE"],
lastAccrualDate: json["LAST_ACCRUAL_DATE"] == null ? null : json["LAST_ACCRUAL_DATE"],
startDate: json["START_DATE"] == null ? null : json["START_DATE"],
accuraLPlanName: json["accuraL_PLAN_NAME"],
starTDate: json["starT_DATE"] == null ? null : DateTime.parse(json["starT_DATE"]),
enDDate: json["enD_DATE"] == null ? null : DateTime.parse(json["enD_DATE"]),
lasTAccrualDate: json["lasT_ACCRUAL_DATE"] == null ? null : DateTime.parse(json["lasT_ACCRUAL_DATE"]),
accruaLYearlyEntitlement: json["accruaL_YEARLY_ENTITLEMENT"],
accruaLNetEntitlement: json["accruaL_NET_ENTITLEMENT"]?.toDouble(),
accruaLUsedEntitlement: json["accruaL_USED_ENTITLEMENT"],
);
Map<String, dynamic> toJson() => {
"ACCRUAL_NET_ENTITLEMENT": accrualNetEntitlement == null ? null : accrualNetEntitlement,
"ACCRUAL_USED_ENTITLEMENT": accrualUsedEntitlement == null ? null : accrualUsedEntitlement,
"ACCRUAL_YEARLY_ENTITLEMENT": accrualYearlyEntitlement,
"ACCURAL_PLAN_NAME": accuralPlanName == null ? null : accuralPlanName,
"END_DATE": endDate == null ? null : endDate,
"LAST_ACCRUAL_DATE": lastAccrualDate == null ? null : lastAccrualDate,
"START_DATE": startDate == null ? null : startDate,
"accuraL_PLAN_NAME": accuraLPlanName,
"starT_DATE": starTDate?.toIso8601String(),
"enD_DATE": enDDate?.toIso8601String(),
"lasT_ACCRUAL_DATE": lasTAccrualDate?.toIso8601String(),
"accruaL_YEARLY_ENTITLEMENT": accruaLYearlyEntitlement,
"accruaL_NET_ENTITLEMENT": accruaLNetEntitlement,
"accruaL_USED_ENTITLEMENT": accruaLUsedEntitlement,
};
}

@ -46,7 +46,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
List<GetAccrualBalancesList>? accrualList;
GetAccrualBalancesList? leaveBalanceAccrual;
double get leaveBalance => leaveBalanceAccrual?.accrualNetEntitlement ?? 0;
double get leaveBalance => leaveBalanceAccrual?.accruaLNetEntitlement ?? 0;
double ticketBalance = 0;
//Menu Entries
@ -195,7 +195,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
accrualList = await DashboardApiClient().getAccrualBalances(DateFormat("MM/dd/yyyy", "en_US").format(date));
isLeaveTicketBalanceLoading = false;
leaveBalanceAccrual = accrualList![0];
ticketBalance = (accrualList![1].accrualNetEntitlement ?? 0.0) + (accrualList![2].accrualNetEntitlement ?? 0.0) + (accrualList![3].accrualNetEntitlement ?? 0.0);
ticketBalance = (accrualList![1].accruaLNetEntitlement ?? 0.0) + (accrualList![2].accruaLNetEntitlement ?? 0.0) + (accrualList![3].accruaLNetEntitlement ?? 0.0);
notifyListeners();
} catch (ex) {
isLeaveTicketBalanceLoading = false;

@ -148,14 +148,14 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
data.fetchWorkListCounter(context);
data.fetchMissingSwipe(context);
data.fetchLeaveTicketBalance(context, DateTime.now());
data.fetchMenuEntries();
data.getCategoryOffersListAPI(context);
marathonProvider.getMarathonDetailsFromApi();
marathonProvider.getMarathonTutorial();
if (isFromInit) {
checkERMChannel();
}
if (!cProvider.disbaleChatForThisUser && !isFromInit) checkHubCon();
// data.fetchMenuEntries();
// data.getCategoryOffersListAPI(context);
// marathonProvider.getMarathonDetailsFromApi();
// marathonProvider.getMarathonTutorial();
// if (isFromInit) {
// checkERMChannel();
// }
// if (!cProvider.disbaleChatForThisUser && !isFromInit) checkHubCon();
_refreshController.refreshCompleted();
}

@ -68,14 +68,14 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
if (widget.isLeaveBalance) {
leaveBalanceAccrual = accrualList[0];
chartModelList = [
PieChartModel(LocaleKeys.currentBalance.tr(), leaveBalanceAccrual?.accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
PieChartModel(LocaleKeys.usedBalance.tr(), leaveBalanceAccrual?.accrualUsedEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
PieChartModel(LocaleKeys.currentBalance.tr(), leaveBalanceAccrual?.accruaLNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
PieChartModel(LocaleKeys.usedBalance.tr(), leaveBalanceAccrual?.accruaLNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
];
} else {
chartModelList = [
PieChartModel(LocaleKeys.adult.tr(), accrualList[1].accrualNetEntitlement?.toDouble() ?? 0, MyColors.textMixColor, titleAppend: ""),
PieChartModel(LocaleKeys.child.tr(), accrualList[2].accrualNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
PieChartModel(LocaleKeys.infants.tr(), accrualList[3].accrualNetEntitlement?.toDouble() ?? 0, MyColors.pinkColor, titleAppend: ""),
PieChartModel(LocaleKeys.adult.tr(), accrualList[1].accruaLNetEntitlement?.toDouble() ?? 0, MyColors.textMixColor, titleAppend: ""),
PieChartModel(LocaleKeys.child.tr(), accrualList[2].accruaLNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
PieChartModel(LocaleKeys.infants.tr(), accrualList[3].accruaLNetEntitlement?.toDouble() ?? 0, MyColors.pinkColor, titleAppend: ""),
];
}
}
@ -92,8 +92,8 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
if (leaveBalanceAccrual == null && widget.isLeaveBalance) {
leaveBalanceAccrual = Provider.of<DashboardProviderModel>(context, listen: false).leaveBalanceAccrual;
chartModelList = [
PieChartModel(LocaleKeys.currentBalance.tr(), leaveBalanceAccrual?.accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
PieChartModel(LocaleKeys.usedBalance.tr(), leaveBalanceAccrual?.accrualUsedEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
PieChartModel(LocaleKeys.currentBalance.tr(), leaveBalanceAccrual?.accruaLNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
PieChartModel(LocaleKeys.usedBalance.tr(), leaveBalanceAccrual?.accruaLNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
];
}
@ -101,9 +101,9 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
ticketBalanceAccrualList = Provider.of<DashboardProviderModel>(context, listen: false).accrualList ?? [];
if (ticketBalanceAccrualList!.isNotEmpty) {
chartModelList = [
PieChartModel(LocaleKeys.adult.tr(), ticketBalanceAccrualList![1].accrualNetEntitlement?.toDouble() ?? 0, MyColors.textMixColor, titleAppend: ""),
PieChartModel(LocaleKeys.child.tr(), ticketBalanceAccrualList![2].accrualNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
PieChartModel(LocaleKeys.infants.tr(), ticketBalanceAccrualList![3].accrualNetEntitlement?.toDouble() ?? 0, MyColors.pinkColor, titleAppend: ""),
PieChartModel(LocaleKeys.adult.tr(), ticketBalanceAccrualList![1].accruaLNetEntitlement?.toDouble() ?? 0, MyColors.textMixColor, titleAppend: ""),
PieChartModel(LocaleKeys.child.tr(), ticketBalanceAccrualList![2].accruaLNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
PieChartModel(LocaleKeys.infants.tr(), ticketBalanceAccrualList![3].accruaLNetEntitlement?.toDouble() ?? 0, MyColors.pinkColor, titleAppend: ""),
];
}
}

Loading…
Cancel
Save