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

Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan

Browse Source
merge-requests/487/head
Sultan Khan 4 years ago
parent 0498545e5c 6a8fbdaedf
commit 212d1dc05f
9 changed files with 72 additions and 54 deletions
Show Stats Download Patch File Download Diff File

2
lib/client/base_app_client.dart
Unescape Escape View File

@ -87,7 +87,7 @@ class BaseAppClient {
print("URL : $url");
print("Body : ${json.encode(body)}");
String bodyData= json.encode(body);
var asd="";
var asd = "";
if (await Helpers.checkConnection()) {

4
lib/config/localized_values.dart
Unescape Escape View File

@ -599,8 +599,8 @@ const Map<String, Map<String, String>> localizedValues = {
'addAssessment': {'en': "Add ASSESSMENT", 'ar': "أضف التقييم"},
'assessment': {'en': "ASSESSMENT", 'ar': " التقييم"},
'physicalSystemExamination': {
'en': "Physical/System Examination",
'ar': " الفحص البدني / النظام"
'en': "Physical System / Examination",
'ar': "الفحص البدني / النظام"
},
'searchExamination': {'en': "Search Examination", 'ar': "فحص البحث"},
'addExamination': {'en': "Add Examination", 'ar': "اضافه"},

79
lib/models/patient/my_referral/PendingReferral.dart
Unescape Escape View File

@ -1,8 +1,14 @@
import '../patiant_info_model.dart';
class PendingReferral {
PatiantInformtion patientDetails;
String doctorImageUrl;
String nationalityFlagUrl;
String responded;
String answerFromTarget;
String createdOn;
int data;
int isSameBranch;
String editedOn;
int interBranchReferral;
int patientID;
@ -27,41 +33,51 @@ class PendingReferral {
String targetSetupID;
bool isReferralDoctorSameBranch;
PendingReferral(
{this.responded,
this.answerFromTarget,
this.createdOn,
this.data,
this.editedOn,
this.interBranchReferral,
this.patientID,
this.patientName,
this.patientType,
this.referralNo,
this.referralStatus,
this.referredByDoctorInfo,
this.referredFromBranchName,
this.referredOn,
this.referredType,
this.remarksFromSource,
this.respondedOn,
this.sourceAppointmentNo,
this.sourceProjectId,
this.sourceSetupID,
this.startDate,
this.targetAppointmentNo,
this.targetClinicID,
this.targetDoctorID,
this.targetProjectId,
this.targetSetupID,
this.isReferralDoctorSameBranch,
});
PendingReferral({
this.patientDetails,
this.doctorImageUrl,
this.nationalityFlagUrl,
this.responded,
this.answerFromTarget,
this.createdOn,
this.data,
this.isSameBranch,
this.editedOn,
this.interBranchReferral,
this.patientID,
this.patientName,
this.patientType,
this.referralNo,
this.referralStatus,
this.referredByDoctorInfo,
this.referredFromBranchName,
this.referredOn,
this.referredType,
this.remarksFromSource,
this.respondedOn,
this.sourceAppointmentNo,
this.sourceProjectId,
this.sourceSetupID,
this.startDate,
this.targetAppointmentNo,
this.targetClinicID,
this.targetDoctorID,
this.targetProjectId,
this.targetSetupID,
this.isReferralDoctorSameBranch,
});
PendingReferral.fromJson(Map<String, dynamic> json) {
patientDetails = json['patientDetails'] != null
? PatiantInformtion.fromJson(json['patientDetails'])
: null;
doctorImageUrl = json['DoctorImageURL'];
nationalityFlagUrl = json['NationalityFlagURL'];
responded = json['Responded'];
answerFromTarget = json['answerFromTarget'];
createdOn = json['createdOn'];
data = json['data'];
isSameBranch = json['isSameBranch'];
editedOn = json['editedOn'];
interBranchReferral = json['interBranchReferral'];
patientID = json['patientID'];
@ -88,10 +104,13 @@ class PendingReferral {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['DoctorImageURL'] = this.doctorImageUrl;
data['NationalityFlagURL'] = this.nationalityFlagUrl;
data['Responded'] = this.responded;
data['answerFromTarget'] = this.answerFromTarget;
data['createdOn'] = this.createdOn;
data['data'] = this.data;
data['isSameBranch'] = this.isSameBranch;
data['editedOn'] = this.editedOn;
data['interBranchReferral'] = this.interBranchReferral;
data['patientID'] = this.patientID;
@ -116,4 +135,4 @@ class PendingReferral {
data['targetSetupID'] = this.targetSetupID;
return data;
}
}
}

2
lib/screens/medical-file/medical_file_page.dart
Unescape Escape View File

@ -103,7 +103,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
context,
MaterialPageRoute(
builder: (context) => MedicalFileDetails(
age: patient.age,
age: patient.age??"",
firstName: patient.firstName,
lastName: patient.lastName,
gender: patient.genderDescription,

11
lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
Unescape Escape View File

@ -6,8 +6,8 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_item.dart';
import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.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/transitions/fade_page.dart';
@ -37,13 +37,10 @@ class VitalSignDetailsScreen extends StatelessWidget {
onModelReady: (model) =>
model.getPatientVitalSignHistory(patient, from, to),
builder: (_, mode, widget) => AppScaffold(
isShowAppBar: false,
baseViewModel: mode,
/* appBar: PatientProfileHeaderWhitAppointmentAppBar(
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
),*/
isShowAppBar: true,
appBar: PatientProfileHeaderNewDesignAppBar(
patient, patientType, arrivalType),
appBarTitle: TranslationBase.of(context).vitalSign,
body: mode.patientVitalSignsHistory.length > 0
? Column(

8
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
Unescape Escape View File

@ -157,7 +157,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
color: HexColor("#20A169"),
),
child: AppText(
patient.startTime,
patient.startTime??"",
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
@ -210,7 +210,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
Row(
children: [
AppText(
patient.nationalityName ?? patient.nationality,
patient.nationalityName ?? patient.nationality??'',
fontWeight: FontWeight.bold,
fontSize: 12,
),
@ -242,11 +242,11 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context).age + " : ",
text: TranslationBase.of(context).age??'' + " : ",
style: TextStyle(fontSize: 14)),
new TextSpan(
text:
"${DateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth : patient.dateofBirth, context)}",
"${DateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth??"" : patient.dateofBirth??"", context)}",
style: TextStyle(
fontWeight: FontWeight.w700, fontSize: 14)),
],

6
lib/widgets/patients/profile/patient-profile-header-new-design.dart
Unescape Escape View File

@ -155,7 +155,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
color: HexColor("#20A169"),
),
child: AppText(
patient.startTime,
patient.startTime??"",
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
@ -208,7 +208,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
Row(
children: [
AppText(
patient.nationalityName ?? patient.nationality,
patient.nationalityName ?? patient.nationality??'',
fontWeight: FontWeight.bold,
fontSize: 12,
),
@ -244,7 +244,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
style: TextStyle(fontSize: 14)),
new TextSpan(
text:
"${DateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth : patient.dateofBirth, context)}",
"${DateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth ?? "" : patient.dateofBirth ?? "", context)}",
style: TextStyle(
fontWeight: FontWeight.w700, fontSize: 14)),
],

7
lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart
Unescape Escape View File

@ -34,8 +34,9 @@ class ExaminationIitemCard extends StatelessWidget {
? examination.selectedExamination.nameAr
: examination.selectedExamination.nameEn
: examination.selectedExamination.nameEn,
fontWeight: FontWeight.bold,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
color: Color(0x2B353E),
fontSize: SizeConfig.textMultiplier * 1.8,
),
)),
@ -43,7 +44,7 @@ class ExaminationIitemCard extends StatelessWidget {
children: [
AppText(
TranslationBase.of(context).remove,
fontWeight: FontWeight.bold,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
color: Colors.red.shade800,
fontSize: SizeConfig.textMultiplier * 1.8,
@ -82,7 +83,7 @@ class ExaminationIitemCard extends StatelessWidget {
examination.remark,
fontWeight: FontWeight.normal,
fontFamily: 'Poppins',
color: Colors.grey.shade500,
color: Color(0xFF575757),
fontSize: SizeConfig.textMultiplier * 1.8,
),
],

7
lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart
Unescape Escape View File

@ -145,14 +145,15 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
"${TranslationBase.of(context).physicalSystemExamination}",
fontFamily: 'Poppins',
fontSize:
SizeConfig.textMultiplier * 2.0,
SizeConfig.textMultiplier * 2.1,
fontWeight: isSysExaminationExpand
? FontWeight.w700
: FontWeight.normal,
color: Color(0xFF2E303A),
),
Icon(
FontAwesomeIcons.asterisk,
color: AppGlobal.appPrimaryColor,
color: Colors.black/*AppGlobal.appPrimaryColor*/,
size: 12,
)
],
@ -205,7 +206,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
fontSize: SizeConfig
.textMultiplier *
1.8,
color: Colors.black,
color: Color(0xFF2E303A),
fontWeight: FontWeight.bold,
),
AppText(

Write Preview
Loading…
Cancel
Save