bug fix

lib/config/localized_values.dart

@@ -666,16 +666,8 @@ const Map<String, Map<String, String>> 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': "خارج الوقت"},
 };

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;

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,
                                                     )),

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<RescheduleLeaveScreen> {
         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<RescheduleLeaveScreen> {
         _controller4.text = fromTime;
         toDate = _toDateController2.text;
         fromDate = _toDateController.text;
+        this.reason = widget.updateData.reasonId.toString();
       }
     });
   }

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<TranslationBase> {

lib/widgets/auth/login_form.dart

@@ -117,8 +117,8 @@ class _LoginFormState extends State<LoginForm> {
               },
               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<LoginForm> {
                     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,

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:

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