first step from radiology

lib/config/config.dart

@@ -238,6 +238,7 @@ const GET_PAtIENTS_INSURANCE_APPROVALS =
 
 const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL';
 const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders';
+const GET_IN_PATIENT_ORDERS = 'Services/DoctorApplication.svc/REST/GetPatientRadResult';
 
 ///Prescriptions
 const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList';

lib/core/model/radiology/final_radiology.dart

@@ -1,47 +1,47 @@
 import 'package:doctor_app_flutter/util/date-utils.dart';
 
 class FinalRadiology {
-  String setupID;
-  int projectID;
-  Null patientID;
-  int invoiceLineItemNo;
-  int invoiceNo;
-  int doctorID;
-  int clinicID;
+  dynamic setupID;
+  dynamic projectID;
+  dynamic patientID;
+  dynamic invoiceLineItemNo;
+  dynamic invoiceNo;
+  dynamic doctorID;
+  dynamic clinicID;
   DateTime orderDate;
-  String reportData;
-  String imageURL;
-  String procedureID;
-  int appointmentNo;
-  Null dIAPacsURL;
+  dynamic reportData;
+  dynamic imageURL;
+  dynamic procedureID;
+  dynamic appodynamicmentNo;
+  dynamic dIAPacsURL;
   bool isRead;
-  String readOn;
+  dynamic readOn;
   var admissionNo;
   bool isInOutPatient;
-  int actualDoctorRate;
-  String clinicDescription;
-  String dIAPACSURL;
-  String doctorImageURL;
-  String doctorName;
-  int doctorRate;
-  String doctorTitle;
-  int gender;
-  String genderDescription;
+  dynamic actualDoctorRate;
+  dynamic clinicDescription;
+  dynamic dIAPACSURL;
+  dynamic doctorImageURL;
+  dynamic doctorName;
+  dynamic doctorRate;
+  dynamic doctorTitle;
+  dynamic gender;
+  dynamic genderDescription;
   bool isActiveDoctorProfile;
   bool isExecludeDoctor;
-  String isInOutPatientDescription;
-  String isInOutPatientDescriptionN;
-  String nationalityFlagURL;
-  int noOfPatientsRate;
-  int orderNo;
-  String projectName;
-  String qR;
-  String reportDataHTML;
-  String reportDataTextString;
-  List<String> speciality;
+  dynamic isInOutPatientDescription;
+  dynamic isInOutPatientDescriptionN;
+  dynamic nationalityFlagURL;
+  dynamic noOfPatientsRate;
+  dynamic orderNo;
+  dynamic projectName;
+  dynamic qR;
+  dynamic reportDataHTML;
+  dynamic reportDataTextdynamic;
+  List<dynamic> speciality;
   bool isCVI;
   bool isRadMedicalReport;
-  bool isLiveCareAppointment;
+  bool isLiveCareAppodynamicment;
 
   FinalRadiology(
       {this.setupID,
@@ -55,7 +55,7 @@ class FinalRadiology {
       this.reportData,
       this.imageURL,
       this.procedureID,
-      this.appointmentNo,
+      this.appodynamicmentNo,
       this.dIAPacsURL,
       this.isRead,
       this.readOn,
@@ -80,12 +80,12 @@ class FinalRadiology {
       this.projectName,
       this.qR,
       this.reportDataHTML,
-      this.reportDataTextString,
+      this.reportDataTextdynamic,
       this.speciality,
       this.isCVI,
-      this.isRadMedicalReport,this.isLiveCareAppointment});
+      this.isRadMedicalReport,this.isLiveCareAppodynamicment});
 
-  FinalRadiology.fromJson(Map<String, dynamic> json) {
+  FinalRadiology.fromJson(Map<dynamic, dynamic> json) {
     try {
       setupID = json['SetupID'];
       projectID = json['ProjectID'];
@@ -98,7 +98,7 @@ class FinalRadiology {
       reportData = json['ReportData'];
       imageURL = json['ImageURL'];
       procedureID = json['ProcedureID'];
-      appointmentNo = json['AppointmentNo'];
+      appodynamicmentNo = json['AppodynamicmentNo'];
       dIAPacsURL = json['DIAPacsURL'];
       isRead = json['IsRead'];
       readOn = json['ReadOn'];
@@ -122,20 +122,21 @@ class FinalRadiology {
       orderNo = json['OrderNo'];
       projectName = json['ProjectName'];
       qR = json['QR'];
-      isLiveCareAppointment = json['IsLiveCareAppointment'];
+      isLiveCareAppodynamicment = json['IsLiveCareAppodynamicment'];
       reportDataHTML = json['ReportDataHTML'];
-      reportDataTextString = json['ReportDataTextString'];
-    //  speciality = json['Speciality'].cast<String>();
+      reportDataTextdynamic = json['ReportDataTextdynamic'];
+    //  speciality = json['Speciality'].cast<dynamic>();
       isCVI = json['isCVI'];
       isRadMedicalReport = json['isRadMedicalReport'];
 
     } catch (e) {
       print(e);
+
     }
   }
 
-  Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
+  Map<dynamic, dynamic> toJson() {
+    final Map<dynamic, dynamic> data = new Map<dynamic, dynamic>();
     data['SetupID'] = this.setupID;
     data['ProjectID'] = this.projectID;
     data['PatientID'] = this.patientID;
@@ -147,7 +148,7 @@ class FinalRadiology {
     data['ReportData'] = this.reportData;
     data['ImageURL'] = this.imageURL;
     data['ProcedureID'] = this.procedureID;
-    data['AppointmentNo'] = this.appointmentNo;
+    data['AppodynamicmentNo'] = this.appodynamicmentNo;
     data['DIAPacsURL'] = this.dIAPacsURL;
     data['IsRead'] = this.isRead;
     data['ReadOn'] = this.readOn;
@@ -172,7 +173,7 @@ class FinalRadiology {
     data['ProjectName'] = this.projectName;
     data['QR'] = this.qR;
     data['ReportDataHTML'] = this.reportDataHTML;
-    data['ReportDataTextString'] = this.reportDataTextString;
+    data['ReportDataTextdynamic'] = this.reportDataTextdynamic;
     data['Speciality'] = this.speciality;
     data['isCVI'] = this.isCVI;
     data['isRadMedicalReport'] = this.isRadMedicalReport;
@@ -181,7 +182,7 @@ class FinalRadiology {
 }
 
 class FinalRadiologyList {
-  String filterName = "";
+  dynamic filterName = "";
   List<FinalRadiology> finalRadiologyList = List();
 
   FinalRadiologyList({this.filterName, FinalRadiology finalRadiology}) {

lib/core/service/radiology_service.dart

@@ -28,12 +28,20 @@ class RadiologyService extends BaseService {
   }
 
   Future getPatientRadOrders(PatiantInformtion patient) async {
+    String url = GET_PATIENT_ORDERS;
+    if(patient.patientType == 1) {
+      url = GET_IN_PATIENT_ORDERS;
+    }
     hasError = false;
-    await baseAppClient.postPatient(GET_PATIENT_ORDERS,
+    await baseAppClient.postPatient(url,
         patient: patient,
         onSuccess: (dynamic response, int statusCode) {
           finalRadiologyList.clear();
-          response['ListRAD'].forEach((radiology) {
+          String label = "ListRAD";
+          if(patient.patientType == 1) {
+            label ="List_GetRadOreders";
+          }
+          response[label].forEach((radiology) {
             finalRadiologyList.add(FinalRadiology.fromJson(radiology));
           });
         }, onFailure: (String error, int statusCode) {

lib/screens/patients/profile/radiology/radiology_home_page.dart

@@ -111,13 +111,13 @@ class RadiologyHomePage extends StatelessWidget {
                             ),
                           ),
                         ),
-                        child: DoctorCard(
+                        child:  DoctorCard(
                           doctorName: model.radiologyList[index].doctorName,
                           profileUrl: model.radiologyList[index].doctorImageURL,
                           invoiceNO: '${model.radiologyList[index].invoiceNo}',
                           branch: '${model.radiologyList[index].projectName}',
                           clinic: model.radiologyList[index].clinicDescription,
-                  appointmentDate: model.radiologyList[index].orderDate,
+                  appointmentDate: model.radiologyList[index].orderDate ?? model.radiologyList[index].reportData,
                 ),
               )),
                 if(model.radiologyList.isEmpty && patient.patientStatusType != 43)

lib/widgets/doctor/my_schedule_widget.dart

@@ -1,4 +1,5 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart';
 import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/helpers.dart';
@@ -6,6 +7,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class MyScheduleWidget extends StatelessWidget {
   final ListDoctorWorkingHoursTable workingHoursTable;
@@ -14,6 +16,7 @@ class MyScheduleWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    ProjectViewModel projectViewModel = Provider.of(context);
     List<WorkingHours> workingHours = Helpers.getWorkingHours(
       workingHoursTable.workingHours,
     );
@@ -30,7 +33,7 @@ class MyScheduleWidget extends StatelessWidget {
                 height: 10,
               ),
               AppText(
-                workingHoursTable.dayName,
+                projectViewModel.isArabic?DateUtils.getWeekDayArabic(workingHoursTable.date.weekday): DateUtils.getWeekDay(workingHoursTable.date.weekday) ,
                 fontSize: 18,
                 fontFamily: 'Poppins',
                 // fontSize: 18
@@ -71,6 +74,7 @@ class MyScheduleWidget extends StatelessWidget {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: workingHours.map((work) {
                       return Container(
+                        margin: EdgeInsets.only(bottom:workingHours.length>1? 15:0),
                         child: Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: <Widget>[