fix out patient + fix steper in arabic

merge-requests/633/head
Elham Rababah 5 years ago
parent 8e4d9d9692
commit 7559ab31c0

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/core/enum/filter_type.dart';
import 'package:doctor_app_flutter/core/enum/patient_type.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart';
@ -83,11 +84,10 @@ class PatientSearchViewModel extends BaseViewModel{
getPatientBasedOnDate ( getPatientBasedOnDate (
{item, PatientSearchRequestModel patientSearchRequestModel, PatientType selectedPatientType, {item, PatientSearchRequestModel patientSearchRequestModel, PatientType selectedPatientType,
bool isSearchWithKeyInfo })async { bool isSearchWithKeyInfo,OutPatientFilterType outPatientFilterType })async {
String dateTo; String dateTo;
String dateFrom; String dateFrom;
// TODO Fix this in Arabic if (OutPatientFilterType.Previous == outPatientFilterType) {
if (item == 'Previous') {
selectedFromDate = DateTime(DateTime.now().year, DateTime.now().month-1, selectedFromDate = DateTime(DateTime.now().year, DateTime.now().month-1,
DateTime.now().day); DateTime.now().day);
@ -101,7 +101,7 @@ class PatientSearchViewModel extends BaseViewModel{
'yyyy-MM-dd'); 'yyyy-MM-dd');
} else if (item == 'Next Week') { } else if (OutPatientFilterType.NextWeek == outPatientFilterType) {
dateTo = DateUtils.convertDateToFormat( dateTo = DateUtils.convertDateToFormat(

@ -142,7 +142,7 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
selectedPatientType: widget.selectedPatientType, selectedPatientType: widget.selectedPatientType,
patientSearchRequestModel: widget patientSearchRequestModel: widget
.patientSearchRequestModel, .patientSearchRequestModel,
isSearchWithKeyInfo: widget.isSearchWithKeyInfo); isSearchWithKeyInfo: widget.isSearchWithKeyInfo, outPatientFilterType: outPatientFilterType);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
}, },
child: Center( child: Center(

@ -33,7 +33,6 @@ class SOAPStepHeader extends StatelessWidget {
child: StepsWidget( child: StepsWidget(
index: currentIndex, index: currentIndex,
changeCurrentTab: changePageViewIndex, changeCurrentTab: changePageViewIndex,
height: 100,
), ),
), ),
SizedBox( SizedBox(

@ -20,7 +20,7 @@ class StepsWidget extends StatelessWidget {
? Stack( ? Stack(
children: [ children: [
Container( Container(
height: height == 0 ? 150 : height, height: height == 0 ? 100 : height,
width: MediaQuery.of(context).size.width * 0.9, width: MediaQuery.of(context).size.width * 0.9,
color: Colors.transparent, color: Colors.transparent,
), ),
@ -29,14 +29,17 @@ class StepsWidget extends StatelessWidget {
, ,
child: Center( child: Center(
child: Container( child: Container(
width: MediaQuery.of(context).size.width * 0.9, width: MediaQuery
.of(context)
.size
.width * 0.9,
child: Divider( child: Divider(
color: Colors.grey, color: Colors.grey,
height: 0.75, height: 0.75,
thickness: 0.75, thickness: 0.75,
), ),
), ),
)), ),),
Positioned( Positioned(
top: 10, top: 10,
left: 0, left: 0,
@ -260,17 +263,26 @@ class StepsWidget extends StatelessWidget {
: Stack( : Stack(
children: [ children: [
Container( Container(
height: height == 0 ? 150 : height, height: height == 0 ? 100 : height,
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width * 0.9,
color: Colors.transparent, color: Colors.transparent,
),
Positioned(
top: 30
,
child: Center( child: Center(
child: Container(
width: MediaQuery
.of(context)
.size
.width * 0.9,
child: Divider( child: Divider(
color: Colors.grey, color: Colors.grey,
height: 0.75, height: 0.75,
thickness: 0.75, thickness: 0.75,
), ),
), ),
), ),),
Positioned( Positioned(
top: 10, top: 10,
right: 0, right: 0,
@ -303,7 +315,7 @@ class StepsWidget extends StatelessWidget {
color: Colors.white, color: Colors.white,
)), )),
), ),
SizedBox(height: 5), SizedBox(height: 3),
Column( Column(
children: [ children: [
AppText( AppText(

Loading…
Cancel
Save