From 5309ace62ef89bbde7ddb465139a1c2a63bb1226 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Mon, 5 Apr 2021 13:02:01 +0300 Subject: [PATCH] sick leave --- lib/config/config.dart | 5 +- lib/screens/sick-leave/add-sickleave.dart | 141 +++++++++++---------- lib/screens/sick-leave/show-sickleave.dart | 1 + 3 files changed, 76 insertions(+), 71 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index f402bea2..06768cbc 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -121,7 +121,7 @@ const GET_DASHBOARD = const GET_SICKLEAVE_STATISTIC = 'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics'; const ARRIVED_PATIENT_URL = - 'Services/DoctorApplication.svc/REST/PatientArrivalList'; + 'Services/DoctorApplication.svc/REST/PatientArrivalList​'; const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave'; const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves'; const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave'; @@ -143,6 +143,9 @@ const GET_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/GetOrderedProcedure'; const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure'; +const GET_PATIENT_ARRIVAL_LIST = + 'Services/DoctorApplication.svc/REST/PatientArrivalList'; + ///Lab Order const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders'; const GET_Patient_LAB_SPECIAL_RESULT = diff --git a/lib/screens/sick-leave/add-sickleave.dart b/lib/screens/sick-leave/add-sickleave.dart index 1297a673..5c0ad3f4 100644 --- a/lib/screens/sick-leave/add-sickleave.dart +++ b/lib/screens/sick-leave/add-sickleave.dart @@ -230,76 +230,77 @@ class AddSickLeavScreen extends StatelessWidget { )); }).toList(), ) - : new Builder(builder: (context) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.all(10), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).patient, - fontWeight: FontWeight.bold, - ), - AppText( - TranslationBase.of(context).sickLeave, - fontSize: 24, - fontWeight: FontWeight.bold, - ), - ], - )), - Container( - width: SizeConfig.screenWidth, - margin: EdgeInsets.only( - left: 20, right: 20, top: 20, bottom: 20), - padding: EdgeInsets.all(20), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - color: HexColor('#EAEAEA')), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Container( - child: Container( - 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), - ), - ], - )), - SizedBox( - height: SizeConfig.screenHeight * .6, - ) - ], - ); - }), + : SizedBox() + // : new Builder(builder: (context) { + // return Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: EdgeInsets.all(10), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // AppText( + // TranslationBase.of(context).patient, + // fontWeight: FontWeight.bold, + // ), + // AppText( + // TranslationBase.of(context).sickLeave, + // fontSize: 24, + // fontWeight: FontWeight.bold, + // ), + // ], + // )), + // Container( + // width: SizeConfig.screenWidth, + // margin: EdgeInsets.only( + // left: 20, right: 20, top: 20, bottom: 20), + // padding: EdgeInsets.all(20), + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(10), + // color: HexColor('#EAEAEA')), + // child: Column( + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // Container( + // child: Container( + // 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), + // ), + // ], + // )), + // SizedBox( + // height: SizeConfig.screenHeight * .6, + // ) + // ], + // ); + // }), ])))); } diff --git a/lib/screens/sick-leave/show-sickleave.dart b/lib/screens/sick-leave/show-sickleave.dart index 52ec7094..f64147dc 100644 --- a/lib/screens/sick-leave/show-sickleave.dart +++ b/lib/screens/sick-leave/show-sickleave.dart @@ -30,6 +30,7 @@ class ShowSickLeaveScreen extends StatelessWidget { model.getSickLeave(patient.patientMRN ?? patient.patientId), builder: (_, model, w) => AppScaffold( baseViewModel: model, + isShowAppBar: false, appBarTitle: TranslationBase.of(context).sickleave, body: SingleChildScrollView( child: Column(