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

Merge remote-tracking branch 'origin/demo_branch' into demo_branch

Browse Source
design_3.0_task_module_new
Sikander Saleem 7 months ago
parent c4c68fbe8b b592e114bc
commit b0d5e03d5c
5 changed files with 106 additions and 78 deletions
Show Stats Download Patch File Download Diff File

2
lib/new_views/pages/new_gas_refill_request_page.dart
Unescape Escape View File

@ -67,10 +67,12 @@ class _NewGasRefillRequestPageState extends State<NewGasRefillRequestPage> {
@override @override
void dispose() { void dispose() {
super.dispose(); super.dispose();
_gasRefillProvider!.gasRefillAttachments.clear();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: DefaultAppBar(title: context.translation.newGasRefillRequest), appBar: DefaultAppBar(title: context.translation.newGasRefillRequest),
body: Column( body: Column(

16
lib/views/pages/device_transfer/update_device_transfer.dart
Unescape Escape View File

@ -636,11 +636,17 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
} else { } else {
employeeList = widget.formModel!.assetTransferAssistantEmployeesReceiver ?? []; employeeList = widget.formModel!.assetTransferAssistantEmployeesReceiver ?? [];
} }
widget.formModel?.modelAssistantEmployees = employeeList.isNotEmpty ? employeeList[0] : AssetTransferAssistantEmployees();
AssignedEmployee? assignedUser = AssignedEmployee(
id: employeeList[0].employeeId, widget.formModel?.modelAssistantEmployees = employeeList.isEmpty ? AssetTransferAssistantEmployees():employeeList[0];
name: employeeList[0].employeeName,
); AssignedEmployee? assignedUser = AssignedEmployee();
if(employeeList.isNotEmpty){
assignedUser= AssignedEmployee(
id: employeeList[0].employeeId,
name: employeeList[0].employeeName,
);
}
selectedEmployee = AssistantEmployees(userId: assignedUser.id, user: assignedUser); selectedEmployee = AssistantEmployees(userId: assignedUser.id, user: assignedUser);
} }

141
lib/views/pages/user/gas_refill/gas_refill_details.dart
Unescape Escape View File

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/gas_refill_comments.dart'; import 'package:test_sa/controllers/providers/api/gas_refill_comments.dart';
@ -10,6 +12,7 @@ import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/views/pages/user/gas_refill/gas_refill_form.dart'; import 'package:test_sa/views/pages/user/gas_refill/gas_refill_form.dart';
import 'package:test_sa/views/pages/user/gas_refill/request_gas_refill.dart'; import 'package:test_sa/views/pages/user/gas_refill/request_gas_refill.dart';
import 'package:test_sa/views/widgets/images/multi_image_picker.dart';
import 'package:test_sa/views/widgets/loaders/app_loading.dart'; import 'package:test_sa/views/widgets/loaders/app_loading.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
@ -39,6 +42,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
List<File> _attachments = [];
@override @override
void initState() { void initState() {
@ -63,6 +67,8 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
return const ALoading(); return const ALoading();
} else if (snap.hasData) { } else if (snap.hasData) {
_model = snap.data as GasRefillModel; _model = snap.data as GasRefillModel;
_attachments = _model.gasRefillAttachments?.map((e) => File(e.attachmentName ?? '')).toList() ?? [];
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -139,7 +145,19 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
gasRefillModel.comment!.bodyText(context), gasRefillModel.comment!.bodyText(context),
8.height, 8.height,
] ],
if (_attachments.isNotEmpty) ...[
const Divider().defaultStyle(context),
context.translation.attachments.bodyText(context),
8.height,
MultiFilesPicker(
label: context.translation.attachments,
files: _attachments,
enabled: false,
onlyImages: false,
),
12.height,
],
], ],
).expanded, ).expanded,
if (_userProvider.user!.type == UsersTypes.engineer && (gasRefillModel.status?.value ?? 0) != 2) 8.height, if (_userProvider.user!.type == UsersTypes.engineer && (gasRefillModel.status?.value ?? 0) != 2) 8.height,
@ -149,69 +167,70 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50), style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50),
), ),
], ],
).paddingOnly(top: 16, start: 16, end: 16), ).paddingOnly(top: 16, start: 16, end: 16),
/// TBD /// TBD
(_userProvider.user!.type == UsersTypes.normal_user // (_userProvider.user!.type == UsersTypes.normal_user
? Container( // ? Container(
height: 50, // height: 50,
padding: const EdgeInsets.only(left: 16, right: 16), // padding: const EdgeInsets.only(left: 16, right: 16),
alignment: Alignment.center, // alignment: Alignment.center,
width: double.infinity, // width: double.infinity,
decoration: ShapeDecoration( // decoration: ShapeDecoration(
color: context.isDark ? AppColor.neutral50 : AppColor.neutral30, // color: context.isDark ? AppColor.neutral50 : AppColor.neutral30,
shape: const RoundedRectangleBorder( // shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only( // borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(14), // bottomLeft: Radius.circular(14),
bottomRight: Radius.circular(14), // bottomRight: Radius.circular(14),
), // ),
), // ),
), // ),
child: Row( // child: Row(
children: [ // children: [
Text( // Text(
'${context.translation.commentHere}...', // '${context.translation.commentHere}...',
style: AppTextStyles.heading6.copyWith( // style: AppTextStyles.heading6.copyWith(
color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(.6), // color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(.6),
), // ),
).expanded, // ).expanded,
"comment_send".toSvgAsset(width: 24, color: context.isDark ? AppColor.primary50 : AppColor.primary70), // "comment_send".toSvgAsset(width: 24, color: context.isDark ? AppColor.primary50 : AppColor.primary70),
], // ],
), // ),
) // )
: Column( // : Column(
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
const Divider().defaultStyle(context), // const Divider().defaultStyle(context),
8.height, // 8.height,
Row( // Row(
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
children: [ // children: [
Text( // Text(
context.translation.viewComments, // context.translation.viewComments,
style: AppTextStyles.bodyText.copyWith(color: AppColor.blueStatus(context)), // style: AppTextStyles.bodyText.copyWith(color: AppColor.blueStatus(context)),
), // ),
4.width, // 4.width,
Icon( // Icon(
Icons.arrow_forward, // Icons.arrow_forward,
color: AppColor.blueStatus(context), // color: AppColor.blueStatus(context),
size: 14, // size: 14,
) // )
], // ],
), // ),
], // ],
).paddingOnly(bottom: 16, start: 16, end: 16)) // ).paddingOnly(bottom: 16, start: 16, end: 16))
.onPress(() { // .onPress(() {
showModalBottomSheet( // showModalBottomSheet(
context: context, // context: context,
useSafeArea: true, // useSafeArea: true,
isScrollControlled: true, // isScrollControlled: true,
useRootNavigator: true, // useRootNavigator: true,
backgroundColor: Colors.transparent, // backgroundColor: Colors.transparent,
builder: (context) => GasRefillCommentsBottomSheet(requestId: gasRefillModel.id.toString()), // builder: (context) => GasRefillCommentsBottomSheet(requestId: gasRefillModel.id.toString()),
); // );
}), // }),
], ],
).toShadowContainer(context, padding: 0); ).toShadowContainer(context, padding: 0);
} }

