updates & fixes

android/app/build.gradle

@@ -5,6 +5,8 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
     id "com.google.firebase.crashlytics"
     id "com.huawei.agconnect"
+//    id("com.mapbox.gradle.application")
+//    id("com.mapbox.gradle.plugins.ndk")
 }
 
 
@@ -146,6 +148,7 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
 
     implementation 'com.mapbox.maps:android:11.5.0'
+//    implementation 'com.mapbox.maps:android:11.4.0'
 
     // AARs
     implementation files('libs/PenNavUI.aar')

android/build.gradle

@@ -3,6 +3,19 @@ buildscript {
         mavenCentral()
         google()
         maven { url "https://developer.huawei.com/repo/" }
+        maven {
+            url = uri("https://api.mapbox.com/downloads/v2/releases/maven")
+            credentials {
+                username = "mapbox"
+                password = "sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg"
+                if (password == null || password == "") {
+                    throw new GradleException("MAPBOX_DOWNLOADS_TOKEN isn't set. Set it to the project properties or to the environment variables.")
+                }
+            }
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.0'

android/settings.gradle

@@ -131,10 +131,6 @@ pluginManagement {
 //        return vitalSignEnginePath
 //    }()
 
-
-
-
-
     repositories {
         google()
         mavenCentral()
@@ -166,7 +162,6 @@ pluginManagement {
             }
             maven {
                 url 'https://api.mapbox.com/downloads/v2/releases/maven'
-
                 credentials {
                     username = 'mapbox'
                     password = "sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg"

lib/core/model/radiology/final_radiology.dart

@@ -44,6 +44,7 @@ class FinalRadiology {
   bool? isCVI;
   bool? isRadMedicalReport;
   bool? isLiveCareAppointment;
+  String? exam_Id;
 
   FinalRadiology(
       {this.setupID,
@@ -88,7 +89,8 @@ class FinalRadiology {
       this.speciality,
       this.isCVI,
       this.isRadMedicalReport,
-      this.isLiveCareAppointment});
+      this.isLiveCareAppointment,
+      this.exam_Id});
 
   FinalRadiology.fromJson(Map<String, dynamic> json) {
     try {
@@ -135,6 +137,7 @@ class FinalRadiology {
       //  speciality = json['Speciality'].cast<String>();
       isCVI = json['isCVI'];
       isRadMedicalReport = json['isRadMedicalReport'];
+      exam_Id = json['Exam_id'];
     } catch (e) {
       print(e);
     }

lib/core/service/medical/medical_service.dart

@@ -55,7 +55,7 @@ class MedicalService extends BaseService {
 
   getSchedule(DoctorList doctorRequest) async {
     Map<String, dynamic> request;
-    request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 7};
+    request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 90};
     dynamic localRes;
     await baseAppClient.post(DOCTOR_SCHEDULE_URL, onSuccess: (response, statusCode) async {
       localRes = response;
@@ -68,7 +68,7 @@ class MedicalService extends BaseService {
 
   getFreeSlot(DoctorList doctorRequest) async {
     Map<String, dynamic> request;
-    request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 7};
+    request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 90};
     dynamic localRes;
     await baseAppClient.post(GET_DOCTOR_FREE_SLOTS, onSuccess: (response, statusCode) async {
       localRes = response;

lib/core/service/medical/radiology_service.dart

@@ -12,7 +12,7 @@ class RadiologyService extends BaseService {
 
   String radReportPDF = "";
 
-  Future getRadImageURL({int? invoiceNo, String? invoiceType, int? lineItem, int? projectId, bool? isVidaPlus}) async {
+  Future getRadImageURL({int? invoiceNo, String? invoiceType, int? lineItem, int? projectId, bool? isVidaPlus, String? examId}) async {
     hasError = false;
     final Map<String, dynamic> body = new Map<String, dynamic>();
     body['InvoiceNo'] = isVidaPlus! ? "0" : invoiceNo;
@@ -20,6 +20,7 @@ class RadiologyService extends BaseService {
     body['LineItemNo'] = lineItem;
     body['ProjectID'] = projectId;
     body['InvoiceType'] = invoiceType;
+    body['ExamId'] = examId;
 
     await baseAppClient.post(GET_RAD_IMAGE_URL, isAllowAny: true, onSuccess: (dynamic response, int statusCode) {
       url = response['Data'];

lib/core/viewModels/medical/radiology_view_model.dart

@@ -56,9 +56,9 @@ class RadiologyViewModel extends BaseViewModel {
 
   String get radImageURL => _radiologyService.url;
 
-  getRadImageURL({required int invoiceNo, String? invoiceType, required int lineItem, required int projectId, required bool isVidaPlus}) async {
+  getRadImageURL({required int invoiceNo, String? invoiceType, required int lineItem, required int projectId, required bool isVidaPlus, required String examId}) async {
     setState(ViewState.Busy);
-    await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, invoiceType: invoiceType, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus);
+    await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, invoiceType: invoiceType, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus, examId: examId);
     if (_radiologyService.hasError) {
       error = _radiologyService.error!;
       setState(ViewState.Error);

lib/pages/login/confirm-login.dart

@@ -99,7 +99,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
   late ToDoCountProviderModel toDoProvider;
 
   var dob;
-  late int isHijri;
+  int isHijri = 0;
   var healthId;
 
   @override

lib/pages/medical/radiology/radiology_details_page.dart

@@ -33,7 +33,8 @@ class RadiologyDetailsPage extends StatelessWidget {
           invoiceType: finalRadiology!.invoiceType,
           lineItem: finalRadiology!.invoiceLineItemNo!,
           invoiceNo: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!) ? finalRadiology!.invoiceNo_VP : finalRadiology!.invoiceNo,
-          isVidaPlus: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!)),
+          isVidaPlus: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!),
+          examId: finalRadiology!.exam_Id ?? ""),
       builder: (_, model, widget) => AppScaffold(
         appBarTitle: TranslationBase.of(context).report,
         isShowAppBar: true,