statuses colors changed.

main_production_RSG
Sikander Saleem 1 month ago
parent 14aa5cccfb
commit e91effa914

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M20.8135 7.57324L20.8125 7.67773V7.71094C20.8123 7.73249 20.812 7.76465 20.8115 7.80566C20.8105 7.88864 20.8083 8.01042 20.8057 8.16406C20.8004 8.4723 20.7921 8.91198 20.7764 9.43457C20.7448 10.4801 20.6861 11.8642 20.5801 13.2119L20.082 13.1729C20.1872 11.8363 20.2449 10.4613 20.2764 9.41992C20.2921 8.8998 20.3005 8.46273 20.3057 8.15625C20.3071 8.06866 20.3087 7.991 20.3096 7.92578H14.8867V2.5H6.7832C6.35169 2.50045 6.00579 2.8639 6.02539 3.29785C6.04387 3.70083 6.06291 4.20258 6.08203 4.77246C6.13033 4.82584 6.17674 4.87881 6.22461 4.92773C6.8718 5.58898 7.94448 6.29691 8.57812 6.68945C8.82035 6.84033 8.80071 7.21085 8.5459 7.33789C7.9054 7.65664 6.84964 8.23073 6.22363 8.8291C6.19641 8.85513 6.17072 8.88356 6.14355 8.91113C6.13336 10.3165 6.08617 11.7427 5.96973 12.9658C5.71064 15.6866 4.92271 19.4278 4.49512 21.3359C4.38867 21.8125 4.75053 22.2673 5.23535 22.2676H17.7295C18.0658 22.2676 18.359 22.0436 18.4453 21.7217C18.5153 21.4593 18.6001 21.1359 18.6934 20.7715L18.9355 20.834L19.1777 20.8955C19.084 21.2615 18.999 21.586 18.9287 21.8496C18.7834 22.3935 18.2895 22.7676 17.7295 22.7676H5.23535C4.42682 22.7673 3.83112 22.0122 4.00684 21.2266C4.43467 19.3173 5.2169 15.6037 5.47266 12.918C5.57102 11.8845 5.61734 10.7017 5.63574 9.50879C5.22908 10.0487 4.86326 10.6668 4.62109 11.1084C4.4782 11.3688 4.08341 11.3604 3.95117 11.0947C3.63068 10.4474 3.07383 9.42863 2.4834 8.82812C1.90897 8.24419 0.92838 7.67584 0.318359 7.35254C0.0657916 7.2187 0.0545002 6.84457 0.300781 6.69824C0.945658 6.3158 2.02771 5.61993 2.64062 4.92969C3.16589 4.33808 3.67898 3.37717 3.97461 2.77344C4.10088 2.51608 4.47381 2.49734 4.62402 2.74219C4.85512 3.11892 5.19316 3.64521 5.55957 4.13477C5.54785 3.83368 5.53733 3.56035 5.52637 3.32129C5.49356 2.60514 6.06356 2.00045 6.7832 2H15.2402L20.8135 7.57324ZM19.583 13.501C21.4779 13.501 23.0146 15.0368 23.0146 16.9316C23.0146 18.8266 21.4779 20.3633 19.583 20.3633C18.1728 20.3631 16.9619 19.5114 16.4346 18.2949C16.4235 18.2964 16.4119 18.2988 16.4004 18.2988H7.7832C7.64536 18.2986 7.53324 18.1867 7.5332 18.0488C7.5332 17.9109 7.64533 17.7991 7.7832 17.7988H16.2637C16.1915 17.5218 16.1523 17.2313 16.1523 16.9316C16.1524 16.3797 16.2831 15.8584 16.5146 15.3965C16.4803 15.4143 16.4418 15.4258 16.4004 15.4258H7.7832C7.64533 15.4255 7.5332 15.3137 7.5332 15.1758C7.53343 15.0381 7.64548 14.926 7.7832 14.9258H16.4004C16.5307 14.9258 16.6368 15.026 16.6484 15.1533C17.25 14.1626 18.3393 13.5011 19.583 13.501ZM20.7666 15.749C20.642 15.6244 20.4401 15.6244 20.3154 15.749L19.583 16.4805L18.8516 15.749C18.7269 15.6244 18.525 15.6244 18.4004 15.749C18.2759 15.8737 18.2758 16.0756 18.4004 16.2002L19.1318 16.9316L18.4004 17.6631C18.2757 17.7877 18.2758 17.9906 18.4004 18.1152C18.525 18.2395 18.727 18.2395 18.8516 18.1152L19.583 17.3828L20.3154 18.1152C20.44 18.2396 20.642 18.2396 20.7666 18.1152C20.8912 17.9906 20.8912 17.7877 20.7666 17.6631L20.0352 16.9316L20.7666 16.2002C20.8912 16.0756 20.891 15.8737 20.7666 15.749ZM16.4004 12.0547C16.5385 12.0547 16.6504 12.1666 16.6504 12.3047C16.6501 12.4425 16.5383 12.5547 16.4004 12.5547H7.7832C7.64549 12.5545 7.53347 12.4424 7.5332 12.3047C7.5332 12.1668 7.64533 12.0549 7.7832 12.0547H16.4004ZM12.5703 9.18066C12.7082 9.18066 12.8201 9.29281 12.8203 9.43066C12.8203 9.56874 12.7084 9.68066 12.5703 9.68066H7.7832C7.64533 9.68043 7.5332 9.56859 7.5332 9.43066C7.53345 9.29295 7.64549 9.1809 7.7832 9.18066H12.5703Z" fill="#3B3D4A"/>
</svg>

