Merge branch 'development' into soap-objective-feature-re-design

merge-requests/447/head
mosazaid 5 years ago
commit 14b76c9302

@ -35,69 +35,72 @@ class AddSickLeavScreen extends StatelessWidget {
child: Column(children: [ child: Column(children: [
PatientProfileHeaderNewDesign( PatientProfileHeaderNewDesign(
patient, routeArgs['patientType'], routeArgs['arrivalType']), patient, routeArgs['patientType'], routeArgs['arrivalType']),
Column( patient.patientStatusType == 43
crossAxisAlignment: CrossAxisAlignment.start, ? Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Padding( children: [
padding: EdgeInsets.all(10), Padding(
child: Column( padding: EdgeInsets.all(10),
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
AppText( children: [
TranslationBase.of(context).patient, AppText(
fontWeight: FontWeight.bold, TranslationBase.of(context).patient,
), fontWeight: FontWeight.bold,
AppText( ),
TranslationBase.of(context).sickLeave, AppText(
fontSize: 24, TranslationBase.of(context).sickLeave,
fontWeight: FontWeight.bold, fontSize: 24,
), fontWeight: FontWeight.bold,
], ),
)), ],
Container( )),
width: SizeConfig.screenWidth, Container(
margin: EdgeInsets.only( width: SizeConfig.screenWidth,
left: 20, right: 20, top: 10, bottom: 10), margin: EdgeInsets.only(
padding: EdgeInsets.all(20), left: 20, right: 20, top: 10, bottom: 10),
decoration: BoxDecoration( padding: EdgeInsets.all(20),
borderRadius: BorderRadius.circular(10),
color: HexColor('#EAEAEA')),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.grey, borderRadius: BorderRadius.circular(10),
borderRadius: BorderRadius.circular(10)), color: HexColor('#EAEAEA')),
padding: EdgeInsets.all(3), child: Column(
child: IconButton( mainAxisAlignment: MainAxisAlignment.start,
icon: Icon( children: [
Icons.add, Container(
size: 35, child: Container(
color: Colors.white, decoration: BoxDecoration(
color: Colors.grey,
borderRadius: BorderRadius.circular(10)),
padding: EdgeInsets.all(3),
child: IconButton(
icon: Icon(
Icons.add,
size: 35,
color: Colors.white,
),
onPressed: () {
openSickLeave(
context,
false,
);
}),
)),
Padding(
child: AppText(
TranslationBase.of(context)
.noSickLeaveApplied,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontSize: 16,
textAlign: TextAlign.center,
color: HexColor('#7E7E7E')),
padding: EdgeInsets.all(10),
), ),
onPressed: () { ],
openSickLeave( )),
context, ],
false, )
); : SizedBox(),
}),
)),
Padding(
child: AppText(
TranslationBase.of(context).noSickLeaveApplied,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontSize: 16,
textAlign: TextAlign.center,
color: HexColor('#7E7E7E')),
padding: EdgeInsets.all(10),
),
],
)),
],
),
model.getAllSIckLeave.length > 0 model.getAllSIckLeave.length > 0
? Column( ? Column(
children: model.getAllSIckLeave children: model.getAllSIckLeave

Loading…
Cancel
Save