From 71f9e54d589eb300afa24c17c950a18ea4c9736f Mon Sep 17 00:00:00 2001 From: Vaibhav Surve Date: Thu, 10 Jul 2025 11:16:15 +0530 Subject: [PATCH] feat(api): update daily task details endpoint to use new URL --- lib/helpers/services/api_endpoints.dart | 2 +- lib/view/taskPlaning/daily_progress.dart | 59 +++++++++++++----------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/lib/helpers/services/api_endpoints.dart b/lib/helpers/services/api_endpoints.dart index f0de389..4dbeec6 100644 --- a/lib/helpers/services/api_endpoints.dart +++ b/lib/helpers/services/api_endpoints.dart @@ -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"; diff --git a/lib/view/taskPlaning/daily_progress.dart b/lib/view/taskPlaning/daily_progress.dart index 21d704a..3aea78d 100644 --- a/lib/view/taskPlaning/daily_progress.dart +++ b/lib/view/taskPlaning/daily_progress.dart @@ -87,7 +87,7 @@ class _DailyProgressReportScreenState extends State 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 : 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, - ), - ], + ), ) ], ),