Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!548
merge-requests/549/head
Mohammad Aljammal 5 years ago
commit 584d1e1346

@ -88,8 +88,6 @@ class BaseAppClient {
print("URL : $url"); print("URL : $url");
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");
var asd =json.encode(body);
var asd2;
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await http.post(url, final response = await http.post(url,

@ -58,7 +58,7 @@ class PatientCard extends StatelessWidget {
height: 10, height: 10,
), ),
SERVICES_PATIANT2[int.parse(patientType)] == SERVICES_PATIANT2[int.parse(patientType)] ==
"patientArrivalList" "List_MyOutPatient"
? Padding( ? Padding(
padding: EdgeInsets.only(left: 12.0), padding: EdgeInsets.only(left: 12.0),
child: Row( child: Row(
@ -83,7 +83,7 @@ class PatientCard extends StatelessWidget {
? AppText( ? AppText(
patientInfo.startTime != null patientInfo.startTime != null
? patientInfo.startTime ? patientInfo.startTime
: '', : patientInfo.startTimes,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
) )
@ -253,13 +253,16 @@ class PatientCard extends StatelessWidget {
), ),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: patientInfo.admissionDate ==null?"":TranslationBase.of(context) text: patientInfo.admissionDate == null
? ""
: TranslationBase.of(context)
.admissionDate + .admissionDate +
" : ", " : ",
style: TextStyle(fontSize: 14)), style: TextStyle(fontSize: 14)),
new TextSpan( new TextSpan(
text:patientInfo.admissionDate ==null?"": text: patientInfo.admissionDate == null
"${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}", ? ""
: "${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 15)), fontSize: 15)),
@ -292,72 +295,72 @@ class PatientCard extends StatelessWidget {
// top: 8, // top: 8,
// ), // ),
// ), // ),
if (SERVICES_PATIANT2[int.parse(patientType)] == //if (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyOutPatient") // "List_MyOutPatient")
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context)
.appointmentDate +
" : ",
fontSize: 14,
),
// Container(
// child:
patientInfo.appointmentDate != null
? AppText(
DateUtils
.convertDateFromServerFormat(
patientInfo.appointmentDate
.toString(),
'yyyy-MM-dd'),
fontSize: 12,
fontWeight: FontWeight.bold,
)
: SizedBox(),
//),
patientInfo.startTimes != null
?
//
// Container( // Container(
// // height: 15, // child: Row(
// // width: 60, // crossAxisAlignment: CrossAxisAlignment.start,
// padding: EdgeInsets.all(5), // mainAxisAlignment: MainAxisAlignment.start,
// decoration: BoxDecoration( // children: <Widget>[
// borderRadius: // AppText(
// BorderRadius.circular(25), // TranslationBase.of(context)
// color: HexColor("#20A169"), // .appointmentDate +
// " : ",
// fontSize: 14,
// ), // ),
// child:
AppText( // // Container(
' ' + patientInfo.startTimes, // // child:
fontSize: 11, // patientInfo.appointmentDate != null
fontWeight: FontWeight.bold, // ? AppText(
) // DateUtils
// .convertDateFromServerFormat(
// patientInfo.appointmentDate
// .toString(),
// 'yyyy-MM-dd'),
// fontSize: 12,
// fontWeight: FontWeight.bold,
// )
// : SizedBox(),
// //),
// patientInfo.startTimes != null
// ?
// //
// // Container(
// // // height: 15,
// // // width: 60,
// // padding: EdgeInsets.all(5),
// // decoration: BoxDecoration(
// // borderRadius:
// // BorderRadius.circular(25),
// // color: HexColor("#20A169"),
// // ),
// // child:
// AppText(
// ' ' + patientInfo.startTimes,
// fontSize: 11,
// fontWeight: FontWeight.bold,
// )
// //)
// : SizedBox(),
// SizedBox(
// width: 3.5,
// ),
// //,
// SizedBox(
// height: 0.5,
// )
// ],
// ),
// margin: EdgeInsets.only(
// top: 8,
// ),
//) //)
: SizedBox(),
SizedBox(
width: 3.5,
),
//,
SizedBox(
height: 0.5,
)
],
),
margin: EdgeInsets.only(
top: 8,
),
)
])) ]))
]), ]),
SERVICES_PATIANT2[int.parse(patientType)] == SERVICES_PATIANT2[int.parse(patientType)] ==
"patientArrivalList" "List_MyOutPatient"
? Row( ? Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [

Loading…
Cancel
Save