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

statuses & date added.

Browse Source
main_design2.0
Sikander Saleem 12 months ago
parent af5144ffa3
commit 29d83101af
7 changed files with 72 additions and 55 deletions
Show Stats Download Patch File Download Diff File

2
lib/controllers/providers/api/all_requests_provider.dart
Unescape Escape View File

@ -41,7 +41,7 @@ class AllRequestsProvider extends ChangeNotifier {
"typeTransaction": [1, 2, 3, 4],
"statusTransaction": [1, 2, 3],
"priority": [0, 1],
"displayData": [1]
"displayData": []
};
response = await ApiManager.instance.post(URLs.getAllRequestsAndCount, body: body);

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

@ -2,10 +2,13 @@ import 'package:flutter/material.dart';
import 'package:test_sa/controllers/api_routes/urls.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/all_requests_and_count_model.dart';
import 'package:test_sa/models/device/asset.dart';
import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart';
class AssetItemView extends StatelessWidget {
final RequestsDetails request;
@ -15,9 +18,24 @@ class AssetItemView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(label: request.priority, textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)),
8.width,
StatusLabel(
label: request.status,
textColor: AColors.getRequestStatusTextColorByName(request.status),
backgroundColor: AColors.getRequestStatusColorByName(request.status),
),
1.width.expanded,
Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
),
8.height,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,

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

@ -5,7 +5,9 @@ import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/all_requests_and_count_model.dart';
import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/app_style/sizing.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart';
class GasRefillItemView extends StatelessWidget {
final RequestsDetails request;
@ -17,22 +19,21 @@ class GasRefillItemView extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Row(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// /// TBD
// // StatusLabel(
// // label: ,
// // id: ,
// // textColor: AColors.getPriorityStatusTextColor(),
// // backgroundColor: AColors.getPriorityStatusColor()),
// 8.width,
// StatusLabel(label: item.status.name, textColor: AColors.getRequestStatusTextColor(item.status.value), backgroundColor: AColors.getRequestStatusColor(item.status.value)),
// 1.width.expanded,
// Text(item.startDate != null ? item.startDate.toServiceRequestCardFormat : "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
// ],
// ),
// 8.height,
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: request.priority,
// id: ,
textColor: AColors.getRequestStatusTextColorByName(request.priority),
backgroundColor: AColors.getRequestStatusColorByName(request.priority)),
8.width,
StatusLabel(label: request.status, textColor: AColors.getRequestStatusTextColorByName(request.status), backgroundColor: AColors.getRequestStatusColorByName(request.status)),
1.width.expanded,
Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
),
8.height,
Text(context.translation.gasRefillRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
Text(
'${context.translation.gasType}: ${request.gasType}',

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

@ -8,7 +8,9 @@ import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/all_requests_and_count_model.dart';
import 'package:test_sa/models/enums/user_types.dart';
import 'package:test_sa/models/visits/visit.dart';
import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/pages/user/visits/visit_details.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart';
class PpmItemView extends StatelessWidget {
final RequestsDetails request;
@ -20,24 +22,21 @@ class PpmItemView extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Row(
// children: [
// // StatusLabel(
// // label: visit.priority.name,
// // id: visit.priority.id,
// // textColor: AColors.getPriorityStatusTextColor(visit.priority.id),
// // backgroundColor: AColors.getPriorityStatusColor(visit.priority.id)),
// // 8.width,
// StatusLabel(
// label: visit.status.name,
// id: visit.status.id,
// textColor: AColors.getRequestStatusTextColorByName(visit.status.name),
// backgroundColor: AColors.getRequestStatusColorByName(visit.status.name),
// ),
// 1.width.expanded,
// ],
// ),
// 8.height,
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(label: request.priority, textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)),
8.width,
StatusLabel(
label: request.status,
textColor: AColors.getRequestStatusTextColorByName(request.status),
backgroundColor: AColors.getRequestStatusColorByName(request.status),
),
1.width.expanded,
Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
),
8.height,
Text("PPMs Request", style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
8.height,
Text(

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

@ -1,10 +1,12 @@
import 'package:flutter/material.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/all_requests_and_count_model.dart';
import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart';
class ServiceRequestItemView extends StatelessWidget {
final RequestsDetails request;
@ -17,21 +19,17 @@ class ServiceRequestItemView extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Row(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// StatusLabel(
// label: request.priority.name,
// id: request.priority.id,
// textColor: AColors.getPriorityStatusTextColor(request.priority.id),
// backgroundColor: AColors.getPriorityStatusColor(request.priority.id)),
// 8.width,
// StatusLabel(label: request.statusLabel, textColor: AColors.getRequestStatusTextColor(request.statusValue), backgroundColor: AColors.getRequestStatusColor(request.statusValue)),
// 1.width.expanded,
// Text(request.date.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
// ],
// ),
// 8.height,
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(label: request.priority, textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)),
8.width,
StatusLabel(label: request.status, textColor: AColors.getRequestStatusTextColorByName(request.status), backgroundColor: AColors.getRequestStatusColorByName(request.status)),
1.width.expanded,
Text(request.date.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
),
8.height,
Text(context.translation.serviceRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
Text(
'${context.translation.assetName}: ${request.assetName}',
@ -66,6 +64,6 @@ class ServiceRequestItemView extends StatelessWidget {
],
),
],
).toShadowContainer(context).onPress(() { });
).toShadowContainer(context).onPress(() {});
}
}

2
lib/views/app_style/colors.dart
Unescape Escape View File

@ -36,6 +36,8 @@ class AColors {
return AColors.statusYellow;
case "high priority":
return AColors.statusRed;
// case "low priority":
// return AColors.statusGreen;
default:
return AColors.white;
}

3
lib/views/widgets/requests/request_status.dart
Unescape Escape View File

@ -11,7 +11,7 @@ class StatusLabel extends StatelessWidget {
final Color textColor;
final bool isPriority;
StatusLabel({Key key, this.id, this.label, this.backgroundColor, this.textColor, this.isPriority = false}) : super(key: key);
StatusLabel({Key key, this.id=0, this.label, this.backgroundColor, this.textColor, this.isPriority = false}) : super(key: key);
@override
Widget build(BuildContext context) {
@ -23,7 +23,6 @@ class StatusLabel extends StatelessWidget {
if (label.toLowerCase() == 'Closed'.toLowerCase()) label = context.translation.closed;
if (label.toLowerCase() == 'Waiting for quotation'.toLowerCase()) label = context.translation.waitingForQuotation;
print("label:$label:$id");
return Container(
padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 10),
decoration: ShapeDecoration(

Write Preview
Loading…
Cancel
Save