Merge branch 'fix_inpatient' into 'development'

Fix inpatient

See merge request Cloud_Solution/doctor_app_flutter!849

lib/core/model/Prescriptions/prescription_report.dart

@@ -1,13 +1,13 @@
 class PrescriptionReport {
   String address;
-  int appointmentNo;
+  dynamic appodynamicmentNo;
   String clinic;
   String companyName;
-  int days;
+  dynamic days;
   String doctorName;
   var doseDailyQuantity;
   String frequency;
-  int frequencyNumber;
+  dynamic frequencyNumber;
   String image;
   String imageExtension;
   String imageSRCUrl;
@@ -15,30 +15,30 @@ class PrescriptionReport {
   String imageThumbUrl;
   String isCovered;
   String itemDescription;
-  int itemID;
+  dynamic itemID;
   String orderDate;
-  int patientID;
+  dynamic patientID;
   String patientName;
   String phoneOffice1;
   String prescriptionQR;
-  int prescriptionTimes;
+  dynamic prescriptionTimes;
   String productImage;
   String productImageBase64;
   String productImageString;
-  int projectID;
+  dynamic projectID;
   String projectName;
   String remarks;
   String route;
   String sKU;
-  int scaleOffset;
+  dynamic scaleOffset;
   String startDate;
 
   String patientAge;
   String patientGender;
   String phoneOffice;
-  int doseTimingID;
+  dynamic doseTimingID;
-  int frequencyID;
+  dynamic frequencyID;
-  int routeID;
+  dynamic routeID;
   String name;
   String itemDescriptionN;
   String routeN;
@@ -46,7 +46,7 @@ class PrescriptionReport {
 
   PrescriptionReport({
     this.address,
-    this.appointmentNo,
+    this.appodynamicmentNo,
     this.clinic,
     this.companyName,
     this.days,
@@ -92,7 +92,7 @@ class PrescriptionReport {
 
   PrescriptionReport.fromJson(Map<String, dynamic> json) {
     address = json['Address'];
-    appointmentNo = json['AppointmentNo'];
+    appodynamicmentNo = json['AppodynamicmentNo'];
     clinic = json['Clinic'];
     companyName = json['CompanyName'];
     days = json['Days'];
@@ -141,7 +141,7 @@ class PrescriptionReport {
     final Map<String, dynamic> data = new Map<String, dynamic>();
 
     data['Address'] = this.address;
-    data['AppointmentNo'] = this.appointmentNo;
+    data['AppodynamicmentNo'] = this.appodynamicmentNo;
     data['Clinic'] = this.clinic;
     data['CompanyName'] = this.companyName;
     data['Days'] = this.days;

lib/core/model/Prescriptions/prescription_report_enh.dart

@@ -1,41 +1,41 @@
 class PrescriptionReportEnh {
   String address;
-  int appointmentNo;
+  dynamic appodynamicmentNo;
   String clinic;
-  Null companyName;
+  dynamic companyName;
-  int days;
+  dynamic days;
   String doctorName;
-  int doseDailyQuantity;
+  dynamic doseDailyQuantity;
   String frequency;
-  int frequencyNumber;
+  dynamic frequencyNumber;
-  Null image;
+  dynamic image;
-  Null imageExtension;
+  dynamic imageExtension;
   String imageSRCUrl;
-  Null imageString;
+  dynamic imageString;
   String imageThumbUrl;
   String isCovered;
   String itemDescription;
-  int itemID;
+  dynamic itemID;
   String orderDate;
-  int patientID;
+  dynamic patientID;
   String patientName;
   String phoneOffice1;
-  Null prescriptionQR;
+  dynamic prescriptionQR;
-  int prescriptionTimes;
+  dynamic prescriptionTimes;
-  Null productImage;
+  dynamic productImage;
-  Null productImageBase64;
+  dynamic productImageBase64;
   String productImageString;
-  int projectID;
+  dynamic projectID;
   String projectName;
   String remarks;
   String route;
   String sKU;
-  int scaleOffset;
+  dynamic scaleOffset;
   String startDate;
 
   PrescriptionReportEnh(
       {this.address,
-        this.appointmentNo,
+        this.appodynamicmentNo,
         this.clinic,
         this.companyName,
         this.days,
@@ -70,7 +70,7 @@ class PrescriptionReportEnh {
 
   PrescriptionReportEnh.fromJson(Map<String, dynamic> json) {
     address = json['Address'];
-    appointmentNo = json['AppointmentNo'];
+    appodynamicmentNo = json['AppodynamicmentNo'];
     clinic = json['Clinic'];
     companyName = json['CompanyName'];
     days = json['Days'];
@@ -107,7 +107,7 @@ class PrescriptionReportEnh {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['Address'] = this.address;
-    data['AppointmentNo'] = this.appointmentNo;
+    data['AppodynamicmentNo'] = this.appodynamicmentNo;
     data['Clinic'] = this.clinic;
     data['CompanyName'] = this.companyName;
     data['Days'] = this.days;

lib/screens/patients/In_patient/in_patient_screen.dart

@@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/models/dashboard/get_special_clinical_care_Li
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/screens/patients/In_patient/InPatientHeader.dart';
 import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
+import 'package:doctor_app_flutter/util/helpers.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@@ -50,7 +51,9 @@ class _InPatientScreenState extends State<InPatientScreen>
   }
 
   _handleTabSelection() {
+    Helpers.hideKeyboard(context);
     setState(() {
+      widget.showBottomSheet = false;
       _activeTab = _tabController.index;
     });
   }

lib/widgets/shared/text_fields/text_fields_utils.dart

@@ -46,7 +46,7 @@ class TextFieldsUtils{
         borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
         borderRadius: BorderRadius.circular(8),
       ),*/
-      hintText: selectedText != null ? selectedText : hintText,
+      hintText: selectedText != null ? selectedText : hintText??"",
       suffixIcon: Icon(suffixIcon??null, color: Colors.grey.shade600,),
 
       hintStyle: TextStyle(