Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

improvements

Browse Source
design_3.0_latest
Sikander Saleem 1 year ago
parent c9ce003b29
commit 0d9e119c32
8 changed files with 89 additions and 83 deletions
Show Stats Download Patch File Download Diff File

9
lib/dashboard_latest/widgets/app_bar_widget.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
import 'package:test_sa/controllers/providers/api/notifications_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/dashboard_latest/dashboard_provider.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart';
@ -88,9 +89,11 @@ class AppBarWidget extends StatelessWidget {
if (settingProvider.assetGroup != newValue) {
settingProvider.setAssetGroup(newValue);
WidgetsBinding.instance.addPostFrameCallback((_) {
Provider.of<AllRequestsProvider>(context, listen: false).getRequests();
Provider.of<NotificationsProvider>(context, listen: false)
.getSystemNotifications(user: Provider.of<UserProvider>(context, listen: false).user!, resetProvider: true); // Added null check
DashBoardProvider dashBoardProvider = Provider.of<DashBoardProvider>(context, listen: false);
dashBoardProvider.setTabs(userType: settingProvider.user!.type!, context: context);
dashBoardProvider.getDashBoardCount(usersType: settingProvider.user!.type!);
dashBoardProvider.resetRequestDataList();
dashBoardProvider.getRequestDetail(usersType: settingProvider.user!.type!, status: dashBoardProvider.tabs[dashBoardProvider.currentListIndex].tag);
});
}
},

5
lib/models/new_models/dashboard_detail.dart
Unescape Escape View File

