Merge branch 'feature-ucaf' into 'development'

Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!255

lib/screens/patients/profile/vital_sign/vital_sign_details_blood_pressurewideget.dart

@@ -101,6 +101,8 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
     ]));
     widget.vitalList.forEach((vital) {
       var data = vital.toJson()[widget.viewKey1];
+      DateTime elementDate =
+      DateUtils.getDateTimeFromServerFormat(vital.createdOn);
       if (data != 0)
         tableRow.add(TableRow(children: [
           Container(
@@ -109,7 +111,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
               color: Colors.white,
               child: Center(
                 child: AppText(
-                  '${projectViewModel.isArabic ? DateUtils.getWeekDayArabic(vital.vitalSignDate.weekday) : DateUtils.getWeekDay(vital.vitalSignDate.weekday)}, ${vital.vitalSignDate.day} ${projectViewModel.isArabic ? DateUtils.getMonthArabic(vital.vitalSignDate.month) : DateUtils.getMonth(vital.vitalSignDate.month)}, ${vital.vitalSignDate.year} ',
+                  '${projectViewModel.isArabic ? DateUtils.getWeekDayArabic(elementDate.weekday) : DateUtils.getWeekDay(elementDate.weekday)}, ${elementDate.day} ${projectViewModel.isArabic ? DateUtils.getMonthArabic(elementDate.month) : DateUtils.getMonth(elementDate.month)}, ${elementDate.year} ',
                   textAlign: TextAlign.center,
                 ),
               ),

lib/screens/patients/profile/vital_sign/vital_sign_details_wideget.dart

@@ -89,6 +89,8 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
     ]));
     widget.vitalList.forEach((vital) {
       var data = vital.toJson()[widget.viewKey];
+      DateTime elementDate =
+      DateUtils.getDateTimeFromServerFormat(vital.createdOn);
       if (data != 0)
         tableRow.add(TableRow(children: [
           Container(
@@ -97,7 +99,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
               color: Colors.white,
               child: Center(
                 child: AppText(
-                  '${projectViewModel.isArabic ? DateUtils.getWeekDayArabic(vital.vitalSignDate.weekday) : DateUtils.getWeekDay(vital.vitalSignDate.weekday)}, ${vital.vitalSignDate.day} ${projectViewModel.isArabic ? DateUtils.getMonthArabic(vital.vitalSignDate.month) : DateUtils.getMonth(vital.vitalSignDate.month)}, ${vital.vitalSignDate.year} ',
+                  '${projectViewModel.isArabic ? DateUtils.getWeekDayArabic(elementDate.weekday) : DateUtils.getWeekDay(elementDate.weekday)}, ${elementDate.day} ${projectViewModel.isArabic ? DateUtils.getMonthArabic(elementDate.month) : DateUtils.getMonth(elementDate.month)}, ${elementDate.year} ',
                   textAlign: TextAlign.center,
                 ),
               ),

lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart

@@ -1,6 +1,7 @@
 import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart';
 import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_details_wideget.dart';
+import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier.dart';
 import 'package:flutter/material.dart';
@@ -49,10 +50,11 @@ class VitalSingChartAndDetials extends StatelessWidget {
     if (vitalList.length > 0) {
       vitalList.reversed.toList().forEach(
             (element) {
+              DateTime elementDate = DateUtils.getDateTimeFromServerFormat(element.createdOn);
               if( element.toJson()[viewKey]!=null && element.toJson()[viewKey]?.toInt()!=0)
           timeSeriesData.add(
             TimeSeriesSales2(
-              new DateTime(element.vitalSignDate.year, element.vitalSignDate.month, element.vitalSignDate.day),
+              new DateTime(elementDate.year, elementDate.month, elementDate.day),
               element.toJson()[viewKey].toDouble(),
             ),
           );

lib/screens/patients/profile/vital_sign/vital_sing_chart_blood_pressure.dart

@@ -1,6 +1,7 @@
 import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart';
 import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_details_blood_pressurewideget.dart';
+import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier.dart';
 import 'package:flutter/material.dart';
@@ -62,19 +63,21 @@ class VitalSingChartBloodPressure extends StatelessWidget {
     if (vitalList.length > 0) {
       vitalList.reversed.toList().forEach(
         (element) {
+          DateTime elementDate =
+              DateUtils.getDateTimeFromServerFormat(element.createdOn);
           if (element.toJson()[viewKey1]?.toInt() != 0)
             timeSeriesData1.add(
               TimeSeriesSales2(
-                new DateTime(element.vitalSignDate.year,
-                    element.vitalSignDate.month, element.vitalSignDate.day),
+                new DateTime(
+                    elementDate.year, elementDate.month, elementDate.day),
                 element.toJson()[viewKey1].toDouble(),
               ),
             );
           if (element.toJson()[viewKey2]?.toInt() != 0)
             timeSeriesData2.add(
               TimeSeriesSales2(
-                new DateTime(element.vitalSignDate.year,
-                    element.vitalSignDate.month, element.vitalSignDate.day),
+                new DateTime(
+                    elementDate.year, elementDate.month, elementDate.day),
                 element.toJson()[viewKey2].toDouble(),
               ),
             );

lib/util/date-utils.dart

@@ -12,6 +12,12 @@ class DateUtils {
   }
 
   static convertDateFromServerFormat(String str, dateFormat) {
+    var date = getDateTimeFromServerFormat(str);
+
+    return DateFormat(dateFormat).format(date);
+  }
+
+  static DateTime getDateTimeFromServerFormat(String str) {
     const start = "/Date(";
 
     const end = "+0300)";
@@ -23,7 +29,7 @@ class DateUtils {
     var date = new DateTime.fromMillisecondsSinceEpoch(
         int.parse(str.substring(startIndex + start.length, endIndex)));
 
-    return DateFormat(dateFormat).format(date);
+    return date;
   }
 
   static String differenceBetweenDateAndCurrentInYearMonthDay(DateTime firstDate) {

pubspec.lock

@@ -552,7 +552,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.4"
+    version: "1.3.0-nullsafety.3"
   mime:
     dependency: transitive
     description:
@@ -823,7 +823,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.2"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
@@ -958,5 +958,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.0 <=2.11.0-213.1.beta"
+  dart: ">=2.10.0 <2.11.0"
   flutter: ">=1.22.0 <2.0.0"