rythondev/multi-task-widget-cross-platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed enableLimit bug

Browse source
This commit is contained in:
liyunze 2024-09-02 12:34:55 +10:00
parent 6c0f98abff
commit 6611765c38
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/taskList.js
View file

@ -418,8 +418,11 @@ async function completedTasksCount(username) {
* @param {string} username - The name of the user whose tasks are to be counted. * @param {string} username - The name of the user whose tasks are to be counted.
* @returns {number} The total number of tasks for the user. * @returns {number} The total number of tasks for the user.
*/ */
function getUserTotalTaskCount(username) { async function getUserTotalTaskCount(username) {
return incompleteTasksCount(username) + completedTasksCount(username); return (
(await incompleteTasksCount(username)) +
(await completedTasksCount(username))
);
} }
/** /**
@ -807,9 +810,12 @@ async function addTask(username, userColor, task) {
); );
const taskIsInvalid = const taskIsInvalid =
!task || !task.trim() || task.toLowerCase() === "all" || isInt(task); !task || !task.trim() || task.toLowerCase() === "all" || isInt(task);
const taskLimit = getSetting("limit");
const limitEnabled = getSetting("enableLimit");
let incompleteTaskCount = await incompleteTasksCount(username);
const userHasReachedTaskLimit = const userHasReachedTaskLimit =
incompleteTasksCount(username) >= getSetting("limit") && incompleteTaskCount >= taskLimit && limitEnabled;
getSetting("enableLimit");
if (taskExists) { if (taskExists) {
return createErrorResponse( return createErrorResponse(
@ -846,13 +852,15 @@ async function addTask(username, userColor, task) {
if ( if (
t && t &&
!tasks[username].todos.find((task) => task.text === t) && !tasks[username].todos.find((task) => task.text === t) &&
!isInt(t) !isInt(t) &&
!(incompleteTaskCount >= taskLimit && limitEnabled)
) { ) {
tasks[username].todos.push({ text: t, done: false, focus: false }); tasks[username].todos.push({ text: t, done: false, focus: false });
let index = tasks[username].todos.length - 1; let index = tasks[username].todos.length - 1;
addedTaskIndices.push({ index: index, task: t }); // store index of added task addedTaskIndices.push({ index: index, task: t }); // store index of added task
taskListMemory.totalTaskCount++; taskListMemory.totalTaskCount++;
incompleteTaskCount++;
} else { } else {
tasksFailedToAdd.push(t); tasksFailedToAdd.push(t);
} }
@ -918,7 +926,7 @@ async function nowTask(username, userColor, task) {
); );
const taskIsInvalid = !task || !task.trim() || task.toLowerCase() === "all"; const taskIsInvalid = !task || !task.trim() || task.toLowerCase() === "all";
const userHasReachedTaskLimit = const userHasReachedTaskLimit =
incompleteTasksCount(username) >= getSetting("limit") && (await incompleteTasksCount(username)) >= getSetting("limit") &&
getSetting("enableLimit"); getSetting("enableLimit");
const taskHasSeparators = taskSeparator.some((char) => task.includes(char)); const taskHasSeparators = taskSeparator.some((char) => task.includes(char));
@ -997,7 +1005,7 @@ async function nowTask(username, userColor, task) {
); );
const taskIsInvalid = !task || !task.trim() || task.toLowerCase() === "all"; const taskIsInvalid = !task || !task.trim() || task.toLowerCase() === "all";
const userHasReachedTaskLimit = const userHasReachedTaskLimit =
incompleteTasksCount(username) >= getSetting("limit") && (await incompleteTasksCount(username)) >= getSetting("limit") &&
getSetting("enableLimit"); getSetting("enableLimit");
const taskHasSeparators = taskSeparator.some((char) => task.includes(char)); const taskHasSeparators = taskSeparator.some((char) => task.includes(char));