patient profile new design

merge-requests/377/head
mosazaid 5 years ago
parent 0ea66bd1e1
commit ffd77528a2

@ -1,12 +1,13 @@
// TODO : it have to be changed. // TODO : it have to be changed.
class PatiantInformtion { class PatiantInformtion {
final List<PatiantInformtion> list; final PatiantInformtion patientDetails;
int genderInt; int genderInt;
dynamic age; dynamic age;
String appointmentDate; String appointmentDate;
int appointmentNo; int appointmentNo;
String appointmentType; String appointmentType;
int appointmentTypeId;
String arrivedOn; String arrivedOn;
int clinicGroupId; int clinicGroupId;
String companyName; String companyName;
@ -31,6 +32,8 @@ class PatiantInformtion {
String firstNameN; String firstNameN;
String middleNameN; String middleNameN;
String lastNameN; String lastNameN;
String fullName;
String fullNameN;
int gender; int gender;
String dateofBirth; String dateofBirth;
String nationalityId; String nationalityId;
@ -58,7 +61,7 @@ class PatiantInformtion {
int visitTypeId; int visitTypeId;
String startTimes; String startTimes;
PatiantInformtion( PatiantInformtion(
{this.list, {this.patientDetails,
this.projectId, this.projectId,
this.clinicId, this.clinicId,
this.doctorId, this.doctorId,
@ -96,6 +99,7 @@ class PatiantInformtion {
this.startTime, this.startTime,
this.appointmentNo, this.appointmentNo,
this.appointmentType, this.appointmentType,
this.appointmentTypeId,
this.arrivedOn, this.arrivedOn,
this.clinicGroupId, this.clinicGroupId,
this.companyName, this.companyName,
@ -110,6 +114,8 @@ class PatiantInformtion {
this.nationality, this.nationality,
this.patientMRN, this.patientMRN,
this.visitType, this.visitType,
this.fullName,
this.fullNameN,
this.nationalityFlagURL, this.nationalityFlagURL,
this.patientStatusType, this.patientStatusType,
this.visitTypeId, this.visitTypeId,
@ -117,6 +123,8 @@ class PatiantInformtion {
factory PatiantInformtion.fromJson(Map<String, dynamic> json) => factory PatiantInformtion.fromJson(Map<String, dynamic> json) =>
PatiantInformtion( PatiantInformtion(
patientDetails: json['patientDetails'] != null ? new PatiantInformtion.fromJson(json['patientDetails'])
: null,
projectId: json["ProjectID"] ?? json["projectID"], projectId: json["ProjectID"] ?? json["projectID"],
clinicId: json["ClinicID"] ?? json["clinicID"], clinicId: json["ClinicID"] ?? json["clinicID"],
doctorId: json["DoctorID"] ?? json["doctorID"], doctorId: json["DoctorID"] ?? json["doctorID"],
@ -133,6 +141,8 @@ class PatiantInformtion {
middleNameN: json["MiddleNameN"] ?? json["middleNameN"], middleNameN: json["MiddleNameN"] ?? json["middleNameN"],
lastNameN: json["LastNameN"] ?? json["lastNameN"], lastNameN: json["LastNameN"] ?? json["lastNameN"],
gender: json["Gender"] ?? json["gender"], gender: json["Gender"] ?? json["gender"],
fullName: json["fullName"] ?? json["fullName"],
fullNameN: json["fullNameN"] ?? json["fullNameN"],
dateofBirth: json["DateofBirth"] ?? json["dob"], dateofBirth: json["DateofBirth"] ?? json["dob"],
nationalityId: json["NationalityID"] ?? json["nationalityID"], nationalityId: json["NationalityID"] ?? json["nationalityID"],
mobileNumber: json["MobileNumber"] ?? json["mobileNumber"], mobileNumber: json["MobileNumber"] ?? json["mobileNumber"],
@ -165,6 +175,7 @@ class PatiantInformtion {
startTime: json["startTime"], startTime: json["startTime"],
appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'], appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'],
appointmentType: json['appointmentType'], appointmentType: json['appointmentType'],
appointmentTypeId: json['appointmentTypeId'],
arrivedOn: json['arrivedOn'], arrivedOn: json['arrivedOn'],
clinicGroupId: json['clinicGroupId'], clinicGroupId: json['clinicGroupId'],
companyName: json['companyName'], companyName: json['companyName'],

@ -73,7 +73,7 @@ class PatientProfileScreen extends StatelessWidget {
color: Color(0XFFF2F2F2), color: Color(0XFFF2F2F2),
child: Stack( child: Stack(
children: [ children: [
SingleChildScrollView( Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -368,25 +368,27 @@ class PatientProfileScreen extends StatelessWidget {
), ),
), ),
), ),
Padding( Expanded(
padding: const EdgeInsets.all(16.0), child: Padding(
child: Container( padding: const EdgeInsets.all(16.0),
child: Column( child: SingleChildScrollView(
children: [ child: Column(
isFromSearch children: [
? ProfileMedicalInfoWidgetSearch( isFromSearch
patient: patient, ? ProfileMedicalInfoWidgetSearch(
patientType: patientType, patient: patient,
from: from, patientType: patientType,
to: to, from: from,
) to: to,
: ProfileMedicalInfoWidget( )
patient: patient, : ProfileMedicalInfoWidget(
patientType: patientType, patient: patient,
from: from, patientType: patientType,
to: to, from: from,
), to: to,
], ),
],
),
), ),
), ),
) )

@ -2,14 +2,17 @@ import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/my_referral/PendingReferral.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/PendingReferral.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget_search.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:doctor_app_flutter/widgets/shared/borderedButton.dart'; import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart';
@ -42,17 +45,60 @@ class MyReferralDetailScreen extends StatelessWidget {
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
appBarTitle: TranslationBase.of(context).referPatient, appBarTitle: TranslationBase.of(context).referPatient,
isShowAppBar: false,
body: model.patientArrivalList != null && body: model.patientArrivalList != null &&
model.patientArrivalList.length > 0 model.patientArrivalList.length > 0
? Column( ? Column(
children: [ children: [
Container(
padding: EdgeInsets.only(
left: 0, right: 5, bottom: 5, top: 5),
decoration: BoxDecoration(
color: Colors.white,
),
child: Container(
padding: EdgeInsets.only(
left: 10, right: 10, bottom: 10),
margin: EdgeInsets.only(top: 50),
child: Column(
children: [
Container(
padding: EdgeInsets.only(left: 12.0),
child: Row(children: [
IconButton(
icon: Icon(Icons.arrow_back_ios),
color: Colors.black, //Colors.black,
onPressed: () => Navigator.pop(context),
),
AppText(
(Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)),
fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
model.patientArrivalList[0].patientDetails.gender == 1
? Icon(
DoctorApp.male_2,
color: Colors.blue,
)
: Icon(
DoctorApp.female_1,
color: Colors.pink,
),
]),
),
],
),
),
),
Expanded( Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
ProfileWelcomeWidget( /*ProfileWelcomeWidget(
AppText( AppText(
authProvider.selectedClinicName != null authProvider.selectedClinicName != null
? authProvider.selectedClinicName ? authProvider.selectedClinicName
@ -63,7 +109,7 @@ class MyReferralDetailScreen extends StatelessWidget {
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
height: 100, height: 100,
), ),*/
SizedBox( SizedBox(
height: 16, height: 16,
), ),
@ -91,45 +137,11 @@ class MyReferralDetailScreen extends StatelessWidget {
referredOn: pendingReferral.referredOn, referredOn: pendingReferral.referredOn,
), ),
SizedBox( SizedBox(
child: GridView.count( child: ProfileMedicalInfoWidgetSearch(
childAspectRatio: 1.8, patient: model.patientArrivalList[0],
crossAxisSpacing: 8, patientType: "7",
mainAxisSpacing: 10, from: null,
controller: new ScrollController( to: null,
keepScrollOffset: false),
shrinkWrap: true,
padding: const EdgeInsets.all(4.0),
crossAxisCount: 2,
children: [
PatientProfileButton(
key: key,
patient: model.patientArrivalList[0],
route: MEDICAL_FILE,
nameLine1: TranslationBase.of(context)
.previewHealth,
nameLine2: TranslationBase.of(context)
.summaryReport,
icon: 'radiology-1.png'),
PatientProfileButton(
key: key,
patient: model.patientArrivalList[0],
route: LAB_ORDERS,
nameLine1:
TranslationBase.of(context).lab,
nameLine2:
TranslationBase.of(context).result,
icon: 'lab.png'),
PatientProfileButton(
key: key,
patient: model.patientArrivalList[0],
route:
VITAL_SIGN_DETAILS /*PATIENT_VITAL_SIGN*/,
nameLine1:
TranslationBase.of(context).vital,
nameLine2:
TranslationBase.of(context).signs,
icon: 'heartbeat.png'),
],
), ),
), ),
], ],

@ -88,14 +88,14 @@ class PatientProfileButton extends StatelessWidget {
color: Color(0xffBBBBBB), color: Color(0xffBBBBBB),
width: 1, width: 1,
)), )),
boxShadow: [ /*boxShadow: [
BoxShadow( BoxShadow(
color: Colors.grey.withOpacity(0.2), color: Colors.grey.withOpacity(0.2),
spreadRadius: 5, spreadRadius: 5,
blurRadius: 7, blurRadius: 7,
offset: Offset(0, 3), // changes position of shadow offset: Offset(0, 3), // changes position of shadow
), ),
], ],*/
), ),
); );
} }

@ -67,7 +67,7 @@ class PatientPageHeaderWidget extends StatelessWidget {
height: 5, height: 5,
), ),
AppText( AppText(
patient.firstName + ' ' + patient.lastName, patient.patientDetails.fullName != null ? patient.patientDetails.fullName : patient.firstName,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),

Loading…
Cancel
Save