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,7 +167,8 @@ class PatientSickLeaveScreen extends StatelessWidget {
SizedBox(
width: 10,
),
Column(
Expanded(
child: Column(
children: [
CustomRow(
label: TranslationBase.of(
@ -255,6 +256,7 @@ class PatientSickLeaveScreen extends StatelessWidget {
crossAxisAlignment:
CrossAxisAlignment.start,
),
),
],
),
],

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

Loading…
Cancel
Save