From 1c67378147c896a051e9ce0f8934c6bc5d7f55db Mon Sep 17 00:00:00 2001 From: Sultan khan Date: Mon, 6 Jul 2026 15:00:18 +0300 Subject: [PATCH] bud fixes --- .../patient_sick_leave_screen.dart | 8 +++--- .../profile/vital_sign/line_chart_curved.dart | 17 ++++++++++--- .../line_chart_curved_blood_pressure.dart | 25 +++++++++++-------- .../vital_sign_item_details_screen.dart | 1 + 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart b/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart index c93a37b7..d214fcd5 100644 --- a/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart +++ b/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart @@ -174,11 +174,11 @@ class PatientSickLeaveScreen extends StatelessWidget { valueSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4, value: AppDateUtils.getDayMonthYearDateFormatted( item.startDate.contains("/Date(") - ? AppDateUtils.convertStringToDate(item.endDate ?? "").add( - Duration(days: item.noOfDays ?? item.sickLeaveDays), + ? AppDateUtils.convertStringToDate(item.startDate).add( + Duration(days: (item.noOfDays ?? item.sickLeaveDays) - 1), ) - : DateTime.parse(item.startDate ?? "").add( - Duration(days: item.noOfDays ?? ""), + : DateTime.parse(item.startDate).add( + Duration(days: (item.noOfDays ?? item.sickLeaveDays) - 1), ), ), ), diff --git a/lib/screens/patients/profile/vital_sign/line_chart_curved.dart b/lib/screens/patients/profile/vital_sign/line_chart_curved.dart index 51cc3bb9..79035e1b 100644 --- a/lib/screens/patients/profile/vital_sign/line_chart_curved.dart +++ b/lib/screens/patients/profile/vital_sign/line_chart_curved.dart @@ -167,7 +167,18 @@ class LineChartCurved extends StatelessWidget { sideTitles: SideTitles( showTitles: true, interval: getInterval(), - reservedSize: 12, + reservedSize: 48, + getTitlesWidget: (value, meta) { + if (value == meta.max) return const SizedBox.shrink(); + return Padding( + padding: const EdgeInsets.only(right: 4.0), + child: Text( + value % 1 == 0 ? value.toInt().toString() : value.toStringAsFixed(1), + style: const TextStyle(color: Colors.black, fontSize: 10), + textAlign: TextAlign.right, + ), + ); + }, )), ), borderData: FlBorderData( @@ -189,7 +200,7 @@ class LineChartCurved extends StatelessWidget { ), ), minX: 0, - maxX: (timeSeries!.length - 1).toDouble(), + maxX: timeSeries!.length <= 1 ? 1.0 : (timeSeries!.length - 1).toDouble(), maxY: getMaxY() + getInterval(), minY: 0, lineBarsData: getData(context), @@ -265,7 +276,7 @@ class LineChartCurved extends StatelessWidget { barWidth: 5, isStrokeCapRound: true, dotData: FlDotData( - show: false, + show: timeSeries!.length <= 1, ), belowBarData: BarAreaData( show: false, diff --git a/lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart b/lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart index e843a4d1..c8520da6 100644 --- a/lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart +++ b/lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart @@ -177,16 +177,21 @@ class LineChartCurvedBloodPressure extends StatelessWidget { showTitles: true, interval: getInterval(), getTitlesWidget: (value, meta) { - return Text( - '${value.toInt()}', - style: TextStyle( - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 10, + if (value == meta.max) return const SizedBox.shrink(); + return Padding( + padding: const EdgeInsets.only(right: 4.0), + child: Text( + '${value.toInt()}', + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + fontSize: 10, + ), + textAlign: TextAlign.right, ), ); }, - reservedSize: 12, + reservedSize: 48, )), ), borderData: FlBorderData( @@ -208,7 +213,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget { ), ), minX: 0, - maxX: 0, + maxX: timeSeries1!.length <= 1 ? 1.0 : (timeSeries1!.length - 1).toDouble(), maxY: getMaxY() + getInterval(), minY: 0, lineBarsData: getData(context), @@ -292,7 +297,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget { barWidth: 5, isStrokeCapRound: true, dotData: FlDotData( - show: false, + show: timeSeries1!.length <= 1, ), belowBarData: BarAreaData( show: false, @@ -305,7 +310,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget { barWidth: 5, isStrokeCapRound: true, dotData: FlDotData( - show: false, + show: timeSeries2!.length <= 1, ), belowBarData: BarAreaData( show: false, diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart index c80e16c2..fca93ade 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart @@ -28,6 +28,7 @@ class VitalSignItemDetailsScreen extends StatelessWidget { final String? viewKey1; final String? viewKey2; + VitalSignItemDetailsScreen({required this.vitalList, required this.pageKey, this.viewKey1, this.viewKey2, required this.pageTitle, required this.patient, this.patientType, this.arrivalType}); final List vitalList;