|
|
|
@ -97,7 +97,6 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
|
|
|
|
|
mySelectedExamination.add(tempEam);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
widget.changeLoadingState(false);
|
|
|
|
|
},
|
|
|
|
|
builder: (_, model, w) => AppScaffold(
|
|
|
|
@ -130,8 +129,50 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
|
|
|
|
|
openExaminationList(context);
|
|
|
|
|
},
|
|
|
|
|
),
|
|
|
|
|
if (mySelectedExamination.isNotEmpty &&
|
|
|
|
|
mySelectedExamination.first.isLocal)
|
|
|
|
|
Row(
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
"New",
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
color: Colors.blue,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
Column(
|
|
|
|
|
children: mySelectedExamination.map((examination) {
|
|
|
|
|
children: mySelectedExamination
|
|
|
|
|
.sublist(
|
|
|
|
|
0,
|
|
|
|
|
model.getFirstIndexForOldExamination(
|
|
|
|
|
mySelectedExamination))
|
|
|
|
|
.map((examination) {
|
|
|
|
|
return ExaminationItemCard(examination, () {
|
|
|
|
|
removeExamination(
|
|
|
|
|
examination.selectedExamination);
|
|
|
|
|
});
|
|
|
|
|
}).toList(),
|
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
if (mySelectedExamination.isNotEmpty &&
|
|
|
|
|
model.getFirstIndexForOldExamination(
|
|
|
|
|
mySelectedExamination)>-1)
|
|
|
|
|
Row(
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
"old",
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
color: Colors.green,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
Column(
|
|
|
|
|
children: mySelectedExamination
|
|
|
|
|
.sublist(model.getFirstIndexForOldExamination(
|
|
|
|
|
mySelectedExamination))
|
|
|
|
|
.map((examination) {
|
|
|
|
|
return ExaminationItemCard(examination, () {
|
|
|
|
|
removeExamination(
|
|
|
|
|
examination.selectedExamination);
|
|
|
|
@ -276,10 +317,17 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
|
|
|
|
|
masterKey.id == element.selectedExamination.id &&
|
|
|
|
|
masterKey.typeId == element.selectedExamination.typeId);
|
|
|
|
|
|
|
|
|
|
if (history.length > 0)
|
|
|
|
|
if (history.length > 0) {
|
|
|
|
|
setState(() {
|
|
|
|
|
mySelectedExamination.remove(history.first);
|
|
|
|
|
if (history.first.isLocal) {
|
|
|
|
|
mySelectedExamination.remove(history.first);
|
|
|
|
|
} else {
|
|
|
|
|
history.first.notExamined = true;
|
|
|
|
|
history.first.isNormal = false;
|
|
|
|
|
history.first.isAbnormal = false;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
openExaminationList(BuildContext context) {
|
|
|
|
@ -298,59 +346,3 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
class AddExaminationDailog extends StatefulWidget {
|
|
|
|
|
final List<MySelectedExamination> mySelectedExamination;
|
|
|
|
|
final Function addSelectedExamination;
|
|
|
|
|
final Function(MasterKeyModel) removeExamination;
|
|
|
|
|
|
|
|
|
|
const AddExaminationDailog(
|
|
|
|
|
{Key key,
|
|
|
|
|
this.mySelectedExamination,
|
|
|
|
|
this.addSelectedExamination,
|
|
|
|
|
this.removeExamination})
|
|
|
|
|
: super(key: key);
|
|
|
|
|
|
|
|
|
|
@override
|
|
|
|
|
_AddExaminationDailogState createState() => _AddExaminationDailogState();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
class _AddExaminationDailogState extends State<AddExaminationDailog> {
|
|
|
|
|
@override
|
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
|
return FractionallySizedBox(
|
|
|
|
|
heightFactor: 0.7,
|
|
|
|
|
child: BaseView<SOAPViewModel>(
|
|
|
|
|
onModelReady: (model) async {
|
|
|
|
|
if (model.physicalExaminationList.length == 0) {
|
|
|
|
|
await model
|
|
|
|
|
.getMasterLookup(MasterKeysService.PhysicalExamination);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
builder: (_, model, w) => AppScaffold(
|
|
|
|
|
baseViewModel: model,
|
|
|
|
|
isShowAppBar: false,
|
|
|
|
|
body: Center(
|
|
|
|
|
child: Container(
|
|
|
|
|
child: FractionallySizedBox(
|
|
|
|
|
widthFactor: 0.9,
|
|
|
|
|
child: Column(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 16,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).physicalSystemExamination,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
fontSize: 16,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 16,
|
|
|
|
|
),
|
|
|
|
|
]),
|
|
|
|
|
))),
|
|
|
|
|
)),
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|