update-to-3.32-sdk
haroon amjad 5 months ago
parent afd7c5db81
commit a6164c6c6b

@ -2843,6 +2843,6 @@ const Map localizedValues = {
"pleaseEnterValidMobile": {"en": "Please enter valid phone number", "ar": "الرجاء إدخال رقم هاتف صالح"}, "pleaseEnterValidMobile": {"en": "Please enter valid phone number", "ar": "الرجاء إدخال رقم هاتف صالح"},
"pleaseEnterNationalIdOrFileNo": {"en": "Please enter National id or File no", "ar": "الرجاء إدخال رقم الهوية الوطنية أو رقم الملف"}, "pleaseEnterNationalIdOrFileNo": {"en": "Please enter National id or File no", "ar": "الرجاء إدخال رقم الهوية الوطنية أو رقم الملف"},
"thisResult": {"en": "This Result", "ar": "هذه النتيجة"}, "thisResult": {"en": "This Result", "ar": "هذه النتيجة"},
"seeAllGraphValues": {"en": "See all values", "ar": "شاهد جميع القيم"}, "seeAllGraphValues": {"en": "View all results", "ar": "عرض جميع النتائج"},
"verify-with-biometric": {"en": "Biometric", "ar": "الحيوية"}, "verify-with-biometric": {"en": "Biometric", "ar": "الحيوية"},
}; };

@ -187,8 +187,8 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217; // body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232 // body['MobileNo'] = "531940021"; //0560717232
body['PatientID'] = 1018977; //4609100 // body['PatientID'] = 53320; //4609100
body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
// Patient ID: 3027574 // Patient ID: 3027574
// Mobile no.: 0502303285 // Mobile no.: 0502303285

@ -325,7 +325,7 @@ class LabsService extends BaseService {
return bDate.compareTo(aDate); // descending return bDate.compareTo(aDate); // descending
}); });
print("the copied item are $copy"); // print("the copied item are $copy");
labOrdersResultsList = copy; labOrdersResultsList = copy;
return copy.take(3).toList(); return copy.take(3).toList();
} }

@ -6,55 +6,60 @@ import 'package:hmg_patient_app/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class FullScreenGraph extends StatelessWidget { class FullScreenGraph extends StatelessWidget {
final List<DataPoint> completeeGraphValues ; final List<DataPoint> completeeGraphValues;
final List<ThresholdRange> threshold ;
final double maxY ; final List<ThresholdRange> threshold;
final double maxY;
const FullScreenGraph({super.key, required this.completeeGraphValues, required this.threshold, required this.maxY});
const FullScreenGraph({super.key, required this.completeeGraphValues, required this.threshold, required this. maxY});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).labResult, appBarTitle: TranslationBase.of(context).labResult,
showNewAppBar: true, showNewAppBar: true,
showNewAppBarTitle: true, showNewAppBarTitle: true,
backgroundColor: Color(0xffF8F8F8), showHomeAppBarIcon: false,
body: RotatedBox( backgroundColor: Color(0xffF8F8F8),
quarterTurns: 1, body: RotatedBox(
child: SizedBox( quarterTurns: 1,
// width: MediaQuery.sizeOf(context).height, child: SizedBox(
height: MediaQuery.sizeOf(context).width, // width: MediaQuery.sizeOf(context).height,
child: Material( height: MediaQuery.sizeOf(context).width,
color: Colors.white, child: Material(
child: Padding( color: Colors.white,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 18), child: Padding(
child: DynamicResultChart( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 18),
dataPoints: completeeGraphValues, child: DynamicResultChart(
thresholds: threshold, dataPoints: completeeGraphValues,
maxY : maxY, thresholds: threshold,
// width:((completeeGraphValues.length <=2)? MediaQuery.sizeOf(context).height : (MediaQuery.sizeOf(context).height* ( maxY: maxY,
// completeeGraphValues.length <= 3 // width:((completeeGraphValues.length <=2)? MediaQuery.sizeOf(context).height : (MediaQuery.sizeOf(context).height* (
// ? 1 // completeeGraphValues.length <= 3
// : (completeeGraphValues.length/3)) // ? 1
// ) )-77, // : (completeeGraphValues.length/3))
width: MediaQuery.sizeOf(context).height-100, // ) )-77,
scrollDirection: Axis.horizontal, width: MediaQuery.sizeOf(context).height - 100,
height: MediaQuery.sizeOf(context).width, scrollDirection: Axis.horizontal,
isFullScreenGraph: true, height: MediaQuery.sizeOf(context).width,
), isFullScreenGraph: true,
// isFullScreenGraph: false,
), ),
), ),
), ),
), ),
); ),
);
} }
// double getMax(List<DataPoint> dataPoints) { // double getMax(List<DataPoint> dataPoints) {
// double max = double.negativeInfinity; // double max = double.negativeInfinity;
// for (var point in dataPoints) { // for (var point in dataPoints) {
// if (point.value > max) { // if (point.value > max) {
// max = point.y; // max = point.y;
// } // }
// } // }
// return max; // return max;
// } // }
} }

