|
|
|
@ -134,8 +134,8 @@ class PatientCard extends StatelessWidget {
|
|
|
|
)
|
|
|
|
)
|
|
|
|
: patientInfo.arrivedOn != null
|
|
|
|
: patientInfo.arrivedOn != null
|
|
|
|
? AppText(
|
|
|
|
? AppText(
|
|
|
|
DateUtils.getDayMonthYearDate(DateUtils.convertStringToDate(patientInfo.arrivedOn,)
|
|
|
|
AppDateUtils.getDayMonthYearDate(AppDateUtils.convertStringToDate(patientInfo.arrivedOn,)
|
|
|
|
)+" "+ "${DateUtils.getStartTime(patientInfo.startTime)}",
|
|
|
|
)+" "+ "${AppDateUtils.getStartTime(patientInfo.startTime)}",
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
fontSize: 15,
|
|
|
|
fontSize: 15,
|
|
|
|
@ -143,7 +143,7 @@ class PatientCard extends StatelessWidget {
|
|
|
|
: (patientInfo.appointmentDate != null && patientInfo.appointmentDate.isNotEmpty)?
|
|
|
|
: (patientInfo.appointmentDate != null && patientInfo.appointmentDate.isNotEmpty)?
|
|
|
|
AppText(
|
|
|
|
AppText(
|
|
|
|
|
|
|
|
|
|
|
|
"${DateUtils.getDayMonthYearDate(DateUtils.convertStringToDate(patientInfo.appointmentDate,))} ${DateUtils.getStartTime(patientInfo.startTime)}",
|
|
|
|
"${AppDateUtils.getDayMonthYearDate(AppDateUtils.convertStringToDate(patientInfo.appointmentDate,))} ${AppDateUtils.getStartTime(patientInfo.startTime)}",
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
fontSize: 15,
|
|
|
|
fontSize: 15,
|
|
|
|
@ -299,7 +299,7 @@ class PatientCard extends StatelessWidget {
|
|
|
|
style: TextStyle(fontSize: 12)),
|
|
|
|
style: TextStyle(fontSize: 12)),
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text:
|
|
|
|
text:
|
|
|
|
"${DateUtils.getAgeByBirthday(patientInfo.dateofBirth, context)}",
|
|
|
|
"${AppDateUtils.getAgeByBirthday(patientInfo.dateofBirth, context)}",
|
|
|
|
style: TextStyle(
|
|
|
|
style: TextStyle(
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
fontSize: 13)),
|
|
|
|
fontSize: 13)),
|
|
|
|
@ -328,7 +328,7 @@ class PatientCard extends StatelessWidget {
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text: patientInfo.admissionDate == null
|
|
|
|
text: patientInfo.admissionDate == null
|
|
|
|
? ""
|
|
|
|
? ""
|
|
|
|
: "${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}",
|
|
|
|
: "${AppDateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}",
|
|
|
|
style: TextStyle(
|
|
|
|
style: TextStyle(
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
fontSize: 13)),
|
|
|
|
fontSize: 13)),
|
|
|
|
@ -348,7 +348,7 @@ class PatientCard extends StatelessWidget {
|
|
|
|
text: TranslationBase.of(context).numOfDays + " : ",
|
|
|
|
text: TranslationBase.of(context).numOfDays + " : ",
|
|
|
|
style: TextStyle(fontSize: 12)),
|
|
|
|
style: TextStyle(fontSize: 12)),
|
|
|
|
new TextSpan(
|
|
|
|
new TextSpan(
|
|
|
|
text: "${DateTime.now().difference(DateUtils.getDateTimeFromServerFormat(patientInfo.admissionDate)).inDays + 1}",
|
|
|
|
text: "${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(patientInfo.admissionDate)).inDays + 1}",
|
|
|
|
style: TextStyle(
|
|
|
|
style: TextStyle(
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
fontSize: 13)),
|
|
|
|
fontSize: 13)),
|
|
|
|
|