Migration dev to Zohaib branch

lib/core/viewModel/PatientSearchViewModel.dart

@@ -98,24 +98,24 @@ class PatientSearchViewModel extends BaseViewModel {
           DateTime.now().year, DateTime.now().month - 1, DateTime.now().day);
       selectedToDate = DateTime(
           DateTime.now().year, DateTime.now().month, DateTime.now().day - 1);
-      dateTo = DateUtils.convertDateToFormat(selectedToDate, 'yyyy-MM-dd');
-      dateFrom = DateUtils.convertDateToFormat(selectedFromDate, 'yyyy-MM-dd');
+      dateTo = AppDateUtils.convertDateToFormat(selectedToDate, 'yyyy-MM-dd');
+      dateFrom = AppDateUtils.convertDateToFormat(selectedFromDate, 'yyyy-MM-dd');
     } else if (OutPatientFilterType.NextWeek == outPatientFilterType) {
-      dateTo = DateUtils.convertDateToFormat(
+      dateTo = AppDateUtils.convertDateToFormat(
           DateTime(DateTime.now().year, DateTime.now().month,
               DateTime.now().day + 6),
           'yyyy-MM-dd');
 
-      dateFrom = DateUtils.convertDateToFormat(
+      dateFrom = AppDateUtils.convertDateToFormat(
           DateTime(DateTime.now().year, DateTime.now().month,
               DateTime.now().day + 1),
           'yyyy-MM-dd');
     } else {
-      dateFrom = DateUtils.convertDateToFormat(
+      dateFrom = AppDateUtils.convertDateToFormat(
           DateTime(
               DateTime.now().year, DateTime.now().month, DateTime.now().day),
           'yyyy-MM-dd');
-      dateTo = DateUtils.convertDateToFormat(
+      dateTo = AppDateUtils.convertDateToFormat(
           DateTime(
               DateTime.now().year, DateTime.now().month, DateTime.now().day),
           'yyyy-MM-dd');

lib/screens/home/home_screen.dart

@@ -570,7 +570,7 @@ class _HomeScreenState extends State<HomeScreen> {
                                       hasBorder: false,
                                       onTap: () {
                                         String date =
-                                            DateUtils.convertDateToFormat(
+                                            AppDateUtils.convertDateToFormat(
                                                 DateTime(
                                                     DateTime.now().year,
                                                     DateTime.now().month,

lib/screens/patients/DischargedPatientPage.dart

@@ -335,8 +335,9 @@ class _DischargedPatientState extends State<DischargedPatient> {
 
 
           ),
-        ),
+        ),],
       ),
+    ),)
     );
   }
 

lib/screens/patients/ReferralDischargedPatientDetails.dart

@@ -199,7 +199,7 @@ class ReferralDischargedPatientDetails extends StatelessWidget {
                                     ),
                                     Expanded(
                                       child: AppText(
-                                        "${AppDateUtils.convertStringToDate(referredPatient.dischargeDate).difference(DateUtils.convertStringToDate(referredPatient.admissionDate)).inDays + 1}",
+                                        "${AppDateUtils.convertStringToDate(referredPatient.dischargeDate).difference(AppDateUtils.convertStringToDate(referredPatient.admissionDate)).inDays + 1}",
                                         fontFamily: 'Poppins',
                                         fontWeight: FontWeight.w700,
                                         fontSize:

lib/screens/patients/out_patient/filter_date_page.dart

@@ -73,7 +73,7 @@ class _FilterDatePageState extends State<FilterDatePage> {
                                     widget.patientSearchViewModel
                                                 .selectedFromDate !=
                                             null
-                                        ? "${DateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedFromDate.toString(), "yyyy-MM-dd")}"
+                                        ? "${AppDateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedFromDate.toString(), "yyyy-MM-dd")}"
                                         : null,
                                     true,
                                     suffixIcon: Icon(
@@ -102,7 +102,7 @@ class _FilterDatePageState extends State<FilterDatePage> {
                                     widget.patientSearchViewModel
                                                 .selectedToDate !=
                                             null
-                                        ? "${DateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedToDate.toString(), "yyyy-MM-dd")}"
+                                        ? "${AppDateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedToDate.toString(), "yyyy-MM-dd")}"
                                         : null,
                                     true,
                                     suffixIcon: Icon(
@@ -161,10 +161,10 @@ class _FilterDatePageState extends State<FilterDatePage> {
                             Helpers.showErrorToast(
                                 "The difference between from date and end date must be less than 3 months");
                           } else {
-                            String dateTo = DateUtils.convertDateToFormat(
+                            String dateTo = AppDateUtils.convertDateToFormat(
                                 widget.patientSearchViewModel.selectedToDate,
                                 'yyyy-MM-dd');
-                            String dateFrom = DateUtils.convertDateToFormat(
+                            String dateFrom = AppDateUtils.convertDateToFormat(
                                 widget.patientSearchViewModel.selectedFromDate,
                                 'yyyy-MM-dd');
 

lib/widgets/patients/PatientCard.dart

@@ -134,8 +134,8 @@ class PatientCard extends StatelessWidget {
                                       )
                                     : patientInfo.arrivedOn != null
                                         ? AppText(
-                                            AppDateUtils.getDayMonthYearDate(DateUtils.convertStringToDate(patientInfo.arrivedOn,)
-                                            )+" "+ "${DateUtils.getStartTime(patientInfo.startTime)}",
+                                            AppDateUtils.getDayMonthYearDate(AppDateUtils.convertStringToDate(patientInfo.arrivedOn,)
+                                            )+" "+ "${AppDateUtils.getStartTime(patientInfo.startTime)}",
                                             fontFamily: 'Poppins',
                                             fontWeight: FontWeight.w400,
                                           fontSize: 15,
@@ -143,7 +143,7 @@ class PatientCard extends StatelessWidget {
                                         : (patientInfo.appointmentDate != null && patientInfo.appointmentDate.isNotEmpty)?
                                          AppText(
 
-                                           "${DateUtils.getDayMonthYearDate(DateUtils.convertStringToDate(patientInfo.appointmentDate,))} ${DateUtils.getStartTime(patientInfo.startTime)}",
+                                           "${AppDateUtils.getDayMonthYearDate(AppDateUtils.convertStringToDate(patientInfo.appointmentDate,))} ${AppDateUtils.getStartTime(patientInfo.startTime)}",
                                            fontFamily: 'Poppins',
                                            fontWeight: FontWeight.w400,
                                            fontSize: 15,

lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart

@@ -291,7 +291,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
                                         new TextSpan(
                                             text: patient.admissionDate == null
                                                 ? ""
-                                                : "${DateUtils.convertDateFromServerFormat(patient.admissionDate.toString(), 'yyyy-MM-dd')}",
+                                                : "${AppDateUtils.convertDateFromServerFormat(patient.admissionDate.toString(), 'yyyy-MM-dd')}",
                                             style: TextStyle(
                                                 fontWeight: FontWeight.w700,
                                                 fontSize: 15)),
@@ -305,12 +305,12 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
                                 ),
                                 if(isDischargedPatient && patient.dischargeDate!=null)
                                 AppText(
-                                    "${DateUtils.getDateTimeFromServerFormat(patient.dischargeDate).difference(DateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}",
+                                    "${AppDateUtils.getDateTimeFromServerFormat(patient.dischargeDate).difference(AppDateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}",
                                     fontSize: 15,
                                     fontWeight: FontWeight.w700)
                                 else
                                   AppText(
-                                      "${DateTime.now().difference(DateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}",
+                                      "${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}",
                                       fontSize: 15,
                                       fontWeight: FontWeight.w700),
                               ],

pubspec.lock

@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.0-nullsafety.1"
   autocomplete_textfield:
     dependency: "direct main"
     description:
@@ -63,7 +63,7 @@ packages:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.1"
   build:
     dependency: transitive
     description:
@@ -140,14 +140,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.3"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.1"
   charts_common:
     dependency: transitive
     description:
@@ -196,7 +196,7 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.1"
   code_builder:
     dependency: transitive
     description:
@@ -210,7 +210,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.15.0-nullsafety.3"
   connectivity:
     dependency: "direct main"
     description:
@@ -336,7 +336,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.1"
   ffi:
     dependency: transitive
     description:
@@ -445,6 +445,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.11"
+  flutter_staggered_grid_view:
+    dependency: "direct main"
+    description:
+      name: flutter_staggered_grid_view
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.4"
   flutter_svg:
     dependency: transitive
     description:
@@ -552,7 +559,7 @@ packages:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.17.0-nullsafety.2"
+    version: "0.16.1"
   io:
     dependency: transitive
     description:
@@ -566,7 +573,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.2"
   json_annotation:
     dependency: transitive
     description:
@@ -601,14 +608,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.10-nullsafety.1"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.0-nullsafety.3"
   mime:
     dependency: transitive
     description:
@@ -657,7 +664,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.0-nullsafety.1"
   path_drawing:
     dependency: transitive
     description:
@@ -886,7 +893,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.0-nullsafety.2"
   speech_to_text:
     dependency: "direct main"
     description:
@@ -900,7 +907,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.0-nullsafety.1"
   sticky_headers:
     dependency: "direct main"
     description:
@@ -914,7 +921,7 @@ packages:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.1"
   stream_transform:
     dependency: transitive
     description:
@@ -928,21 +935,21 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.2.19-nullsafety.2"
   timing:
     dependency: transitive
     description:
@@ -963,7 +970,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.0-nullsafety.3"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1012,7 +1019,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.3"
   video_player:
     dependency: transitive
     description:
@@ -1091,5 +1098,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
-  flutter: ">=1.22.0"
+  dart: ">=2.10.0 <2.11.0"
+  flutter: ">=1.22.0 <2.0.0"