After

Width:  |  Height:  |  Size: 3.5 KiB

@ -152,8 +152,8 @@ class HistoryLogView extends StatelessWidget {
radius: 4,
label: statusText(status.toLowerCase()),
labelInCenter: true,
textColor: AppColor.getHistoryLogStatusTextColorByName(status),
backgroundColor: AppColor.getHistoryLogStatusColorByName(status),
textColor: AppColor.getHistoryLogStatusTextColorByName(context, status),
backgroundColor: AppColor.getHistoryLogStatusColorByName(context, status),
),
).paddingOnly(bottom: 16, start: 40);
}

@ -164,8 +164,8 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
StatusLabel(
radius: 4,
label: workOrder.status!.name,
textColor: AppColor.getHistoryLogStatusTextColorByName(workOrder.status!.name!),
backgroundColor: AppColor.getHistoryLogStatusColorByName(workOrder.status!.name!),
textColor: AppColor.getHistoryLogStatusTextColorByName(context, workOrder.status!.name!),
backgroundColor: AppColor.getHistoryLogStatusColorByName(context, workOrder.status!.name!),
),
if (workOrder.since != null) ...[
8.width,

@ -81,8 +81,8 @@ class _MedicalGasInspectionDetailPageState extends State<MedicalGasInspectionDet
],
StatusLabel(
label: model?.requestStatus?.name,
textColor: AppColor.getHistoryLogStatusTextColorByName(model?.requestStatus?.name ?? ''),
backgroundColor: AppColor.getHistoryLogStatusColorByName(model?.requestStatus?.name ?? ''),
textColor: AppColor.getHistoryLogStatusTextColorByName(context, model?.requestStatus?.name ?? ''),
backgroundColor: AppColor.getHistoryLogStatusColorByName(context, model?.requestStatus?.name ?? ''),
),
1.width.expanded,
InfoDateWidget(model!.requestedDate?.toString() ?? ""),

@ -41,8 +41,8 @@ class MedicalGasInspectionItemView extends StatelessWidget {
],
StatusLabel(
label: requestData!.statusName!,
textColor: AppColor.getHistoryLogStatusTextColorByName(requestData!.statusName!),
backgroundColor: AppColor.getHistoryLogStatusColorByName(requestData!.statusName!),
textColor: AppColor.getHistoryLogStatusTextColorByName(context, requestData!.statusName!),
backgroundColor: AppColor.getHistoryLogStatusColorByName(context, requestData!.statusName!),
),
1.width.expanded,
InfoDateWidget(requestData!.transactionDate ?? ""),
@ -79,8 +79,8 @@ class MedicalGasInspectionItemView extends StatelessWidget {
],
StatusLabel(
label: requestDetails!.status!,
textColor: AppColor.getHistoryLogStatusTextColorByName(requestDetails!.status!),
backgroundColor: AppColor.getHistoryLogStatusColorByName(requestDetails!.status!),
textColor: AppColor.getHistoryLogStatusTextColorByName(context, requestDetails!.status!),
backgroundColor: AppColor.getHistoryLogStatusColorByName(context, requestDetails!.status!),
),
1.width.expanded,
InfoDateWidget(requestDetails!.date ?? ""),

