updates

lib/core/utils/date_util.dart

@@ -28,21 +28,21 @@ class DateUtil {
       const end = "+0300)";
       final startIndex = date.indexOf(start);
       final endIndex = date.indexOf(end, startIndex + start.length);
-      // if (projectId == 2 || projectId == 3) {
-      //   return DateTime.fromMillisecondsSinceEpoch(
-      //           int.parse(
-      //             date.substring(startIndex + start.length, endIndex),
-      //           ),
-      //           isUtc: true)
-      //       .add(Duration(hours: 4));
-      // } else {
-      return DateTime.fromMillisecondsSinceEpoch(
+      if (projectId == 2 || projectId == 3) {
+        return DateTime.fromMillisecondsSinceEpoch(
+                int.parse(
+                  date.substring(startIndex + start.length, endIndex),
+                ),
+                isUtc: true)
+            .add(Duration(hours: 4));
+      } else {
+        return DateTime.fromMillisecondsSinceEpoch(
               int.parse(
                 date.substring(startIndex + start.length, endIndex),
               ),
               isUtc: true)
-          .add(Duration(hours: 3));
-      // }
+            .add(Duration(hours: 3));
+      }
     } else {
       return DateTime.now();
     }

lib/presentation/appointments/widgets/appointment_card.dart

@@ -321,7 +321,8 @@ class _AppointmentCardState extends State<AppointmentCard> {
                         icon: AppAssets.appointment_calendar_icon,
                         richText: widget.isLoading
                             ? 'Cardiology'.toText10().toShimmer2(isShow: widget.isLoading)
-                            : "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(widget.patientAppointmentHistoryResponseModel.appointmentDate), false)} ${DateUtil.formatDateToTimeLang(DateUtil.convertStringToDate(widget.patientAppointmentHistoryResponseModel.appointmentDate), false)}"
+                            // : "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(widget.patientAppointmentHistoryResponseModel.appointmentDate), false)} ${DateUtil.formatDateToTimeLang(DateUtil.convertStringToDateSaudiTimezone(widget.patientAppointmentHistoryResponseModel.appointmentDate!, widget.patientAppointmentHistoryResponseModel.projectID), false)}"
+                            : "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(widget.patientAppointmentHistoryResponseModel.appointmentDate), false)} ${(widget.patientAppointmentHistoryResponseModel.startTime != null && widget.patientAppointmentHistoryResponseModel.startTime!.isNotEmpty) ? widget.patientAppointmentHistoryResponseModel.startTime!.substring(0, 5) : DateUtil.formatDateToTimeLang(DateUtil.convertStringToDateSaudiTimezone(widget.patientAppointmentHistoryResponseModel.appointmentDate!, widget.patientAppointmentHistoryResponseModel.projectID), false)}"
                                 .toText10(isEnglishOnly: true, isBold: true),
                       ).toShimmer2(isShow: widget.isLoading),
                     ),

lib/presentation/appointments/widgets/appointment_doctor_card.dart

@@ -142,11 +142,9 @@ class AppointmentDoctorCard extends StatelessWidget {
                               child: AppCustomChipWidget(
                                 labelPadding: EdgeInsetsDirectional.only(start: -6.w, end: 6.w),
                                 icon: AppAssets.doctor_calendar_icon,
-                                richText: "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)} ${DateUtil.formatDateToTimeLang(
-                                  DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate),
-                                  false,
-                                )}"
-                                    .toText10(isBold: true),
+                                richText:
+                                    "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)} ${(patientAppointmentHistoryResponseModel.startTime != null && patientAppointmentHistoryResponseModel.startTime!.isNotEmpty) ? patientAppointmentHistoryResponseModel.startTime!.substring(0, 5) : DateUtil.formatDateToTimeLang(DateUtil.convertStringToDateSaudiTimezone(patientAppointmentHistoryResponseModel.appointmentDate!, patientAppointmentHistoryResponseModel.projectID), false)}"
+                                        .toText10(isBold: true),
                               ),
                             ),
                           ),

lib/presentation/lab/lab_result_via_clinic/LabResultList.dart

@@ -90,7 +90,7 @@ class _LabResultListState extends State<LabResultList> {
                               )
                             else
                               SizedBox.shrink(),
-                            CustomButton(
+                            (labResults.first.isPackage ?? false) ? CustomButton(
                               icon: AppAssets.document,
                               iconColor: AppColors.primaryRedColor,
                               iconSize: 16.h,
@@ -106,7 +106,7 @@ class _LabResultListState extends State<LabResultList> {
                               borderRadius: 12.r,
                               padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                               height: 40.h,
-                            ),
+                            ) : SizedBox.shrink(),
                           ],
                         ),),