From c96939e6b0ec5ce1dd0fa578cf8df14c2f03218d Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 6 Mar 2022 11:36:27 +0300 Subject: [PATCH] refactor some name and add todos --- .../doctor/patient_arrival_screen.dart | 4 +- .../procedures/add-procedure-page.dart | 2 + .../base_add_procedure_tab_page.dart | 3 + .../entity_list_checkbox_search_widget.dart | 2 + .../procedures/entity_list_fav_procedure.dart | 1 + .../procedures/procedure_checkout_screen.dart | 6 + lib/screens/procedures/procedure_screen.dart | 2 +- lib/screens/procedures/update-procedure.dart | 186 +----------------- .../add_reschedule_leave.dart} | 18 +- .../reschedule_leave.dart | 14 +- lib/widgets/shared/app_drawer_widget.dart | 4 +- 11 files changed, 26 insertions(+), 216 deletions(-) rename lib/screens/{reschedule-leaves/add-rescheduleleave.dart => reschedule_leaves/add_reschedule_leave.dart} (95%) rename lib/screens/{reschedule-leaves => reschedule_leaves}/reschedule_leave.dart (99%) diff --git a/lib/screens/doctor/patient_arrival_screen.dart b/lib/screens/doctor/patient_arrival_screen.dart index 9dcd859d..bc7908cf 100644 --- a/lib/screens/doctor/patient_arrival_screen.dart +++ b/lib/screens/doctor/patient_arrival_screen.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'package:doctor_app_flutter/core/model/patient/patient_model.dart'; -import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart'; +import 'package:doctor_app_flutter/screens/reschedule_leaves/add_reschedule_leave.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -111,7 +111,7 @@ class _PatientArrivalScreen extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - AddRescheduleLeavScreen(), + AddRescheduleLeaveScreen(), ], ), ) diff --git a/lib/screens/procedures/add-procedure-page.dart b/lib/screens/procedures/add-procedure-page.dart index 81805cf8..26dde2e0 100644 --- a/lib/screens/procedures/add-procedure-page.dart +++ b/lib/screens/procedures/add-procedure-page.dart @@ -211,6 +211,8 @@ class _AddProcedurePageState extends State { ); } + + ///TODO Elham* move it to view model bool isEntityListSelected(EntityList masterKey) { Iterable history = entityList .where((element) => masterKey.procedureId == element.procedureId); diff --git a/lib/screens/procedures/base_add_procedure_tab_page.dart b/lib/screens/procedures/base_add_procedure_tab_page.dart index ed556f3c..5df0130a 100644 --- a/lib/screens/procedures/base_add_procedure_tab_page.dart +++ b/lib/screens/procedures/base_add_procedure_tab_page.dart @@ -149,6 +149,9 @@ class _BaseAddProcedureTabPageState extends State ); } + ///TODO Elham* move it to new file + + Widget tabWidget( Size screenSize, bool isActive, diff --git a/lib/screens/procedures/entity_list_checkbox_search_widget.dart b/lib/screens/procedures/entity_list_checkbox_search_widget.dart index 43583c0a..c6a468fb 100644 --- a/lib/screens/procedures/entity_list_checkbox_search_widget.dart +++ b/lib/screens/procedures/entity_list_checkbox_search_widget.dart @@ -247,6 +247,8 @@ class _EntityListCheckboxSearchWidgetState ); } + + ///TODO Elham* move it to view model void filterSearchResults(String query) { List dummySearchList = List(); dummySearchList.addAll(widget.masterList); diff --git a/lib/screens/procedures/entity_list_fav_procedure.dart b/lib/screens/procedures/entity_list_fav_procedure.dart index 100ed581..96f88d18 100644 --- a/lib/screens/procedures/entity_list_fav_procedure.dart +++ b/lib/screens/procedures/entity_list_fav_procedure.dart @@ -144,6 +144,7 @@ class _EntityListCheckboxSearchFavProceduresWidgetState ); } + ///TODO Elham* move it to view model and try to make it work for every search void filterSearchResults(String query) { List dummySearchList = List(); dummySearchList.addAll(widget.masterList); diff --git a/lib/screens/procedures/procedure_checkout_screen.dart b/lib/screens/procedures/procedure_checkout_screen.dart index 39d2f96c..31a0a195 100644 --- a/lib/screens/procedures/procedure_checkout_screen.dart +++ b/lib/screens/procedures/procedure_checkout_screen.dart @@ -85,6 +85,9 @@ class _ProcedureCheckOutScreenState extends State { SizedBox( height: 30, ), + + ///TODO Elham* user view list builder + ...List.generate( widget.items.length, (index) => Container( @@ -219,6 +222,9 @@ class _ProcedureCheckOutScreenState extends State { color: AppGlobal.appGreenColor, fontWeight: FontWeight.w700, onPressed: () async { + + ///TODO Elham* move it to function + List entityList = List(); widget.items.forEach((element) { entityList.add( diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index a07869db..1a6de092 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -33,7 +33,6 @@ class ProcedureScreen extends StatelessWidget { final routeArgs = ModalRoute.of(context).settings.arguments as Map; PatiantInformtion patient = routeArgs['patient']; String patientType = routeArgs['patientType']; - String arrivalType = routeArgs['arrivalType']; bool isFromLiveCare = routeArgs['isFromLiveCare']; bool isInpatient = routeArgs['isInpatient']; return BaseView( @@ -128,6 +127,7 @@ class ProcedureScreen extends StatelessWidget { ), ), if (model.procedureList.isNotEmpty) + ///TODO Elham* use list view builder ...List.generate( model.procedureList[0].rowcount, (index) => ProcedureCard( diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart index 1a3219b3..1ae3d3e5 100644 --- a/lib/screens/procedures/update-procedure.dart +++ b/lib/screens/procedures/update-procedure.dart @@ -27,9 +27,7 @@ void updateProcedureForm(context, String remarks, ProcedureViewModel model, String categoreId}) { - //ProcedureViewModel model2 = ProcedureViewModel(); TextEditingController remarksController = TextEditingController(); - TextEditingController orderController = TextEditingController(); showModalBottomSheet( context: context, isScrollControlled: true, @@ -119,129 +117,6 @@ class _UpdateProcedureWidgetState extends State { SizedBox( height: 30.0, ), - // Container( - // height: screenSize.height * 0.070, - // child: InkWell( - // onTap: model.categoryList != null && - // model.categoryList.length > 0 - // ? () { - // ListSelectDialog dialog = - // ListSelectDialog( - // list: model.categoryList, - // attributeName: 'categoryName', - // attributeValueId: 'categoryId', - // okText: - // TranslationBase.of(context).ok, - // okFunction: (selectedValue) { - // setState(() { - // selectedCategory = - // selectedValue; - // model.getProcedureCategory( - // categoryName: - // selectedCategory[ - // 'categoryName'], - // categoryID: selectedCategory[ - // 'categoryId'] <= - // 9 - // ? "0" + - // selectedCategory[ - // 'categoryId'] - // .toString() - // : selectedCategory[ - // 'categoryId'] - // .toString()); - // }); - // }, - // ); - // showDialog( - // barrierDismissible: false, - // context: context, - // builder: (BuildContext context) { - // return dialog; - // }, - // ); - // //model.getProcedureCategory(); - // } - // : null, - // child: TextField( - // decoration: textFieldSelectorDecoration( - // TranslationBase.of(context) - // .procedureCategorise, - // selectedCategory != null - // ? selectedCategory['categoryName'] - // : null, - // true, - // suffixIcon: Icon( - // Icons.search, - // color: Colors.black, - // )), - // enabled: false, - // ), - // ), - // ), - // if (widget.model.categoriesList.length != 0) - // NetworkBaseView( - // baseViewModel: model, - // child: selectedCategory != null - // ? selectedCategory['categoryId'] == - // 02 || - // selectedCategory[ - // 'categoryId'] == - // 03 || - // selectedCategory[ - // 'categoryId'] == - // 55 - // ? EntityListCheckboxSearchWidget( - // model: widget.model, - // masterList: widget - // .model - // .categoriesList[0] - // .entityList, - // removeHistory: (item) { - // setState(() { - // entityList.remove(item); - // }); - // }, - // addHistory: (history) { - // setState(() { - // entityList.add(history); - // }); - // }, - // addSelectedHistories: () { - // //TODO build your fun herr - // // widget.addSelectedHistories(); - // }, - // isEntityListSelected: - // (master) => - // isEntityListSelected( - // master), - // ) - // : ProcedureListWidget( - // model: widget.model, - // masterList: widget - // .model - // .categoriesList[0] - // .entityList, - // removeHistory: (item) { - // setState(() { - // entityList.remove(item); - // }); - // }, - // addHistory: (history) { - // setState(() { - // entityList.add(history); - // }); - // }, - // addSelectedHistories: () { - // //TODO build your fun herr - // // widget.addSelectedHistories(); - // }, - // isEntityListSelected: - // (master) => - // isEntityListSelected( - // master), - // ) - // : null), Container( child: Row( children: [ @@ -294,7 +169,6 @@ class _UpdateProcedureWidgetState extends State { margin: EdgeInsets.all(SizeConfig.widthMultiplier * 2), child: Column( - //alignment: WrapAlignment.center, children: [ AppButton( color: AppGlobal.appGreenColor, @@ -302,13 +176,6 @@ class _UpdateProcedureWidgetState extends State { .updateProcedure .toUpperCase(), onPressed: () { - // if (entityList.isEmpty == true && - // widget.remarksController.text == - // widget.remarks) { - // DrAppToastMsg.showErrorToast( - // "Fill the mandatory procedure details"); - // return; - // } Navigator.pop(context); updateProcedure( limetNO: widget.limetNo, @@ -370,23 +237,6 @@ class _UpdateProcedureWidgetState extends State { updateProcedureReqModel.lineItemNo = limetNO; updateProcedureReqModel.orderNo = orderNo; - // if (entityList.isNotEmpty) { - // entityList.forEach((element) { - // controls.add( - // Controls(code: "remarks", controlValue: element.remarks ?? ''), - // ); - // controls.add( - // Controls(code: "ordertype", controlValue: '1'), - // ); - // - // controlsProcedure.procedure = element.procedureId; - // controlsProcedure.category = int.parse(element.categoryID) > 9 - // ? element.categoryID - // : "0" + element.categoryID; - // controlsProcedure.controls = controls; - // }); - // } - // else { { controls.add( Controls( @@ -401,8 +251,6 @@ class _UpdateProcedureWidgetState extends State { controlsProcedure.controls = controls; } - // controlsProcedure.add(ProcedureDetail( - // category: categorieId, procedure: procedureId, controls: controls)); updateProcedureReqModel.procedureDetail = controlsProcedure; await model.updateProcedure( @@ -418,6 +266,8 @@ class _UpdateProcedureWidgetState extends State { } } + + ///TODO Elham* move it to view model bool isEntityListSelected(EntityList masterKey) { Iterable history = entityList .where((element) => masterKey.procedureId == element.procedureId); @@ -426,36 +276,4 @@ class _UpdateProcedureWidgetState extends State { } return false; } - - InputDecoration textFieldSelectorDecoration( - String hintText, String selectedText, bool isDropDown, - {Icon suffixIcon}) { - return InputDecoration( - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0), - borderRadius: BorderRadius.circular(8), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0), - borderRadius: BorderRadius.circular(8), - ), - disabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0), - borderRadius: BorderRadius.circular(8), - ), - hintText: selectedText != null ? selectedText : hintText, - suffixIcon: isDropDown - ? suffixIcon != null - ? suffixIcon - : Icon( - Icons.arrow_drop_down, - color: Colors.black, - ) - : null, - hintStyle: TextStyle( - fontSize: 14, - color: Colors.grey.shade600, - ), - ); - } } diff --git a/lib/screens/reschedule-leaves/add-rescheduleleave.dart b/lib/screens/reschedule_leaves/add_reschedule_leave.dart similarity index 95% rename from lib/screens/reschedule-leaves/add-rescheduleleave.dart rename to lib/screens/reschedule_leaves/add_reschedule_leave.dart index 5ce5fb6e..029f60a1 100644 --- a/lib/screens/reschedule-leaves/add-rescheduleleave.dart +++ b/lib/screens/reschedule_leaves/add_reschedule_leave.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/reschedule-leaves/reschedule_leave.dart'; +import 'package:doctor_app_flutter/screens/reschedule_leaves/reschedule_leave.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; @@ -17,7 +17,7 @@ import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; -class AddRescheduleLeavScreen extends StatelessWidget { +class AddRescheduleLeaveScreen extends StatelessWidget { ProjectViewModel projectsProvider; @override @@ -195,11 +195,6 @@ class AddRescheduleLeavScreen extends StatelessWidget { ) ]) : SizedBox(), - // AppText( - // TranslationBase.of(context) - // .reasons, - // fontWeight: FontWeight.bold, - // ), Row( mainAxisAlignment: MainAxisAlignment @@ -246,15 +241,6 @@ class AddRescheduleLeavScreen extends StatelessWidget { } openLeave(BuildContext context, isExtend, {extendedData}) { - // showModalBottomSheet( - // context: context, - // builder: (context) { - // return new Container( - // child: RescheduleLeaveScreen( - // isExtend, - // extendedData, - // )); - // }); Navigator.push( context, diff --git a/lib/screens/reschedule-leaves/reschedule_leave.dart b/lib/screens/reschedule_leaves/reschedule_leave.dart similarity index 99% rename from lib/screens/reschedule-leaves/reschedule_leave.dart rename to lib/screens/reschedule_leaves/reschedule_leave.dart index 4fa63b7c..3ebf5b97 100644 --- a/lib/screens/reschedule-leaves/reschedule_leave.dart +++ b/lib/screens/reschedule_leaves/reschedule_leave.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart'; +import 'package:doctor_app_flutter/screens/reschedule_leaves/add_reschedule_leave.dart'; import 'package:doctor_app_flutter/utils/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; @@ -41,7 +41,6 @@ class _RescheduleLeaveScreen extends State { TextEditingController _toDateController2 = new TextEditingController(); ProjectViewModel projectsProvider; SickLeaveViewModel sickLeaveViewModel; - String _selectedClinic; Map profile = {}; var offTime = '1'; var date; @@ -82,13 +81,6 @@ class _RescheduleLeaveScreen extends State { _toDateController2.text = df.format(pickedDate); } }); - - // setState(() { - // final df = new DateFormat('yyyy-MM-dd'); - // fromDate = pickedDate; //df.format(); - // //_toDateController2.text = df.format(pickedDate); - // //toDate = pickedDate; - // }); }); } @@ -794,7 +786,7 @@ class _RescheduleLeaveScreen extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => AddRescheduleLeavScreen(), + builder: (context) => AddRescheduleLeaveScreen(), settings: RouteSettings(name: 'AddRescheduleLeaveScreen') // MyReferredPatient(), ), @@ -861,7 +853,7 @@ class _RescheduleLeaveScreen extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => AddRescheduleLeavScreen(), + builder: (context) => AddRescheduleLeaveScreen(), settings: RouteSettings(name: 'AddRescheduleLeaveScreen')), ); } diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index dfbfba31..5700db9c 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.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/screens/reschedule-leaves/add-rescheduleleave.dart'; +import 'package:doctor_app_flutter/screens/reschedule_leaves/add_reschedule_leave.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; @@ -128,7 +128,7 @@ class _AppDrawerState extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => AddRescheduleLeavScreen(), + builder: (context) => AddRescheduleLeaveScreen(), settings: RouteSettings( name: 'AddRescheduleLeaveScreen') // MyReferredPatient(),