Lab report download enabled

merge-update-with-lab-changes
haroon amjad 1 year ago
parent 2c5be020e9
commit 1080a59106

@ -353,7 +353,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal
var CHANNEL = 3; var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958'; var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20'; var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 17.5; var VERSION_ID = 17.6;
var SETUP_ID = '91877'; var SETUP_ID = '91877';
var LANGUAGE = 2; var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0; // var PATIENT_OUT_SA = 0;

@ -125,7 +125,7 @@ class LabsService extends BaseService {
} }
Future updateWorkplaceName(String workplaceName, String workplaceNameAR, String occupation, String occupationAR, int requestNumber, String setupID, int projectID) async { Future updateWorkplaceName(String workplaceName, String workplaceNameAR, String occupation, String occupationAR, int requestNumber, String setupID, int projectID) async {
// Future updateWorkplaceName(String workplaceName, String workplaceNameAR, int requestNumber, String setupID, int projectID) async { // Future updateWorkplaceName(String workplaceName, String workplaceNameAR, int requestNumber, String setupID, int projectID) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
@ -233,7 +233,7 @@ class LabsService extends BaseService {
// await baseAppClient.post(SEND_LAB_RESULT_EMAIL, onSuccess: (dynamic response, int statusCode) { // await baseAppClient.post(SEND_LAB_RESULT_EMAIL, onSuccess: (dynamic response, int statusCode) {
await baseAppClient.post(SEND_LAB_RESULT_EMAIL_NEW, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(SEND_LAB_RESULT_EMAIL_NEW, onSuccess: (dynamic response, int statusCode) {
if (isDownload) { if (isDownload) {
labReportPDF = response['LabReportsPDFContent']; labReportPDF = response['PdfContent'];
} }
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

@ -1,3 +1,7 @@
import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';
import 'package:diplomaticquarterapp/core/enum/filter_type.dart'; import 'package:diplomaticquarterapp/core/enum/filter_type.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/labs/LabOrderResult.dart'; import 'package:diplomaticquarterapp/core/model/labs/LabOrderResult.dart';
@ -9,6 +13,8 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart'; import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
import 'package:open_filex/open_filex.dart';
import 'package:path_provider/path_provider.dart';
import '../../../locator.dart'; import '../../../locator.dart';
import '../base_view_model.dart'; import '../base_view_model.dart';
@ -76,13 +82,7 @@ class LabsViewModel extends BaseViewModel {
getLaboratoryResult({String? projectID, int? clinicID, String? invoiceNo, String? invoiceType, String? orderNo, String? setupID, bool? isVidaPlus}) async { getLaboratoryResult({String? projectID, int? clinicID, String? invoiceNo, String? invoiceType, String? orderNo, String? setupID, bool? isVidaPlus}) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _labsService.getLaboratoryResult(invoiceNo: invoiceNo, await _labsService.getLaboratoryResult(invoiceNo: invoiceNo, invoiceType: invoiceType, orderNo: orderNo, projectID: projectID, clinicID: clinicID, setupID: setupID, isVidaPlus: isVidaPlus);
invoiceType: invoiceType,
orderNo: orderNo,
projectID: projectID,
clinicID: clinicID,
setupID: setupID,
isVidaPlus: isVidaPlus);
if (_labsService.hasError) { if (_labsService.hasError) {
error = _labsService.error!; error = _labsService.error!;
setState(ViewState.Error); setState(ViewState.Error);
@ -109,7 +109,7 @@ class LabsViewModel extends BaseViewModel {
// }) // })
// .toList(); // .toList();
// if (value.isEmpty) // if (value.isEmpty)
labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])].patientLabResultList!.add(element); labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])].patientLabResultList!.add(element);
} else { } else {
labResultLists.add(LabResultList(filterName: element.testCode, lab: element)); labResultLists.add(LabResultList(filterName: element.testCode, lab: element));
} }
@ -156,9 +156,25 @@ class LabsViewModel extends BaseViewModel {
error = _labsService.error!; error = _labsService.error!;
} else { } else {
if (isDownload) { if (isDownload) {
if (labReportPDF.isNotEmpty) {
String path = await _createFileFromString(labReportPDF, "pdf");
try {
OpenFilex.open(path);
} catch (ex) {
AppToast.showErrorToast(message: "Cannot open file.");
}
}
} else { } else {
AppToast.showSuccessToast(message: mes!); AppToast.showSuccessToast(message: mes!);
} }
} }
} }
Future<String> _createFileFromString(String encodedStr, String ext) async {
Uint8List bytes = base64.decode(encodedStr);
String dir = (await getApplicationDocumentsDirectory()).path;
File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext);
await file.writeAsBytes(bytes);
return file.path;
}
} }

