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

merge improvement

Browse Source
design_3.0_task_module_new
Sikander Saleem 4 months ago
parent 469cffd0c8
commit a626934b78
2 changed files with 76 additions and 77 deletions
Show Stats Download Patch File Download Diff File

10
lib/models/new_models/task_request/task_request_model.dart
Unescape Escape View File

@ -2,11 +2,11 @@ import 'package:test_sa/models/base.dart';
import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/lookup.dart';
import 'package:test_sa/models/new_models/assistant_employee.dart'; import 'package:test_sa/models/new_models/assistant_employee.dart';
import 'package:test_sa/models/new_models/building.dart'; import 'package:test_sa/models/new_models/building.dart';
import 'package:test_sa/models/new_models/department.dart';
import 'package:test_sa/models/new_models/floor.dart'; import 'package:test_sa/models/new_models/floor.dart';
import 'package:test_sa/models/new_models/mapped_sites.dart'; import 'package:test_sa/models/new_models/mapped_sites.dart';
import 'package:test_sa/models/new_models/site.dart';
import 'package:test_sa/models/new_models/department.dart';
import 'package:test_sa/models/new_models/room_model.dart'; import 'package:test_sa/models/new_models/room_model.dart';
import 'package:test_sa/models/new_models/site.dart';
import 'package:test_sa/models/new_models/work_order_detail_model.dart'; import 'package:test_sa/models/new_models/work_order_detail_model.dart';
import 'package:test_sa/models/timer_model.dart'; import 'package:test_sa/models/timer_model.dart';
@ -494,14 +494,14 @@ class TaskJobStatus {
class TaskJobAttachment { class TaskJobAttachment {
final int? id; final int? id;
final String? name; final String? name;
String ?createdBy; String? createdBy;
TaskJobAttachment({this.id, this.name,this.createdBy}); TaskJobAttachment({this.id, this.name, this.createdBy});
factory TaskJobAttachment.fromJson(Map<String, dynamic> json) => TaskJobAttachment( factory TaskJobAttachment.fromJson(Map<String, dynamic> json) => TaskJobAttachment(
id: json['id'], id: json['id'],
name: json['name'], name: json['name'],
createdBy: json['createdBy'], createdBy: json['createdBy'],
); );
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {

143
lib/modules/tm_module/tasks_wo/update_task_request_view.dart
Unescape Escape View File

@ -74,10 +74,9 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
UserProvider _userProvider = Provider.of<UserProvider>(context, listen: false); UserProvider _userProvider = Provider.of<UserProvider>(context, listen: false);
TaskData? taskModel = _taskProvider!.taskRequestModel; TaskData? taskModel = _taskProvider!.taskRequestModel;
_userAttachments = _taskProvider?.taskRequestModel?.taskJobAttachments?.where((e) => e.createdBy == _userProvider.user?.userID).map((e) => File(e.name ?? '')).toList() ?? []; _userAttachments = _taskProvider?.taskRequestModel?.taskJobAttachments?.where((e) => e.createdBy == _userProvider.user?.userID).map((e) => File(e.name ?? '')).toList() ?? [];
_readOnlyAttachments = _taskProvider?.taskRequestModel?.taskJobAttachments?.where((e) => e.createdBy != _userProvider.user?.userID).toList() ?? []; _readOnlyAttachments = _taskProvider?.taskRequestModel?.taskJobAttachments?.where((e) => e.createdBy != _userProvider.user?.userID).toList() ?? [];
_taskProvider?.updateTaskModel(taskModel); _taskProvider?.updateTaskModel(taskModel);
} }
@ -102,78 +101,78 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
? const ALoading() ? const ALoading()
: taskProvider.taskRequestModel != null : taskProvider.taskRequestModel != null
? Form( ? Form(
key: _formKey, key: _formKey,
child: Column( child: Column(
children: [ children: [
SingleChildScrollView( SingleChildScrollView(
padding: EdgeInsets.all(12 * AppStyle.getScaleFactor(context)), padding: EdgeInsets.all(12 * AppStyle.getScaleFactor(context)),
child: Column( child: Column(
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
_timerWidget(context, true, taskProvider), _timerWidget(context, true, taskProvider),
8.height, 8.height,
if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[installationWidget(taskModel: taskProvider.taskRequestModel!)], if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[installationWidget(taskModel: taskProvider.taskRequestModel!)],
if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[ if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[
recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!), recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!),
],
// if (previousComments.isNotEmpty) ...[
// 'Previous Comments'.bodyText2(context).custom(color: AppColor.neutral50),
// 8.height,
buildPreviousComments(taskProvider: taskProvider),
// 8.height,
// ],
AppTextFormField(
initialValue: "",
labelText: context.translation.technicalComment,
textInputType: TextInputType.multiline,
backgroundColor: AppColor.neutral90,
showShadow: false,
alignLabelWithHint: true,
onChange: (value) {
comments = value;
setState(() {});
},
onSaved: (value) {},
),
20.height,
MultiFilesPicker(
label: context.translation.attachFiles,
files: _userAttachments,
buttonColor: AppColor.black10,
onlyImages: false,
buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120),
),
], ],
// if (previousComments.isNotEmpty) ...[ ).toShadowContainer(context),
// 'Previous Comments'.bodyText2(context).custom(color: AppColor.neutral50), 16.height,
// 8.height, const AssistantEmployeeCard().toShadowContainer(context, paddingObject: const EdgeInsets.symmetric(horizontal: 16)),
buildPreviousComments(taskProvider: taskProvider), ],
// 8.height, ),
// ], ).expanded,
AppTextFormField( FooterActionButton.footerContainer(
initialValue: "", child: Row(
labelText: context.translation.technicalComment, mainAxisAlignment: MainAxisAlignment.spaceAround,
textInputType: TextInputType.multiline, children: [
backgroundColor: AppColor.neutral90, AppFilledButton(
showShadow: false, label: context.translation.save,
alignLabelWithHint: true, buttonColor: AppColor.white60,
onChange: (value) { textColor: AppColor.black10,
comments = value; onPressed: () => _updateTask(context: context, status: 0),
setState(() {}); ).expanded,
}, 12.width,
onSaved: (value) {}, AppFilledButton(
), label: context.translation.complete,
20.height, buttonColor: AppColor.primary10,
MultiFilesPicker( onPressed: () => _updateTask(context: context, status: 1),
label: context.translation.attachFiles, ).expanded,
files: _userAttachments, ],
buttonColor: AppColor.black10, ),
onlyImages: false,
buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120),
),
],
).toShadowContainer(context),
16.height,
const AssistantEmployeeCard().toShadowContainer(context, paddingObject: const EdgeInsets.symmetric(horizontal: 16)),
],
),
).expanded,
FooterActionButton.footerContainer(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
AppFilledButton(
label: context.translation.save,
buttonColor: AppColor.white60,
textColor: AppColor.black10,
onPressed: () => _updateTask(context: context, status: 0),
).expanded,
12.width,
AppFilledButton(
label: context.translation.complete,
buttonColor: AppColor.primary10,
onPressed: () => _updateTask(context: context, status: 1),
).expanded,
],
), ),
), ],
], ),
), )
)
: NoDataFound(message: context.translation.noDataFound).center, : NoDataFound(message: context.translation.noDataFound).center,
).handlePopScope( ).handlePopScope(
cxt: context, cxt: context,

Write Preview
Loading…
Cancel
Save