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

Vaibhav_Feature-#541 #52

Merged
umesh.desai merged 39 commits from Vaibhav_Feature-#541 into main 2025-07-11 07:39:26 +00:00
Conversation 0 Commits 39 Files Changed 66 +32 -29
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 71f9e54d58 - Show all commits

2
lib/helpers/services/api_endpoints.dart
View File

@ -25,7 +25,7 @@ class ApiEndpoints {
static const String getDailyTask = "/task/list";
static const String reportTask = "/task/report";
static const String commentTask = "/task/comment";
static const String dailyTaskDetails = "/project/details";
static const String dailyTaskDetails = "/project/details-old";
static const String assignDailyTask = "/task/assign";
static const String getWorkStatus = "/master/work-status";
static const String approveReportAction = "/task/approve";

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

@ -87,7 +87,7 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min,
children: [
MyText.titleLarge(
'Daily Task Progress',
@ -461,41 +461,44 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
: Colors.red[700],
),
const SizedBox(height: 12),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
if (task.reportedDate == null ||
task.reportedDate
.toString()
.isEmpty) ...[
TaskActionButtons.reportButton(
context: context,
task: task,
completed: completed.toInt(),
refreshCallback: _refreshData,
),
const SizedBox(width: 8),
] else if (task.approvedBy == null) ...[
TaskActionButtons.reportActionButton(
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
if (task.reportedDate == null ||
task.reportedDate
.toString()
.isEmpty) ...[
TaskActionButtons.reportButton(
context: context,
task: task,
completed: completed.toInt(),
refreshCallback: _refreshData,
),
const SizedBox(width: 4),
] else if (task.approvedBy == null) ...[
TaskActionButtons.reportActionButton(
context: context,
task: task,
parentTaskID: parentTaskID,
workAreaId: workAreaId.toString(),
activityId: activityId.toString(),
completed: completed.toInt(),
refreshCallback: _refreshData,
),
const SizedBox(width: 5),
],
TaskActionButtons.commentButton(
context: context,
task: task,
parentTaskID: parentTaskID,
workAreaId: workAreaId.toString(),
activityId: activityId.toString(),
completed: completed.toInt(),
refreshCallback: _refreshData,
),
const SizedBox(width: 8),
],
TaskActionButtons.commentButton(
context: context,
task: task,
parentTaskID: parentTaskID,
workAreaId: workAreaId.toString(),
activityId: activityId.toString(),
refreshCallback: _refreshData,
),
],
),
)
],
),