Merge remote-tracking branch 'origin/ipd-changes-for-vida-plus' into ipd-changes-for-vida-plus

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(
+                                                         ? AppDateUtils.convertStringToDate(item.startDate).add(
-                                                              Duration(days: item.noOfDays ?? item.sickLeaveDays),
+                                                             Duration(days: (item.noOfDays ?? item.sickLeaveDays) - 1),
                                                             )
-                                                          : DateTime.parse(item.startDate ?? "").add(
+                                                         : DateTime.parse(item.startDate).add(
-                                                              Duration(days: item.noOfDays ?? ""),
+                                                             Duration(days: (item.noOfDays ?? item.sickLeaveDays) - 1),
                                                             ),
                                                     ),
                                                   ),

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,

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(
+            if (value == meta.max) return const SizedBox.shrink();
-              '${value.toInt()}',
+            return Padding(
-              style: TextStyle(
+              padding: const EdgeInsets.only(right: 4.0),
-                color: Colors.black,
+              child: Text(
-                fontWeight: FontWeight.bold,
+                '${value.toInt()}',
-                fontSize: 10,
+                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,

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<VitalSignHistory> vitalList;