fix header issues && exam issues

episode_fixes
Elham Rababh 5 years ago
parent 3b1a493d76
commit 8a69becab3

@ -59,5 +59,32 @@ class SizeConfig {
print('widthMultiplier $widthMultiplier'); print('widthMultiplier $widthMultiplier');
print('isPortrait $isPortrait'); print('isPortrait $isPortrait');
print('isMobilePortrait $isMobilePortrait'); print('isMobilePortrait $isMobilePortrait');
}
static getTextMultiplierBasedOnWidth({double width}) {
// TODO handel LandScape case
if (width != null) {
return width / 100;
}
return widthMultiplier;
}
static getWidthMultiplier({double width}) {
// TODO handel LandScape case
if (width != null) {
return width / 100;
}
return widthMultiplier;
}
static getHeightMultiplier({double height}) {
// TODO handel LandScape case
if (height != null) {
return height / 100;
}
return heightMultiplier;
} }
} }

@ -81,9 +81,9 @@ class _AddExaminationPageState extends State<AddExaminationPage> {
masterList: model.physicalExaminationList, masterList: model.physicalExaminationList,
isServiceSelected: (master) => isServiceSelected: (master) =>
isServiceSelected(master), isServiceSelected(master),
removeExamination: (exam) { removeExamination: (selectedExamination) {
setState(() { setState(() {
widget.removeExamination(exam); mySelectedExaminationLocal.remove(selectedExamination);
}); });
}, },
addExamination: (selectedExamination) { addExamination: (selectedExamination) {

@ -14,7 +14,7 @@ import 'package:provider/provider.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class AddExaminationWidget extends StatefulWidget { class AddExaminationWidget extends StatefulWidget {
MasterKeyModel item; MasterKeyModel item;
final Function(MasterKeyModel) removeExamination; final Function(MySelectedExamination) removeExamination;
final Function(MySelectedExamination) addExamination; final Function(MySelectedExamination) addExamination;
final bool Function(MasterKeyModel) isServiceSelected; final bool Function(MasterKeyModel) isServiceSelected;
bool isExpand; bool isExpand;
@ -83,7 +83,7 @@ class _AddExaminationWidgetState extends State<AddExaminationWidget> {
setState(() { setState(() {
if (widget.isServiceSelected(widget.item)) { if (widget.isServiceSelected(widget.item)) {
if (examination.isLocal) if (examination.isLocal)
widget.removeExamination(widget.item); widget.removeExamination(examination);
widget.expandClick(); widget.expandClick();
} else { } else {
examination.isNormal = status == 1; examination.isNormal = status == 1;

@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
import 'add_examination_widget.dart'; import 'add_examination_widget.dart';
class ExaminationsListSearchWidget extends StatefulWidget { class ExaminationsListSearchWidget extends StatefulWidget {
final Function(MasterKeyModel) removeExamination; final Function(MySelectedExamination) removeExamination;
final Function(MySelectedExamination) addExamination; final Function(MySelectedExamination) addExamination;
final bool Function(MasterKeyModel) isServiceSelected; final bool Function(MasterKeyModel) isServiceSelected;
final List<MasterKeyModel> masterList; final List<MasterKeyModel> masterList;

@ -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/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -76,11 +77,7 @@ class StepsWidget extends StatelessWidget {
Column( Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
AppText( StepWidget(stepLabel: "Subjective",),
"Subjective",
fontWeight: FontWeight.bold,
fontSize: 12,
),
StatusLabel( StatusLabel(
selectedStepId: index, selectedStepId: index,
stepId: 0, stepId: 0,
@ -132,11 +129,7 @@ class StepsWidget extends StatelessWidget {
Column( Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
AppText( StepWidget(stepLabel: "Objective",),
"Objective",
fontWeight: FontWeight.bold,
fontSize: 12,
),
StatusLabel( StatusLabel(
selectedStepId: index, selectedStepId: index,
stepId: 1, stepId: 1,
@ -152,7 +145,7 @@ class StepsWidget extends StatelessWidget {
left: MediaQuery left: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.50, .width * 0.47,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
if (index >= 3) changeCurrentTab(2); if (index >= 3) changeCurrentTab(2);
@ -190,11 +183,7 @@ class StepsWidget extends StatelessWidget {
Column( Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
AppText( StepWidget(stepLabel: "Assessment",),
"Assessment",
fontWeight: FontWeight.bold,
fontSize: 12,
),
StatusLabel( StatusLabel(
selectedStepId: index, selectedStepId: index,
stepId: 2, stepId: 2,
@ -243,13 +232,7 @@ class StepsWidget extends StatelessWidget {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
AppText( StepWidget(stepLabel: "Plan",marginLeft: 30,),
"Plan",
fontWeight: FontWeight.bold,
fontSize: 12,
textAlign: TextAlign.end,
marginLeft: 30,
),
StatusLabel( StatusLabel(
selectedStepId: index, selectedStepId: index,
stepId: 3, stepId: 3,
@ -506,6 +489,25 @@ class StepsWidget extends StatelessWidget {
} }
} }
class StepWidget extends StatelessWidget {
final String stepLabel;
final double marginLeft;
const StepWidget({
Key key, this.stepLabel, this.marginLeft = 0,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return AppText(
stepLabel,
fontWeight: FontWeight.bold,
marginLeft: marginLeft,
fontSize:SizeConfig.getTextMultiplierBasedOnWidth() * 3.5 //12,
);
}
}
class StatusLabel extends StatelessWidget { class StatusLabel extends StatelessWidget {
const StatusLabel({ const StatusLabel({
Key key, Key key,
@ -519,7 +521,7 @@ class StatusLabel extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
width: 65, width: SizeConfig.getTextMultiplierBasedOnWidth() * 18.5,
padding: EdgeInsets.symmetric(horizontal: 2, vertical: 3), padding: EdgeInsets.symmetric(horizontal: 2, vertical: 3),
decoration: BoxDecoration( decoration: BoxDecoration(
color: stepId == selectedStepId color: stepId == selectedStepId
@ -541,7 +543,7 @@ class StatusLabel extends StatelessWidget {
: "Locked", : "Locked",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textAlign: TextAlign.center, textAlign: TextAlign.center,
fontSize: 10, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
color: stepId == selectedStepId color: stepId == selectedStepId
? Color(0xFFCC9B14) ? Color(0xFFCC9B14)
: stepId < selectedStepId : stepId < selectedStepId

Loading…
Cancel
Save