fixes on procedure

merge-requests/997/head
Elham Rababh 4 years ago
parent 986af6ba9c
commit 17f32c4dc8

@ -1129,7 +1129,7 @@ const Map<String, Map<String, String>> localizedValues = {
"VTE_Type": {"en": "VTE Type", "ar": "VTE Type"}, "VTE_Type": {"en": "VTE Type", "ar": "VTE Type"},
"pharmacology": {"en": "Pharmacology", "ar": "علم العقاقير"}, "pharmacology": {"en": "Pharmacology", "ar": "علم العقاقير"},
"reasonsThrombo": {"en": "Reasons Thrombo", "ar": "أسباب ثرومبو"}, "reasonsThrombo": {"en": "Reasons Thrombo", "ar": "أسباب ثرومبو"},
"youDoNotHaveFavoritePrescription": {"en": "You Don't Have Favorite Prescription", "ar": "ليس لديك وصفة طبية مفضلة"}, "youDoNotHaveFavoriteTemplate": {"en": "You Don't Have Favorite Template", "ar": "ليس لديك وصفة طبية مفضلة"},
"pleaseSelectItem": {"en": "please Select Item", "ar": "الرجاء اختيار عنصر"}, "pleaseSelectItem": {"en": "please Select Item", "ar": "الرجاء اختيار عنصر"},
"searchFavoriteTemplate": {"en": "search Favorites Template", "ar": "البحث في قالب المفضلة"}, "searchFavoriteTemplate": {"en": "search Favorites Template", "ar": "البحث في قالب المفضلة"},
"sorryNoMatch": {"en": "Sorry No Match", "ar": "عذرا لا يوجد تطابق"}, "sorryNoMatch": {"en": "Sorry No Match", "ar": "عذرا لا يوجد تطابق"},

@ -59,7 +59,8 @@ class DashboardViewModel extends BaseViewModel {
_firebaseMessaging.getToken().then((String token) async { _firebaseMessaging.getToken().then((String token) async {
if (token != '') { if (token != '') {
// DEVICE_TOKEN = token; // DEVICE_TOKEN = token;
authProvider.insertDeviceImei(token); ///TODO Elham* return it back
// authProvider.insertDeviceImei(token);
} }
}); });
} }

@ -96,6 +96,7 @@ class _RadiologyHomePageState extends State<RadiologyHomePage> {
}, },
label: TranslationBase.of(context).applyForRadiologyOrder, label: TranslationBase.of(context).applyForRadiologyOrder,
), ),
///TODO Elham * fix this to be list view builder
...List.generate( ...List.generate(
model.radiologyList.length, model.radiologyList.length,
(index) => Container( (index) => Container(

@ -185,7 +185,7 @@ class _AddProcedurePageState extends State<AddProcedurePage> {
], ],
), ),
), ),
bottomSheet: model.state == ViewState.BusyLocal bottomSheet: model.state == ViewState.BusyLocal || entityList.isEmpty
? Container( ? Container(
height: 0, height: 0,
) )

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart'; import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
import 'package:doctor_app_flutter/utils/utils.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
@ -117,7 +118,7 @@ class _EntityListCheckboxSearchWidgetState
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 0), horizontal: 10, vertical: 0),
child: AppText( child: AppText(
historyInfo.procedureName, Utils.convertToTitleCase( historyInfo.procedureName),
fontSize: 14.0, fontSize: 14.0,
variant: "bodyText", variant: "bodyText",
bold: true, bold: true,

@ -78,10 +78,10 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
) )
: ErrorMessage( : ErrorMessage(
error: TranslationBase.of(context) error: TranslationBase.of(context)
.youDoNotHaveFavoritePrescription, .youDoNotHaveFavoriteTemplate,
), ),
]), ]),
bottomSheet: CustomBottomSheetContainer( bottomSheet: widget.previousProcedureViewModel.templateList.length == 0?Container(height: 0,):CustomBottomSheetContainer(
label: widget.procedureType.getAddButtonTitle(context) ?? label: widget.procedureType.getAddButtonTitle(context) ??
TranslationBase.of(context).addSelectedProcedures, TranslationBase.of(context).addSelectedProcedures,
onTap: () async { onTap: () async {

@ -190,6 +190,7 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
), ),
), ),
), ),
///TODO Elham* use our custom bottomsheet
bottomSheet: Container( bottomSheet: Container(
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
child: Wrap( child: Wrap(

@ -1698,7 +1698,7 @@ class TranslationBase {
String get reasonsThrombo => localizedValues['reasonsThrombo'][locale.languageCode]; String get reasonsThrombo => localizedValues['reasonsThrombo'][locale.languageCode];
String get youDoNotHaveFavoritePrescription => localizedValues['youDoNotHaveFavoritePrescription'][locale.languageCode]; String get youDoNotHaveFavoriteTemplate => localizedValues['youDoNotHaveFavoriteTemplate'][locale.languageCode];
String get pleaseSelectItem => localizedValues['pleaseSelectItem'][locale.languageCode]; String get pleaseSelectItem => localizedValues['pleaseSelectItem'][locale.languageCode];

Loading…
Cancel
Save