design updates

merge-requests/385/head
Sultan Khan 5 years ago
parent ee2e3fbbd6
commit 9c111b07dd

@ -803,4 +803,12 @@ const Map<String, Map<String, String>> localizedValues = {
"add-reschedule": {"en": "Add reschedule", "ar": "أضف إعادة الجدولة"}, "add-reschedule": {"en": "Add reschedule", "ar": "أضف إعادة الجدولة"},
"update-reschedule": {"en": "Update reschedule", "ar": "تحديث إعادة الجدولة"}, "update-reschedule": {"en": "Update reschedule", "ar": "تحديث إعادة الجدولة"},
"sick_leave": {"en": "Sick Leave", "ar": "أجازة مرضية"}, "sick_leave": {"en": "Sick Leave", "ar": "أجازة مرضية"},
"addSickLeaveRequest": {
"en": "Add Sick Leave Request",
"ar": "إضافة طلب إجازة مرضية"
},
"extendSickLeaveRequest": {
"en": "Extend Sick Leave Request",
"ar": "تمديد طلب الإجازة المرضية"
},
}; };

@ -26,7 +26,8 @@ class AddRescheduleLeavScreen extends StatelessWidget {
baseViewModel: model, baseViewModel: model,
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).rescheduleLeaves, appBarTitle: TranslationBase.of(context).rescheduleLeaves,
body: Column(children: [ body: SingleChildScrollView(
child: Column(children: [
Container( Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
margin: EdgeInsets.all(10), margin: EdgeInsets.all(10),
@ -68,10 +69,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
], ],
), ),
), ),
Container( Column(
height: MediaQuery.of(context).size.height * .65,
child: SingleChildScrollView(
child: Column(
children: model.getReschduleLeave children: model.getReschduleLeave
.map<Widget>((GetRescheduleLeavesResponse item) { .map<Widget>((GetRescheduleLeavesResponse item) {
return RoundedContainer( return RoundedContainer(
@ -100,9 +98,14 @@ class AddRescheduleLeavScreen extends StatelessWidget {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Container( Container(
padding: EdgeInsets.all(3), padding: EdgeInsets.all(3),
margin: EdgeInsets.only(top: 10), margin:
EdgeInsets.only(top: 10),
child: AppText( child: AppText(
item.status == 1 item.status == 1
? TranslationBase.of( ? TranslationBase.of(
@ -124,6 +127,17 @@ class AddRescheduleLeavScreen extends StatelessWidget {
fontSize: 14, fontSize: 14,
), ),
), ),
Padding(
padding:
EdgeInsets.only(top: 10),
child: AppText(
DateUtils
.convertStringToDateFormat(
item.dateTimeTo,
'yyyy-MM-dd HH:mm'),
fontWeight: FontWeight.bold,
))
]),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -141,12 +155,10 @@ class AddRescheduleLeavScreen extends StatelessWidget {
height: 5, height: 5,
), ),
Row(children: [ Row(children: [
AppText( AppText(TranslationBase.of(context)
TranslationBase.of(context)
.startDate), .startDate),
AppText( AppText(
DateUtils DateUtils.convertStringToDateFormat(
.convertStringToDateFormat(
item.dateTimeFrom, item.dateTimeFrom,
'yyyy-MM-dd HH:mm'), 'yyyy-MM-dd HH:mm'),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -164,8 +176,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
), ),
Row( Row(
children: [ children: [
AppText( AppText(TranslationBase.of(context)
TranslationBase.of(context)
.endDate), .endDate),
AppText( AppText(
DateUtils DateUtils
@ -183,16 +194,14 @@ class AddRescheduleLeavScreen extends StatelessWidget {
model.coveringDoctors.length > 0 model.coveringDoctors.length > 0
? Row(children: [ ? Row(children: [
AppText( AppText(
TranslationBase.of( TranslationBase.of(context)
context)
.coveringDoctor, .coveringDoctor,
), ),
AppText( AppText(
getDoctor( getDoctor(
model.coveringDoctors, model.coveringDoctors,
item.coveringDoctorId), item.coveringDoctorId),
fontWeight: fontWeight: FontWeight.bold,
FontWeight.bold,
) )
]) ])
: SizedBox(), : SizedBox(),
@ -203,8 +212,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
// ), // ),
Row( Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment MainAxisAlignment.spaceBetween,
.spaceBetween,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@ -218,10 +226,8 @@ class AddRescheduleLeavScreen extends StatelessWidget {
'assets/images/edit.png'), 'assets/images/edit.png'),
// color: Colors.green, //Colors.black, // color: Colors.green, //Colors.black,
onPressed: () => { onPressed: () => {
openLeave( openLeave(context, true,
context, true, extendedData: item)
extendedData:
item)
}, },
) )
: SizedBox(), : SizedBox(),
@ -240,8 +246,8 @@ class AddRescheduleLeavScreen extends StatelessWidget {
), ),
); );
}).toList(), }).toList(),
))) )
])), ]))),
); );
} }

@ -390,7 +390,9 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
AppButton( AppButton(
title: widget.isExtended == true title: widget.isExtended == true
? TranslationBase.of(context).extend ? TranslationBase.of(context).extend
: TranslationBase.of(context).add, : TranslationBase.of(context)
.addSickLeaverequest,
color: Colors.green,
onPressed: () async { onPressed: () async {
if (widget.isExtended) { if (widget.isExtended) {
await model2.extendSickLeave( await model2.extendSickLeave(

@ -523,7 +523,10 @@ class TranslationBase {
localizedValues['add-sickleave'][locale.languageCode]; localizedValues['add-sickleave'][locale.languageCode];
String get add => localizedValues['add'][locale.languageCode]; String get add => localizedValues['add'][locale.languageCode];
String get addSickLeaverequest =>
localizedValues['addSickLeaveRequest'][locale.languageCode];
String get extendSickLeaverequest =>
localizedValues['extendSickLeaveRequest'][locale.languageCode];
String get approved => localizedValues['approved'][locale.languageCode]; String get approved => localizedValues['approved'][locale.languageCode];
String get extended => localizedValues['extended'][locale.languageCode]; String get extended => localizedValues['extended'][locale.languageCode];

Loading…
Cancel
Save