@ -262,6 +262,7 @@ class _AppScaffoldState extends State<AppScaffold> {
showCenterLogo: widget.showCenteredLogo, showCenterLogo: widget.showCenteredLogo,
isShowLanguageChanger: widget.isShowLanguageChanger, isShowLanguageChanger: widget.isShowLanguageChanger,
showSavedLoginBar: widget.showLastLoginScreenBar, showSavedLoginBar: widget.showLastLoginScreenBar,
showHomeAppBarIcon: widget.showHomeAppBarIcon,
onTap: () { onTap: () {
widget.onTap; widget.onTap;
}, },
@ -297,11 +298,7 @@ class _AppScaffoldState extends State<AppScaffold> {
icon: widget.icon, icon: widget.icon,
) )
: widget.baseViewModel != null : widget.baseViewModel != null
? NetworkBaseView( ? NetworkBaseView(child: buildBodyWidget(context), baseViewModel: widget.baseViewModel, showLoader: widget.showLoader)
child: buildBodyWidget(context),
baseViewModel: widget.baseViewModel,
showLoader : widget.showLoader
)
: buildBodyWidget(context), : buildBodyWidget(context),
), ),
bottomNavigationBar: widget.isBottomBar bottomNavigationBar: widget.isBottomBar
@ -369,6 +366,7 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
final bool isShowLanguageChanger; final bool isShowLanguageChanger;
final bool showCenterLogo; final bool showCenterLogo;
final bool showSavedLoginBar; final bool showSavedLoginBar;
final bool? showHomeAppBarIcon;
String currentLang = 'ar'; String currentLang = 'ar';
@ -388,6 +386,7 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
this.isShowLanguageChanger = false, this.isShowLanguageChanger = false,
this.showCenterLogo = false, this.showCenterLogo = false,
this.showSavedLoginBar = false, this.showSavedLoginBar = false,
this.showHomeAppBarIcon = true,
}) : super(key: key); }) : super(key: key);
@override @override
@ -586,17 +585,19 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
if (appBarIcons != null) if (appBarIcons != null)
...appBarIcons! ...appBarIcons!
else else
IconButton( showHomeAppBarIcon!
onPressed: () { ? IconButton(
AppSharedPreferences().remove(IS_LIVECARE_APPOINTMENT); onPressed: () {
Navigator.pushAndRemoveUntil( AppSharedPreferences().remove(IS_LIVECARE_APPOINTMENT);
context, Navigator.pushAndRemoveUntil(
MaterialPageRoute(builder: (context) => LandingPage()), context,
(Route<dynamic> route) => false, MaterialPageRoute(builder: (context) => LandingPage()),
); (Route<dynamic> route) => false,
}, );
icon: Icon(Icons.home), },
), icon: Icon(Icons.home),
)
: Container(),
], ],
); );
} }
@ -623,7 +624,7 @@ class AppBarWidget extends StatefulWidget implements PreferredSizeWidget {
AppBarWidget( AppBarWidget(
{this.appBarTitle, {this.appBarTitle,
this.showHomeAppBarIcon, this.showHomeAppBarIcon = true,
this.appBarIcons, this.appBarIcons,
this.isPharmacy = true, this.isPharmacy = true,
this.isshowBackButton = true, this.isshowBackButton = true,

Loading…
Cancel
Save