@ -51,8 +51,9 @@ class Data {
String? requestTypeName;
String? requestNo;
int? transactionNo;
String? nameOfType;
Data({this.id, this.typeTransaction, this.transactionDate, this.statusName, this.priorityName, this.isHighPriority, this.assetName, this.assetNumber, this.requestTypeName, this.requestNo,this.transactionNo});
Data({this.id, this.typeTransaction, this.nameOfType,this.transactionDate, this.statusName, this.priorityName, this.isHighPriority, this.assetName, this.assetNumber, this.requestTypeName, this.requestNo,this.transactionNo});
Data.fromJson(Map<String, dynamic> json) {
id = json['id'];
@ -66,6 +67,7 @@ class Data {
requestTypeName = json['requestTypeName'];
requestNo = json['requestNo'];
transactionNo = json['transactionNo'];
nameOfType = json['nameOfType'];
}
Map<String, dynamic> toJson() {
@ -81,6 +83,7 @@ class Data {
data['requestTypeName'] = requestTypeName;
data['requestNo'] = requestNo;
data['transactionNo'] = transactionNo;
data['nameOfType'] = nameOfType;
return data;
}
}

12
lib/new_views/pages/land_page/requests/asset_item_view.dart
Unescape Escape View File

@ -21,8 +21,7 @@ class AssetItemView extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (requestData!=null) {
if (requestData != null) {
return Column(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
@ -53,7 +52,7 @@ class AssetItemView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
context.translation.deviceTransferRequest.heading5(context),
(requestData?.typeTransaction ?? context.translation.deviceTransferRequest).heading5(context),
// "${context.translation.from} : ${request.siteTransferFrom?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context), // todo ask ahmed
// "${context.translation.to} : ${request.siteTransferTo?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context),// todo ask ahmed
requestData!.statusName!.replaceAll("=", ":").bodyText(context),
@ -81,7 +80,7 @@ class AssetItemView extends StatelessWidget {
});
}
if(requestDetails!=null) {
if (requestDetails != null) {
return Column(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
@ -103,7 +102,8 @@ class AssetItemView extends StatelessWidget {
// backgroundColor: AppColor.getRequestStatusColorByName(context, request.status),
// ),
1.width.expanded,
Text(requestDetails!.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
Text(requestDetails!.date?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
],
),
8.height,
@ -111,7 +111,7 @@ class AssetItemView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
context.translation.deviceTransferRequest.heading5(context),
(requestDetails?.nameOfType ?? context.translation.deviceTransferRequest).heading5(context),
"${context.translation.from} : ${requestDetails!.siteTransferFrom?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context),
"${context.translation.to} : ${requestDetails!.siteTransferTo?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context),
requestDetails!.status!.replaceAll("=", ":").bodyText(context),

115
lib/new_views/pages/land_page/requests/gas_refill_item_view.dart
Unescape Escape View File

@ -21,67 +21,67 @@ class GasRefillItemView extends StatelessWidget {
@override
Widget build(BuildContext context) {
if(requestData!=null) {
if (requestData != null) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
),
8.width,
StatusLabel(
label: requestData!.statusName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.statusName!),
),
1.width.expanded,
Text(requestData!.transactionDate?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
],
),
8.height,
context.translation.gasRefillRequest.heading5(context),
// '${context.translation.gasType}: ${request.gasType}'.bodyText(context), // todo ask ahmed
// '${context.translation.site}: ${request.site?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),// todo ask ahmed
'${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context),
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
context.translation.viewDetails,
style: AppTextStyles.bodyText.copyWith(
color: AppColor.blueStatus(context),
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
),
8.width,
StatusLabel(
label: requestData!.statusName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.statusName!),
),
1.width.expanded,
Text(requestData!.transactionDate?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
],
),
8.height,
(requestData?.typeTransaction ?? context.translation.gasRefillRequest).heading5(context),
// '${context.translation.gasType}: ${request.gasType}'.bodyText(context), // todo ask ahmed
// '${context.translation.site}: ${request.site?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),// todo ask ahmed
'${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context),
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
context.translation.viewDetails,
style: AppTextStyles.bodyText.copyWith(
color: AppColor.blueStatus(context),
),
),
4.width,
Icon(
Icons.arrow_forward,
color: AppColor.blueStatus(context),
size: 14,
)
],
),
],
).toShadowContainer(context, withShadow: showShadow).onPress(() {
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => GasRefillDetailsPage(
priority: requestData!.priorityName,
date: requestData!.transactionDate!,
model: GasRefillModel(id: requestData!.id),
),
4.width,
Icon(
Icons.arrow_forward,
color: AppColor.blueStatus(context),
size: 14,
)
],
),
],
).toShadowContainer(context, withShadow: showShadow).onPress(() {
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => GasRefillDetailsPage(
priority: requestData!.priorityName,
date: requestData!.transactionDate!,
model: GasRefillModel(id: requestData!.id),
),
),
);
});
);
});
}
if(requestDetails!=null) {
if (requestDetails != null) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -100,11 +100,12 @@ class GasRefillItemView extends StatelessWidget {
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.status!),
),
1.width.expanded,
Text(requestDetails!.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
Text(requestDetails!.date?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
],
),
8.height,
context.translation.gasRefillRequest.heading5(context),
(requestDetails?.nameOfType ?? context.translation.gasRefillRequest).heading5(context),
'${context.translation.gasType}: ${requestDetails!.gasType}'.bodyText(context),
'${context.translation.site}: ${requestDetails!.site?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context),
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),

15
lib/new_views/pages/land_page/requests/ppm_item_view.dart
Unescape Escape View File

