doctor leave

merge-requests/228/head
Sultan Khan 5 years ago
parent 9adc5ddd8e
commit 68cfbf8fc7

@ -504,4 +504,5 @@ const Map<String, Map<String, String>> localizedValues = {
'itemExist': {'en': "This item already exist", 'ar': "هذا العنصر موجود"}, 'itemExist': {'en': "This item already exist", 'ar': "هذا العنصر موجود"},
'selectAllergy': {'en': "Select Allergy", 'ar': "أختر الحساسية"}, 'selectAllergy': {'en': "Select Allergy", 'ar': "أختر الحساسية"},
'selectSeverity': {'en': "Select Severity", 'ar': "أختر الدرجه"}, 'selectSeverity': {'en': "Select Severity", 'ar': "أختر الدرجه"},
'leaveCreated': {'en': "Leave has been created", 'ar': "تم إنشاء الإجازة"}
}; };

@ -45,23 +45,49 @@ class AddRescheduleLeavScreen extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppTextFormField( InkWell(
hintText: child: Row(
TranslationBase.of(context).requestLeave, children: [
borderColor: Colors.white, Expanded(
prefix: IconButton( flex: 4,
icon: Icon( child: AppText(
Icons.add_circle, TranslationBase.of(context)
color: Colors.red, .requestLeave),
)), ),
textInputType: TextInputType.text, 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: () { onTap: () {
openLeave( openLeave(
context, context,
false, false,
); );
}, },
inputFormatter: ONLY_LETTERS,
) )
], ],
), ),

@ -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/models/sickleave/add_sickleave_request.dart';
import 'package:doctor_app_flutter/screens/base/base_view.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_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/helpers.dart';
import 'package:doctor_app_flutter/util/text_validator.dart'; import 'package:doctor_app_flutter/util/text_validator.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
@ -130,10 +131,12 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
child: DropdownButton( child: DropdownButton(
focusColor: Colors.grey, focusColor: Colors.grey,
isExpanded: true, isExpanded: true,
dropdownColor:
Colors.grey,
value: getClinicName( value: getClinicName(
model) ?? model) ??
"", "",
iconSize: 40, iconSize: 0,
elevation: 16, elevation: 16,
selectedItemBuilder: selectedItemBuilder:
(BuildContext (BuildContext
@ -151,8 +154,8 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
color: color: Colors
Colors.grey, .grey[500],
), ),
], ],
); );
@ -234,7 +237,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
child: child:
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: DropdownButton( child: DropdownButton(
focusColor: Colors.grey, // focusColor: Colors.grey,
isExpanded: true, isExpanded: true,
value: offTime == null value: offTime == null
? model2.allOffTime[0] ? model2.allOffTime[0]
@ -256,8 +259,8 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
color: // color:
Colors.grey, // Colors.grey,
), ),
], ],
); );
@ -560,8 +563,8 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
color: // color:
Colors.grey, // Colors.grey,
), ),
], ],
); );
@ -654,8 +657,6 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
color:
Colors.grey,
), ),
], ],
); );
@ -731,9 +732,10 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
getProfile() async { getProfile() async {
Map p = await sharedPref.getObj(DOCTOR_PROFILE); Map p = await sharedPref.getObj(DOCTOR_PROFILE);
setState(() { setState(() {
this.profile = p;
if (widget.updateData != null) { if (widget.updateData != null) {
this.profile = p;
this.clinicID = widget.updateData.clinicId; this.clinicID = widget.updateData.clinicId;
_toDateController.text = widget.updateData.dateTimeFrom; _toDateController.text = widget.updateData.dateTimeFrom;
@ -779,7 +781,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
}; };
model.addReschedule(request).then((response) { model.addReschedule(request).then((response) {
print(response); DrAppToastMsg.showSuccesToast(TranslationBase.of(context).leaveCreated);
}); });
} }

@ -203,7 +203,7 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
value: getClinicName( value: getClinicName(
model) ?? model) ??
"", "",
iconSize: 40, iconSize: 0,
elevation: 16, elevation: 16,
selectedItemBuilder: selectedItemBuilder:
(BuildContext (BuildContext
@ -221,6 +221,8 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2.1, 2.1,
color:
Colors.grey,
), ),
], ],
); );
@ -310,18 +312,19 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
// TranslationBase.of(context).remarks, // TranslationBase.of(context).remarks,
// fontSize: 10, // fontSize: 10,
// ), // ),
AppTextFormField( TextField(
borderColor: Colors.white, maxLines: 3,
hintText: widget.extendedData != null decoration: InputDecoration(
? widget.extendedData.remarks contentPadding: EdgeInsets.all(20.0),
: TranslationBase.of(context).remarks, border: InputBorder.none,
onChanged: (value) { hintText: widget.extendedData != null
addSickLeave.remarks = value; ? widget.extendedData.remarks
}, : TranslationBase.of(context)
validator: (value) { .remarks),
// return TextValidator().validateName(value); onChanged: (value) {
}, addSickLeave.remarks = value;
inputFormatter: ONLY_LETTERS) },
)
], ],
), ),
), ),

@ -530,6 +530,8 @@ class TranslationBase {
localizedValues['selectAllergy'][locale.languageCode]; localizedValues['selectAllergy'][locale.languageCode];
String get selectSeverity => String get selectSeverity =>
localizedValues['selectSeverity'][locale.languageCode]; localizedValues['selectSeverity'][locale.languageCode];
String get leaveCreated =>
localizedValues['leaveCreated'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save