merge-requests/291/head
Sultan Khan 5 years ago
parent ed3b42d721
commit 6a23c2a137

@ -666,16 +666,8 @@ const Map<String, Map<String, String>> localizedValues = {
'en': "You have to add chief complaint fields correctly .", 'en': "You have to add chief complaint fields correctly .",
'ar': "يجب عليك إضافة حقول شكوى الرئيس بشكل صحيح" 'ar': "يجب عليك إضافة حقول شكوى الرئيس بشكل صحيح"
}, },
'referralStatus': { 'referralStatus': {'en': "Referral Status : ", 'ar': "حالة الإحالة :"},
'en': "Referral Status : ", 'referralRemark': {'en': "Referral Remark : ", 'ar': "ملاحظة الإحالة :"},
'ar': "حالة الإحالة :" 'ICDName': {'en': "ICDName", 'ar': "اسم ال ICD"},
}, 'offTime': {'en': "OffTime", 'ar': "خارج الوقت"},
'referralRemark': {
'en': "Referral Remark : ",
'ar': "ملاحظة الإحالة :"
},
'ICDName': {
'en': "ICDName",
'ar': "اسم ال ICD"
},
}; };

@ -128,7 +128,10 @@ class SickLeaveService extends BaseService {
GET_OFFTIME, GET_OFFTIME,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
offTime = []; 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) { onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

@ -144,7 +144,11 @@ class AddRescheduleLeavScreen extends StatelessWidget {
), ),
Container( Container(
child: AppText( child: AppText(
TranslationBase.of( item.requisitionType == 1
? TranslationBase.of(
context)
.offTime
: TranslationBase.of(
context) context)
.holiday + .holiday +
' ', ' ',

@ -26,6 +26,7 @@ import 'package:intl/intl.dart';
import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart'; import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart';
import 'package:dropdown_search/dropdown_search.dart';
Helpers helpers = Helpers(); Helpers helpers = Helpers();
@ -758,7 +759,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
this.clinicID = widget.updateData.clinicId; this.clinicID = widget.updateData.clinicId;
final df = new DateFormat('HH:mm:ss'); final df = new DateFormat('HH:mm:ss');
final dateFormat = new DateFormat('yyyy-MM-dd'); final dateFormat = new DateFormat('yyyy-MM-dd');
this.offTime = widget.updateData.requisitionType.toString();
_toDateController.text = _toDateController.text =
dateFormat.format(DateTime.parse(widget.updateData.dateTimeFrom)); dateFormat.format(DateTime.parse(widget.updateData.dateTimeFrom));
//df.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; _controller4.text = fromTime;
toDate = _toDateController2.text; toDate = _toDateController2.text;
fromDate = _toDateController.text; fromDate = _toDateController.text;
this.reason = widget.updateData.reasonId.toString();
} }
}); });
} }

@ -1036,12 +1036,12 @@ class TranslationBase {
String get chiefComplaintErrorMsg => String get chiefComplaintErrorMsg =>
localizedValues['chiefComplaintErrorMsg'][locale.languageCode]; localizedValues['chiefComplaintErrorMsg'][locale.languageCode];
String get ICDName => String get ICDName => localizedValues['ICDName'][locale.languageCode];
localizedValues['ICDName'][locale.languageCode];
String get referralStatus => String get referralStatus =>
localizedValues['referralStatus'][locale.languageCode]; localizedValues['referralStatus'][locale.languageCode];
String get referralRemark => String get referralRemark =>
localizedValues['referralRemark'][locale.languageCode]; localizedValues['referralRemark'][locale.languageCode];
String get offTime => localizedValues['offTime'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -117,8 +117,8 @@ class _LoginFormState extends State<LoginForm> {
}, },
onFieldSubmitted: (_) { onFieldSubmitted: (_) {
focusPass.nextFocus(); focusPass.nextFocus();
// helpers.showCupertinoPicker( helpers.showCupertinoPicker(
// context, projectsList, 'facilityName', onSelectProject); context, projectsList, 'facilityName', onSelectProject);
}, },
onTap: () { onTap: () {
this.getProjects(userInfo.userID); this.getProjects(userInfo.userID);
@ -130,11 +130,11 @@ class _LoginFormState extends State<LoginForm> {
focusNode: focusProject, focusNode: focusProject,
controller: projectIdController, controller: projectIdController,
onTap: () { onTap: () {
// helpers.showCupertinoPicker(context, projectsList, helpers.showCupertinoPicker(context, projectsList,
// 'facilityName', onSelectProject); 'facilityName', onSelectProject);
}, },
showCursor: false, showCursor: false,
readOnly: true, //readOnly: true,
decoration: buildInputDecoration( decoration: buildInputDecoration(
context, context,
TranslationBase.of(context).selectYourProject, TranslationBase.of(context).selectYourProject,

@ -281,6 +281,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.1" 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: equatable:
dependency: transitive dependency: transitive
description: description:

@ -39,7 +39,7 @@ dependencies:
#Icons #Icons
eva_icons_flutter: ^2.0.0 eva_icons_flutter: ^2.0.0
font_awesome_flutter: ^8.11.0 font_awesome_flutter: ^8.11.0
dropdown_search: ^0.4.8
expandable: ^4.1.4 expandable: ^4.1.4

Loading…
Cancel
Save