admin/marco.pms.mobileapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature_Report_Action #48

Merged
vaibhav.surve merged 19 commits from Feature_Report_Action into main 2025-06-23 07:32:30 +00:00
Conversation 0 Commits 19 Files Changed 30 +11 -10
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44d72b73ac - Show all commits

13
lib/model/daily_task_model.dart
View File

@ -7,6 +7,7 @@ class TaskModel {
final int plannedTask; final int plannedTask;
final int completedTask; final int completedTask;
final AssignedBy assignedBy; final AssignedBy assignedBy;
final AssignedBy? approvedBy;
final List<TeamMember> teamMembers; final List<TeamMember> teamMembers;
final List<Comment> comments; final List<Comment> comments;
final List<String> reportedPreSignedUrls; final List<String> reportedPreSignedUrls;
@ -20,6 +21,7 @@ class TaskModel {
required this.plannedTask, required this.plannedTask,
required this.completedTask, required this.completedTask,
required this.assignedBy, required this.assignedBy,
this.approvedBy,
required this.teamMembers, required this.teamMembers,
required this.comments, required this.comments,
required this.reportedPreSignedUrls, required this.reportedPreSignedUrls,
@ -32,13 +34,15 @@ class TaskModel {
? DateTime.tryParse(json['reportedDate']) ? DateTime.tryParse(json['reportedDate'])
: null, : null,
id: json['id'], id: json['id'],
workItem: json['workItem'] != null workItem:
? WorkItem.fromJson(json['workItem']) json['workItem'] != null ? WorkItem.fromJson(json['workItem']) : null,
: null,
workItemId: json['workItemId'], workItemId: json['workItemId'],
plannedTask: json['plannedTask'], plannedTask: json['plannedTask'],
completedTask: json['completedTask'], completedTask: json['completedTask'],
assignedBy: AssignedBy.fromJson(json['assignedBy']), assignedBy: AssignedBy.fromJson(json['assignedBy']),
approvedBy: json['approvedBy'] != null
? AssignedBy.fromJson(json['approvedBy'])
: null,
teamMembers: (json['teamMembers'] as List) teamMembers: (json['teamMembers'] as List)
.map((e) => TeamMember.fromJson(e)) .map((e) => TeamMember.fromJson(e))
.toList(), .toList(),
@ -119,8 +123,7 @@ class WorkArea {
return WorkArea( return WorkArea(
id: json['id']?.toString(), id: json['id']?.toString(),
areaName: json['areaName'] ?? '', areaName: json['areaName'] ?? '',
floor: floor: json['floor'] != null ? Floor.fromJson(json['floor']) : null,
json['floor'] != null ? Floor.fromJson(json['floor']) : null,
); );
} }
} }

8
lib/view/taskPlaning/daily_progress.dart
View File

@ -368,9 +368,8 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
final activityName = final activityName =
task.workItem?.activityMaster?.activityName ?? 'N/A'; task.workItem?.activityMaster?.activityName ?? 'N/A';
final activityId = task.workItem?.activityMaster?.id ; final activityId = task.workItem?.activityMaster?.id;
final workAreaId = final workAreaId = task.workItem?.workArea?.id;
task.workItem?.workArea?.id;
final location = [ final location = [
task.workItem?.workArea?.floor?.building?.name, task.workItem?.workArea?.floor?.building?.name,
task.workItem?.workArea?.floor?.floorName, task.workItem?.workArea?.floor?.floorName,
@ -471,7 +470,7 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
refreshCallback: _refreshData, refreshCallback: _refreshData,
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
] else ...[ ] else if (task.approvedBy == null) ...[
TaskActionButtons.reportActionButton( TaskActionButtons.reportActionButton(
context: context, context: context,
task: task, task: task,
@ -481,7 +480,6 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
completed: completed, completed: completed,
refreshCallback: _refreshData, refreshCallback: _refreshData,
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
], ],
TaskActionButtons.commentButton( TaskActionButtons.commentButton(