Merge branch 'fix_issues' into 'development'

Fix issues

See merge request Cloud_Solution/doctor_app_flutter!260

lib/config/localized_values.dart

@@ -627,4 +627,6 @@ const Map<String, Map<String, String>> localizedValues = {
   'addProgressNote': {'en': "Add Progress Note", 'ar':"أضف ملاحظة التقدم" },
   'createdBy': {'en': "Created By :", 'ar':"أضيفت : " },
   'editedBy': {'en': "Edited By :", 'ar':"عدلت : " },
+  'currentMedications': {'en': "Current Medications", 'ar':"الأدوية الحالية" },
+  'noItem': {'en': "No items exists in this list", 'ar':"لا توجد عناصر في هذه القائمة" },
 };

lib/core/viewModel/SOAP_view_model.dart

@@ -253,7 +253,7 @@ class SOAPViewModel extends BaseViewModel {
           masterKeys: MasterKeysService.Allergies,
           id: element.allergyDiseaseId,
           typeId: element.allergyDiseaseType);
-      if(selectedAllergy != null)
+      if(selectedAllergy != null && element.isChecked)
       allergiesString +=
           (isArabic ? selectedAllergy.nameAr : selectedAllergy.nameEn )+ ' , ';
     });

lib/models/patient/patiant_info_model.dart

@@ -111,7 +111,7 @@ class PatiantInformtion {
         projectId: json["ProjectID"] ?? json["projectID"],
         clinicId: json["ClinicID"]?? json["clinicID"],
         doctorId: json["DoctorID"]?? json["doctorID"],
-        patientId: json["PatientID"]?? json["patientID"],
+        patientId: json["PatientID"]?? json["patientID"]??json['patientMRN'] ?? json['PatientMRN'],
         doctorName: json["DoctorName"]?? json["doctorName"],
         doctorNameN: json["DoctorNameN"]?? json["doctorNameN"],
         firstName: json["FirstName"]?? json["firstName"],

lib/screens/doctor/doctor_reply_screen.dart

@@ -3,6 +3,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/doctor/doctor_reply_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
+import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -22,7 +23,8 @@ class DoctorReplyScreen extends StatelessWidget {
         builder: (_, model, w) => AppScaffold(
           baseViewModel: model,
               appBarTitle: TranslationBase.of(context).replay2,
-              body: Container(
+              body: model
+                  .listDoctorWorkingHoursTable.isEmpty ? DrAppEmbeddedError(error: TranslationBase.of(context).noItem):Container(
                           padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),
                           child: ListView(
                             children: [

lib/screens/patients/patient_search_screen.dart

@@ -1,4 +1,3 @@
-import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
 import 'package:doctor_app_flutter/models/patient/patient_model.dart';
@@ -15,7 +14,6 @@ import 'package:provider/provider.dart';
 import '../../config/config.dart';
 import '../../config/size_config.dart';
 import '../../lookups/patient_lookup.dart';
-import '../../models/doctor/doctor_profile_model.dart';
 import '../../widgets/patients/dynamic_elements.dart';
 import '../../widgets/shared/app_buttons_widget.dart';
 import '../../widgets/shared/app_scaffold_widget.dart';
@@ -44,6 +42,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
   String itemText2 = '';
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
   bool _autoValidate = false;
+  bool onlyArrived = false;
 
   var _patientSearchFormValues = PatientModel(
       FirstName: "0",
@@ -87,7 +86,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
         });
       }
     } catch (err) {
-      error = err;
+      error = err.toString();
     }
   }
 
@@ -244,13 +243,14 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
                                     TranslationBase.of(context).firstName,
                                 borderColor: Colors.white,
                                 onSaved: (value) {
-                                  value == null
+                                  value == null || value == ''
                                       ? _patientSearchFormValues.setFirstName =
                                           "0"
                                       : _patientSearchFormValues.setFirstName =
                                           value;
 
-                                  if (value.toString().trim().isEmpty) {
+                                  if (value != null &&
+                                      value.toString().trim().isEmpty) {
                                     _patientSearchFormValues.setFirstName = "0";
                                   }
                                 },
@@ -274,14 +274,17 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
                                     TranslationBase.of(context).middleName,
                                 borderColor: Colors.white,
                                 onSaved: (value) {
-                                  value == null
+                                  value == null || value == ''
                                       ? _patientSearchFormValues.setMiddleName =
                                           "0"
                                       : _patientSearchFormValues.setMiddleName =
                                           value;
-                                  if (value.toString().trim().isEmpty) {
+                                  if (value != null && value
+                                      .toString()
+                                      .trim()
+                                      .isEmpty) {
                                     _patientSearchFormValues.setMiddleName =
-                                        "0";
+                                    "0";
                                   }
                                 },
                                 // validator: (value) {
@@ -303,12 +306,15 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
                                 labelText: TranslationBase.of(context).lastName,
                                 borderColor: Colors.white,
                                 onSaved: (value) {
-                                  value == null
+                                  value == null || value == ''
                                       ? _patientSearchFormValues.setLastName =
                                           "0"
                                       : _patientSearchFormValues.setLastName =
                                           value;
-                                  if (value.toString().trim().isEmpty) {
+                                  if (value != null && value
+                                      .toString()
+                                      .trim()
+                                      .isEmpty) {
                                     _patientSearchFormValues.setLastName = "0";
                                   }
                                 },
@@ -331,13 +337,16 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
                               textInputType: TextInputType.number,
                               inputFormatter: ONLY_NUMBERS,
                               onSaved: (value) {
-                                value == null
+                                value == null || value == ''
                                     ? _patientSearchFormValues
                                         .setPatientMobileNumber = "0"
                                     : _patientSearchFormValues
                                         .setPatientMobileNumber = value;
 
-                                if (value.toString().trim().isEmpty) {
+                                if (value != null && value
+                                    .toString()
+                                    .trim()
+                                    .isEmpty) {
                                   _patientSearchFormValues
                                       .setPatientMobileNumber = "0";
                                 }
@@ -361,12 +370,15 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
                                 textInputType: TextInputType.number,
                                 inputFormatter: ONLY_NUMBERS,
                                 onSaved: (value) {
-                                  value == null
+                                  value == null || value==''
                                       ? _patientSearchFormValues.setPatientID =
                                           0
                                       : _patientSearchFormValues.setPatientID =
                                           int.parse(value);
-                                  if (value.toString().trim().isEmpty) {
+                                  if (value != null && value
+                                      .trim()
+                                      .toString()
+                                      .isEmpty) {
                                     _patientSearchFormValues.setPatientID = 0;
                                   }
                                 }),
@@ -491,10 +503,14 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
                                   height: 25,
                                   width: 25,
                                   child: Checkbox(
-                                      value: true,
+                                      value: onlyArrived,
                                       checkColor: HexColor("#2A930A"),
                                       activeColor: Colors.white,
-                                      onChanged: (bool newValue) {}),
+                                      onChanged: (bool newValue) {
+                                        setState(() {
+                                          onlyArrived = newValue;
+                                        });
+                                      }),
                                 ),
                                 SizedBox(
                                   width: 12,

lib/screens/patients/patients_screen.dart

@@ -481,6 +481,10 @@ class _PatientsScreenState extends State<PatientsScreen> {
                                                                           backGroundcolor:
                                                                         Colors.white,
                                                                         ),
+                                                                      SizedBox(
+                                                                        height:
+                                                                        5,
+                                                                      ),
                                                                     ],
                                                                   ),
                                                                   Row(
@@ -502,13 +506,13 @@ class _PatientsScreenState extends State<PatientsScreen> {
                                                                                 fontWeight: FontWeight.bold,
                                                                                 backGroundcolor: Colors.white,
                                                                               ),
-
                                                                               AppText(
                                                                                 item.patientId.toString(),
                                                                                 fontSize: 1.8 * SizeConfig.textMultiplier,
                                                                                 fontWeight: FontWeight.w300,
                                                                                 backGroundcolor: Colors.white,
-                                                                              ),SizedBox(
+                                                                              ),
+                                                                              SizedBox(
                                                                                 width: 10,
                                                                               ),
                                                                             ],
@@ -517,15 +521,20 @@ class _PatientsScreenState extends State<PatientsScreen> {
                                                                             height:
                                                                                 2.5,
                                                                           ),
-                                                                          AppText(
+                                                                          Container(
-                                                                            TranslationBase.of(context).nationality +" : "+(
+                                                                            child:
-                                                                                item.nationalityName??item.nationality),
+                                                                                AppText(
-                                                                            fontSize:
+                                                                              TranslationBase.of(context).nationality + " : " + (item.nationalityName ?? item.nationality),
-                                                                                1.8 * SizeConfig.textMultiplier,
+                                                                              fontSize: 1.8 * SizeConfig.textMultiplier,
-                                                                            fontWeight:
+                                                                              fontWeight: FontWeight.bold,
-                                                                                FontWeight.bold,
+                                                                              backGroundcolor: Colors.white,
-                                                                            backGroundcolor:
+                                                                            ),
-                                                                                Colors.white,
+                                                                            margin:
+                                                                                EdgeInsets.only(right: projectsProvider.isArabic ? 0 : 10, left: projectsProvider.isArabic ? 10 : 0),
+                                                                          ),
+                                                                          SizedBox(
+                                                                            width:
+                                                                                10,
                                                                           ),
                                                                           SizedBox(
                                                                             height:
@@ -590,16 +599,32 @@ class _PatientsScreenState extends State<PatientsScreen> {
                                                                             Wrap(
                                                                               children: [
                                                                                 AppText(
-                                                                                  TranslationBase.of(context).age2,
+                                                                                  TranslationBase
-                                                                                  fontSize: 1.8 * SizeConfig.textMultiplier,
+                                                                                      .of(
-                                                                                  fontWeight: FontWeight.bold,
+                                                                                      context)
-                                                                                  backGroundcolor: Colors.white,
+                                                                                      .age2,
+                                                                                  fontSize: 1.8 *
+                                                                                      SizeConfig
+                                                                                          .textMultiplier,
+                                                                                  fontWeight: FontWeight
+                                                                                      .bold,
+                                                                                  backGroundcolor: Colors
+                                                                                      .white,
                                                                                 ),
                                                                                 AppText(
-                                                                                  item.age.toString(),
+                                                                                  item
-                                                                                  fontSize: 1.8 * SizeConfig.textMultiplier,
+                                                                                      .age
-                                                                                  fontWeight: FontWeight.w300,
+                                                                                      .toString(),
-                                                                                  backGroundcolor: Colors.white,
+                                                                                  fontSize: 1.8 *
+                                                                                      SizeConfig
+                                                                                          .textMultiplier,
+                                                                                  fontWeight: FontWeight
+                                                                                      .w300,
+                                                                                  backGroundcolor: Colors
+                                                                                      .white,
+                                                                                ),
+                                                                                SizedBox(
+                                                                                  width: 10,
                                                                                 ),
                                                                               ],
                                                                             ),
@@ -607,6 +632,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
                                                                               height:
                                                                                   2.5,
                                                                             ),
+
                                                                             Wrap(
                                                                               children: [
                                                                                 AppText(

lib/util/translations_delegate_base.dart

@@ -25,6 +25,7 @@ class TranslationBase {
   String get lanArabic => localizedValues['lanArabic'][locale.languageCode];
 
   String get theDoctor => localizedValues['theDoctor'][locale.languageCode];
+
   String get reply => localizedValues['reply'][locale.languageCode];
 
   String get time => localizedValues['time'][locale.languageCode];
@@ -45,223 +46,380 @@ class TranslationBase {
       localizedValues['errorNoSchedule'][locale.languageCode];
 
   String get verify => localizedValues['verify'][locale.languageCode];
+
   String get referralDoctor =>
       localizedValues['referralDoctor'][locale.languageCode];
+
   String get referringClinic =>
       localizedValues['referringClinic'][locale.languageCode];
+
   String get frequency => localizedValues['frequency'][locale.languageCode];
+
   String get priority => localizedValues['priority'][locale.languageCode];
+
   String get maxResponseTime =>
       localizedValues['maxResponseTime'][locale.languageCode];
+
   String get clinicDetailsandRemarks =>
       localizedValues['clinicDetailsandRemarks'][locale.languageCode];
+
   String get answerSuggestions =>
       localizedValues['answerSuggestions'][locale.languageCode];
+
   String get outPatients => localizedValues['outPatients'][locale.languageCode];
+
   String get searchPatient =>
       localizedValues['searchPatient'][locale.languageCode];
+
   String get searchAbout => localizedValues['searchAbout'][locale.languageCode];
+
   String get patient => localizedValues['patient'][locale.languageCode];
+
   String get labResult => localizedValues['labResult'][locale.languageCode];
+
   String get todayStatistics =>
       localizedValues['todayStatistics'][locale.languageCode];
+
   String get familyMedicine =>
       localizedValues['familyMedicine'][locale.languageCode];
+
   String get arrived => localizedValues['arrived'][locale.languageCode];
+
   String get er => localizedValues['er'][locale.languageCode];
+
   String get walkIn => localizedValues['walkIn'][locale.languageCode];
+
   String get notArrived => localizedValues['notArrived'][locale.languageCode];
+
   String get radiology => localizedValues['radiology'][locale.languageCode];
+
   String get service => localizedValues['service'][locale.languageCode];
+
   String get referral => localizedValues['referral'][locale.languageCode];
+
   String get inPatient => localizedValues['inPatient'][locale.languageCode];
+
   String get operations => localizedValues['operations'][locale.languageCode];
+
   String get patientServices =>
       localizedValues['patientServices'][locale.languageCode];
+
   String get searchMedicine =>
       localizedValues['searchMedicine'][locale.languageCode];
+
   String get myReferralPatient =>
       localizedValues['myReferralPatient'][locale.languageCode];
 
   String get referPatient =>
       localizedValues['referPatient'][locale.languageCode];
+
   String get myReferral => localizedValues['myReferral'][locale.languageCode];
+
   String get myReferredPatient =>
       localizedValues['myReferredPatient'][locale.languageCode];
+
   String get firstName => localizedValues['firstName'][locale.languageCode];
+
   String get middleName => localizedValues['middleName'][locale.languageCode];
+
   String get lastName => localizedValues['lastName'][locale.languageCode];
+
   String get phoneNumber => localizedValues['phoneNumber'][locale.languageCode];
+
   String get patientID => localizedValues['patientID'][locale.languageCode];
+
   String get patientFile => localizedValues['patientFile'][locale.languageCode];
+
   String get search => localizedValues['search'][locale.languageCode];
+
   String get onlyArrivedPatient =>
       localizedValues['onlyArrivedPatient'][locale.languageCode];
+
   String get searchMedicineNameHere =>
       localizedValues['searchMedicineNameHere'][locale.languageCode];
+
   String get youCanFind => localizedValues['youCanFind'][locale.languageCode];
+
   String get itemsInSearch =>
       localizedValues['itemsInSearch'][locale.languageCode];
+
   String get qr => localizedValues['qr'][locale.languageCode];
+
   String get reader => localizedValues['reader'][locale.languageCode];
+
   String get startScanning =>
       localizedValues['startScanning'][locale.languageCode];
+
   String get scanQrCode => localizedValues['scanQrCode'][locale.languageCode];
+
   String get scanQr => localizedValues['scanQr'][locale.languageCode];
+
   String get profile => localizedValues['profile'][locale.languageCode];
+
   String get gender => localizedValues['gender'][locale.languageCode];
+
   String get clinic => localizedValues['clinic'][locale.languageCode];
+
   String get clinicSelect =>
       localizedValues['clinicSelect'][locale.languageCode];
+
   String get doctorSelect =>
       localizedValues['doctorSelect'][locale.languageCode];
+
   String get hospital => localizedValues['hospital'][locale.languageCode];
+
   String get speciality => localizedValues['speciality'][locale.languageCode];
+
   String get errorMessage =>
       localizedValues['errorMessage'][locale.languageCode];
+
   String get patientProfile =>
       localizedValues['patientProfile'][locale.languageCode];
+
   String get vitalSign => localizedValues['vitalSign'][locale.languageCode];
+
   String get vital => localizedValues['vital'][locale.languageCode];
+
   String get signs => localizedValues['signs'][locale.languageCode];
+
   String get labOrder => localizedValues['labOrder'][locale.languageCode];
+
   String get lab => localizedValues['lab'][locale.languageCode];
+
   String get result => localizedValues['result'][locale.languageCode];
+
   String get medicines => localizedValues['medicines'][locale.languageCode];
+
   String get prescription =>
       localizedValues['prescription'][locale.languageCode];
+
   String get insuranceApprovals =>
       localizedValues['insuranceApprovals'][locale.languageCode];
+
   String get insurance => localizedValues['insurance'][locale.languageCode];
+
   String get approvals => localizedValues['approvals'][locale.languageCode];
+
   String get bodyMeasurements =>
       localizedValues['bodyMeasurements'][locale.languageCode];
+
   String get temperature => localizedValues['temperature'][locale.languageCode];
+
   String get pulse => localizedValues['pulse'][locale.languageCode];
+
   String get respiration => localizedValues['respiration'][locale.languageCode];
+
   String get bloodPressure =>
       localizedValues['bloodPressure'][locale.languageCode];
+
   String get oxygenation => localizedValues['oxygenation'][locale.languageCode];
+
   String get painScale => localizedValues['painScale'][locale.languageCode];
+
   String get errorNoVitalSign =>
       localizedValues['errorNoVitalSign'][locale.languageCode];
+
   String get labOrders => localizedValues['labOrders'][locale.languageCode];
+
   String get errorNoLabOrders =>
       localizedValues['errorNoLabOrders'][locale.languageCode];
+
   String get answerThePatient =>
       localizedValues['answerThePatient'][locale.languageCode];
+
   String get pleaseEnterAnswer =>
       localizedValues['pleaseEnterAnswer'][locale.languageCode];
+
   String get replay => localizedValues['replay'][locale.languageCode];
+
   String get progressNote =>
       localizedValues['progressNote'][locale.languageCode];
+
   String get progress => localizedValues['progress'][locale.languageCode];
+
   String get note => localizedValues['note'][locale.languageCode];
+
   String get searchNote => localizedValues['searchNote'][locale.languageCode];
+
   String get errorNoProgressNote =>
       localizedValues['errorNoProgressNote'][locale.languageCode];
+
   String get invoiceNo => localizedValues['invoiceNo:'][locale.languageCode];
+
   String get generalResult =>
       localizedValues['generalResult'][locale.languageCode];
+
   String get description => localizedValues['description'][locale.languageCode];
+
   String get value => localizedValues['value'][locale.languageCode];
+
   String get range => localizedValues['range'][locale.languageCode];
+
   String get enterId => localizedValues['enterId'][locale.languageCode];
+
   String get pleaseEnterYourID =>
       localizedValues['pleaseEnterYourID'][locale.languageCode];
+
   String get enterPassword =>
       localizedValues['enterPassword'][locale.languageCode];
+
   String get pleaseEnterPassword =>
       localizedValues['pleaseEnterPassword'][locale.languageCode];
+
   String get selectYourProject =>
       localizedValues['selectYourProject'][locale.languageCode];
+
   String get pleaseEnterYourProject =>
       localizedValues['pleaseEnterYourProject'][locale.languageCode];
+
   String get login => localizedValues['login'][locale.languageCode];
+
   String get drSulaimanAlHabib =>
       localizedValues['drSulaimanAlHabib'][locale.languageCode];
+
   String get welcomeTo => localizedValues['welcomeTo'][locale.languageCode];
+
   String get welcomeBackTo =>
       localizedValues['welcomeBackTo'][locale.languageCode];
+
   String get home => localizedValues['home'][locale.languageCode];
+
   String get services => localizedValues['services'][locale.languageCode];
+
   String get sms => localizedValues['sms'][locale.languageCode];
+
   String get fingerprint => localizedValues['fingerprint'][locale.languageCode];
+
   String get faceId => localizedValues['faceId'][locale.languageCode];
+
   String get whatsApp => localizedValues['whatsApp'][locale.languageCode];
+
   String get whatsAppBy => localizedValues['whatsAppBy'][locale.languageCode];
+
   String get pleaseChoose =>
       localizedValues['pleaseChoose'][locale.languageCode];
+
   String get choose => localizedValues['choose'][locale.languageCode];
+
   String get verification =>
       localizedValues['verification'][locale.languageCode];
+
   String get firstStep => localizedValues['firstStep'][locale.languageCode];
+
   String get yourAccount =>
       localizedValues['yourAccount!'][locale.languageCode];
+
   String get verify1 => localizedValues['verify1'][locale.languageCode];
+
   String get youWillReceiveA =>
       localizedValues['youWillReceiveA'][locale.languageCode];
+
   String get loginCode => localizedValues['loginCode'][locale.languageCode];
+
   String get smsBy => localizedValues['smsBy'][locale.languageCode];
+
   String get pleaseEnterTheCode =>
       localizedValues['pleaseEnterTheCode'][locale.languageCode];
+
   String get youDontHaveAnyPatient =>
       localizedValues['youDon\'tHaveAnyPatient'][locale.languageCode];
+
   String get youDoNotHaveAnyItem =>
       localizedValues['youDoNotHaveAnyItem'][locale.languageCode];
+
   String get age => localizedValues['age'][locale.languageCode];
+
   String get nationality => localizedValues['nationality'][locale.languageCode];
+
   String get today => localizedValues['today'][locale.languageCode];
+
   String get tomorrow => localizedValues['tomorrow'][locale.languageCode];
+
   String get all => localizedValues['all'][locale.languageCode];
+
   String get nextWeek => localizedValues['nextWeek'][locale.languageCode];
+
   String get yesterday => localizedValues['yesterday'][locale.languageCode];
+
   String get errorNoInsuranceApprovals =>
       localizedValues['errorNoInsuranceApprovals'][locale.languageCode];
+
   String get searchInsuranceApprovals =>
       localizedValues['searchInsuranceApprovals'][locale.languageCode];
+
   String get status => localizedValues['status'][locale.languageCode];
+
   String get expiryDate => localizedValues['expiryDate'][locale.languageCode];
+
   String get producerName =>
       localizedValues['producerName'][locale.languageCode];
+
   String get receiptOn => localizedValues['receiptOn'][locale.languageCode];
+
   String get approvalNo => localizedValues['approvalNo'][locale.languageCode];
+
   String get doctor => localizedValues['doctor'][locale.languageCode];
+
   String get ext => localizedValues['ext'][locale.languageCode];
+
   String get veryUrgent => localizedValues['veryUrgent'][locale.languageCode];
+
   String get urgent => localizedValues['urgent'][locale.languageCode];
+
   String get routine => localizedValues['routine'][locale.languageCode];
+
   String get send => localizedValues['send'][locale.languageCode];
+
   String get referralFrequency =>
       localizedValues['referralFrequency'][locale.languageCode];
+
   String get selectReferralFrequency =>
       localizedValues['selectReferralFrequency'][locale.languageCode];
+
   String get clinicalDetailsAndRemarks =>
       localizedValues['clinicalDetailsAndRemarks'][locale.languageCode];
+
   String get remarks => localizedValues['remarks'][locale.languageCode];
+
   String get pleaseFill => localizedValues['pleaseFill'][locale.languageCode];
+
   String get replay2 => localizedValues['replay2'][locale.languageCode];
+
   String get outPatient => localizedValues['outPatient'][locale.languageCode];
+
   String get logout => localizedValues['logout'][locale.languageCode];
+
   String get pharmaciesList =>
       localizedValues['pharmaciesList'][locale.languageCode];
+
   String get price => localizedValues['price'][locale.languageCode];
+
   String get youCanFindItIn =>
       localizedValues['youCanFindItIn'][locale.languageCode];
+
   String get radiologyReport =>
       localizedValues['radiologyReport'][locale.languageCode];
+
   String get orders => localizedValues['orders'][locale.languageCode];
+
   String get list => localizedValues['list'][locale.languageCode];
+
   String get searchOrders =>
       localizedValues['searchOrders'][locale.languageCode];
+
   String get prescriptionDetails =>
       localizedValues['prescriptionDetails'][locale.languageCode];
+
   String get prescriptionInfo =>
       localizedValues['prescriptionInfo'][locale.languageCode];
+
   String get errorNoOrders =>
       localizedValues['errorNoOrders'][locale.languageCode];
+
   String get livecare => localizedValues['livecare'][locale.languageCode];
+
   String get beingBad => localizedValues['beingBad'][locale.languageCode];
+
   String get beingGreat => localizedValues['beingGreat'][locale.languageCode];
 
   String get cancel => localizedValues['cancel'][locale.languageCode];
@@ -300,58 +458,94 @@ class TranslationBase {
       localizedValues['searchPatientImageCaptionBody'][locale.languageCode];
 
   String get welcome => localizedValues['welcome'][locale.languageCode];
+
   String get typeMedicineName =>
       localizedValues['typeMedicineName'][locale.languageCode];
+
   String get moreThan3Letter =>
       localizedValues['moreThan3Letter'][locale.languageCode];
+
   String get gender2 => localizedValues['gender2'][locale.languageCode];
+
   String get age2 => localizedValues['age2'][locale.languageCode];
+
   String get sickleave => localizedValues['sick-leaves'][locale.languageCode];
+
   String get patientSick =>
       localizedValues['patient-sick'][locale.languageCode];
+
   String get leave => localizedValues['leave'][locale.languageCode];
+
   String get submit => localizedValues['submit'][locale.languageCode];
+
   String get doctorName => localizedValues['doc-name'][locale.languageCode];
+
   String get clinicName => localizedValues['clinicname'][locale.languageCode];
+
   String get sickLeaveDate =>
       localizedValues['sick-leave-date'][locale.languageCode];
+
   String get sickLeaveDays =>
       localizedValues['sick-leave-days'][locale.languageCode];
+
   String get admissionDetail =>
       localizedValues['admissionDetail'][locale.languageCode];
+
   String get dateTime => localizedValues['dateTime'][locale.languageCode];
+
   String get date => localizedValues['date'][locale.languageCode];
+
   String get admissionNo => localizedValues['admissionNo'][locale.languageCode];
+
   String get losNo => localizedValues['losNo'][locale.languageCode];
+
   String get area => localizedValues['area'][locale.languageCode];
+
   String get room => localizedValues['room'][locale.languageCode];
+
   String get bed => localizedValues['bed'][locale.languageCode];
+
   String get previousSickLeaveIssue =>
       localizedValues['prevoius-sickleave-issed'][locale.languageCode];
+
   String get noSickLeaveApplied =>
       localizedValues['no-sickleve-applied'][locale.languageCode];
+
   String get applyNow => localizedValues['applynow'][locale.languageCode];
+
   String get addSickLeave =>
       localizedValues['add-sickleave'][locale.languageCode];
+
   String get add => localizedValues['add'][locale.languageCode];
+
   String get approved => localizedValues['approved'][locale.languageCode];
+
   String get extended => localizedValues['extended'][locale.languageCode];
+
   String get pending => localizedValues['pending'][locale.languageCode];
+
   String get leaveStartDate =>
       localizedValues['leave-start-date'][locale.languageCode];
+
   String get daysSickleave =>
       localizedValues['days-sick-leave'][locale.languageCode];
+
   String get extend => localizedValues['extend'][locale.languageCode];
+
   String get extendSickLeave =>
       localizedValues['extend-sickleave'][locale.languageCode];
+
   String get targetPatient =>
       localizedValues['patient-target'][locale.languageCode];
+
   String get noPrescription =>
       localizedValues['no-priscription-listed'][locale.languageCode];
+
   String get next => localizedValues['next'][locale.languageCode];
 
   String get emptyMessage =>
       localizedValues['empty-message'][locale.languageCode];
+
   String get healthRecordInformation =>
       localizedValues['healthRecordInformation'][locale.languageCode];
 
@@ -359,202 +553,325 @@ class TranslationBase {
       localizedValues['chiefComplaintLength'][locale.languageCode];
 
   String get referTo => localizedValues['referTo'][locale.languageCode];
+
   String get referredFrom =>
       localizedValues['referredFrom'][locale.languageCode];
+
   String get branch => localizedValues['branch'][locale.languageCode];
+
   String get chooseAppointment =>
       localizedValues['chooseAppointment'][locale.languageCode];
+
   String get appointmentNo =>
       localizedValues['appointmentNo'][locale.languageCode];
+
   String get refer => localizedValues['refer'][locale.languageCode];
 
   String get rejected => localizedValues['rejected'][locale.languageCode];
+
   String get sameBranch => localizedValues['sameBranch'][locale.languageCode];
+
   String get otherBranch => localizedValues['otherBranch'][locale.languageCode];
+
   String get dr => localizedValues['dr'][locale.languageCode];
+
   String get previewHealth =>
       localizedValues['previewHealth'][locale.languageCode];
+
   String get summaryReport =>
       localizedValues['summaryReport'][locale.languageCode];
+
   String get accept => localizedValues['accept'][locale.languageCode];
+
   String get reject => localizedValues['reject'][locale.languageCode];
+
   String get noAppointmentsErrorMsg =>
       localizedValues['noAppointmentsErrorMsg'][locale.languageCode];
 
   String get referralPatient =>
       localizedValues['referralPatient'][locale.languageCode];
+
   String get noPrescriptionListed =>
       localizedValues['noPrescriptionListed'][locale.languageCode];
+
   String get addNow => localizedValues['addNow'][locale.languageCode];
+
   String get orderType => localizedValues['orderType'][locale.languageCode];
+
   String get strength => localizedValues['strength'][locale.languageCode];
+
   String get doseTime => localizedValues['doseTime'][locale.languageCode];
+
   String get indication => localizedValues['indication'][locale.languageCode];
+
   String get duration => localizedValues['duration'][locale.languageCode];
+
   String get instruction => localizedValues['instruction'][locale.languageCode];
+
   String get rescheduleLeaves =>
       localizedValues['reschedule-leave'][locale.languageCode];
+
   String get addMedication =>
       localizedValues['addMedication'][locale.languageCode];
+
   String get route => localizedValues['route'][locale.languageCode];
+
   String get noReScheduleLeave =>
       localizedValues['no-reschedule-leave'][locale.languageCode];
+
   String get weight => localizedValues['weight'][locale.languageCode];
+
   String get kg => localizedValues['kg'][locale.languageCode];
+
   String get height => localizedValues['height'][locale.languageCode];
+
   String get cm => localizedValues['cm'][locale.languageCode];
+
   String get idealBodyWeight =>
       localizedValues['idealBodyWeight'][locale.languageCode];
+
   String get waistSize => localizedValues['waistSize'][locale.languageCode];
+
   String get inch => localizedValues['inch'][locale.languageCode];
+
   String get headCircum => localizedValues['headCircum'][locale.languageCode];
+
   String get leanBodyWeight =>
       localizedValues['leanBodyWeight'][locale.languageCode];
+
   String get bodyMassIndex =>
       localizedValues['bodyMassIndex'][locale.languageCode];
+
   String get method => localizedValues['method'][locale.languageCode];
+
   String get pulseBeats => localizedValues['pulseBeats'][locale.languageCode];
+
   String get rhythm => localizedValues['rhythm'][locale.languageCode];
+
   String get respBeats => localizedValues['respBeats'][locale.languageCode];
+
   String get patternOfRespiration =>
       localizedValues['patternOfRespiration'][locale.languageCode];
+
   String get bloodPressureDiastoleAndSystole =>
       localizedValues['bloodPressureDiastoleAndSystole'][locale.languageCode];
+
   String get cuffLocation =>
       localizedValues['cuffLocation'][locale.languageCode];
+
   String get cuffSize => localizedValues['cuffSize'][locale.languageCode];
+
   String get patientPosition =>
       localizedValues['patientPosition'][locale.languageCode];
+
   String get fio2 => localizedValues['fio2'][locale.languageCode];
+
   String get sao2 => localizedValues['sao2'][locale.languageCode];
+
   String get painManagement =>
       localizedValues['painManagement'][locale.languageCode];
+
   String get holiday => localizedValues['holiday'][locale.languageCode];
+
   String get to => localizedValues['to'][locale.languageCode];
+
   String get coveringDoctor =>
       localizedValues['coveringDoctor'][locale.languageCode];
+
   String get requestLeave =>
       localizedValues['requestLeave'][locale.languageCode];
+
   String get pleaseEnterDate =>
       localizedValues['pleaseEnterDate'][locale.languageCode];
+
   String get pleaseEnterNoOfDays =>
       localizedValues['pleaseEnterNoOfDays'][locale.languageCode];
+
   String get pleaseEnterRemarks =>
       localizedValues['pleaseEnterRemarks'][locale.languageCode];
+
   String get update => localizedValues['update'][locale.languageCode];
+
   String get admission => localizedValues['admission'][locale.languageCode];
+
   String get request => localizedValues['request'][locale.languageCode];
+
   String get admissionRequest =>
       localizedValues['admissionRequest'][locale.languageCode];
+
   String get patientDetails =>
       localizedValues['patientDetails'][locale.languageCode];
+
   String get specialityAndDoctorDetail =>
       localizedValues['specialityAndDoctorDetail'][locale.languageCode];
+
   String get referringDate =>
       localizedValues['referringDate'][locale.languageCode];
+
   String get referringDoctor =>
       localizedValues['referringDoctor'][locale.languageCode];
+
   String get otherInformation =>
       localizedValues['otherInformation'][locale.languageCode];
+
   String get expectedDays =>
       localizedValues['expectedDays'][locale.languageCode];
+
   String get expectedAdmissionDate =>
       localizedValues['expectedAdmissionDate'][locale.languageCode];
+
   String get emergencyAdmission =>
       localizedValues['emergencyAdmission'][locale.languageCode];
+
   String get patientPregnant =>
       localizedValues['patientPregnant'][locale.languageCode];
+
   String get treatmentLine =>
       localizedValues['treatmentLine'][locale.languageCode];
+
   String get ward => localizedValues['ward'][locale.languageCode];
+
   String get preAnesthesiaReferred =>
       localizedValues['preAnesthesiaReferred'][locale.languageCode];
+
   String get admissionType =>
       localizedValues['admissionType'][locale.languageCode];
+
   String get diagnosis => localizedValues['diagnosis'][locale.languageCode];
+
   String get allergies => localizedValues['allergies'][locale.languageCode];
+
   String get preOperativeOrders =>
       localizedValues['preOperativeOrders'][locale.languageCode];
+
   String get elementForImprovement =>
       localizedValues['elementForImprovement'][locale.languageCode];
+
   String get dischargeDate =>
       localizedValues['dischargeDate'][locale.languageCode];
+
   String get dietType => localizedValues['dietType'][locale.languageCode];
+
   String get dietTypeRemarks =>
       localizedValues['dietTypeRemarks'][locale.languageCode];
+
   String get save => localizedValues['save'][locale.languageCode];
+
   String get postPlansEstimatedCost =>
       localizedValues['postPlansEstimatedCost'][locale.languageCode];
+
   String get ucaf => localizedValues['ucaf'][locale.languageCode];
+
   String get emergencyCase =>
       localizedValues['emergencyCase'][locale.languageCode];
+
   String get durationOfIllness =>
       localizedValues['durationOfIllness'][locale.languageCode];
+
   String get chiefComplaintsAndSymptoms =>
       localizedValues['chiefComplaintsAndSymptoms'][locale.languageCode];
+
   String get patientFeelsPainInHisBackAndCough =>
       localizedValues['patientFeelsPainInHisBackAndCough'][locale.languageCode];
+
   String get additionalTextComplaints =>
       localizedValues['additionalTextComplaints'][locale.languageCode];
+
   String get otherConditions =>
       localizedValues['otherConditions'][locale.languageCode];
+
   String get other => localizedValues['other'][locale.languageCode];
+
   String get how => localizedValues['how'][locale.languageCode];
+
   String get when => localizedValues['when'][locale.languageCode];
+
   String get where => localizedValues['where'][locale.languageCode];
+
   String get specifyPossibleLineManagement =>
       localizedValues['specifyPossibleLineManagement'][locale.languageCode];
+
   String get significantSigns =>
       localizedValues['significantSigns'][locale.languageCode];
+
   String get backAbdomen => localizedValues['backAbdomen'][locale.languageCode];
+
   String get reasons => localizedValues['reasons'][locale.languageCode];
+
   String get createNew => localizedValues['createNew'][locale.languageCode];
 
   String get episode => localizedValues['episode'][locale.languageCode];
+
   String get medications => localizedValues['medications'][locale.languageCode];
+
   String get procedures => localizedValues['procedures'][locale.languageCode];
 
   String get chiefComplaints =>
       localizedValues['chiefComplaints'][locale.languageCode];
+
   String get histories => localizedValues['histories'][locale.languageCode];
+
   String get allergiesSoap =>
       localizedValues['allergiesSoap'][locale.languageCode];
+
   String get addChiefComplaints =>
       localizedValues['addChiefComplaints'][locale.languageCode];
+
   String get historyOfPresentIllness =>
       localizedValues['historyOfPresentIllness'][locale.languageCode];
+
   String get requiredMsg => localizedValues['requiredMsg'][locale.languageCode];
+
   String get addHistory => localizedValues['addHistory'][locale.languageCode];
+
   String get searchHistory =>
       localizedValues['searchHistory'][locale.languageCode];
+
   String get addSelectedHistories =>
       localizedValues['addSelectedHistories'][locale.languageCode];
+
   String get addAllergies =>
       localizedValues['addAllergies'][locale.languageCode];
+
   String get itemExist => localizedValues['itemExist'][locale.languageCode];
+
   String get selectAllergy =>
       localizedValues['selectAllergy'][locale.languageCode];
+
   String get selectSeverity =>
       localizedValues['selectSeverity'][locale.languageCode];
+
   String get leaveCreated =>
       localizedValues['leaveCreated'][locale.languageCode];
+
   String get vitalSignEmptyMsg =>
       localizedValues['vitalSignEmptyMsg'][locale.languageCode];
+
   String get referralEmptyMsg =>
       localizedValues['referralEmptyMsg'][locale.languageCode];
+
   String get referralSuccessMsg =>
       localizedValues['referralSuccessMsg'][locale.languageCode];
+
   String get diagnoseType =>
       localizedValues['diagnoseType'][locale.languageCode];
+
   String get condition => localizedValues['condition'][locale.languageCode];
+
   String get id => localizedValues['id'][locale.languageCode];
+
   String get quantity => localizedValues['quantity'][locale.languageCode];
+
   String get codeNo => localizedValues['codeNo'][locale.languageCode];
+
   String get covered => localizedValues['covered'][locale.languageCode];
+
   String get approvalRequired =>
       localizedValues['approvalRequired'][locale.languageCode];
+
   String get uncoveredByDoctor =>
       localizedValues['uncoveredByDoctor'][locale.languageCode];
+
   String get chiefComplaintEmptyMsg =>
       localizedValues['chiefComplaintEmptyMsg'][locale.languageCode];
 
@@ -594,77 +911,116 @@ class TranslationBase {
 
   String get verifyFingerprint2 =>
       localizedValues['verify-fingerprint'][locale.languageCode];
+
   String get verificationMessage =>
       localizedValues['verification_message'][locale.languageCode];
+
   String get validationMessage =>
       localizedValues['validation_message'][locale.languageCode];
 
   String get addAssessment =>
       localizedValues['addAssessment'][locale.languageCode];
+
   String get assessment => localizedValues['assessment'][locale.languageCode];
 
   String get physicalSystemExamination =>
       localizedValues['physicalSystemExamination'][locale.languageCode];
+
   String get searchExamination =>
       localizedValues['searchExamination'][locale.languageCode];
+
   String get addExamination =>
       localizedValues['addExamination'][locale.languageCode];
+
   String get doc => localizedValues['doc'][locale.languageCode];
-  String get  allergicTO=> localizedValues['allergicTO'][locale.languageCode];
+
-  String get  normal=> localizedValues['normal'][locale.languageCode];
+  String get allergicTO => localizedValues['allergicTO'][locale.languageCode];
-  String get  abnormal=> localizedValues['abnormal'][locale.languageCode];
+
+  String get normal => localizedValues['normal'][locale.languageCode];
+
+  String get abnormal => localizedValues['abnormal'][locale.languageCode];
 
   String get patientNoDetailErrMsg =>
       localizedValues['patientNoDetailErrMsg'][locale.languageCode];
+
   String get systolicLng =>
       localizedValues['systolic-lng'][locale.languageCode];
+
   String get diastolicLng =>
       localizedValues['diastolic-lng'][locale.languageCode];
+
   String get mass => localizedValues['mass'][locale.languageCode];
+
   String get tempC => localizedValues['temp-c'][locale.languageCode];
+
   String get bpm => localizedValues['bpm'][locale.languageCode];
+
   String get respirationSigns =>
       localizedValues['respiration-signs'][locale.languageCode];
+
   String get sysDias => localizedValues['sys-dias'][locale.languageCode];
+
   String get body => localizedValues['body'][locale.languageCode];
+
   String get respirationRate =>
       localizedValues['respirationRate'][locale.languageCode];
+
   String get heart => localizedValues['heart'][locale.languageCode];
 
   String get medicalReport =>
       localizedValues['medicalReport'][locale.languageCode];
+
   String get visitDate => localizedValues['visitDate'][locale.languageCode];
+
   String get test => localizedValues['test'][locale.languageCode];
+
   String get addMoreProcedure =>
       localizedValues['addMoreProcedure'][locale.languageCode];
+
   String get regular => localizedValues['regular'][locale.languageCode];
+
   String get searchProcedures =>
       localizedValues['searchProcedures'][locale.languageCode];
+
   String get procedureCategorise =>
       localizedValues['procedureCategorise'][locale.languageCode];
+
   String get selectProcedures =>
       localizedValues['selectProcedures'][locale.languageCode];
+
   String get addSelectedProcedures =>
       localizedValues['addSelectedProcedures'][locale.languageCode];
+
   String get updateProcedure =>
       localizedValues['updateProcedure'][locale.languageCode];
+
   String get orderProcedure =>
       localizedValues['orderProcedure'][locale.languageCode];
+
   String get nameOrICD =>
       localizedValues['nameOrICD'][locale.languageCode];
 
   String get dType =>
       localizedValues['dType'][locale.languageCode];
+
   String get addAssessmentDetails =>
       localizedValues['addAssessmentDetails'][locale.languageCode];
+
   String get progressNoteSOAP =>
       localizedValues['progressNoteSOAP'][locale.languageCode];
+
   String get addProgressNote =>
       localizedValues['addProgressNote'][locale.languageCode];
+
   String get createdBy =>
       localizedValues['createdBy'][locale.languageCode];
+
   String get editedBy =>
       localizedValues['editedBy'][locale.languageCode];
+  String get currentMedications =>
+      localizedValues['currentMedications'][locale.languageCode];
+  String get noItem =>
+      localizedValues['noItem'][locale.languageCode];
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

lib/widgets/patients/profile/soap_update/subjective/update_subjective_page.dart

@@ -52,8 +52,11 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
   bool isAllergiesExpand = false;
   TextEditingController illnessController = TextEditingController();
   TextEditingController complaintsController = TextEditingController();
+  TextEditingController medicationController = TextEditingController();
+
   final formKey = GlobalKey<FormState>();
-  getHistory(SOAPViewModel model) async{
+
+  getHistory(SOAPViewModel model) async {
     widget.changeLoadingState(true);
     GetHistoryReqModel getHistoryReqModel = GetHistoryReqModel(
         patientMRN: widget.patientInfo.patientMRN,
@@ -204,6 +207,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
           complaintsController.text = helpers.parseHtmlString(
               model.patientChiefComplaintList[0].chiefComplaint);
           illnessController.text = model.patientChiefComplaintList[0].hopi;
+          medicationController.text = model.patientChiefComplaintList[0].currentMedication;
         }
 
         await getHistory(model);
@@ -302,8 +306,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
                               controller: illnessController,
                               validator: (value) {
                                 if (value == null || value == "")
-                                  return TranslationBase
+                                  return TranslationBase.of(context)
-                                      .of(context)
                                       .emptyMessage;
                                 else
                                   return null;
@@ -312,8 +315,34 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
                         SizedBox(
                           height: 20,
                         ),
-                        // TODO return it back when we need it.
+                        SizedBox(
-                        // AddMedication(),
+                          height: 10,
+                        ),
+                        Container(
+                          margin: EdgeInsets.only(left: 10, right: 10, top: 15),
+                          child: TextFields(
+                              hintText: TranslationBase.of(context)
+                                  .currentMedications,
+                              fontSize: 13.5,
+                              // hintColor: Colors.black,
+                              fontWeight: FontWeight.w600,
+                              maxLines: 2,
+                              minLines: 1,
+                              controller: medicationController,
+                              validator: (value) {
+                                if (value == null || value == "")
+                                  return TranslationBase.of(context)
+                                      .emptyMessage;
+                                else
+                                  return null;
+                              }),
+                        ),
+                        SizedBox(
+                          height: 10,
+                        ),
+                        SizedBox(
+                          height: 10,
+                        ),
                       ]),
                     ),
                     isExpand: isChiefExpand,
@@ -563,7 +592,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
               episodeID: widget.patientInfo.episodeNo,
               appointmentNo: widget.patientInfo.appointmentNo,
               chiefComplaint: complaintsController.text,
-              currentMedication: " currentMedication ",
+              currentMedication: medicationController.text,
               hopi: illnessController.text,
               isLactation: false,
               ispregnant: false,

lib/widgets/patients/profile/soap_update/update_plan_page.dart

@@ -223,6 +223,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
                                       SizedBox(
                                         height: 8,
                                       ),
+                                      if(widget.patientProgressNote.createdByName !=null)
                                       Row(
                                         mainAxisAlignment:
                                             MainAxisAlignment.start,
@@ -239,6 +240,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
                                           ),
                                         ],
                                       ),
+                                      if(widget.patientProgressNote.editedByName !=null)
                                       Row(
                                         mainAxisAlignment:
                                             MainAxisAlignment.start,