@ -65,6 +65,7 @@ class _LaboratoryResultPageState extends State<LaboratoryResultPage> {
mes: TranslationBase.of(context).sendSuc, mes: TranslationBase.of(context).sendSuc,
userObj: projectViewModel.user, userObj: projectViewModel.user,
languageID: projectViewModel.isArabic ? 1 : 2, languageID: projectViewModel.isArabic ? 1 : 2,
isDownload: true,
isVidaPlus: Utils.isVidaPlusProject( isVidaPlus: Utils.isVidaPlusProject(
projectViewModel, projectViewModel,
int.parse(widget.patientLabOrders!.projectID!), int.parse(widget.patientLabOrders!.projectID!),
@ -119,14 +120,6 @@ class _LaboratoryResultPageState extends State<LaboratoryResultPage> {
); );
} }
Future<String> _createFileFromString(String encodedStr, String ext) async {
Uint8List bytes = base64.decode(encodedStr);
String dir = (await getApplicationDocumentsDirectory()).path;
File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext);
await file.writeAsBytes(bytes);
return file.path;
}
String getSpecialResults(LabsViewModel model) { String getSpecialResults(LabsViewModel model) {
String labResults = ""; String labResults = "";
model.patientLabSpecialResult.forEach((element) { model.patientLabSpecialResult.forEach((element) {

@ -67,6 +67,10 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
widget.patientLabOrder!.actualDoctorRate!, widget.patientLabOrder!.actualDoctorRate!,
widget.patientLabOrder!.noOfPatientsRate!, widget.patientLabOrder!.noOfPatientsRate!,
projectViewModel.user.emailAddress!), projectViewModel.user.emailAddress!),
buttonTitle: TranslationBase.of(context).downloadReport,
buttonIcon: "assets/images/new/download_1.svg",
showConfirmMessageDialog: false,
isDownload: true,
onTap: widget.onTap!, onTap: widget.onTap!,
), ),
SizedBox(height: 10), SizedBox(height: 10),

@ -25,6 +25,7 @@ class DoctorHeader extends StatelessWidget {
final String? buttonIcon; final String? buttonIcon;
final bool isNeedToShowButton; final bool isNeedToShowButton;
final bool isShowName; final bool isShowName;
final bool isDownload;
DoctorHeader( DoctorHeader(
{Key? key, {Key? key,
@ -35,6 +36,7 @@ class DoctorHeader extends StatelessWidget {
this.isShowName = false, this.isShowName = false,
this.buttonIcon, this.buttonIcon,
this.showConfirmMessageDialog = true, this.showConfirmMessageDialog = true,
this.isDownload = false,
this.onRatingAndReviewTap}) this.onRatingAndReviewTap})
: super(key: key); : super(key: key);
@ -107,7 +109,9 @@ class DoctorHeader extends StatelessWidget {
if (headerModel.nationalityFlagURL != null) if (headerModel.nationalityFlagURL != null)
Padding( Padding(
padding: const EdgeInsets.only(top: 8.0), padding: const EdgeInsets.only(top: 8.0),
child: headerModel.nationalityFlagURL.isNotEmpty && headerModel.nationalityFlagURL != null && headerModel.nationalityFlagURL != 'null'? Image.network(headerModel.nationalityFlagURL, height: 20) : SizedBox(), child: headerModel.nationalityFlagURL.isNotEmpty && headerModel.nationalityFlagURL != null && headerModel.nationalityFlagURL != 'null'
? Image.network(headerModel.nationalityFlagURL, height: 20)
: SizedBox(),
), ),
], ],
) )
@ -178,7 +182,8 @@ class DoctorHeader extends StatelessWidget {
child: Container( child: Container(
padding: EdgeInsets.only(top: 10, bottom: 10, right: 15, left: 15), padding: EdgeInsets.only(top: 10, bottom: 10, right: 15, left: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0XFFD02127), borderRadius: projectViewModel.isArabic ? BorderRadius.only(topRight: Radius.circular(10)) : BorderRadius.only(topLeft: Radius.circular(10))), color: isDownload ? CustomColors.green : CustomColors.accentColor,
borderRadius: projectViewModel.isArabic ? BorderRadius.only(topRight: Radius.circular(10)) : BorderRadius.only(topLeft: Radius.circular(10))),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [

Loading…
Cancel
Save