Merge branch 'patient_app_services' into 'development'

hot fixes on doctor replay and schedule

See merge request Cloud_Solution/doctor_app_flutter!505
merge-requests/507/merge
Mohammad Aljammal 5 years ago
commit 7da3ab40fe

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

@ -4,6 +4,9 @@ class ListDoctorWorkingHoursTable {
DateTime date; DateTime date;
String dayName; String dayName;
String workingHours; String workingHours;
String projectName;
String clinicName;
ListDoctorWorkingHoursTable({ ListDoctorWorkingHoursTable({
this.date, this.date,
@ -15,6 +18,8 @@ class ListDoctorWorkingHoursTable {
date = Helpers.convertStringToDate(json['Date']); date = Helpers.convertStringToDate(json['Date']);
dayName = json['DayName']; dayName = json['DayName'];
workingHours = json['WorkingHours']; workingHours = json['WorkingHours'];
projectName = json['ProjectName'];
clinicName = json['ClinicName'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -22,6 +27,8 @@ class ListDoctorWorkingHoursTable {
data['Date'] = this.date; data['Date'] = this.date;
data['DayName'] = this.dayName; data['DayName'] = this.dayName;
data['WorkingHours'] = this.workingHours; data['WorkingHours'] = this.workingHours;
data['ProjectName'] = this.projectName;
data['ClinicName'] = this.clinicName;
return data; return data;
} }

@ -63,6 +63,7 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
), ),
), ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
AppText( AppText(
DateUtils.getDateTimeFromServerFormat( DateUtils.getDateTimeFromServerFormat(

@ -59,7 +59,7 @@ class MyScheduleWidget extends StatelessWidget {
if (DateUtils.isToday(workingHoursTable.date)) if (DateUtils.isToday(workingHoursTable.date))
AppText( AppText(
"Today", "Today",
fontSize: 2.5 * SizeConfig.textMultiplier, fontSize: 1.8 * SizeConfig.textMultiplier,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Colors.green[500], color: Colors.green[500],
// fontSize: 18 // fontSize: 18
@ -72,10 +72,17 @@ class MyScheduleWidget extends StatelessWidget {
children: workingHours.map((work) { children: workingHours.map((work) {
return Container( return Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 5, height: 5,
), ),
if(workingHoursTable.clinicName!=null)
AppText(
workingHoursTable.clinicName??"",
fontSize: 15,
fontWeight: FontWeight.w700,
),
Container( Container(
width: MediaQuery.of(context).size.width*0.55, width: MediaQuery.of(context).size.width*0.55,
child: AppText( child: AppText(
@ -83,7 +90,13 @@ class MyScheduleWidget extends StatelessWidget {
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
), ),
) ),
if(workingHoursTable.projectName!=null)
AppText(
workingHoursTable.projectName??"",
fontSize: 15,
fontWeight: FontWeight.w700,
),
], ],
), ),
); );

Loading…
Cancel
Save