From 68cfbf8fc78cdce7dc0bd8171ad4fe88cc9274c6 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 3 Jan 2021 15:45:50 +0300 Subject: [PATCH] doctor leave --- lib/config/localized_values.dart | 1 + .../add-rescheduleleave.dart | 48 ++++++++++++++----- .../reschedule-leaves/reschedule_leave.dart | 26 +++++----- lib/screens/sick-leave/sick_leave.dart | 29 ++++++----- lib/util/translations_delegate_base.dart | 2 + 5 files changed, 70 insertions(+), 36 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 66c2e58c..19c4854c 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -504,4 +504,5 @@ const Map> localizedValues = { 'itemExist': {'en': "This item already exist", 'ar': "هذا العنصر موجود"}, 'selectAllergy': {'en': "Select Allergy", 'ar': "أختر الحساسية"}, 'selectSeverity': {'en': "Select Severity", 'ar': "أختر الدرجه"}, + 'leaveCreated': {'en': "Leave has been created", '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 2cc38638..501c2ae5 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -530,6 +530,8 @@ class TranslationBase { localizedValues['selectAllergy'][locale.languageCode]; String get selectSeverity => localizedValues['selectSeverity'][locale.languageCode]; + String get leaveCreated => + localizedValues['leaveCreated'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate {