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 getDailyTask = "/task/list";
static const String reportTask = "/task/report"; static const String reportTask = "/task/report";
static const String commentTask = "/task/comment"; 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 assignDailyTask = "/task/assign";
static const String getWorkStatus = "/master/work-status"; static const String getWorkStatus = "/master/work-status";
static const String approveReportAction = "/task/approve"; static const String approveReportAction = "/task/approve";

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

@ -461,7 +461,9 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
: Colors.red[700], : Colors.red[700],
), ),
const SizedBox(height: 12), const SizedBox(height: 12),
Row( SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
if (task.reportedDate == null || if (task.reportedDate == null ||
@ -474,7 +476,7 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
completed: completed.toInt(), completed: completed.toInt(),
refreshCallback: _refreshData, refreshCallback: _refreshData,
), ),
const SizedBox(width: 8), const SizedBox(width: 4),
] else if (task.approvedBy == null) ...[ ] else if (task.approvedBy == null) ...[
TaskActionButtons.reportActionButton( TaskActionButtons.reportActionButton(
context: context, context: context,
@ -485,7 +487,7 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
completed: completed.toInt(), completed: completed.toInt(),
refreshCallback: _refreshData, refreshCallback: _refreshData,
), ),
const SizedBox(width: 8), const SizedBox(width: 5),
], ],
TaskActionButtons.commentButton( TaskActionButtons.commentButton(
context: context, context: context,
@ -496,6 +498,7 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
refreshCallback: _refreshData, refreshCallback: _refreshData,
), ),
], ],
),
) )
], ],
), ),