Merge branch 'master' into dev_aamir
# Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart # lib/presentation/book_appointment/select_clinic_page.dartdev_aamir
commit
cb2e3c7574
@ -0,0 +1,5 @@
|
||||
<svg width="11" height="13" viewBox="0 0 11 13" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M8.3125 9.18754C8.3125 9.5097 8.05133 9.77087 7.72917 9.77087H3.64583C3.32367 9.77087 3.0625 9.5097 3.0625 9.18753C3.0625 8.86537 3.32367 8.6042 3.64583 8.6042L7.72917 8.6042C8.05133 8.6042 8.3125 8.86537 8.3125 9.18754Z" fill="#D48D05"/>
|
||||
<path d="M7.72917 7.43754C8.05133 7.43754 8.3125 7.17637 8.3125 6.8542C8.3125 6.53204 8.05133 6.27087 7.72917 6.27087H5.97917C5.657 6.27087 5.39583 6.53204 5.39583 6.8542C5.39583 7.17637 5.657 7.43754 5.97917 7.43754H7.72917Z" fill="#D48D05"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.73382 12.4817C3.3068 12.5417 4.02593 12.5417 4.92491 12.5416H5.43552C6.53974 12.5417 7.42285 12.5417 8.11587 12.4537C8.83017 12.3629 9.42828 12.17 9.90594 11.7188C10.3885 11.263 10.5993 10.6844 10.6976 9.99371C10.7917 9.33241 10.7917 8.49251 10.7917 7.45491V3.86752C10.7917 3.40135 10.7917 3.02361 10.7714 2.71527C10.7505 2.39757 10.7064 2.11426 10.5995 1.8435C10.291 1.06224 9.64446 0.458909 8.84147 0.17599C8.3405 -0.000517334 7.48179 -0.000290103 6.5747 2.63095e-05C4.91826 -0.000183545 3.93438 -0.000307483 3.12796 0.28382C1.83296 0.74009 0.798282 1.71002 0.3063 2.95606C0.142319 3.37137 0.0696729 3.81745 0.034526 4.35227C-2.24045e-06 4.87769 -1.10714e-06 5.52671 3.38423e-07 6.35404L3.38423e-07 7.8611C-1.19404e-05 8.70582 -2.16874e-05 9.38986 0.0640774 9.93664C0.130643 10.5045 0.272541 10.9932 0.604942 11.4127C0.777131 11.63 0.98045 11.8217 1.20816 11.9828C1.64261 12.29 2.14499 12.4201 2.73382 12.4817ZM9.12738 10.8885C8.89802 11.1052 8.57364 11.2463 7.97325 11.3225C7.35988 11.4004 6.5489 11.4015 5.39582 11.4015H4.95693C4.01857 11.4015 3.35874 11.4008 2.85157 11.3477C2.35344 11.2956 2.07116 11.1983 1.86242 11.0507C1.72157 10.9511 1.59769 10.8338 1.49397 10.7029C1.3449 10.5148 1.24605 10.2623 1.19225 9.80338C1.13687 9.33102 1.13596 8.71425 1.13596 7.82557L1.13591 6.13379C1.1359 5.97803 1.136 5.60554 1.29969 5.33011C1.40057 5.16037 1.52973 5.01856 1.66241 4.94633C1.87621 4.82994 2.12132 4.76381 2.38188 4.76381L2.98876 4.7851C3.21048 4.7897 3.46921 4.7827 3.71896 4.71578C4.20545 4.58542 4.58543 4.20544 4.71579 3.71895C4.78271 3.4692 4.78971 3.21047 4.78511 2.98875L4.76382 2.38187C4.76382 2.10905 4.83638 1.87156 4.96316 1.65082C5.03707 1.52214 5.16584 1.40437 5.34361 1.30094C5.61319 1.14408 5.93601 1.14262 6.13327 1.14173C6.33053 1.14084 6.53865 1.14016 6.71251 1.14016C7.78242 1.14016 8.17157 1.1483 8.4652 1.25175C8.97423 1.4311 9.36256 1.8054 9.54344 2.26352C9.58874 2.37823 9.62073 2.52898 9.6379 2.79028C9.6554 3.05668 9.65569 3.39673 9.65569 3.88688V7.41097C9.65569 8.503 9.65433 9.26115 9.57302 9.83245C9.49457 10.3836 9.35187 10.6765 9.12738 10.8885Z" fill="#D48D05"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.7 KiB |
@ -0,0 +1,4 @@
|
||||
<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M7.32954 16.125C6.17371 16.125 4.2516 16.125 3.5149 16.0479C2.75784 15.9687 2.11193 15.8014 1.55335 15.4064C1.26058 15.1994 0.999168 14.9528 0.777782 14.6734C0.35041 14.1341 0.16797 13.5057 0.082385 12.7757C-2.81744e-05 12.0727 -1.53024e-05 11.1932 4.33207e-07 10.1071V8.16951C-9.97304e-07 7.10582 -2.42796e-06 6.27131 0.0443906 5.59578C0.0895791 4.90815 0.182981 4.33462 0.393815 3.80065C1.02636 2.1986 2.35666 0.951546 4.02166 0.364913C5.05849 -0.000393972 6.32348 -0.000236608 8.45319 3.37585e-05C9.61944 -0.000372507 10.7235 -0.000664338 11.3676 0.226273C12.4 0.590027 13.2313 1.36573 13.6279 2.37021C13.7654 2.71833 13.8221 3.08259 13.849 3.49106C13.875 3.88749 13.875 4.37316 13.875 4.97253V5.83223C13.875 6.23555 13.548 6.5625 13.1447 6.5625C12.7414 6.5625 12.4145 6.23555 12.4145 5.83223V4.99742C12.4145 4.36722 12.4141 3.93001 12.3916 3.58751C12.3695 3.25154 12.3284 3.05773 12.2701 2.91025C12.0376 2.32122 11.5383 1.83999 10.8838 1.6094C10.5063 1.47639 10.006 1.46592 8.63037 1.46592C8.40683 1.46592 8.13925 1.4668 7.88563 1.46794C7.63201 1.46909 7.21696 1.47096 6.87035 1.67263C6.6418 1.80562 6.47623 1.95704 6.38121 2.12248C6.2182 2.40629 6.12491 2.71164 6.12491 3.0624L6.15228 3.84268C6.1582 4.12775 6.14919 4.4604 6.06315 4.78151C5.89556 5.40699 5.407 5.89555 4.78152 6.06314C4.46041 6.14919 4.12776 6.15819 3.84268 6.15227L3.06241 6.1249C2.72741 6.1249 2.41226 6.20992 2.13738 6.35957C1.96679 6.45243 1.80073 6.63476 1.67103 6.85299C1.46057 7.20712 1.46044 7.68604 1.46045 7.88631L1.46052 10.0614C1.46052 11.204 1.4617 11.997 1.53289 12.6044C1.60207 13.1944 1.72915 13.519 1.92082 13.7609C2.05417 13.9292 2.21345 14.08 2.39454 14.2081C2.66291 14.3978 3.02586 14.5229 3.6663 14.5899C4.31838 14.6581 6.12307 14.6591 7.32954 14.6591C7.73434 14.6591 8.0625 14.9872 8.0625 15.3921C8.0625 15.7969 7.73434 16.125 7.32954 16.125Z" fill="#F43333"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1909 7.74268C12.0592 7.4633 11.7697 7.29324 11.4615 7.31423C11.1534 7.33522 10.8896 7.54297 10.797 7.83762L9.72246 11.2566L9.33448 10.4336C9.23436 10.2212 9.13716 10.0149 9.03714 9.84819C8.92509 9.6614 8.77697 9.46633 8.54751 9.31592C8.31524 9.16367 8.07628 9.10728 7.8576 9.0833C7.66706 9.0624 7.44476 9.06245 7.22295 9.06249L6.5625 9.06249C6.14829 9.06249 5.8125 9.39828 5.8125 9.81249C5.8125 10.2267 6.14829 10.5625 6.5625 10.5625H7.19274C7.45714 10.5625 7.59536 10.5635 7.69409 10.5744C7.70631 10.5757 7.71628 10.577 7.72429 10.5783C7.73108 10.5881 7.73992 10.6016 7.75086 10.6199C7.80748 10.7142 7.8728 10.8507 7.99016 11.0997L9.18411 13.6323C9.31581 13.9117 9.60532 14.0817 9.91347 14.0608C10.2216 14.0398 10.4854 13.832 10.578 13.5374L11.6525 10.1184L12.0405 10.9414C12.1406 11.1538 12.2378 11.3601 12.3379 11.5268C12.4499 11.7136 12.598 11.9087 12.8275 12.0591C13.0598 12.2113 13.2987 12.2677 13.5174 12.2917C13.7079 12.3126 13.9302 12.3125 14.1521 12.3125L14.8125 12.3125C15.2267 12.3125 15.5625 11.9767 15.5625 11.5625C15.5625 11.1483 15.2267 10.8125 14.8125 10.8125H14.1823C13.9179 10.8125 13.7796 10.8115 13.6809 10.8006C13.6687 10.7993 13.6587 10.7979 13.6507 10.7967C13.6439 10.7869 13.6351 10.7734 13.6241 10.7551C13.5675 10.6608 13.5022 10.5242 13.3848 10.2753L12.1909 7.74268ZM7.70832 10.5571L7.70719 10.5559C7.70719 10.5559 7.70757 10.5563 7.70832 10.5571ZM13.6667 10.8179L13.6678 10.8191C13.6678 10.8191 13.6674 10.8187 13.6667 10.8179Z" fill="#F43333"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.4 KiB |
@ -0,0 +1,3 @@
|
||||
<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 6.27083C0 9.73408 2.80758 12.5417 6.27083 12.5417C9.73408 12.5417 12.5417 9.73408 12.5417 6.27083C12.5417 2.80758 9.73408 0 6.27083 0C2.80758 0 0 2.80758 0 6.27083ZM8.9985 4.09091C9.23592 4.30849 9.25167 4.67774 9.03409 4.91515L5.82576 8.41515C5.71842 8.5324 5.56733 8.60067 5.40867 8.60417C5.24941 8.60767 5.096 8.54585 4.98341 8.43327L3.52508 6.97494C3.297 6.74744 3.297 6.37756 3.52508 6.15006C3.75258 5.92198 4.12242 5.92198 4.34992 6.15006L5.37775 7.17734L8.17424 4.12651C8.39183 3.8891 8.76108 3.87333 8.9985 4.09091Z" fill="#18C273"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 697 B |
@ -0,0 +1,101 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_assets.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_export.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/features/medical_file/models/patient_medical_response_model.dart';
|
||||
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
|
||||
import 'package:hmg_patient_app_new/presentation/medical_report/medical_reports_page.dart';
|
||||
import 'package:hmg_patient_app_new/presentation/monthly_report/monthly_report.dart';
|
||||
import 'package:hmg_patient_app_new/theme/colors.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
|
||||
|
||||
class MedicalReportCard extends StatelessWidget {
|
||||
final bool isLoading;
|
||||
final List<PatientMedicalReportResponseModel> listRequest;
|
||||
final List<PatientMedicalReportResponseModel> listReady;
|
||||
final VoidCallback? onViewDetails;
|
||||
|
||||
const MedicalReportCard({
|
||||
super.key,
|
||||
required this.isLoading,
|
||||
required this.listRequest,
|
||||
required this.listReady,
|
||||
this.onViewDetails,
|
||||
});
|
||||
|
||||
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
|
||||
color: AppColors.whiteColor,
|
||||
borderRadius: 24,
|
||||
hasShadow: true,
|
||||
),
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(16.h),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
LocaleKeys.medicalReport.tr().toText18(
|
||||
isBold: true,
|
||||
weight: FontWeight.w700,
|
||||
).toShimmer2(isShow: isLoading),
|
||||
SizedBox(height: 12.h),
|
||||
Wrap(
|
||||
spacing: 8.w,
|
||||
runSpacing: 8.h,
|
||||
children: [
|
||||
if ( listRequest.isNotEmpty )
|
||||
AppCustomChipWidget(
|
||||
labelText: '${listRequest.length.toString().padLeft(2, '0')} ${LocaleKeys.requested.tr()}',
|
||||
icon: AppAssets.document,
|
||||
iconColor: AppColors.alertColor,
|
||||
textColor: AppColors.alertColor,
|
||||
backgroundColor: AppColors.warningColorYellow.withOpacity(.2),
|
||||
iconSize: 14.w,
|
||||
),
|
||||
if (listReady.isNotEmpty)
|
||||
AppCustomChipWidget(
|
||||
labelText: '${listRequest.length.toString().padLeft(2, '0')} ${LocaleKeys.readyToDownload.tr()}',
|
||||
icon: AppAssets.sucess,
|
||||
iconColor: AppColors.successColor,
|
||||
textColor: AppColors.successColor,
|
||||
backgroundColor: AppColors.switchBackgroundColor,
|
||||
iconSize: 14.w,
|
||||
),
|
||||
],
|
||||
).toShimmer2(isShow: isLoading),
|
||||
SizedBox(height: 16.h),
|
||||
CustomButton(
|
||||
text: LocaleKeys.viewDetails.tr(),
|
||||
icon: AppAssets.report,
|
||||
borderWidth: 0,
|
||||
isDisabled: false,
|
||||
onPressed: (){
|
||||
Navigator.of(context).push(
|
||||
CustomPageRoute(
|
||||
page: MedicalReportsPage(),
|
||||
),
|
||||
);
|
||||
},
|
||||
backgroundColor: AppColors.lightRedButtonColor,
|
||||
borderColor: AppColors.lightRedButtonColor,
|
||||
textColor: AppColors.primaryRedColor,
|
||||
iconColor: AppColors.primaryRedColor,
|
||||
fontSize: 14.f,
|
||||
fontWeight: FontWeight.w600,
|
||||
borderRadius: 12.r,
|
||||
height: 48.h,
|
||||
).toShimmer2(isShow: isLoading),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue