Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 25 Wiki Activity

keep old notification behavior,

Browse Source
ui_ux_rollout_merge_notification_settings
Sikander Saleem 24 hours ago
parent b97f310d9d
commit f1f7f19ecc
3 changed files with 106 additions and 66 deletions
Show Stats Download Patch File Download Diff File

4
lib/controllers/api_routes/urls.dart
Unescape Escape View File

@ -7,8 +7,8 @@ class URLs {
// static const host1 = "https://atomsmdev.hmg.com"; // local DEV url // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
static const host1 = "https://atomsmuat.hmg.com"; // local UAT url static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
// static final String _baseUrl = "$_host/mobile"; // host local UAT static final String _baseUrl = "$_host/mobile"; // host local UAT
static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
// static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM // static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM
// static final String _baseUrl = "$_host/v4/mobile"; // v4 for Demo module // static final String _baseUrl = "$_host/v4/mobile"; // v4 for Demo module
// static final String _baseUrl = "$_host/v5/mobile"; // v5 for data segregation // static final String _baseUrl = "$_host/v5/mobile"; // v5 for data segregation

164
lib/controllers/notification/firebase_notification_manger.dart
Unescape Escape View File

@ -103,6 +103,7 @@ class FirebaseNotificationManger {
Widget? serviceClass; Widget? serviceClass;
String? transactionType = messageData["transactionType"]?.toString(); String? transactionType = messageData["transactionType"]?.toString();
bool IsOldNotification = messageData["IsOldNotification"]?.toString() == null;
if (transactionType == null) { if (transactionType == null) {
return; return;
@ -142,71 +143,106 @@ class FirebaseNotificationManger {
return; return;
} }
switch (transactionType) { if (IsOldNotification) {
case "1": switch (transactionType) {
serviceClass = CMDetailPage(requestId: int.parse(messageData["requestNumber"].toString()), moduleId: 1); case "1":
break; serviceClass = PpmDetailsPage(requestId: int.parse(messageData["requestNumber"].toString()));
case "2": break;
serviceClass = GasRefillDetailsPage( case "3":
priority: messageData["priority"], serviceClass = CMDetailPage(requestId: int.parse(messageData["requestNumber"].toString()), moduleId: 1);
date: messageData["createdOn"], break;
moduleId: 2, case "8":
model: GasRefillModel(id: int.parse(messageData["requestNumber"].toString())), serviceClass = CMDetailPage(requestId: int.parse(messageData["requestNumber"].toString()), moduleId: 1);
); break;
break; case "11":
case "3": serviceClass = CMDetailPage(requestId: int.parse(messageData["requestNumber"].toString()), moduleId: 1);
serviceClass = DeviceTransferDetails(model: DeviceTransfer(id: int.parse(messageData["requestNumber"].toString())), moduleId: 3); break;
break; case "7":
case "4": serviceClass = DeviceTransferDetails(model: DeviceTransfer(id: int.parse(messageData["requestNumber"].toString())), moduleId: 3);
serviceClass = PpmDetailsPage(requestId: int.parse(messageData["requestNumber"].toString())); break;
break; case "9":
case "5": serviceClass = GasRefillDetailsPage(
serviceClass = RecurrentWorkOrderView(taskId: int.parse(messageData["requestNumber"].toString())); priority: messageData["priority"],
break; date: messageData["createdOn"],
case "6": moduleId: 2,
serviceClass = TaskRequestDetailsView( model: GasRefillModel(id: int.parse(messageData["requestNumber"].toString())),
taskId: int.parse(messageData["requestNumber"].toString()), );
requestDetails: RequestsDetails(nameOfType: messageData["sourceName"], status: messageData["statusName"], priority: messageData["priorityName"], date: messageData["createdDate"]), break;
moduleId: 6); case "12":
break; serviceClass = RecurrentWorkOrderView(taskId: int.parse(messageData["requestNumber"].toString()));
case "7": case "17":
serviceClass = TaskRequestDetailsView( serviceClass = SurveyPage(surveyId: int.parse(messageData["requestNumber"].toString()));
taskId: int.parse(messageData["requestNumber"].toString()),
requestDetails: RequestsDetails(nameOfType: messageData["sourceName"], status: messageData["statusName"], priority: messageData["priorityName"], date: messageData["createdDate"]),
moduleId: 7);
break;
case "8":
serviceClass = AssetInventoryPage(sessionId: int.parse(messageData["requestNumber"].toString()), moduleId: int.parse(transactionType));
break;
case "9":
serviceClass = TrafRequestDetailPage(trafId: int.parse(messageData["requestNumber"].toString()));
break;
case "10":
serviceClass = EquipmentInternalAuditDetailPage(auditId: int.parse(messageData["requestNumber"].toString()));
break;
case "11":
serviceClass = SystemInternalAuditDetailPage(auditId: int.parse(messageData["requestNumber"].toString()));
break;
case "12":
serviceClass = LoanEquipmentDetailPage(loanId: int.parse(messageData["requestNumber"].toString()));
break;
case "13":
serviceClass = AssetDeliveryPage(requestId: int.parse(messageData["requestNumber"].toString()));
break;
case "14":
serviceClass = MedicalGasInspectionDetailPage(inspectionId: int.parse(messageData["requestNumber"].toString()), prority: messageData["priorityName"]);
break;
case "15":
serviceClass = DemoDetailViewPage(demoId: int.parse(messageData["requestNumber"].toString()), moduleId: 15);
break;
case "16":
serviceClass = IncidentDetailPage(incidentId: int.parse(messageData["requestNumber"].toString()));
break;
case "17":
serviceClass = SurveyPage(surveyId: int.parse(messageData["requestNumber"].toString()));
default: default:
serviceClass = const Scaffold(appBar: DefaultAppBar(), body: Center(child: NoDataFound())); serviceClass = const Scaffold(appBar: DefaultAppBar(), body: Center(child: NoDataFound()));
}
} else {
switch (transactionType) {
case "1":
serviceClass = CMDetailPage(requestId: int.parse(messageData["requestNumber"].toString()), moduleId: 1);
break;
case "2":
serviceClass = GasRefillDetailsPage(
priority: messageData["priority"],
date: messageData["createdOn"],
moduleId: 2,
model: GasRefillModel(id: int.parse(messageData["requestNumber"].toString())),
);
break;
case "3":
serviceClass = DeviceTransferDetails(model: DeviceTransfer(id: int.parse(messageData["requestNumber"].toString())), moduleId: 3);
break;
case "4":
serviceClass = PpmDetailsPage(requestId: int.parse(messageData["requestNumber"].toString()));
break;
case "5":
serviceClass = RecurrentWorkOrderView(taskId: int.parse(messageData["requestNumber"].toString()));
break;
case "6":
serviceClass = TaskRequestDetailsView(
taskId: int.parse(messageData["requestNumber"].toString()),
requestDetails: RequestsDetails(nameOfType: messageData["sourceName"], status: messageData["statusName"], priority: messageData["priorityName"], date: messageData["createdDate"]),
moduleId: 6);
break;
case "7":
serviceClass = TaskRequestDetailsView(
taskId: int.parse(messageData["requestNumber"].toString()),
requestDetails: RequestsDetails(nameOfType: messageData["sourceName"], status: messageData["statusName"], priority: messageData["priorityName"], date: messageData["createdDate"]),
moduleId: 7);
break;
case "8":
serviceClass = AssetInventoryPage(sessionId: int.parse(messageData["requestNumber"].toString()), moduleId: int.parse(transactionType));
break;
case "9":
serviceClass = TrafRequestDetailPage(trafId: int.parse(messageData["requestNumber"].toString()));
break;
case "10":
serviceClass = EquipmentInternalAuditDetailPage(auditId: int.parse(messageData["requestNumber"].toString()));
break;
case "11":
serviceClass = SystemInternalAuditDetailPage(auditId: int.parse(messageData["requestNumber"].toString()));
break;
case "12":
serviceClass = LoanEquipmentDetailPage(loanId: int.parse(messageData["requestNumber"].toString()));
break;
case "13":
serviceClass = AssetDeliveryPage(requestId: int.parse(messageData["requestNumber"].toString()));
break;
case "14":
serviceClass = MedicalGasInspectionDetailPage(inspectionId: int.parse(messageData["requestNumber"].toString()), prority: messageData["priorityName"]);
break;
case "15":
serviceClass = DemoDetailViewPage(demoId: int.parse(messageData["requestNumber"].toString()), moduleId: 15);
break;
case "16":
serviceClass = IncidentDetailPage(incidentId: int.parse(messageData["requestNumber"].toString()));
break;
case "17":
serviceClass = SurveyPage(surveyId: int.parse(messageData["requestNumber"].toString()));
default:
serviceClass = const Scaffold(appBar: DefaultAppBar(), body: Center(child: NoDataFound()));
}
} }
Navigator.of(context).push(MaterialPageRoute(builder: (_) => serviceClass!)); Navigator.of(context).push(MaterialPageRoute(builder: (_) => serviceClass!));

4
lib/models/system_notification_model.dart
Unescape Escape View File

@ -24,6 +24,7 @@ class SystemNotificationModel {
String? sentDate; String? sentDate;
int? noOfFailure; int? noOfFailure;
int? totalUnreadCount; // Added from API payload int? totalUnreadCount; // Added from API payload
bool? isOldNotification;
SystemNotificationModel( SystemNotificationModel(
{this.userId, {this.userId,
@ -48,6 +49,7 @@ class SystemNotificationModel {
this.sent, this.sent,
this.sentDate, this.sentDate,
this.noOfFailure, this.noOfFailure,
this.isOldNotification,
this.totalUnreadCount}); this.totalUnreadCount});
SystemNotificationModel.fromJson(Map<String, dynamic>? json) { SystemNotificationModel.fromJson(Map<String, dynamic>? json) {
@ -79,6 +81,7 @@ class SystemNotificationModel {
sentDate = json['sentDate']; sentDate = json['sentDate'];
noOfFailure = json['noOfFailure']; noOfFailure = json['noOfFailure'];
totalUnreadCount = json['totalUnreadCount']; totalUnreadCount = json['totalUnreadCount'];
isOldNotification = json['IsOldNotification'];
} }
} }
@ -106,6 +109,7 @@ class SystemNotificationModel {
data['sentDate'] = sentDate; data['sentDate'] = sentDate;
data['noOfFailure'] = noOfFailure; data['noOfFailure'] = noOfFailure;
data['totalUnreadCount'] = totalUnreadCount; data['totalUnreadCount'] = totalUnreadCount;
data['IsOldNotification'] = isOldNotification;
return data; return data;
} }

Write Preview
Loading…
Cancel
Save