From 32eb24ddf5ed6d92b7287a0130bed81b918455d5 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 2 Jul 2025 13:23:39 +0200 Subject: [PATCH] get notification sevice --- .../mih_notification_services.dart | 18 +++++++++ .../lib/mih_services/mih_service_calls.dart | 39 ++----------------- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/Frontend/lib/mih_services/mih_notification_services.dart b/Frontend/lib/mih_services/mih_notification_services.dart index 00298801..c58bca6f 100644 --- a/Frontend/lib/mih_services/mih_notification_services.dart +++ b/Frontend/lib/mih_services/mih_notification_services.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_objects/notification.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; @@ -11,6 +12,23 @@ class MihNotificationApis { final baseAPI = AppEnviroment.baseApiUrl; //================== Notifications ========================================================================== + Future> getNotificationByUser( + String app_id, + int notificationAmount, + ) async { + var responseNotification = await http.get( + Uri.parse("$baseAPI/notifications/$app_id?amount=$notificationAmount")); + if (responseNotification.statusCode == 200) { + String body = responseNotification.body; + Iterable l = jsonDecode(body); + List notifications = List.from( + l.map((model) => MIHNotification.fromJson(model))); + return notifications; + } else { + return []; + } + } + /// This function is used to create notification to patient for access reviews /// /// Patameters:- diff --git a/Frontend/lib/mih_services/mih_service_calls.dart b/Frontend/lib/mih_services/mih_service_calls.dart index 2ed117aa..a1b701cc 100644 --- a/Frontend/lib/mih_services/mih_service_calls.dart +++ b/Frontend/lib/mih_services/mih_service_calls.dart @@ -96,21 +96,10 @@ class MIHApiCalls { } //Get Notifications - var responseNotification = await http.get( - Uri.parse("$baseAPI/notifications/$uid?amount=$notificationAmount")); - if (responseNotification.statusCode == 200) { - String body = responseNotification.body; - // var decodedData = jsonDecode(body); - // MIHNotification notifications = MIHNotification.fromJson(decodedData); - - Iterable l = jsonDecode(body); - //print("Here2"); - List notifications = List.from( - l.map((model) => MIHNotification.fromJson(model))); - notifi = notifications; - } else { - notifi = []; - } + notifi = await MihNotificationApis().getNotificationByUser( + uid, + notificationAmount, + ); //get patient profile Patient? patient = await MihPatientServices().getPatientDetails( @@ -122,26 +111,6 @@ class MIHApiCalls { patientData = null; } - // print("Here"); - // print("Body: ${response.body}"); - // print("Code: ${response.statusCode}"); - // var errorCode = response.statusCode.toString(); - // var errorBody = response.body; - - // final response = await http.get( - // Uri.parse("${AppEnviroment.baseApiUrl}/patients/${userData.app_id}")); - // if (response.statusCode == 200) { - // // print("Here1"); - // var decodedData = jsonDecode(response.body); - // // print("Here2"); - // Patient patients = Patient.fromJson(decodedData as Map); - // // print("Here3"); - // // print(patients); - // patientData = patients; - // } else { - // patientData = null; - // } - //print(userPic); return HomeArguments( userData, bUserData, busData, patientData, notifi, userPic); }