merge-update-with-lab-changes
haroon amjad 4 years ago
parent eb64962d7c
commit 76984a4ef6

@ -77,9 +77,9 @@ class InsuranceApprovalDetail extends StatelessWidget {
MyRichText(TranslationBase.of(context).unusedCount, insuranceApprovalModel?.unUsedCount.toString() ?? "", projectViewModel.isArabic), MyRichText(TranslationBase.of(context).unusedCount, insuranceApprovalModel?.unUsedCount.toString() ?? "", projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).companyName, insuranceApprovalModel?.companyName ?? "", projectViewModel.isArabic), MyRichText(TranslationBase.of(context).companyName, insuranceApprovalModel?.companyName ?? "", projectViewModel.isArabic),
SizedBox(height: 6), SizedBox(height: 6),
MyRichText(TranslationBase.of(context).receiptOn, DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDateTime(insuranceApprovalModel.receiptOn)) ?? "", MyRichText(TranslationBase.of(context).receiptOn, DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(insuranceApprovalModel.receiptOn)) ?? "",
projectViewModel.isArabic), projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).expiryOn, DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDateTime(insuranceApprovalModel.expiryDate)) ?? "", MyRichText(TranslationBase.of(context).expiryOn, DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(insuranceApprovalModel.expiryDate)) ?? "",
projectViewModel.isArabic), projectViewModel.isArabic),
], ],
), ),

@ -140,7 +140,7 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
MyRichText(TranslationBase.of(context).clinic + ":", model.insuranceApproval[index]?.clinicName.toLowerCase().capitalizeFirstofEach ?? "", MyRichText(TranslationBase.of(context).clinic + ":", model.insuranceApproval[index]?.clinicName != null ? model.insuranceApproval[index]?.clinicName.toLowerCase().capitalizeFirstofEach : "",
projectViewModel.isArabic), projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).approvalNo, model.insuranceApproval[index]?.approvalNo.toString() ?? "", projectViewModel.isArabic), MyRichText(TranslationBase.of(context).approvalNo, model.insuranceApproval[index]?.approvalNo.toString() ?? "", projectViewModel.isArabic),
], ],

@ -76,38 +76,37 @@ class _MyVaccinesState extends State<MyVaccines> {
bottomSheet: Container( bottomSheet: Container(
color: Colors.white, color: Colors.white,
padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21), padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
child: Row( child:
mainAxisSize: MainAxisSize.min, // Row(
children: [ // mainAxisSize: MainAxisSize.min,
Expanded( // children: [
child: DefaultButton( // Expanded(
TranslationBase.of(context).availability, // child: DefaultButton(
() { // TranslationBase.of(context).availability,
// Navigator.push(context, FadePage(page: MyVaccinesItemPage())); // () {
}, // // Navigator.push(context, FadePage(page: MyVaccinesItemPage()));
color: Color(0xffEAEAEA), // },
textColor: Color(0xff000000), // color: Color(0xffEAEAEA),
), // textColor: Color(0xff000000),
), // ),
SizedBox(width: 8), // ),
Expanded( // SizedBox(width: 8),
child: DefaultButton( DefaultButton(
TranslationBase.of(context).sendEmail, TranslationBase.of(context).sendEmail,
() { () {
showDialog( showDialog(
context: context, context: context,
child: ConfirmSendEmailDialog( child: ConfirmSendEmailDialog(
email: projectViewModel.user.emailAddress, email: projectViewModel.user.emailAddress,
onTapSendEmail: () { onTapSendEmail: () {
model.sendEmail(message: TranslationBase.of(context).emailSentSuccessfully); model.sendEmail(message: TranslationBase.of(context).emailSentSuccessfully);
}, },
), ),
); );
}, },
),
), ),
], // ],
), // ),
), ),
), ),
); );

Loading…
Cancel
Save