Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'get_pending_orders' into 'development'

Browse Source 
admission orders changes

See merge request Cloud_Solution/doctor_app_flutter!872
merge-requests/873/merge
Mohammad Aljammal 4 years ago
parent 45822d16d1 d0e6532814
commit 9de1085b49
3 changed files with 22 additions and 74 deletions
Show Stats Download Patch File Download Diff File

12
lib/config/config.dart
Unescape Escape View File

@ -371,11 +371,13 @@ const GET_ADMISSION_ORDERS =
"/Services/DoctorApplication.svc/REST/DoctorApp_GetAdmissionOrders";
///Patient Registration Services
const CHECK_PATIENT_FOR_REGISTRATION = "Authentication.svc/REST/CheckPatientForRegisteration";
const SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE = "Authentication.svc/REST/SendActivationCodebyOTPNotificationType";
const CHECK_ACTIVATION_CODE_FOR_PATIENT = "Authentication.svc/REST/CheckActivationCode";
const PATIENT_REGISTRATION = "Authentication.svc/REST/PatientRegistration";
const CHECK_PATIENT_FOR_REGISTRATION =
"Authentication.svc/REST/CheckPatientForRegisteration";
const SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE =
"Authentication.svc/REST/SendActivationCodebyOTPNotificationType";
const CHECK_ACTIVATION_CODE_FOR_PATIENT =
"Authentication.svc/REST/CheckActivationCode";
const PATIENT_REGISTRATION = "Authentication.svc/REST/PatientRegistration";
var selectedPatientType = 1;

7
lib/models/admisson_orders/admission_orders_model.dart
Unescape Escape View File

@ -9,6 +9,7 @@ class AdmissionOrdersModel {
int createdBy;
String editedOn;
int editedBy;
String createdByName;
AdmissionOrdersModel(
{this.procedureID,
@ -20,7 +21,8 @@ class AdmissionOrdersModel {
this.createdOn,
this.createdBy,
this.editedOn,
this.editedBy});
this.editedBy,
this.createdByName});
AdmissionOrdersModel.fromJson(Map<String, dynamic> json) {
procedureID = json['ProcedureID'];
@ -33,6 +35,7 @@ class AdmissionOrdersModel {
createdBy = json['CreatedBy'];
editedOn = json['EditedOn'];
editedBy = json['EditedBy'];
createdByName = json['CreatedByName'];
}
Map<String, dynamic> toJson() {
@ -47,6 +50,8 @@ class AdmissionOrdersModel {
data['CreatedBy'] = this.createdBy;
data['EditedOn'] = this.editedOn;
data['EditedBy'] = this.editedBy;
data['CreatedByName'] = this.createdByName;
return data;
}
}

77
lib/screens/patients/profile/admission-orders/admission_orders_screen.dart
Unescape Escape View File

@ -38,8 +38,7 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
isDischargedPatient = routeArgs['isDischargedPatient'];
return BaseView<PendingOrdersViewModel>(
onModelReady: (model) => model.getAdmissionOrders(
admissionNo: int.parse(patient.admissionNo),
patientId: patient.patientMRN),
admissionNo: 2014005178, patientId: patient.patientMRN),
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
@ -91,43 +90,12 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
widthFactor: 0.95,
child: CardWithBgWidget(
hasBorder: false,
// bgColor: model.admissionOrderList[index]
// .status ==
// 1 &&
// authenticationViewModel
// .doctorProfile.doctorID !=
// model
// .patientProgressNoteList[
// index]
// .createdBy
// ? Color(0xFFCC9B14)
// : model.patientProgressNoteList[index]
// .status ==
// 4
// ? Colors.red.shade700
// : model.patientProgressNoteList[index]
// .status ==
// 2
// ? Colors.green[600]
// : Color(0xFFCC9B14),
widget: Column(
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
SizedBox(
width: 10,
),
SizedBox(
width: 10,
)
],
),
SizedBox(
height: 10,
),
@ -156,14 +124,14 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
context)
.createdBy
.toString(),
fontSize: 10,
fontSize: 13,
),
Expanded(
child: AppText(
model
.admissionOrderList[
index]
.createdBy
.createdByName
.toString() ??
'',
fontWeight:
@ -181,10 +149,11 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
children: [
AppText(
TranslationBase.of(
context)
.procedureName
.toString(),
fontSize: 10,
context)
.procedureName
.toString() +
": ",
fontSize: 13,
),
Expanded(
child: AppText(
@ -212,7 +181,7 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
context)
.orderNo
.toString(),
fontSize: 10,
fontSize: 13,
),
Expanded(
child: AppText(
@ -230,34 +199,6 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
),
],
),
// Row(
// crossAxisAlignment:
// CrossAxisAlignment
// .start,
// children: [
// AppText(
// TranslationBase.of(
// context)
// .createdBy
// .toString(),
// fontSize: 10,
// ),
// Expanded(
// child: AppText(
// model
// .admissionOrderList[
// index]
// .createdBy
// .toString() ??
// '',
// fontWeight:
// FontWeight.w600,
// fontSize: 12,
// isCopyable: true,
// ),
// ),
// ],
// ),
],
),
),

Write Preview
Loading…
Cancel
Save