remove commented code

lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart

@@ -12,7 +12,7 @@ import 'package:doctor_app_flutter/models/SOAP/post_assessment_request_model.dar
 import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
 import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/bottom_sheet_title.dart';
+import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/Text.dart';
 import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
@@ -24,7 +24,7 @@ import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 
-import '../custom_validation_error.dart';
+import '../../../../../widgets/shared/user-guid/custom_validation_error.dart';
 
 class AddAssessmentDetails extends StatefulWidget {
   final MySelectedAssessment mySelectedAssessment;
@@ -151,7 +151,6 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                                 height: 10,
                               ),
                               Container(
-                                // height: 60.0,
                                 child: InkWell(
                                     onTap: model.listOfICD10 != null
                                         ? () {

lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart

@@ -18,9 +18,9 @@ import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 
-import '../SOAP_open_items.dart';
-import '../SOAP_step_header.dart';
-import '../expandable_SOAP_widget.dart';
+import '../shared_soap_widgets/SOAP_open_items.dart';
+import '../shared_soap_widgets/SOAP_step_header.dart';
+import '../shared_soap_widgets/expandable_SOAP_widget.dart';
 import 'add_assessment_details.dart';
 
 class UpdateAssessmentPage extends StatefulWidget {

lib/screens/patients/profile/soap_update/objective/update_objective_page.dart

@@ -20,9 +20,9 @@ import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 
-import '../SOAP_open_items.dart';
-import '../SOAP_step_header.dart';
-import '../expandable_SOAP_widget.dart';
+import '../shared_soap_widgets/SOAP_open_items.dart';
+import '../shared_soap_widgets/SOAP_step_header.dart';
+import '../shared_soap_widgets/expandable_SOAP_widget.dart';
 import 'add-examination.dart';
 import 'examination-item-card.dart';
 
@@ -102,7 +102,6 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
         builder: (_, model, w) => AppScaffold(
           isShowAppBar: false,
         backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-        // baseViewModel: model,
         body: SingleChildScrollView(
           child: Center(
             child: FractionallySizedBox(
@@ -234,7 +233,6 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
                 examType: exam.selectedExamination.typeId,
                 isAbnormal: exam.isAbnormal,
                 isNormal: exam.isNormal,
-                // masterDescription: exam.selectedExamination,
                 notExamined: exam.notExamined,
                 examinationType: exam.isNormal
                     ? 1
@@ -263,10 +261,6 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
         widget.changePageViewIndex(2);
       }
     } else {
-      // widget.changeLoadingState(true);
-      //
-      // widget.changePageViewIndex(2);
-
       helpers.showErrorToast(TranslationBase.of(context).examinationErrorMsg);
     }
   }

lib/screens/patients/profile/soap_update/plan/update_plan_page.dart

@@ -19,8 +19,8 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 
-import 'SOAP_step_header.dart';
-import 'expandable_SOAP_widget.dart';
+import '../shared_soap_widgets/SOAP_step_header.dart';
+import '../shared_soap_widgets/expandable_SOAP_widget.dart';
 
 class UpdatePlanPage extends StatefulWidget {
   final Function changePageViewIndex;
@@ -99,7 +99,6 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
         widget.changeLoadingState(false);
       },
       builder: (_, model, w) => AppScaffold(
-        // baseViewModel: model,
         backgroundColor: Theme
             .of(context)
             .scaffoldBackgroundColor,

lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/screens/patients/profile/soap_update/steps_widget.dart';
+import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/steps_widget.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:flutter/material.dart';
@@ -33,7 +33,7 @@ class SOAPStepHeader extends StatelessWidget {
           child: StepsWidget(
             index: currentIndex,
             changeCurrentTab: changePageViewIndex,
-            height: 100,//MediaQuery.of(context).size.height * 0.17,
+            height: 100,
           ),
         ),
         SizedBox(

lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart

@@ -41,7 +41,6 @@ class ExpandableSOAPWidget extends StatelessWidget {
                   children: [
                     Texts(headerTitle,
                         variant: isExpanded ? "bodyText" : '',
-                        // bold: isExpanded ? true : false,
                         fontSize: 15,
                         color: Colors.black),
                     if(isRequired)

lib/screens/patients/profile/soap_update/shared_soap_widgets/steps_widget.dart

@@ -13,7 +13,6 @@ class StepsWidget extends StatelessWidget {
 
   StepsWidget({Key key, this.index, this.changeCurrentTab, this.height = 0.0});
 
-  //  TODO : Add translation to name
   @override
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
@@ -24,7 +23,6 @@ class StepsWidget extends StatelessWidget {
                 height: height == 0 ? 150 : height,
                 width: MediaQuery.of(context).size.width * 0.9,
                 color: Colors.transparent,
-                // child:,
               ),
               Positioned(
                   top: 30
@@ -245,7 +243,6 @@ class StepsWidget extends StatelessWidget {
                           AppText(
                             "Plan",
                             fontWeight: FontWeight.bold,
-                            // textAlign: TextAlign.center,
                             fontSize: 12,
                           ),
                           StatusLabel(

lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart

@@ -14,7 +14,7 @@ import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 
-import '../bottom_sheet_title.dart';
+import '../../shared_soap_widgets/bottom_sheet_title.dart';
 
 class AddAllergies extends StatefulWidget {
   final Function addAllergiesFun;
@@ -223,18 +223,12 @@ class _AddAllergiesState extends State<AddAllergies> {
 
         if (allergy.isEmpty) {
           myAllergiesListLocal.add(mySelectedAllergy);
-          // Navigator.of(context).pop();
         } else {
           allergy.first.selectedAllergy = mySelectedAllergy.selectedAllergy;
           allergy.first.selectedAllergySeverity =
               mySelectedAllergy.selectedAllergySeverity;
           allergy.first.remark = mySelectedAllergy.remark;
           allergy.first.isChecked = mySelectedAllergy.isChecked;
-          // Navigator.of(context).pop();
-
-          // helpers.showErrorToast(TranslationBase
-          //     .of(context)
-          //     .itemExist);
         }
       });
     }

lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart

@@ -9,7 +9,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 
-import '../../SOAP_open_items.dart';
+import '../../shared_soap_widgets/SOAP_open_items.dart';
 import 'add_allergies.dart';
 
 // ignore: must_be_immutable
@@ -67,7 +67,6 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
                                       ? selectedAllergy.selectedAllergy.nameAr
                                       : selectedAllergy.selectedAllergy.nameEn
                                       .toUpperCase(),
-                                  // variant: "bodyText",
                                   textDecoration: selectedAllergy.isChecked
                                       ? null
                                       : TextDecoration.lineThrough,
@@ -80,11 +79,9 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
                                       : selectedAllergy.selectedAllergySeverity
                                       .nameEn
                                       .toUpperCase(),
-                                  // variant: "bodyText",
                                   textDecoration: selectedAllergy.isChecked
                                       ? null
                                       : TextDecoration.lineThrough,
-                                  // bold: true,
                                   color: Color(0xFFCC9B14)),
                             ],
                           ),

lib/screens/patients/profile/soap_update/subjective/cheif_complaints/update_Chief_complaints.dart

@@ -3,8 +3,8 @@ import 'package:doctor_app_flutter/widgets/shared/new_text_Field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
-import '../custom_validation_error.dart';
-import 'medication/update_medication_widget.dart';
+import '../../../../../../widgets/shared/user-guid/custom_validation_error.dart';
+import '../medication/update_medication_widget.dart';
 
 class UpdateChiefComplaints extends StatelessWidget {
   const UpdateChiefComplaints({

lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart

@@ -11,7 +11,7 @@ import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
 import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 
-import '../bottom_sheet_title.dart';
+import '../../shared_soap_widgets/bottom_sheet_title.dart';
 import 'priority_bar.dart';
 
 class AddHistoryDialog extends StatefulWidget {
@@ -74,7 +74,6 @@ class _AddHistoryDialogState extends State<AddHistoryDialog> {
                             controller: widget.controller,
                             onPageChanged: (index) {
                               setState(() {
-                                // currentIndex = index;
                               });
                             },
                             scrollDirection: Axis.horizontal,

lib/screens/patients/profile/soap_update/subjective/history/priority_bar.dart

@@ -69,7 +69,7 @@ class _PriorityBarState extends State<PriorityBar> {
                             style: TextStyle(
                               fontSize: 14,
 
-                              color: Colors.black, //Colors.black,
+                              color: Colors.black,
                               fontWeight: FontWeight.bold,
                             ),
                           ),

lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart

@@ -8,7 +8,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 
-import '../../SOAP_open_items.dart';
+import '../../shared_soap_widgets/SOAP_open_items.dart';
 import 'add_history_dialog.dart';
 
 class UpdateHistoryWidget extends StatefulWidget {
@@ -68,7 +68,6 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
                             textDecoration: myHistory.isChecked
                                 ? null
                                 : TextDecoration.lineThrough,
-                            // bold: true,
                             color: Colors.black),
                         width: MediaQuery
                             .of(context)
@@ -89,9 +88,7 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
                                   textDecoration: myHistory.isChecked
                                       ? null
                                       : TextDecoration.lineThrough,
-                                  // bold: true,
                                   color: HexColor("#B8382C"),),
-                                // width: MediaQuery.of(context).size.width * 0.3,
                               ),
                               Icon(
                                 FontAwesomeIcons.times,

lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart

@@ -17,8 +17,8 @@ import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 
-import '../../custom_validation_error.dart';
-import '../bottom_sheet_title.dart';
+import '../../../../../../widgets/shared/user-guid/custom_validation_error.dart';
+import '../../shared_soap_widgets/bottom_sheet_title.dart';
 
 // ignore: must_be_immutable
 class AddMedication extends StatefulWidget {
@@ -38,7 +38,6 @@ class _AddMedicationState extends State<AddMedication> {
   MasterKeyModel _selectedMedicationRoute;
   MasterKeyModel _selectedMedicationFrequency;
 
-  MasterKeyModel _selectedAllergy;
   TextEditingController doseController = TextEditingController();
   TextEditingController strengthController = TextEditingController();
   TextEditingController routeController = TextEditingController();
@@ -244,7 +243,6 @@ class _AddMedicationState extends State<AddMedication> {
                                           : null,
                                       hintText:
                                       TranslationBase.of(context).doseTime,
-                                      //TODO add translation
                                       maxLines: 2,
                                       minLines: 2,
                                       isDropDown: true,
@@ -295,8 +293,6 @@ class _AddMedicationState extends State<AddMedication> {
                                           : null,
                                       hintText:
                                       TranslationBase.of(context).strength,
-                                      // hintColor: Colors.black,
-                                      // fontWeight: FontWeight.w600,
                                       maxLines: 2,
                                       minLines: 2,
                                       controller: strengthController,
@@ -392,9 +388,7 @@ class _AddMedicationState extends State<AddMedication> {
                                           : null,
                                       hintText:
                                       TranslationBase.of(context).frequency,
-                                      //TODO add translation
                                       enabled: false,
-                                      // hintColor: Colors.black,
                                       maxLines: 2,
                                       minLines: 2,
                                       isDropDown: true,

lib/screens/patients/profile/soap_update/subjective/medication/update_medication_widget.dart

@@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/models/SOAP/my_selected_allergy.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:flutter/material.dart';
 
-import '../../SOAP_open_items.dart';
+import '../../shared_soap_widgets/SOAP_open_items.dart';
 import 'add_medication.dart';
 
 class UpdateMedicationWidget extends StatefulWidget {

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

@@ -21,11 +21,11 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 
-import '../SOAP_step_header.dart';
-import '../expandable_SOAP_widget.dart';
+import '../shared_soap_widgets/SOAP_step_header.dart';
+import '../shared_soap_widgets/expandable_SOAP_widget.dart';
 import 'allergies/update_allergies_widget.dart';
 import 'history/update_history_widget.dart';
-import 'update_Chief_complaints.dart';
+import 'cheif_complaints/update_Chief_complaints.dart';
 
 class UpdateSubjectivePage extends StatefulWidget {
   final Function changePageViewIndex;
@@ -225,7 +225,6 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
         backgroundColor: Theme
             .of(context)
             .scaffoldBackgroundColor,
-        // baseViewModel: model,
         body: SingleChildScrollView(
           physics: ScrollPhysics(),
           child: Center(
@@ -482,7 +481,6 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
     widget.myHistoryList.forEach((history) {
       if (postHistoriesRequestModel.listMedicalHistoryVM == null)
         postHistoriesRequestModel.listMedicalHistoryVM = [];
-      //TODO: make static value dynamic
       postHistoriesRequestModel.listMedicalHistoryVM.add(ListMedicalHistoryVM(
         patientMRN: widget.patientInfo.patientMRN,
         episodeId: widget.patientInfo.episodeNo,
@@ -511,7 +509,6 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
     formKey.currentState.save();
     if(formKey.currentState.validate()){
       PostChiefComplaintRequestModel postChiefComplaintRequestModel =
-      //TODO: make static value dynamic
           new PostChiefComplaintRequestModel(
               patientMRN: widget.patientInfo.patientMRN,
               episodeID: widget.patientInfo.episodeNo,
@@ -525,7 +522,6 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
 
               numberOfWeeks: 0);
       if (model.patientChiefComplaintList.isEmpty) {
-        // TODO: make it postChiefComplaint after it start to work
         postChiefComplaintRequestModel.editedBy = '';
         await model.postChiefComplaint(postChiefComplaintRequestModel);
       } else {

lib/screens/patients/profile/soap_update/update_soap_index.dart

@@ -14,7 +14,7 @@ import 'package:flutter/material.dart';
 
 import 'assessment/update_assessment_page.dart';
 import 'objective/update_objective_page.dart';
-import 'update_plan_page.dart';
+import 'plan/update_plan_page.dart';
 
 class UpdateSoapIndex extends StatefulWidget {
   final bool isUpdate;
@@ -50,7 +50,6 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
 
   @override
   void initState() {
-    // TODO: implement initState
     _controller = new PageController();
 
     super.initState();
@@ -68,7 +67,6 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
     PatiantInformtion patient = routeArgs['patient'];
     return BaseView<DoctorReplayViewModel>(
       builder: (_, model, w) => AppScaffold(
-        // baseViewModel: model,
         isLoading: _isLoading,
         isShowAppBar: false,
         body: SingleChildScrollView(

lib/widgets/patients/dynamic_elements.dart

@@ -1,6 +1,6 @@
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/models/patient/patient_model.dart';
-import 'package:doctor_app_flutter/screens/patients/profile/soap_update/custom_validation_error.dart';
+import 'package:doctor_app_flutter/widgets/shared/user-guid/custom_validation_error.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_text_form_field.dart';
 import 'package:flutter/material.dart';

lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart

@@ -3,7 +3,7 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/my_selected_allergy.dart';
-import 'package:doctor_app_flutter/screens/patients/profile/soap_update/custom_validation_error.dart';
+import 'package:doctor_app_flutter/widgets/shared/user-guid/custom_validation_error.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';