@ -16,12 +16,11 @@ class PpmItemView extends StatelessWidget {
final RequestsDetails? requestDetails;
final bool showShadow;
const PpmItemView( {Key? key,this.requestData,this.requestDetails, this.showShadow = true}) : super(key: key);
const PpmItemView({Key? key, this.requestData, this.requestDetails, this.showShadow = true}) : super(key: key);
@override
Widget build(BuildContext context) {
if(requestData!=null) {
if (requestData != null) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -48,7 +47,7 @@ class PpmItemView extends StatelessWidget {
],
),
8.height,
context.translation.ppmRequest.heading5(context),
(requestData?.typeTransaction ?? context.translation.ppmRequest).heading5(context),
8.height,
'${context.translation.assetNumber}: ${requestData!.assetNumber}'.bodyText(context),
// '${context.translation.assetSN}: ${request.assetSN}'.bodyText(context),//todo ask ahmed
@ -68,10 +67,10 @@ class PpmItemView extends StatelessWidget {
),
],
).toShadowContainer(context, withShadow: showShadow).onPress(() {
// Navigator.of(context).push(MaterialPageRoute(builder: (_) => PpmDetailsPage(request: request)));
// Navigator.of(context).push(MaterialPageRoute(builder: (_) => PpmDetailsPage(request: request)));
});
}
if(requestDetails!=null) {
if (requestDetails != null) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -98,7 +97,7 @@ class PpmItemView extends StatelessWidget {
],
),
8.height,
context.translation.ppmRequest.heading5(context),
(requestDetails?.nameOfType ?? context.translation.ppmRequest).heading5(context),
8.height,
'${context.translation.assetNumber}: ${requestDetails!.assetNo}'.bodyText(context),
'${context.translation.assetSN}: ${requestDetails!.assetSN}'.bodyText(context),
@ -122,7 +121,5 @@ class PpmItemView extends StatelessWidget {
});
}
return SizedBox();
}
}

4
lib/new_views/pages/land_page/requests/service_request_item_view.dart
Unescape Escape View File

@ -46,7 +46,7 @@ class ServiceRequestItemView extends StatelessWidget {
],
),
8.height,
context.translation.serviceRequest.heading5(context),
(requestData!.typeTransaction ?? context.translation.serviceRequest).heading5(context),
'${context.translation.assetName}: ${requestData!.assetName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),
// '${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context),
'${context.translation.requestType}: ${requestData!.requestTypeName}'.bodyText(context),
@ -97,7 +97,7 @@ class ServiceRequestItemView extends StatelessWidget {
],
),
8.height,
context.translation.serviceRequest.heading5(context),
(requestDetails!.nameOfType ?? context.translation.serviceRequest).heading5(context),
'${context.translation.assetName}: ${requestDetails!.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context),
'${context.translation.assetNumber}: ${requestDetails!.assetNo}'.bodyText(context),
'${context.translation.requestType}: ${requestDetails!.requestType}'.bodyText(context),

10
lib/service_request_latest/views/components/request_detail_view.dart
Unescape Escape View File

@ -180,16 +180,16 @@ class WorkOrderDetailView extends StatelessWidget {
'${context.translation.requestType}: ${workOrder.typeofRequest?.name}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
),
// Text(
// '${context.translation.requestNo}: ${workOrder.requestCode}', // todo ask ahmed
// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
// ),
Text(
'${context.translation.requestNo}: ${workOrder.workOrderNo}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
),
Text(
'${context.translation.requesterName}: ${workOrder.workOrderCreatedBy?.userName ?? "-"}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
),
Text(
'${context.translation.requesterName}: ${workOrder.requestedDate!.toString().toServiceRequestDetailsFormat}',
'${context.translation.date}: ${workOrder.requestedDate!.toString().toServiceRequestDetailsFormat}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120),
),

2
lib/views/pages/user/ppm/update_ppm/edit_ppm.dart
Unescape Escape View File

@ -83,7 +83,9 @@ class _EditPpmState extends State<EditPpm> with SingleTickerProviderStateMixin {
unselectedLabelColor: context.isDark ? AppColor.neutral10 : AppColor.neutral20,
unselectedLabelStyle: AppTextStyles.bodyText,
labelStyle: AppTextStyles.bodyText,
dividerColor: Colors.transparent,
indicatorPadding: const EdgeInsets.all(4),
indicatorSize: TabBarIndicatorSize.tab,
indicator: BoxDecoration(color: context.isDark ? AppColor.neutral60 : Theme.of(context).cardColor, borderRadius: BorderRadius.circular(13)),
onTap: (index) {
setState(() {});

Write Preview
Loading…
Cancel
Save