CR 7241 changes, ProjectID added in radiology results if navigating from appointment details

merge-update-with-lab-changes
haroon amjad 1 year ago
parent ab33d06b91
commit e0de0768b6

@ -31,13 +31,13 @@ void main() async {
await Firebase.initializeApp(); await Firebase.initializeApp();
// Pass all uncaught "fatal" errors from the framework to Crashlytics // Pass all uncaught "fatal" errors from the framework to Crashlytics
FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError; // FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError;
// Pass all uncaught asynchronous errors that aren't handled by the Flutter framework to Crashlytics // Pass all uncaught asynchronous errors that aren't handled by the Flutter framework to Crashlytics
PlatformDispatcher.instance.onError = (error, stack) { // PlatformDispatcher.instance.onError = (error, stack) {
if (!kDebugMode) FirebaseCrashlytics.instance.recordError(error, stack, fatal: true); // if (!kDebugMode) FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
return true; // return true;
}; // };
setupLocator(); setupLocator();
HttpOverrides.global = MyHttpOverrides(); HttpOverrides.global = MyHttpOverrides();

@ -439,7 +439,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService(); DoctorsListService service = new DoctorsListService();
FinalRadiology finalRadiology = new FinalRadiology(); FinalRadiology finalRadiology = new FinalRadiology();
service.getPatientRadOrders(widget.appo.appointmentNo.toString(), languageID, context).then((res) { service.getPatientRadOrders(widget.appo.appointmentNo.toString(), widget.appo.projectID, languageID, context).then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (res['FinalRadiologyList'] != null) { if (res['FinalRadiologyList'] != null) {
print(res['FinalRadiologyList']); print(res['FinalRadiologyList']);

@ -1285,7 +1285,7 @@ class DoctorsListService extends BaseService {
return Future.value(localRes); return Future.value(localRes);
} }
Future<Map> getPatientRadOrders(String appoNo, int languageID, BuildContext context) async { Future<Map> getPatientRadOrders(String appoNo, int projectID, int languageID, BuildContext context) async {
Map<String, dynamic> request; Map<String, dynamic> request;
if (await this.sharedPref.getObject(USER_PROFILE) != null) { if (await this.sharedPref.getObject(USER_PROFILE) != null) {
var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE)); var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE));
@ -1295,6 +1295,7 @@ class DoctorsListService extends BaseService {
Request req = appGlobal.getPublicRequest(); Request req = appGlobal.getPublicRequest();
request = { request = {
"AppointmentNo": appoNo, "AppointmentNo": appoNo,
"ProjectID": projectID,
"VersionID": req.VersionID, "VersionID": req.VersionID,
"Channel": req.Channel, "Channel": req.Channel,
"IPAdress": req.IPAdress, "IPAdress": req.IPAdress,

@ -86,7 +86,7 @@ class _SplashScreenState extends State<SplashScreen> {
// debugPrint("ALL SHARED PREFERENCES!!!!!"); // debugPrint("ALL SHARED PREFERENCES!!!!!");
// debugPrint(jsonEncode(value)); // debugPrint(jsonEncode(value));
}); });
if (!kDebugMode) await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true); // if (!kDebugMode) await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true);
// PushNotificationHandler(context).init(); // Asyncronously // PushNotificationHandler(context).init(); // Asyncronously
} }

@ -849,14 +849,12 @@ class Utils {
} }
static Widget tableColumnValueWithFlowChart(String text, String flowChartText, {bool isLast = false, bool isCapitable = true, ProjectViewModel? mProjectViewModel}) { static Widget tableColumnValueWithFlowChart(String text, String flowChartText, {bool isLast = false, bool isCapitable = true, ProjectViewModel? mProjectViewModel}) {
ProjectViewModel projectViewModel = mProjectViewModel ?? Provider.of(AppGlobal.context);
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
SizedBox(height: 12), SizedBox(height: 12),
Text( Text(
// isCapitable && !projectViewModel.isArabic ? text.toLowerCase().capitalizeFirstofEach : text,
text, text,
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,

@ -161,9 +161,10 @@ class LabResultWidget extends StatelessWidget {
Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false),
// Utils.tableColumnTitle(TranslationBase.of(context).unit, showDivider: false), // Utils.tableColumnTitle(TranslationBase.of(context).unit, showDivider: false),
// Utils.tableColumnTitle(TranslationBase.of(context).labResultFlag, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).labResultFlag, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false),
Utils.tableColumnTitle("", showDivider: false), // Utils.tableColumnTitle("", showDivider: false),
], ],
), ),
); );
@ -189,23 +190,23 @@ class LabResultWidget extends StatelessWidget {
), ),
Utils.tableColumnValue(labResultList[i].resultValue! + " " + labResultList[i].uOM!, Utils.tableColumnValue(labResultList[i].resultValue! + " " + labResultList[i].uOM!,
// isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"),
isLast: true, isLast: true,
mProjectViewModel: projectViewModel), mProjectViewModel: projectViewModel),
// Utils.tableColumnValue((labResultList[i].resultValueFlag ?? ""), Utils.tableColumnValue((labResultList[i].resultValueFlag ?? ""),
// isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"),
// isLast: true,
// isCapitable: false,
// mProjectViewModel: projectViewModel),
Utils.tableColumnValue((labResultList[i].referanceRange! ?? ""),
// isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"),
isLast: true, isLast: true,
isCapitable: false, isCapitable: false,
mProjectViewModel: projectViewModel), mProjectViewModel: projectViewModel),
// Utils.tableColumnValue((labResultList[i].referanceRange! ?? ""),
// // isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"),
// isLast: true,
// isCapitable: false,
// mProjectViewModel: projectViewModel),
!checkIfCovidLab(patientLabResultList!) !checkIfCovidLab(patientLabResultList!)
? InkWell( ? InkWell(
onTap: () { onTap: () {
@ -221,8 +222,8 @@ class LabResultWidget extends StatelessWidget {
}, },
child: Padding( child: Padding(
padding: EdgeInsets.only(left: !projectViewModel.isArabic ? 0 : 12, right: !projectViewModel.isArabic ? 12 : 0), padding: EdgeInsets.only(left: !projectViewModel.isArabic ? 0 : 12, right: !projectViewModel.isArabic ? 12 : 0),
// child: Utils.tableColumnValueWithFlowChart(labResultList[i].referanceRange!, TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), child: Utils.tableColumnValueWithFlowChart(labResultList[i].referanceRange!, TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false),
child: Utils.tableColumnValueWithUnderLine(TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), // child: Utils.tableColumnValueWithUnderLine(TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false),
), ),
) )
: Container(), : Container(),

Loading…
Cancel
Save