merge-requests/445/head
mosazaid 4 years ago
parent 5f245b8c27
commit aeecc12cbe

@ -19,6 +19,7 @@ class ExaminationIitemCard extends StatelessWidget {
return Container( return Container(
color: Colors.white, color: Colors.white,
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
margin: EdgeInsets.only(bottom: 8),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -77,14 +78,12 @@ class ExaminationIitemCard extends StatelessWidget {
SizedBox( SizedBox(
height: 4, height: 4,
), ),
Expanded( AppText(
child: AppText( examination.remark,
examination.remark, fontWeight: FontWeight.normal,
fontWeight: FontWeight.normal, fontFamily: 'Poppins',
fontFamily: 'Poppins', color: Colors.grey.shade500,
color: Colors.grey.shade500, fontSize: SizeConfig.textMultiplier * 1.8,
fontSize: SizeConfig.textMultiplier * 1.8,
),
), ),
], ],
), ),

@ -134,7 +134,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
HeaderBodyExpandableNotifier( HeaderBodyExpandableNotifier(
headerWidget: Row( headerWidget: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Row(
children: [ children: [
@ -142,7 +142,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
"${TranslationBase.of(context).physicalSystemExamination}", "${TranslationBase.of(context).physicalSystemExamination}",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: fontSize:
SizeConfig.textMultiplier * 2.0, SizeConfig.textMultiplier * 2.0,
fontWeight: isSysExaminationExpand fontWeight: isSysExaminationExpand
? FontWeight.w700 ? FontWeight.w700
: FontWeight.normal, : FontWeight.normal,
@ -158,7 +158,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
onTap: () { onTap: () {
setState(() { setState(() {
isSysExaminationExpand = isSysExaminationExpand =
!isSysExaminationExpand; !isSysExaminationExpand;
}); });
}, },
child: Icon(isSysExaminationExpand child: Icon(isSysExaminationExpand
@ -176,7 +176,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 8, horizontal: 8.0), vertical: 8, horizontal: 8.0),
margin: margin:
EdgeInsets.symmetric(vertical: 8), EdgeInsets.symmetric(vertical: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Colors.grey.shade400, color: Colors.grey.shade400,
@ -188,33 +188,33 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
), ),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.center, CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
"${TranslationBase.of(context).addExamination}", "${TranslationBase.of(context).addExamination}",
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
1.8, 1.8,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
"${TranslationBase.of(context).searchHere}", "${TranslationBase.of(context).searchHere}",
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
1.8, 1.8,
color: Colors.grey.shade700, color: Colors.grey.shade700,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
], ],
)), )),
Icon( Icon(
Icons.add_box_rounded, Icons.add_box_rounded,
size: 25, size: 25,
@ -223,6 +223,18 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
), ),
), ),
), ),
/* ...List.generate(
widget.mySelectedExamination.length,
(index) => Container(
child: ExaminationIitemCard(
widget.mySelectedExamination[
index], () {
removeExamination(widget
.mySelectedExamination[
index]
.selectedExamination);
}),
)),*/
Column( Column(
children: widget.mySelectedExamination children: widget.mySelectedExamination
.map((examination) { .map((examination) {

Loading…
Cancel
Save