1
lib/views/pages/user/gas_refill/request_gas_refill.dart
Unescape Escape View File

@ -176,7 +176,6 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_userProvider = Provider.of<UserProvider>(context); _userProvider = Provider.of<UserProvider>(context);
_settingProvider = Provider.of<SettingProvider>(context); _settingProvider = Provider.of<SettingProvider>(context);
_gasRefillProvider ??= Provider.of<GasRefillProvider>(context, listen: false); _gasRefillProvider ??= Provider.of<GasRefillProvider>(context, listen: false);

24
lib/views/widgets/images/multi_image_picker.dart
Unescape Escape View File

@ -51,17 +51,19 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppDashedButton( if(widget.enabled)...[
title: widget.label, AppDashedButton(
height: widget.buttonHeight, title: widget.label,
buttonColor: widget.buttonColor, height: widget.buttonHeight,
icon: widget.buttonIcon, buttonColor: widget.buttonColor,
onPressed: (widget.enabled == false) icon: widget.buttonIcon,
? () {} onPressed: (widget.enabled == false)
: widget.showAsGrid ? () {}
? showFileSourceSheet : widget.showAsGrid
: onFilePicker), ? showFileSourceSheet
16.height, : onFilePicker),
16.height,
],
if (widget.files.isNotEmpty) if (widget.files.isNotEmpty)
Wrap( Wrap(
spacing: 8.toScreenWidth, spacing: 8.toScreenWidth,

Write Preview
Loading…
Cancel
Save