From 6620c79478270252333094d5f92515ac5864a263 Mon Sep 17 00:00:00 2001
From: Mohammad Aljammal <Mohammad.Al-Jammal@cloudsolutions.com.sa>
Date: Wed, 26 May 2021 10:33:21 +0300
Subject: [PATCH] fix ui issues

---
 lib/config/config.dart                        |  4 +--
 .../procedure_template_details_model.dart     | 25 +++++++++++++++++++
 lib/core/viewModel/procedure_View_model.dart  |  2 +-
 lib/screens/procedures/add_lab_orders.dart    |  5 ++--
 lib/screens/procedures/procedure_screen.dart  |  2 +-
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/lib/config/config.dart b/lib/config/config.dart
index 36f4f88d..08dd8562 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
-//const BASE_URL = 'https://hmgwebservices.com/';
-const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
diff --git a/lib/core/model/procedure/procedure_template_details_model.dart b/lib/core/model/procedure/procedure_template_details_model.dart
index 42a2517a..c566a539 100644
--- a/lib/core/model/procedure/procedure_template_details_model.dart
+++ b/lib/core/model/procedure/procedure_template_details_model.dart
@@ -4,6 +4,7 @@ class ProcedureTempleteDetailsModel {
   int clinicID;
   int doctorID;
   int templateID;
+  String templateName;
   String procedureID;
   bool isActive;
   int createdBy;
@@ -16,6 +17,9 @@ class ProcedureTempleteDetailsModel {
   String aliasN;
   String categoryID;
   String subGroupID;
+  String categoryDescription;
+  String categoryDescriptionN;
+  String categoryAlias;
   dynamic riskCategoryID;
   String type = "1";
   String remarks;
@@ -40,6 +44,10 @@ class ProcedureTempleteDetailsModel {
       this.categoryID,
       this.subGroupID,
       this.riskCategoryID,
+      this.templateName,
+      this.categoryDescription,
+      this.categoryDescriptionN,
+      this.categoryAlias,
       this.remarks,
       this.type = "1",
       this.selectedType = 0});
@@ -63,6 +71,10 @@ class ProcedureTempleteDetailsModel {
     categoryID = json['CategoryID'];
     subGroupID = json['SubGroupID'];
     riskCategoryID = json['RiskCategoryID'];
+    templateName = json['TemplateName'];
+    categoryDescription = json['CategoryDescription'];
+    categoryDescriptionN = json['CategoryDescriptionN'];
+    categoryAlias = json['CategoryAlias'];
   }
 
   Map<String, dynamic> toJson() {
@@ -85,6 +97,19 @@ class ProcedureTempleteDetailsModel {
     data['CategoryID'] = this.categoryID;
     data['SubGroupID'] = this.subGroupID;
     data['RiskCategoryID'] = this.riskCategoryID;
+    data['TemplateName'] = this.templateName;
+    data['CategoryDescription'] = this.categoryDescription;
+    data['CategoryDescriptionN'] = this.categoryDescriptionN;
+    data['CategoryAlias'] = this.categoryAlias;
     return data;
   }
 }
+class ProcedureTempleteDetailsModelList {
+  List<ProcedureTempleteDetailsModel> procedureTemplate;
+  String templateName;
+
+  ProcedureTempleteDetailsModelList(
+      {this.templateName, ProcedureTempleteDetailsModel template}) {
+    procedureTemplate.add(template);
+  }
+}
diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart
index 4411f7b5..29b4b0e4 100644
--- a/lib/core/viewModel/procedure_View_model.dart
+++ b/lib/core/viewModel/procedure_View_model.dart
@@ -61,7 +61,7 @@ class ProcedureViewModel extends BaseViewModel {
   Future getProcedure({int mrn, String patientType}) async {
     hasError = false;
     await getDoctorProfile();
-    doctorProfile.doctorID;
+
     //_insuranceCardService.clearInsuranceCard();
     setState(ViewState.Busy);
     await _procedureService.getProcedure(mrn: mrn);
diff --git a/lib/screens/procedures/add_lab_orders.dart b/lib/screens/procedures/add_lab_orders.dart
index 4a20dbaa..cd3205df 100644
--- a/lib/screens/procedures/add_lab_orders.dart
+++ b/lib/screens/procedures/add_lab_orders.dart
@@ -159,15 +159,14 @@ class _AddSelectedLabOrderState extends State<AddSelectedLabOrder> {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
                             children: [
                               AppText(
                                 TranslationBase.of(context).applyForNewLabOrder,
                                 fontWeight: FontWeight.w700,
                                 fontSize: 20,
                               ),
-                              SizedBox(
-                                width: MediaQuery.of(context).size.width * 0.48,
-                              ),
+
                               InkWell(
                                 child: Icon(
                                   Icons.close,
diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart
index b6bd705a..f6752c4a 100644
--- a/lib/screens/procedures/procedure_screen.dart
+++ b/lib/screens/procedures/procedure_screen.dart
@@ -189,7 +189,7 @@ class ProcedureScreen extends StatelessWidget {
                         //       'You Cant Update This Procedure');
                       },
                       patient: patient,
-                      doctorID: model.doctorProfile.doctorID,
+                      doctorID: model?.doctorProfile?.doctorID,
                     ),
                   ),
                 if (model.state == ViewState.ErrorLocal ||