improvements

main_production
Sikander Saleem 6 days ago
parent f4643920df
commit a08a578ef4

@ -329,7 +329,7 @@ class DashBoardProvider extends ChangeNotifier {
if (!statusTransaction.contains(5)) statusTransaction.add(5); if (!statusTransaction.contains(5)) statusTransaction.add(5);
break; break;
case RequestTypeEnum.pendingAcknowledgment: case RequestTypeEnum.pendingAcknowledgment:
if (!statusTransaction.contains(3)) statusTransaction.add(3); if (!statusTransaction.contains(4)) statusTransaction.add(4);
break; break;
case RequestTypeEnum.unassigned: case RequestTypeEnum.unassigned:
case RequestTypeEnum.highPriority: case RequestTypeEnum.highPriority:
@ -605,7 +605,7 @@ class CategoryTabs {
tabs.add(CategoryTabs(label: 'Open', tag: 1, id: 2, requestType: RequestTypeEnum.open, icon: "dashboard/open_icon", iconColor: AppColor.openColor)); tabs.add(CategoryTabs(label: 'Open', tag: 1, id: 2, requestType: RequestTypeEnum.open, icon: "dashboard/open_icon", iconColor: AppColor.openColor));
tabs.add(CategoryTabs(label: 'In Progress', tag: 2, id: 3, requestType: RequestTypeEnum.inProgress, icon: "dashboard/inprogress_icon", iconColor: AppColor.primary10)); tabs.add(CategoryTabs(label: 'In Progress', tag: 2, id: 3, requestType: RequestTypeEnum.inProgress, icon: "dashboard/inprogress_icon", iconColor: AppColor.primary10));
// tabs.add(CategoryTabs(label: 'Pending Acknowledgement', tag: 3, id: 1, requestType: RequestTypeEnum.pendingAcknowledgment, icon: "complete_request", iconColor: AppColor.overdueColor)); // tabs.add(CategoryTabs(label: 'Pending Acknowledgement', tag: 3, id: 1, requestType: RequestTypeEnum.pendingAcknowledgment, icon: "complete_request", iconColor: AppColor.overdueColor));
tabs.add(CategoryTabs(label: 'Acknowledgement', tag: 3, id: 1, requestType: RequestTypeEnum.pendingAcknowledgment, icon: "complete_request", iconColor: AppColor.overdueColor)); tabs.add(CategoryTabs(label: 'Acknowledgement', tag: 4, id: 1, requestType: RequestTypeEnum.pendingAcknowledgment, icon: "complete_request", iconColor: AppColor.overdueColor));
tabs.add(CategoryTabs(label: 'Canceled', tag: 6, id: 4, requestType: RequestTypeEnum.canceled, icon: "dashboard/unassigned", iconColor: AppColor.red30)); tabs.add(CategoryTabs(label: 'Canceled', tag: 6, id: 4, requestType: RequestTypeEnum.canceled, icon: "dashboard/unassigned", iconColor: AppColor.red30));
return tabs; return tabs;
} }

@ -10,6 +10,7 @@ import 'package:test_sa/modules/asset_delivery_module/provider/asset_delivery_pr
import 'package:test_sa/modules/cm_module/cm_request_utils.dart'; import 'package:test_sa/modules/cm_module/cm_request_utils.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart';
class AssetDeliveryHistoryLogView extends StatefulWidget { class AssetDeliveryHistoryLogView extends StatefulWidget {
@ -126,7 +127,7 @@ class _AssetDeliveryHistoryLogViewState extends State<AssetDeliveryHistoryLogVie
child: Text( child: Text(
object.createdDate.toString().toServiceRequestCardFormat, object.createdDate.toString().toServiceRequestCardFormat,
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120), style: AppTextStyles.tinyFont.copyWith(color: AppColor.labelTextStyleColor(context)),
), ),
).expanded, ).expanded,
Expanded( Expanded(
@ -134,7 +135,7 @@ class _AssetDeliveryHistoryLogViewState extends State<AssetDeliveryHistoryLogVie
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
title.bodyText(context).custom(color: AppColor.textColor(context)), InfoHeaderWidget(title),
// object.timeDifference.isNotEmpty ? object.timeDifference?.tinyFont(context).custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120) : const SizedBox(), // object.timeDifference.isNotEmpty ? object.timeDifference?.tinyFont(context).custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120) : const SizedBox(),
], ],
), ),

@ -15,6 +15,8 @@ import 'package:test_sa/modules/cm_module/cm_request_utils.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart';
@ -106,7 +108,7 @@ class HistoryLogView extends StatelessWidget {
child: Text( child: Text(
object.date.toString().toServiceRequestCardFormat, object.date.toString().toServiceRequestCardFormat,
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120), style: AppTextStyles.tinyFont.copyWith(color: AppColor.labelTextStyleColor(context)),
), ),
).expanded, ).expanded,
Expanded( Expanded(
@ -123,8 +125,8 @@ class HistoryLogView extends StatelessWidget {
context.fullScreenImageViewer(Image.network(URLs.getFileUrl(object.photoVerfication ?? '')!)); context.fullScreenImageViewer(Image.network(URLs.getFileUrl(object.photoVerfication ?? '')!));
}), }),
], ],
title.bodyText(context).custom(color: AppColor.textColor(context)), InfoHeaderWidget(title),
object.timeDifference.isNotEmpty ? object.timeDifference.tinyFont(context).custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120) : const SizedBox(), if (object.timeDifference.isNotEmpty) InfoTextLabelWidget(label: object.timeDifference, textStyle: AppTextStyles.tinyFont),
], ],
), ),
), ),

Loading…
Cancel
Save