Merge branch 'feature-ucaf' into 'development'

Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!266
merge-requests/267/merge
Mohammad Aljammal 5 years ago
commit b89af8a5ab

@ -42,6 +42,7 @@ class PatiantInformtion {
int patientMRN; int patientMRN;
String admissionNo; String admissionNo;
String admissionDate; String admissionDate;
String createdOn;
String roomId; String roomId;
String bedId; String bedId;
String nursingStationId; String nursingStationId;
@ -77,6 +78,7 @@ class PatiantInformtion {
this.patientType, this.patientType,
this.admissionNo, this.admissionNo,
this.admissionDate, this.admissionDate,
this.createdOn,
this.roomId, this.roomId,
this.bedId, this.bedId,
this.nursingStationId, this.nursingStationId,
@ -129,6 +131,7 @@ class PatiantInformtion {
patientType: json["PatientType"]?? json["patientType"], patientType: json["PatientType"]?? json["patientType"],
admissionNo: json["AdmissionNo"]?? json["admissionNo"], admissionNo: json["AdmissionNo"]?? json["admissionNo"],
admissionDate: json["AdmissionDate"]?? json["admissionDate"], admissionDate: json["AdmissionDate"]?? json["admissionDate"],
createdOn: json["CreatedOn"]?? json["CreatedOn"],
roomId: json["RoomID"]?? json["roomID"], roomId: json["RoomID"]?? json["roomID"],
bedId: json["BedID"]?? json["bedID"], bedId: json["BedID"]?? json["bedID"],
nursingStationId: json["NursingStationID"]?? json["nursingStationID"], nursingStationId: json["NursingStationID"]?? json["nursingStationID"],
@ -158,10 +161,4 @@ class PatiantInformtion {
patientMRN :json['patientMRN'] ?? json['PatientMRN'], patientMRN :json['patientMRN'] ?? json['PatientMRN'],
); );
} }

@ -254,8 +254,8 @@ class PatientProfileWidget extends StatelessWidget {
), ),
Expanded( Expanded(
child: AppText( child: AppText(
patient.admissionDate != null patient.createdOn != null
? "${DateUtils.convertDateFromServerFormat(patient.admissionDate, 'EEEE dd, MMMM yyyy hh:mm a')}" ? "${DateUtils.convertDateFromServerFormat(patient.createdOn, 'EEEE dd, MMMM yyyy hh:mm a')}"
: "", : "",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
@ -310,10 +310,10 @@ class PatientProfileWidget extends StatelessWidget {
), ),
), ),
AppText( AppText(
patient.admissionDate != null patient.createdOn != null
? DateUtils ? DateUtils
.differenceBetweenServerDateAndCurrent( .differenceBetweenServerDateAndCurrent(
patient.admissionDate) patient.createdOn)
: "", : "",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,

Loading…
Cancel
Save