fix DA-154,DA-150

merge-requests/265/head
Elham Rababah 5 years ago
parent 8360179050
commit e32c360f85

@ -42,7 +42,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
String itemText2 = ''; String itemText2 = '';
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
bool _autoValidate = false; bool _autoValidate = false;
bool onlyArrived = false; bool onlyArrived = true;
var _patientSearchFormValues = PatientModel( var _patientSearchFormValues = PatientModel(
FirstName: "0", FirstName: "0",

@ -141,9 +141,13 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
indent: 0, indent: 0,
endIndent: 0, endIndent: 0,
), ),
Row(mainAxisAlignment: MainAxisAlignment.start,
children: [
AppText( AppText(
notesList[index]["Notes"], notesList[index]["Notes"],
margin: 5, margin: 5,
),
],
) )
], ],
), ),

@ -77,7 +77,7 @@ class PatientPageHeaderWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
TranslationBase.of(context).age, TranslationBase.of(context).age ,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -36,7 +37,7 @@ class StepsWidget extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => changeCurrentTab(0), onTap: () => changeCurrentTab(0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: index == 0 ? 70 : 50, width: index == 0 ? 70 : 50,
@ -74,7 +75,7 @@ class StepsWidget extends StatelessWidget {
AppText( AppText(
"SUBJECTIVE", "SUBJECTIVE",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize: SizeConfig.textMultiplier * 2.0,
), ),
], ],
), ),
@ -86,7 +87,7 @@ class StepsWidget extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => index >= 1 ? changeCurrentTab(1) : null, onTap: () => index >= 1 ? changeCurrentTab(1) : null,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: index == 1 ? 70 : 50, width: index == 1 ? 70 : 50,
@ -124,7 +125,7 @@ class StepsWidget extends StatelessWidget {
AppText( AppText(
"OBJECTIVE", "OBJECTIVE",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize:SizeConfig.textMultiplier * 2.0,
), ),
], ],
), ),
@ -139,7 +140,7 @@ class StepsWidget extends StatelessWidget {
changeCurrentTab(2); changeCurrentTab(2);
}, },
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: index == 2 ? 70 : 50, width: index == 2 ? 70 : 50,
@ -177,7 +178,7 @@ class StepsWidget extends StatelessWidget {
AppText( AppText(
"ASSESSMENT", "ASSESSMENT",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize:SizeConfig.textMultiplier * 2.0,
), ),
], ],
), ),
@ -189,7 +190,7 @@ class StepsWidget extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => index >= 3 ? changeCurrentTab(4) : null, onTap: () => index >= 3 ? changeCurrentTab(4) : null,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: index == 3 ? 70 : 50, width: index == 3 ? 70 : 50,
@ -224,13 +225,12 @@ class StepsWidget extends StatelessWidget {
SizedBox( SizedBox(
height: index == 3 ? 5 : 10, height: index == 3 ? 5 : 10,
), ),
Container( Center(
margin: EdgeInsets.only(left: index == 3? 15:0),
child: AppText( child: AppText(
"PLAN", "PLAN",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textAlign: TextAlign.center, textAlign: TextAlign.center,
fontSize: 14, fontSize:SizeConfig.textMultiplier * 2.0,
), ),
), ),
], ],
@ -259,7 +259,7 @@ class StepsWidget extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => changeCurrentTab(0), onTap: () => changeCurrentTab(0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: index == 0 ? 70 : 50, width: index == 0 ? 70 : 50,
@ -309,7 +309,7 @@ class StepsWidget extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => index >= 2 ? changeCurrentTab(1) : null, onTap: () => index >= 2 ? changeCurrentTab(1) : null,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: index == 1 ? 70 : 50, width: index == 1 ? 70 : 50,
@ -347,7 +347,7 @@ class StepsWidget extends StatelessWidget {
AppText( AppText(
"هدف", "هدف",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize:SizeConfig.textMultiplier * 2.0,
), ),
], ],
), ),
@ -359,7 +359,7 @@ class StepsWidget extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => index >= 3 ? changeCurrentTab(2) : null, onTap: () => index >= 3 ? changeCurrentTab(2) : null,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: index == 2 ? 70 : 50, width: index == 2 ? 70 : 50,
@ -400,7 +400,7 @@ class StepsWidget extends StatelessWidget {
child: AppText( child: AppText(
"تقدير", "تقدير",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize:SizeConfig.textMultiplier * 2.0,
), ),
), ),
], ],
@ -413,7 +413,7 @@ class StepsWidget extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => index >= 3 ? changeCurrentTab(4) : null, onTap: () => index >= 3 ? changeCurrentTab(4) : null,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: index == 3 ? 70 : 50, width: index == 3 ? 70 : 50,
@ -453,7 +453,7 @@ class StepsWidget extends StatelessWidget {
child: AppText( child: AppText(
"خطة", "خطة",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize:SizeConfig.textMultiplier * 2.0,
), ),
), ),
], ],

@ -381,9 +381,13 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.next, .next,
loading: model.state == ViewState.BusyLocal, loading: model.state == ViewState.BusyLocal,
onPressed: () async { onPressed: () async {
if (widget.mySelectedAssessmentList.isEmpty) {
helpers.showErrorToast(
TranslationBase.of(context).requiredMsg);
} else {
widget.changePageViewIndex(3); widget.changePageViewIndex(3);
widget.changeLoadingState(true); widget.changeLoadingState(true);
}
}, },
), ),
SizedBox( SizedBox(

@ -412,11 +412,11 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
widget.changePageViewIndex(2); widget.changePageViewIndex(2);
} }
} else { } else {
widget.changeLoadingState(true); // widget.changeLoadingState(true);
//
widget.changePageViewIndex(2); // widget.changePageViewIndex(2);
// helpers.showErrorToast(TranslationBase.of(context).requiredMsg); helpers.showErrorToast(TranslationBase.of(context).requiredMsg);
} }
} }

@ -321,6 +321,8 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
} else { } else {
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
} else {
helpers.showErrorToast(TranslationBase.of(context).requiredMsg);
} }
} }

Loading…
Cancel
Save