sick leave

merge-requests/421/head
Sultan Khan 5 years ago
parent bf32a3523e
commit 5309ace62e

@ -121,7 +121,7 @@ const GET_DASHBOARD =
const GET_SICKLEAVE_STATISTIC = const GET_SICKLEAVE_STATISTIC =
'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics'; 'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics';
const ARRIVED_PATIENT_URL = const ARRIVED_PATIENT_URL =
'Services/DoctorApplication.svc/REST/PatientArrivalList'; 'Services/DoctorApplication.svc/REST/PatientArrivalList';
const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave'; const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave';
const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves'; const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves';
const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave'; const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';
@ -143,6 +143,9 @@ const GET_PROCEDURE_LIST =
'Services/DoctorApplication.svc/REST/GetOrderedProcedure'; 'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure'; const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
const GET_PATIENT_ARRIVAL_LIST =
'Services/DoctorApplication.svc/REST/PatientArrivalList';
///Lab Order ///Lab Order
const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders'; const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
const GET_Patient_LAB_SPECIAL_RESULT = const GET_Patient_LAB_SPECIAL_RESULT =

@ -230,76 +230,77 @@ class AddSickLeavScreen extends StatelessWidget {
)); ));
}).toList(), }).toList(),
) )
: new Builder(builder: (context) { : SizedBox()
return Column( // : new Builder(builder: (context) {
crossAxisAlignment: CrossAxisAlignment.start, // return 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: 20, bottom: 20), // margin: EdgeInsets.only(
padding: EdgeInsets.all(20), // left: 20, right: 20, top: 20, bottom: 20),
decoration: BoxDecoration( // padding: EdgeInsets.all(20),
borderRadius: BorderRadius.circular(10), // decoration: BoxDecoration(
color: HexColor('#EAEAEA')), // borderRadius: BorderRadius.circular(10),
child: Column( // color: HexColor('#EAEAEA')),
mainAxisAlignment: MainAxisAlignment.start, // child: Column(
children: [ // mainAxisAlignment: MainAxisAlignment.start,
Container( // children: [
child: Container( // Container(
decoration: BoxDecoration( // child: Container(
color: Colors.grey, // decoration: BoxDecoration(
borderRadius: // color: Colors.grey,
BorderRadius.circular(10)), // borderRadius:
padding: EdgeInsets.all(3), // BorderRadius.circular(10)),
child: IconButton( // padding: EdgeInsets.all(3),
icon: Icon( // child: IconButton(
Icons.add, // icon: Icon(
size: 35, // Icons.add,
color: Colors.white, // size: 35,
), // color: Colors.white,
onPressed: () { // ),
openSickLeave( // onPressed: () {
context, // openSickLeave(
false, // context,
); // false,
}), // );
)), // }),
Padding( // )),
child: AppText( // Padding(
TranslationBase.of(context) // child: AppText(
.noSickLeaveApplied, // TranslationBase.of(context)
fontWeight: FontWeight.bold, // .noSickLeaveApplied,
fontFamily: 'Poppins', // fontWeight: FontWeight.bold,
fontSize: 16, // fontFamily: 'Poppins',
textAlign: TextAlign.center, // fontSize: 16,
color: HexColor('#7E7E7E')), // textAlign: TextAlign.center,
padding: EdgeInsets.all(10), // color: HexColor('#7E7E7E')),
), // padding: EdgeInsets.all(10),
], // ),
)), // ],
SizedBox( // )),
height: SizeConfig.screenHeight * .6, // SizedBox(
) // height: SizeConfig.screenHeight * .6,
], // )
); // ],
}), // );
// }),
])))); ]))));
} }

@ -30,6 +30,7 @@ class ShowSickLeaveScreen extends StatelessWidget {
model.getSickLeave(patient.patientMRN ?? patient.patientId), model.getSickLeave(patient.patientMRN ?? patient.patientId),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
isShowAppBar: false,
appBarTitle: TranslationBase.of(context).sickleave, appBarTitle: TranslationBase.of(context).sickleave,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(

Loading…
Cancel
Save