THE REQUESTS ARE LABELED AS "IN PROGRESS" BUT LISTED BELOW THE "OPEN"

The "Type of Request" should be always a maintenance request.
main_design2.0
nextwo 2 years ago
parent 8295fd2b1d
commit b463dfe3a6

@ -9,11 +9,16 @@ import 'package:test_sa/extensions/widget_extensions.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/pages/land_page/widgets/request_item_view_list.dart'; import 'package:test_sa/new_views/pages/land_page/widgets/request_item_view_list.dart';
import '../../../../controllers/providers/api/user_provider.dart';
import '../../../../models/enums/user_types.dart';
class ProgressFragment extends StatelessWidget { class ProgressFragment extends StatelessWidget {
const ProgressFragment({Key key}) : super(key: key); ProgressFragment({Key key}) : super(key: key);
UserProvider _userProvider;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_userProvider = Provider.of<UserProvider>(context);
return Consumer<AllRequestsProvider>( return Consumer<AllRequestsProvider>(
builder: (context, snapshot, _) { builder: (context, snapshot, _) {
Map<String, double> statuses = { Map<String, double> statuses = {
@ -82,6 +87,7 @@ class ProgressFragment extends StatelessWidget {
// setState(() {}); // setState(() {});
}, },
tabs: [ tabs: [
if(_userProvider.user.type != UsersTypes.engineer)
Tab(text: context.translation.open, height: 57.toScreenHeight), Tab(text: context.translation.open, height: 57.toScreenHeight),
Tab(text: context.translation.inProgress, height: 57.toScreenHeight), Tab(text: context.translation.inProgress, height: 57.toScreenHeight),
Tab(text: context.translation.completed, height: 57.toScreenHeight), Tab(text: context.translation.completed, height: 57.toScreenHeight),
@ -91,6 +97,7 @@ class ProgressFragment extends StatelessWidget {
8.height, 8.height,
TabBarView( TabBarView(
children: [ children: [
if(_userProvider.user.type != UsersTypes.engineer)
RequestItemViewList(snapshot.openRequests?.requestsDetails ?? [], snapshot.isOpenLoading), RequestItemViewList(snapshot.openRequests?.requestsDetails ?? [], snapshot.isOpenLoading),
RequestItemViewList(snapshot.inProgressRequests?.requestsDetails ?? [], snapshot.isInProgressLoading), RequestItemViewList(snapshot.inProgressRequests?.requestsDetails ?? [], snapshot.isInProgressLoading),
RequestItemViewList(snapshot.completedRequests?.requestsDetails ?? [], snapshot.isCompleteLoading), RequestItemViewList(snapshot.completedRequests?.requestsDetails ?? [], snapshot.isCompleteLoading),

@ -124,7 +124,7 @@ class _DashboardPageState extends State<DashboardPage> {
onPageChanged: (index) => setState(() => _currentPage = index), onPageChanged: (index) => setState(() => _currentPage = index),
children: [ children: [
const RequestsFragment(), const RequestsFragment(),
const ProgressFragment(), ProgressFragment(),
RecentActivitiesFragment(), RecentActivitiesFragment(),
], ],
).expanded, ).expanded,

@ -162,14 +162,16 @@ class CreateServiceRequestPageState extends State<CreateServiceRequestPage> {
); );
}), }),
8.height, 8.height,
SingleItemDropDownMenu<Lookup, TypeOfRequestProvider>( Consumer<TypeOfRequestProvider>(builder: (context, snapshot, _){
return SingleItemDropDownMenu<Lookup, TypeOfRequestProvider>(
context: context, context: context,
title: context.translation.costCodeName, title: context.translation.costCodeName,
initialValue: _serviceRequest?.type, enabled: false,
onSelect: (value) { initialValue: snapshot.items?.firstWhere((element) => element.value == 1, orElse: () => null),
_serviceRequest.type = value; // onSelect: (value) {
}, // _serviceRequest.type = value;
), // },
);}),
8.height, 8.height,
MultiFilesPicker(label: context.translation.attachImage, files: _deviceImages), MultiFilesPicker(label: context.translation.attachImage, files: _deviceImages),
((_serviceRequest.devicePhotos?.isNotEmpty ?? false) ? 16 : 8).height, ((_serviceRequest.devicePhotos?.isNotEmpty ?? false) ? 16 : 8).height,
@ -212,6 +214,7 @@ class CreateServiceRequestPageState extends State<CreateServiceRequestPage> {
Future<void> _submit() async { Future<void> _submit() async {
_serviceRequest?.requestedThrough = Provider.of<RequestedThroughProvider>(context, listen: false).items?.firstWhere((element) => element.value == 3, orElse: () => null); _serviceRequest?.requestedThrough = Provider.of<RequestedThroughProvider>(context, listen: false).items?.firstWhere((element) => element.value == 3, orElse: () => null);
_serviceRequest?.type=Provider.of<TypeOfRequestProvider>(context, listen: false).items?.firstWhere((element) => element.value == 1, orElse: () => null);
if (_formKey.currentState.validate() && await _serviceRequest.validateNewRequest(context)) { if (_formKey.currentState.validate() && await _serviceRequest.validateNewRequest(context)) {
_formKey.currentState.save(); _formKey.currentState.save();
_serviceRequest.devicePhotos = _deviceImages.map((e) => _isLocalUrl(e.path) ? "${e.path.split("/").last}|${base64Encode(e.readAsBytesSync())}" : e.path).toList(); _serviceRequest.devicePhotos = _deviceImages.map((e) => _isLocalUrl(e.path) ? "${e.path.split("/").last}|${base64Encode(e.readAsBytesSync())}" : e.path).toList();

Loading…
Cancel
Save