@ -107,6 +107,28 @@ class AppColor {
static const Color unassignedColor = Color(0xff9F9FA8);
static const Color lowPriorityColor = Color(0xff54C166);
static const Color greenStatusColor = Color(0x1518C273);
static const Color greenStatusTextColor = Color(0xff18C273);
static const Color blueStatusColor = Color(0x303DA5E5);
static const Color blueStatusTextColor = inProgressChartColor; //Color(0xff144F79);
static const Color yellowStatusColor = Color(0x30F4A308);
static const Color yellowStatusTextColor = Color(0xffD48D05);
static const Color redStatusColor = Color(0x30F63939);
static const Color redStatusTextColor = Color(0xffF63939);
static const Color defaultStatusColorLight = Color(0xffEFEFF0);
static const Color defaultStatusTextColorLight = Color(0xff2B353E);
static const Color defaultStatusColorDark = Color(0xff262A3E);
static const Color defaultStatusTextColorDark = Colors.white;
static Color defaultStatusColor(BuildContext context) => context.isDark ? defaultStatusColorDark : defaultStatusColorLight;
static Color defaultStatusTextColor(BuildContext context) => context.isDark ? defaultStatusTextColorDark : defaultStatusTextColorLight;
// static Color greenStatus(BuildContext context) => context.isDark ? const Color(0xff1FA269) : green50;
static Color greenStatus(BuildContext context) => context.isDark ? completedColor : green70.withOpacity(.5);
@ -171,47 +193,58 @@ class AppColor {
static Color selectedButtonColor(BuildContext context) => context.isDark ? neutral60 : neutral30;
static Color unSelectedButtonColor(BuildContext context) => context.isDark ? neutral60 : Colors.white;
static Color noButtonColor(BuildContext context) => context.isDark ?AppColor.neutral70 : AppColor.white60;
static Color noButtonColor(BuildContext context) => context.isDark ? AppColor.neutral70 : AppColor.white60;
static Color filterButtonTextColor(BuildContext context) => context.isDark ? neutral30 : neutral50;
static Color getRequestStatusTextColorByName(BuildContext context, String? status) {
switch ((status ?? "").toLowerCase()) {
case "open":
return blueStatusTextColor;
case "in progress":
return orange60;
return yellowStatusTextColor;
case "high priority":
return white10;
return redStatusTextColor;
case "emergency":
return white10;
return redStatusTextColor;
case "yes":
return white10;
return redStatusTextColor;
case "request completed":
return greenStatusTextColor;
case "low priority":
return green15;
return greenStatusTextColor;
case "low":
return green15;
return greenStatusTextColor;
case "close":
return defaultStatusTextColor(context);
case "closed":
return defaultStatusTextColor(context);
default:
return Colors.white;
return yellowStatusTextColor;
}
}
static Color getHistoryLogStatusTextColorByName(String status) {
static Color getHistoryLogStatusTextColorByName(BuildContext context,String status) {
switch ((status).toLowerCase()) {
case "in progress":
return white936;
return yellowStatusTextColor;
case "waiting for delivery":
return white936;
return yellowStatusTextColor;
case "new":
return primary63;
return blueStatusTextColor;
case "open":
return primary63;
return blueStatusTextColor;
case "close":
return defaultStatusTextColor(context);
case "closed":
return black1E;
return defaultStatusTextColor(context);
case "completed":
return green15;
return greenStatusTextColor;
case "fixed":
return green15;
return greenStatusTextColor;
default:
return Colors.white;
return defaultStatusTextColor(context);
}
}
@ -222,7 +255,7 @@ class AppColor {
case "External":
return white90;
default:
return primary10;
return blueStatusColor;
}
}
@ -233,131 +266,124 @@ class AppColor {
case "External":
return black10;
default:
return Colors.white;
return blueStatusTextColor;
}
}
static Color getHistoryLogStatusColorByName(String status) {
static Color getHistoryLogStatusColorByName(BuildContext context,String status) {
switch ((status).toLowerCase()) {
case "in progress":
return orange30;
return yellowStatusColor;
case "new":
return primary10.withOpacity(.30);
return blueStatusColor;
case "open":
return primary10.withOpacity(.30);
return blueStatusColor;
case "close":
return defaultStatusColor(context);
case "closed":
return white936.withOpacity(.30);
return defaultStatusColor(context);
case "completed":
return green70.withOpacity(.5);
return greenStatusTextColor;
case "fixed":
return green70.withOpacity(.5);
return greenStatusTextColor;
case "reject":
return red30;
return redStatusColor;
case "cancelled":
return red30;
return redStatusColor;
case "canceled":
return red30;
return redStatusColor;
case "returned":
return red30;
return redStatusColor;
case "waiting for delivery":
return orange30;
return yellowStatusColor;
case "waiting for medical gas specialist review":
return orange30;
return yellowStatusColor;
case "reviewed":
return orange30;
return yellowStatusColor;
case "returned for correction":
return orange30;
return yellowStatusColor;
default:
return Colors.white;
return defaultStatusColor(context);
}
}
static Color getRequestStatusColorByName(BuildContext context, String? status) {
switch ((status ?? "").toLowerCase()) {
case "medium":
return blueStatus(context);
return blueStatusColor;
case "in progress":
return yellowStatus(context);
return yellowStatusColor;
case "complete":
return greenStatus(context);
return greenStatusColor;
case "request completed":
return greenStatusColor;
case "close":
return defaultStatusColor(context);
case "closed":
return greenStatus(context);
return defaultStatusColor(context);
case "high priority":
return redStatus(context);
return redStatusColor;
case "emergency":
return redStatus(context);
return redStatusColor;
case "yes":
return redStatus(context);
return redStatusColor;
case "low priority":
return greenStatus(context);
return greenStatusColor;
case "open":
return blueStatus(context);
return blueStatusColor;
default:
return greenStatus(context);
return yellowStatusColor;
}
}
static Color getRequestStatusColor(BuildContext context, int id) {
switch (id) {
case 1:
return blueStatus(context);
case 2:
return yellowStatus(context);
case 3:
return greenStatus(context);
case 4:
return redStatus(context);
case 6:
return greenStatus(context);
case 5:
return greenStatus(context);
case 8:
return greenStatus(context);
case 9:
return orange40;
default:
return blueStatus(context);
}
}
// static Color getRequestStatusColor(BuildContext context, int id) {
// switch (id) {
// case 1:
// return blueStatus(context);
// case 2:
// return yellowStatus(context);
// case 3:
// return greenStatus(context);
// case 4:
// return redStatus(context);
// case 6:
// return greenStatus(context);
// case 5:
// return greenStatus(context);
// case 8:
// return greenStatus(context);
// case 9:
// return orange40;
// default:
// return blueStatus(context);
// }
// }
static Color demoRequestStatus(BuildContext context, int id) {
switch (id) {
case 1:
return blueStatus(context);
return blueStatusColor;
case 2:
return yellowStatus(context);
return yellowStatusColor;
case 3:
return greenStatus(context);
return greenStatusColor;
case 4:
return yellowStatus(context);
return yellowStatusColor;
default:
return yellowStatus(context);
}
}
static Color getRequestStatusTextColor(BuildContext context, int id) {
switch (id) {
case 2:
return orange60;
case 4:
return red60;
case 9:
return orange60;
default:
return Colors.white;
return yellowStatusColor;
}
}
static Color demoRequestStatusTextColor(BuildContext context, int id) {
switch (id) {
case 2:
return orange60;
return yellowStatusTextColor;
case 4:
return orange60;
return yellowStatusTextColor;
case 9:
return orange60;
return yellowStatusTextColor;
default:
return orange60;
return yellowStatusTextColor;
}
}
@ -365,19 +391,19 @@ class AppColor {
switch (id) {
//low priority
case 81:
return green15;
return greenStatusTextColor;
case 370:
return green15;
return greenStatusTextColor;
case 0:
return green15;
return greenStatusTextColor;
case 1:
//high priority
return white10;
return redStatusTextColor;
case 82:
//high priority
return white10;
return redStatusColor;
default:
return blueStatus(context);
return defaultStatusTextColor(context);
}
}
@ -385,18 +411,18 @@ class AppColor {
switch (id) {
//low priority
case 81:
return greenStatus(context);
return greenStatusColor;
case 370:
return greenStatus(context);
return greenStatusColor;
case 0:
return greenStatus(context);
return greenStatusColor;
//high priority
case 82:
return redStatus(context);
return redStatusColor;
case 1:
return redStatus(context);
return redStatusColor;
default:
return blueStatus(context);
return defaultStatusColor(context);
}
}

@ -45,8 +45,8 @@ class ServiceRequestItemView extends StatelessWidget {
],
StatusLabel(
label: requestData!.statusName!,
textColor: AppColor.getHistoryLogStatusTextColorByName(requestData!.statusName!),
backgroundColor: AppColor.getHistoryLogStatusColorByName(requestData!.statusName!),
textColor: AppColor.getHistoryLogStatusTextColorByName(context, requestData!.statusName!),
backgroundColor: AppColor.getHistoryLogStatusColorByName(context, requestData!.statusName!),
),
1.width.expanded,
InfoDateWidget(requestData!.transactionDate!),

@ -14,10 +14,10 @@ class NoDataFound extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
spacing: 16,
children: [
Image.asset("assets/images/no_data_found.png", height: 64, width: 64,color: AppColor.lightTextColor(context)),
16.height,
Text(message ?? "no Data found", style: AppTextStyles.heading6.copyWith(color: AppColor.lightTextColor(context))),
"no_data_found".toSvgAsset(height: 64, width: 64, color: AppColor.lightTextColor(context)),
Text(message ?? "no Data found", style: AppTextStyles.heading6.copyWith(color: AppColor.lightTextColor(context))),
],
);
}

Loading…
Cancel
Save