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

Merge branch 'development' into textfield-validation

Browse Source
merge-requests/481/head
mosazaid 4 years ago
parent 604ff24a93 6a8fbdaedf
commit 906930532b
4 changed files with 9 additions and 9 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()) {

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,

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)),
],

Write Preview
Loading…
Cancel
Save