Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts: lib/config/localized_values.dart lib/util/translations_delegate_base.dartmerge-requests/365/head
Mohammad Aljammal
5 years ago
commit
e515265f11
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
@ -1,18 +1,21 @@
|
|||||||
class PrescriptionReqModel {
|
class PrescriptionReqModel {
|
||||||
String vidaAuthTokenID;
|
String vidaAuthTokenID;
|
||||||
dynamic patientMRN;
|
dynamic patientMRN;
|
||||||
|
dynamic appNo;
|
||||||
|
|
||||||
PrescriptionReqModel({this.vidaAuthTokenID, this.patientMRN});
|
PrescriptionReqModel({this.vidaAuthTokenID, this.patientMRN, this.appNo});
|
||||||
|
|
||||||
PrescriptionReqModel.fromJson(Map<String, dynamic> json) {
|
PrescriptionReqModel.fromJson(Map<String, dynamic> json) {
|
||||||
vidaAuthTokenID = json['VidaAuthTokenID'];
|
vidaAuthTokenID = json['VidaAuthTokenID'];
|
||||||
patientMRN = json['PatientMRN'];
|
patientMRN = json['PatientMRN'];
|
||||||
|
appNo = json['AppointmentNo'];
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
|
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
|
||||||
data['PatientMRN'] = this.patientMRN;
|
data['PatientMRN'] = this.patientMRN;
|
||||||
|
data['AppointmentNo'] = this.appNo;
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,37 +1,76 @@
|
|||||||
import 'package:doctor_app_flutter/config/size_config.dart';
|
import 'package:doctor_app_flutter/config/size_config.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
|
||||||
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
|
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
|
||||||
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
class RadiologyReportScreen extends StatelessWidget {
|
class RadiologyReportScreen extends StatelessWidget {
|
||||||
final String reportData;
|
final String reportData;
|
||||||
|
final String url;
|
||||||
|
|
||||||
RadiologyReportScreen({Key key, this.reportData});
|
RadiologyReportScreen({Key key, this.reportData, this.url});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return AppScaffold(
|
return AppScaffold(
|
||||||
appBarTitle: TranslationBase.of(context).radiologyReport,
|
appBarTitle: TranslationBase.of(context).radiologyReport,
|
||||||
body: Container(
|
body: SingleChildScrollView(
|
||||||
padding: EdgeInsets.all(10),
|
child: Column(
|
||||||
margin: EdgeInsets.all(10),
|
children: [
|
||||||
decoration: BoxDecoration(
|
Container(
|
||||||
borderRadius: BorderRadius.all(Radius.circular(10)),
|
padding: EdgeInsets.all(10),
|
||||||
color: Colors.white,
|
margin: EdgeInsets.all(10),
|
||||||
border: Border(
|
decoration: BoxDecoration(
|
||||||
bottom: BorderSide(color: Colors.grey, width: 0.5),
|
borderRadius: BorderRadius.all(Radius.circular(10)),
|
||||||
top: BorderSide(color: Colors.grey, width: 0.5),
|
color: Colors.white,
|
||||||
left: BorderSide(color: Colors.grey, width: 0.5),
|
border: Border(
|
||||||
right: BorderSide(color: Colors.grey, width: 0.5),
|
bottom: BorderSide(color: Colors.grey, width: 0.5),
|
||||||
|
top: BorderSide(color: Colors.grey, width: 0.5),
|
||||||
|
left: BorderSide(color: Colors.grey, width: 0.5),
|
||||||
|
right: BorderSide(color: Colors.grey, width: 0.5),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: AppText(
|
||||||
|
reportData,
|
||||||
|
fontSize: 2.5 * SizeConfig.textMultiplier,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(height:MediaQuery.of(context).size.height * 0.13 ,)
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
child: AppText(
|
bottomSheet: url == null
|
||||||
reportData,
|
? Container(
|
||||||
fontSize: 2.5 * SizeConfig.textMultiplier,
|
height: MediaQuery.of(context).size.height * 0,
|
||||||
),
|
)
|
||||||
),
|
: Container(
|
||||||
);
|
width: double.infinity,
|
||||||
|
height: MediaQuery.of(context).size.height * 0.1,
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: <Widget>[
|
||||||
|
FractionallySizedBox(
|
||||||
|
widthFactor: 0.9,
|
||||||
|
child: Container(
|
||||||
|
child: Wrap(
|
||||||
|
alignment: WrapAlignment.center,
|
||||||
|
children: <Widget>[
|
||||||
|
// TODO change it secondary button and add loading
|
||||||
|
AppButton(
|
||||||
|
title: TranslationBase.of(context).openRad,
|
||||||
|
onPressed: () async {
|
||||||
|
launch(url);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue