Merge branch 'development' into soap-objective-feature-re-design

lib/client/base_app_client.dart

@@ -68,6 +68,7 @@ class BaseAppClient {
         body['LanguageID'] = 2;
 
       body['stamp'] = STAMP;
+     // if(!body.containsKey("IPAdress"))
       body['IPAdress'] = IP_ADDRESS;
       body['VersionID'] = VERSION_ID;
       body['Channel'] = CHANNEL;
@@ -85,6 +86,9 @@ class BaseAppClient {
 
       print("URL : $url");
       print("Body : ${json.encode(body)}");
+      String bodyData= json.encode(body);
+      var asd="";
+
 
       if (await Helpers.checkConnection()) {
         final response = await http.post(url,

lib/core/model/medical_file_request_model.dart

@@ -1,8 +1,9 @@
 class MedicalFileRequestModel {
   int patientMRN;
   String vidaAuthTokenID;
+  String iPAdress;
 
-  MedicalFileRequestModel({this.patientMRN, this.vidaAuthTokenID});
+  MedicalFileRequestModel({this.patientMRN, this.vidaAuthTokenID,this.iPAdress});
 
   MedicalFileRequestModel.fromJson(Map<String, dynamic> json) {
     patientMRN = json['PatientMRN'];
@@ -13,6 +14,7 @@ class MedicalFileRequestModel {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['PatientMRN'] = this.patientMRN;
     data['VidaAuthTokenID'] = this.vidaAuthTokenID;
+    data['IPAdress'] = this.iPAdress;
     return data;
   }
 }

lib/core/service/medical_file_service.dart

@@ -16,6 +16,7 @@ class MedicalFileService extends BaseService {
 
   Future getMedicalFile({int mrn}) async {
     _fileRequestModel = MedicalFileRequestModel(patientMRN: mrn);
+    _fileRequestModel.iPAdress = "9.9.9.9";
     hasError = false;
     _medicalFileList.clear();
     await baseAppClient.post(GET_MEDICAL_FILE,

lib/screens/patients/insurance_approval_screen_patient.dart

@@ -147,7 +147,7 @@ class _InsuranceApprovalScreenNewState
                                     .toString(),
                                 isPrescriptions: true,
                                 approvalStatus: model.insuranceApproval[index]
-                                    .approvalDetails.status,
+                                    .approvalDetails?.status??'',
                               ),
                             ),
                           ),

lib/widgets/doctor/my_schedule_widget.dart

@@ -21,31 +21,32 @@ class MyScheduleWidget extends StatelessWidget {
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            SizedBox(
-              height: 10,
-            ),
-            AppText(
-              workingHoursTable.dayName,
-              fontSize: 2.5 * SizeConfig.textMultiplier,
-              fontFamily: 'Poppins',
-              // fontSize: 18
-            ),
-            SizedBox(
-              height: 10,
-            ),
-            AppText(
-              ' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}',
-              fontSize: 2.5 * SizeConfig.textMultiplier,
-              fontWeight: FontWeight.w700,
-
-              fontFamily: 'Poppins',
-              // fontSize: 18
-            ),
-          ],
+        Expanded(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(
+                height: 10,
+              ),
+              AppText(
+                workingHoursTable.dayName,
+                fontSize: 2.5 * SizeConfig.textMultiplier,
+                fontFamily: 'Poppins',
+                // fontSize: 18
+              ),
+              SizedBox(
+                height: 10,
+              ),
+              AppText(
+                ' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}',
+                fontSize: 2.5 * SizeConfig.textMultiplier,
+                fontWeight: FontWeight.w700,
+                fontFamily: 'Poppins',
+                // fontSize: 18
+              ),
+            ],
+          ),
         ),
         Container(
           width: MediaQuery.of(context).size.width * 0.55,
@@ -80,15 +81,10 @@ class MyScheduleWidget extends StatelessWidget {
                             ),
                             Container(
                               width: MediaQuery.of(context).size.width*0.55,
-                              child: Expanded(
-                                child: Padding(
-                                  padding: const EdgeInsets.all(8.0),
-                                  child: AppText(
-                                    work.from + ' - ' + work.to,
-                                    fontSize: 15,
-                                    fontWeight: FontWeight.w300,
-                                  ),
-                                ),
+                              child: AppText(
+                               '${work.from}  -  ${work.to}',
+                                fontSize: 15,
+                                fontWeight: FontWeight.w300,
                               ),
                             )
                           ],