diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index ff3ebd74..10ac9856 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -504,11 +504,21 @@ const Map> localizedValues = { 'itemExist': {'en': "This item already exist", 'ar': "هذا العنصر موجود"}, 'selectAllergy': {'en': "Select Allergy", 'ar': "أختر الحساسية"}, 'selectSeverity': {'en': "Select Severity", 'ar': "أختر الدرجه"}, - 'medications': {'en': "Medications", 'ar':"الأدوية" }, - 'procedures': {'en': "Procedures", 'ar':"الإجراءات" }, - 'vitalSignEmptyMsg': {'en': "There is no vital signs for this patient", 'ar':"لا توجد علامات حيوية لهذا المريض" }, - 'referralEmptyMsg': {'en': "There is no referral data", 'ar':"لا توجد بيانات إحالة" }, - 'referralSuccessMsg': {'en': "You make referral successfully", 'ar':"You make referral successfully" }, + 'leaveCreated': {'en': "Leave has been created", 'ar': "تم إنشاء الإجازة"}, + 'medications': {'en': "Medications", 'ar': "الأدوية"}, + 'procedures': {'en': "Procedures", 'ar': "الإجراءات"}, + 'vitalSignEmptyMsg': { + 'en': "There is no vital signs for this patient", + 'ar': "لا توجد علامات حيوية لهذا المريض" + }, + 'referralEmptyMsg': { + 'en': "There is no referral data", + 'ar': "لا توجد بيانات إحالة" + }, + 'referralSuccessMsg': { + 'en': "You make referral successfully", + 'ar': "You make referral successfully" + }, 'diagnoseType': {'en': "Diagnose Type", 'ar':"نوع التشخيص" }, 'condition': {'en': "Condition", 'ar':"الحالة" }, 'id': {'en': "ID", 'ar':"بطاقة هوية" }, diff --git a/lib/screens/reschedule-leaves/add-rescheduleleave.dart b/lib/screens/reschedule-leaves/add-rescheduleleave.dart index a4739247..1b5957b9 100644 --- a/lib/screens/reschedule-leaves/add-rescheduleleave.dart +++ b/lib/screens/reschedule-leaves/add-rescheduleleave.dart @@ -45,23 +45,49 @@ class AddRescheduleLeavScreen extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppTextFormField( - hintText: - TranslationBase.of(context).requestLeave, - borderColor: Colors.white, - prefix: IconButton( - icon: Icon( - Icons.add_circle, - color: Colors.red, - )), - textInputType: TextInputType.text, + InkWell( + child: Row( + children: [ + Expanded( + flex: 4, + child: AppText( + TranslationBase.of(context) + .requestLeave), + ), + IconButton( + icon: Icon( + Icons.add_circle, + color: Colors.red, + )) + ], + ) + // AppTextFormField( + // hintText: + // TranslationBase.of(context).requestLeave, + // borderColor: Colors.white, + // prefix: IconButton( + // icon: Icon( + // Icons.add_circle, + // color: Colors.red, + // )), + // // textInputType: TextInputType.text, + // readOnly: true, + // onTap: () { + // openLeave( + // context, + // false, + // ); + // return false; + // }, + // inputFormatter: ONLY_LETTERS, + // ) + , onTap: () { openLeave( context, false, ); }, - inputFormatter: ONLY_LETTERS, ) ], ), diff --git a/lib/screens/reschedule-leaves/reschedule_leave.dart b/lib/screens/reschedule-leaves/reschedule_leave.dart index c74395a3..8c5889c7 100644 --- a/lib/screens/reschedule-leaves/reschedule_leave.dart +++ b/lib/screens/reschedule-leaves/reschedule_leave.dart @@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:doctor_app_flutter/models/sickleave/add_sickleave_request.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; +import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/text_validator.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; @@ -130,10 +131,12 @@ class _RescheduleLeaveScreen extends State { child: DropdownButton( focusColor: Colors.grey, isExpanded: true, + dropdownColor: + Colors.grey, value: getClinicName( model) ?? "", - iconSize: 40, + iconSize: 0, elevation: 16, selectedItemBuilder: (BuildContext @@ -151,8 +154,8 @@ class _RescheduleLeaveScreen extends State { fontSize: SizeConfig .textMultiplier * 2.1, - color: - Colors.grey, + color: Colors + .grey[500], ), ], ); @@ -234,7 +237,7 @@ class _RescheduleLeaveScreen extends State { child: DropdownButtonHideUnderline( child: DropdownButton( - focusColor: Colors.grey, + // focusColor: Colors.grey, isExpanded: true, value: offTime == null ? model2.allOffTime[0] @@ -256,8 +259,8 @@ class _RescheduleLeaveScreen extends State { fontSize: SizeConfig .textMultiplier * 2.1, - color: - Colors.grey, + // color: + // Colors.grey, ), ], ); @@ -560,8 +563,8 @@ class _RescheduleLeaveScreen extends State { fontSize: SizeConfig .textMultiplier * 2.1, - color: - Colors.grey, + // color: + // Colors.grey, ), ], ); @@ -654,8 +657,6 @@ class _RescheduleLeaveScreen extends State { fontSize: SizeConfig .textMultiplier * 2.1, - color: - Colors.grey, ), ], ); @@ -731,9 +732,10 @@ class _RescheduleLeaveScreen extends State { getProfile() async { Map p = await sharedPref.getObj(DOCTOR_PROFILE); + setState(() { + this.profile = p; if (widget.updateData != null) { - this.profile = p; this.clinicID = widget.updateData.clinicId; _toDateController.text = widget.updateData.dateTimeFrom; @@ -779,7 +781,7 @@ class _RescheduleLeaveScreen extends State { }; model.addReschedule(request).then((response) { - print(response); + DrAppToastMsg.showSuccesToast(TranslationBase.of(context).leaveCreated); }); } diff --git a/lib/screens/sick-leave/sick_leave.dart b/lib/screens/sick-leave/sick_leave.dart index 2aea6f43..fcc641ff 100644 --- a/lib/screens/sick-leave/sick_leave.dart +++ b/lib/screens/sick-leave/sick_leave.dart @@ -203,7 +203,7 @@ class _SickLeaveScreenState extends State { value: getClinicName( model) ?? "", - iconSize: 40, + iconSize: 0, elevation: 16, selectedItemBuilder: (BuildContext @@ -221,6 +221,8 @@ class _SickLeaveScreenState extends State { fontSize: SizeConfig .textMultiplier * 2.1, + color: + Colors.grey, ), ], ); @@ -310,18 +312,19 @@ class _SickLeaveScreenState extends State { // TranslationBase.of(context).remarks, // fontSize: 10, // ), - AppTextFormField( - borderColor: Colors.white, - hintText: widget.extendedData != null - ? widget.extendedData.remarks - : TranslationBase.of(context).remarks, - onChanged: (value) { - addSickLeave.remarks = value; - }, - validator: (value) { - // return TextValidator().validateName(value); - }, - inputFormatter: ONLY_LETTERS) + TextField( + maxLines: 3, + decoration: InputDecoration( + contentPadding: EdgeInsets.all(20.0), + border: InputBorder.none, + hintText: widget.extendedData != null + ? widget.extendedData.remarks + : TranslationBase.of(context) + .remarks), + onChanged: (value) { + addSickLeave.remarks = value; + }, + ) ], ), ), diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 4bbe718f..37e39676 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -532,9 +532,14 @@ class TranslationBase { localizedValues['selectAllergy'][locale.languageCode]; String get selectSeverity => localizedValues['selectSeverity'][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 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];