diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 0ef7fe31..7e425874 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -666,16 +666,8 @@ const Map> localizedValues = { 'en': "You have to add chief complaint fields correctly .", 'ar': "يجب عليك إضافة حقول شكوى الرئيس بشكل صحيح" }, - 'referralStatus': { - 'en': "Referral Status : ", - 'ar': "حالة الإحالة :" - }, - 'referralRemark': { - 'en': "Referral Remark : ", - 'ar': "ملاحظة الإحالة :" - }, - 'ICDName': { - 'en': "ICDName", - 'ar': "اسم ال ICD" - }, + 'referralStatus': {'en': "Referral Status : ", 'ar': "حالة الإحالة :"}, + 'referralRemark': {'en': "Referral Remark : ", 'ar': "ملاحظة الإحالة :"}, + 'ICDName': {'en': "ICDName", 'ar': "اسم ال ICD"}, + 'offTime': {'en': "OffTime", 'ar': "خارج الوقت"}, }; diff --git a/lib/core/service/sickleave_service.dart b/lib/core/service/sickleave_service.dart index 8eebd23c..d188836c 100644 --- a/lib/core/service/sickleave_service.dart +++ b/lib/core/service/sickleave_service.dart @@ -128,7 +128,10 @@ class SickLeaveService extends BaseService { GET_OFFTIME, onSuccess: (dynamic response, int statusCode) { offTime = []; - offTime = response['MasterLookUpList']['entityList']; + response['MasterLookUpList']['entityList'].forEach((item) => { + if (item['code'] == '1' || item['code'] == '2') + {offTime.add(item)} + }); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/screens/reschedule-leaves/add-rescheduleleave.dart b/lib/screens/reschedule-leaves/add-rescheduleleave.dart index b4ebecf4..c3cbe19c 100644 --- a/lib/screens/reschedule-leaves/add-rescheduleleave.dart +++ b/lib/screens/reschedule-leaves/add-rescheduleleave.dart @@ -144,10 +144,14 @@ class AddRescheduleLeavScreen extends StatelessWidget { ), Container( child: AppText( - TranslationBase.of( + item.requisitionType == 1 + ? TranslationBase.of( context) - .holiday + - ' ', + .offTime + : TranslationBase.of( + context) + .holiday + + ' ', fontWeight: FontWeight.bold, )), diff --git a/lib/screens/reschedule-leaves/reschedule_leave.dart b/lib/screens/reschedule-leaves/reschedule_leave.dart index 822a2181..25102e3d 100644 --- a/lib/screens/reschedule-leaves/reschedule_leave.dart +++ b/lib/screens/reschedule-leaves/reschedule_leave.dart @@ -26,6 +26,7 @@ import 'package:intl/intl.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; import 'package:provider/provider.dart'; import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart'; +import 'package:dropdown_search/dropdown_search.dart'; Helpers helpers = Helpers(); @@ -758,7 +759,7 @@ class _RescheduleLeaveScreen extends State { this.clinicID = widget.updateData.clinicId; final df = new DateFormat('HH:mm:ss'); final dateFormat = new DateFormat('yyyy-MM-dd'); - + this.offTime = widget.updateData.requisitionType.toString(); _toDateController.text = dateFormat.format(DateTime.parse(widget.updateData.dateTimeFrom)); //df.format(DateTime.parse(widget.updateData.dateTimeFrom)); @@ -773,6 +774,7 @@ class _RescheduleLeaveScreen extends State { _controller4.text = fromTime; toDate = _toDateController2.text; fromDate = _toDateController.text; + this.reason = widget.updateData.reasonId.toString(); } }); } diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 01c8d90b..9668b514 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -1036,12 +1036,12 @@ class TranslationBase { String get chiefComplaintErrorMsg => localizedValues['chiefComplaintErrorMsg'][locale.languageCode]; -String get ICDName => - localizedValues['ICDName'][locale.languageCode]; + String get ICDName => localizedValues['ICDName'][locale.languageCode]; String get referralStatus => localizedValues['referralStatus'][locale.languageCode]; String get referralRemark => localizedValues['referralRemark'][locale.languageCode]; + String get offTime => localizedValues['offTime'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/auth/login_form.dart b/lib/widgets/auth/login_form.dart index 63087cc7..c52e9a77 100644 --- a/lib/widgets/auth/login_form.dart +++ b/lib/widgets/auth/login_form.dart @@ -117,8 +117,8 @@ class _LoginFormState extends State { }, onFieldSubmitted: (_) { focusPass.nextFocus(); - // helpers.showCupertinoPicker( - // context, projectsList, 'facilityName', onSelectProject); + helpers.showCupertinoPicker( + context, projectsList, 'facilityName', onSelectProject); }, onTap: () { this.getProjects(userInfo.userID); @@ -130,11 +130,11 @@ class _LoginFormState extends State { focusNode: focusProject, controller: projectIdController, onTap: () { - // helpers.showCupertinoPicker(context, projectsList, - // 'facilityName', onSelectProject); + helpers.showCupertinoPicker(context, projectsList, + 'facilityName', onSelectProject); }, showCursor: false, - readOnly: true, + //readOnly: true, decoration: buildInputDecoration( context, TranslationBase.of(context).selectYourProject, diff --git a/pubspec.lock b/pubspec.lock index d49ad4a1..c4bbf56a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -281,6 +281,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" + dropdown_search: + dependency: "direct main" + description: + name: dropdown_search + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.8" equatable: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 887ac913..cf69fa5b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: #Icons eva_icons_flutter: ^2.0.0 font_awesome_flutter: ^8.11.0 - + dropdown_search: ^0.4.8 expandable: ^4.1.4