Fixed some issues in patient_sick_leave_screen and vital_sing_chart_blood_pressure

merge-requests/939/head
RoaaGhali98 4 years ago
parent d9d2e40927
commit bfeb1ac047

@ -167,93 +167,95 @@ class PatientSickLeaveScreen extends StatelessWidget {
SizedBox( SizedBox(
width: 10, width: 10,
), ),
Column( Expanded(
children: [ child: Column(
CustomRow( children: [
label: TranslationBase.of( CustomRow(
context) label: TranslationBase.of(
.daysSickleave , context)
labelSize: SizeConfig .daysSickleave ,
.getTextMultiplierBasedOnWidth() * labelSize: SizeConfig
3.3, .getTextMultiplierBasedOnWidth() *
valueSize: SizeConfig 3.3,
.getTextMultiplierBasedOnWidth() * valueSize: SizeConfig
4, .getTextMultiplierBasedOnWidth() *
value: (item.sickLeaveDays 4,
.toString() != value: (item.sickLeaveDays
null && .toString() !=
item.sickLeaveDays null &&
.toString() != item.sickLeaveDays
"null") .toString() !=
? item.sickLeaveDays "null")
.toString() ? item.sickLeaveDays
: item.noOfDays .toString()
.toString(), : item.noOfDays
), .toString(),
CustomRow(
label: TranslationBase.of(
context)
.startDate +
' ' ??
"",
labelSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.3,
valueSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
4,
value: AppDateUtils
.getDayMonthYearDateFormatted(
item.startDate.contains(
"/Date(")
? AppDateUtils
.convertStringToDate(
item
.startDate)
: DateTime.parse(
item.startDate),
), ),
), CustomRow(
CustomRow( label: TranslationBase.of(
label: TranslationBase.of( context)
context) .startDate +
.endDate + ' ' ??
' ' ?? "",
"", labelSize: SizeConfig
labelSize: SizeConfig .getTextMultiplierBasedOnWidth() *
.getTextMultiplierBasedOnWidth() * 3.3,
3.3, valueSize: SizeConfig
valueSize: SizeConfig .getTextMultiplierBasedOnWidth() *
.getTextMultiplierBasedOnWidth() * 4,
4, value: AppDateUtils
value: AppDateUtils .getDayMonthYearDateFormatted(
.getDayMonthYearDateFormatted( item.startDate.contains(
item.startDate.contains( "/Date(")
"/Date(") ? AppDateUtils
? AppDateUtils .convertStringToDate(
.convertStringToDate( item
item.endDate ?? .startDate)
"") : DateTime.parse(
.add( item.startDate),
Duration( ),
days: item
.noOfDays ??
item.sickLeaveDays),
)
: DateTime.parse(
item.startDate ??
"")
.add(
Duration(
days:
item.noOfDays ??
""),
),
), ),
), CustomRow(
], label: TranslationBase.of(
crossAxisAlignment: context)
CrossAxisAlignment.start, .endDate +
' ' ??
"",
labelSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.3,
valueSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
4,
value: AppDateUtils
.getDayMonthYearDateFormatted(
item.startDate.contains(
"/Date(")
? AppDateUtils
.convertStringToDate(
item.endDate ??
"")
.add(
Duration(
days: item
.noOfDays ??
item.sickLeaveDays),
)
: DateTime.parse(
item.startDate ??
"")
.add(
Duration(
days:
item.noOfDays ??
""),
),
),
),
],
crossAxisAlignment:
CrossAxisAlignment.start,
),
), ),
], ],
), ),

@ -117,20 +117,20 @@ class VitalSingChartBloodPressure extends StatelessWidget {
(element) { (element) {
DateTime elementDate = DateTime elementDate =
AppDateUtils.getDateTimeFromServerFormat(element.createdOn); AppDateUtils.getDateTimeFromServerFormat(element.createdOn);
if (element.toJson()[viewKey1]?.toInt() != 0) if (element.toJson()[viewKey1]?.toInt() != 0 && element.toJson()[viewKey1]?.toInt() != null)
timeSeriesData1.add( timeSeriesData1.add(
TimeSeriesSales2( TimeSeriesSales2(
new DateTime( new DateTime(
elementDate.year, elementDate.month, elementDate.day), elementDate.year, elementDate.month, elementDate.day),
element.toJson()[viewKey1].toDouble(), element.toJson()[viewKey1]?.toDouble(),
), ),
); );
if (element.toJson()[viewKey2]?.toInt() != 0) if (element.toJson()[viewKey2]?.toInt() != 0 && element.toJson()[viewKey2]?.toInt() != null)
timeSeriesData2.add( timeSeriesData2.add(
TimeSeriesSales2( TimeSeriesSales2(
new DateTime( new DateTime(
elementDate.year, elementDate.month, elementDate.day), elementDate.year, elementDate.month, elementDate.day),
element.toJson()[viewKey2].toDouble(), element.toJson()[viewKey2]?.toDouble(),
), ),
); );
}, },

Loading…
Cancel
Save