|
|
|
@ -142,15 +142,10 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
|
|
|
|
return Container(
|
|
|
|
return Container(
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
left: 5, right: 5, top: 15, bottom: 15),
|
|
|
|
left: 5, right: 5, top: 15, bottom: 15),
|
|
|
|
child: Row(
|
|
|
|
child: Column(
|
|
|
|
mainAxisAlignment:
|
|
|
|
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Column(
|
|
|
|
Row(
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
RichText(
|
|
|
|
RichText(
|
|
|
|
text: new TextSpan(
|
|
|
|
text: new TextSpan(
|
|
|
|
@ -175,6 +170,56 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
Column(
|
|
|
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
|
|
|
CrossAxisAlignment.end,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
|
|
|
|
AppText(
|
|
|
|
|
|
|
|
assessment.createdOn != null
|
|
|
|
|
|
|
|
? AppDateUtils
|
|
|
|
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
|
|
|
|
DateTime.parse(
|
|
|
|
|
|
|
|
assessment
|
|
|
|
|
|
|
|
.createdOn), isMonthShort: true)
|
|
|
|
|
|
|
|
: AppDateUtils
|
|
|
|
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
|
|
|
|
DateTime.now()),
|
|
|
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
AppText(
|
|
|
|
|
|
|
|
assessment.createdOn != null
|
|
|
|
|
|
|
|
? AppDateUtils.getHour(
|
|
|
|
|
|
|
|
DateTime.parse(
|
|
|
|
|
|
|
|
assessment
|
|
|
|
|
|
|
|
.createdOn))
|
|
|
|
|
|
|
|
: AppDateUtils.getHour(
|
|
|
|
|
|
|
|
DateTime.now()),
|
|
|
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
Row(
|
|
|
|
|
|
|
|
mainAxisAlignment:
|
|
|
|
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
|
|
|
|
Column(
|
|
|
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
|
|
|
|
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
width: MediaQuery.of(context)
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
@ -185,7 +230,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
|
|
|
|
style: new TextStyle(
|
|
|
|
style: new TextStyle(
|
|
|
|
fontSize: SizeConfig
|
|
|
|
fontSize: SizeConfig
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
5,
|
|
|
|
4.3,
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
@ -397,45 +442,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
|
|
|
|
crossAxisAlignment:
|
|
|
|
crossAxisAlignment:
|
|
|
|
CrossAxisAlignment.end,
|
|
|
|
CrossAxisAlignment.end,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Row(
|
|
|
|
|
|
|
|
children: [
|
|
|
|
|
|
|
|
Column(
|
|
|
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
|
|
|
CrossAxisAlignment.end,
|
|
|
|
|
|
|
|
children: [
|
|
|
|
|
|
|
|
AppText(
|
|
|
|
|
|
|
|
assessment.createdOn != null
|
|
|
|
|
|
|
|
? AppDateUtils
|
|
|
|
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
|
|
|
|
DateTime.parse(
|
|
|
|
|
|
|
|
assessment
|
|
|
|
|
|
|
|
.createdOn))
|
|
|
|
|
|
|
|
: AppDateUtils
|
|
|
|
|
|
|
|
.getDayMonthYearDateFormatted(
|
|
|
|
|
|
|
|
DateTime.now()),
|
|
|
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
AppText(
|
|
|
|
|
|
|
|
assessment.createdOn != null
|
|
|
|
|
|
|
|
? AppDateUtils.getHour(
|
|
|
|
|
|
|
|
DateTime.parse(
|
|
|
|
|
|
|
|
assessment
|
|
|
|
|
|
|
|
.createdOn))
|
|
|
|
|
|
|
|
: AppDateUtils.getHour(
|
|
|
|
|
|
|
|
DateTime.now()),
|
|
|
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
|
|
|
|
fontSize: SizeConfig
|
|
|
|
|
|
|
|
.getTextMultiplierBasedOnWidth() *
|
|
|
|
|
|
|
|
3.6,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
SizedBox(
|
|
|
|
SizedBox(
|
|
|
|
height: MediaQuery.of(context)
|
|
|
|
height: MediaQuery.of(context)
|
|
|
|
.size
|
|
|
|
.size
|
|
|
|
@ -458,6 +465,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
),
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}).toList(),
|
|
|
|
}).toList(),
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|