Skip to content

Operation tasks #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bolortulga07 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Operation tasks #371

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
91079b0
fix(operation): Activy Query cycle sort
Bolortulga07 Sep 25, 2025
ae5c284
Merge branch 'main' of github.com:erxes/erxes-next into operation-tasks
Bolortulga07 Sep 26, 2025
c207814
Merge branch 'main' of github.com:erxes/erxes-next into operation-tasks
Bolortulga07 Sep 29, 2025
7720f68
fix(cycle): activity cycle query
Bolortulga07 Sep 29, 2025
bede15d
Merge branch 'main' of github.com:erxes/erxes-next into operation-tasks
Bolortulga07 Oct 1, 2025
ba09588
FEAT(operation_task): Convert task into project
Bolortulga07 Oct 1, 2025
7f9209f
Merge branch 'main' of github.com:erxes/erxes-next into operation-tasks
Bolortulga07 Oct 7, 2025
68377bc
Merge branch 'main' of github.com:erxes/erxes-next into operation-tasks
Bolortulga07 Oct 9, 2025
ed3c682
fix cycles
Bolortulga07 Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions backend/plugins/operation_api/src/modules/cycle/graphql/resolvers/queries/cycle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
getCycleProgressChart,
getCyclesProgress,
} from '~/modules/cycle/utils';
import { startOfDay } from 'date-fns';

export const cycleQueries = {
getCycle: async (_parent: undefined, { _id }, { models }: IContext) => {
Expand All @@ -24,14 +25,16 @@ export const cycleQueries = {
...params,
orderBy: { isActive: -1, isCompleted: 1, startDate: 1 },
},
query: { teamId: params.teamId, isCompleted: false },
query: { teamId: params.teamId },
},
);

return { list, totalCount, pageInfo };
},

getCyclesActive: async (_parent: undefined, params, { models }: IContext) => {
const today = startOfDay(new Date());

if (params.taskId) {
const task = await models.Task.findOne({
_id: params.taskId,
Expand All @@ -56,12 +59,14 @@ export const cycleQueries = {

query: {
teamId: params.teamId,
isCompleted: { $ne: true },
isCompleted: false,
$or: [
{ isActive: true },
{ _id: params?.cycleId || null },
{
startDate: { $lte: new Date() },
startDate: { $lte: today },
endDate: { $gte: today },
},
{
startDate: { $gt: today },
},
],
},
Expand Down