refactor: version 2.18.2 -- Panel: se quita "Mis actividades pendientes"
El detalle vive en los popups de las tarjetas; se elimina tambien la consulta myPendingActivities del backend, que quedaba sin uso. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -14,10 +14,9 @@ function memberFilterFor(currentUser) {
|
||||
|
||||
export const getSummary = asyncHandler(async (req, res) => {
|
||||
const memberUserId = memberFilterFor(req.currentUser);
|
||||
const [kpis, myActivities, byStatus, overdueProjects, activeProjects, dueSoonProjects,
|
||||
const [kpis, byStatus, overdueProjects, activeProjects, dueSoonProjects,
|
||||
pendingActivities, overdueActivities, todayActivities] = await Promise.all([
|
||||
repo.summary(memberUserId),
|
||||
repo.myPendingActivities(req.currentUser.id, memberUserId),
|
||||
repo.projectsByStatus(memberUserId),
|
||||
repo.overdueProjectsList(memberUserId),
|
||||
repo.activeProjectsList(memberUserId),
|
||||
@@ -30,7 +29,6 @@ export const getSummary = asyncHandler(async (req, res) => {
|
||||
const withActivityDue = (a) => ({ ...a, dueStatus: dueStatus(a.due_date) });
|
||||
ok(res, {
|
||||
kpis,
|
||||
myActivities: myActivities.map(withActivityDue),
|
||||
projectsByStatus: byStatus,
|
||||
// Detalle de cada tarjeta del Panel (popup al hacer clic).
|
||||
overdueProjects: overdueProjects.map((p) => ({ ...p, dueStatus: 'overdue' })),
|
||||
|
||||
@@ -152,19 +152,6 @@ export async function overdueProjectsList(memberUserId) {
|
||||
return rows;
|
||||
}
|
||||
|
||||
export async function myPendingActivities(userId, memberUserId) {
|
||||
const memberClause = memberUserId ? 'AND EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = ?)' : '';
|
||||
const params = memberUserId ? [userId, memberUserId] : [userId];
|
||||
const [rows] = await pool.query(
|
||||
`SELECT a.id, a.code, a.name, a.due_date, a.progress_pct, p.id AS project_id, p.name AS project_name
|
||||
FROM activities a JOIN activity_statuses st ON st.id = a.status_id JOIN projects p ON p.id = a.project_id
|
||||
WHERE st.is_closed = 0 AND p.deleted_at IS NULL AND a.responsible_user_id = ? ${memberClause}
|
||||
ORDER BY (a.due_date IS NULL), a.due_date LIMIT 20`,
|
||||
params
|
||||
);
|
||||
return rows;
|
||||
}
|
||||
|
||||
export async function calendarActivities(monthStart, monthEnd, memberUserId) {
|
||||
const memberClause = memberUserId ? 'AND EXISTS (SELECT 1 FROM project_members pm WHERE pm.project_id = p.id AND pm.user_id = ?)' : '';
|
||||
const params = memberUserId ? [monthStart, monthEnd, memberUserId] : [monthStart, monthEnd];
|
||||
|
||||
Reference in New Issue
Block a user