ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-07-15 09:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reimplementation of the todo take turns feature to fix issues with only one assignee showing

Browse Source
This commit is contained in:
Dejan
2025-02-15 18:39:54 +01:00
parent f649828d80
commit 59664488e8
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/pages/todos/AddChoreDialog.tsx
View File

@ -174,7 +174,8 @@ const AddChoreDialog = (addChoreDialogProps: IAddChoreDialog) => {
updateToDo({ updateToDo({
...todo, ...todo,
points: points, points: points,
assignees: selectedAssignees assignees: selectedAssignees,
currentAssignee: selectedAssignees[0],
}); });
} else { } else {
return; return;
@ -186,6 +187,7 @@ const AddChoreDialog = (addChoreDialogProps: IAddChoreDialog) => {
done: false, done: false,
points: points, points: points,
assignees: selectedAssignees, assignees: selectedAssignees,
currentAssignee: selectedAssignees[0],
repeatDays: todo.repeatDays ?? [] repeatDays: todo.repeatDays ?? []
}); });
} else { } else {

9
components/pages/todos/ToDoItem.tsx
View File

@ -231,6 +231,13 @@ const ToDoItem = (props: {
</View> </View>
<View row style={{ gap: 3 }}> <View row style={{ gap: 3 }}>
{selectedMembers?.map((member) => { {selectedMembers?.map((member) => {
let currentAssignee = props?.item?.currentAssignee;
let opacity = 1;
if (selectedMembers?.length > 1 && currentAssignee !== member?.uid) {
opacity = 0.4;
}
return member?.pfp ? ( return member?.pfp ? (
<ImageBackground <ImageBackground
key={member?.uid} key={member?.uid}
@ -242,6 +249,7 @@ const ToDoItem = (props: {
overflow: "hidden", overflow: "hidden",
borderWidth: 2, borderWidth: 2,
borderColor: member.eventColor || "transparent", borderColor: member.eventColor || "transparent",
opacity: opacity
}} }}
/> />
) : ( ) : (
@ -254,6 +262,7 @@ const ToDoItem = (props: {
borderWidth: 2, borderWidth: 2,
borderRadius: 100, borderRadius: 100,
borderColor: member.eventColor || "#ccc", borderColor: member.eventColor || "#ccc",
opacity: opacity
}} }}
> >
<View <View

1
hooks/firebase/types/todoData.ts
View File

@ -11,6 +11,7 @@ export interface IToDo {
creatorId?: string; creatorId?: string;
familyId?: string; familyId?: string;
assignees?: string[]; // Optional list of assignees assignees?: string[]; // Optional list of assignees
currentAssignee?: string,
connectedTodoId?: string; connectedTodoId?: string;
} }

5
hooks/firebase/useCreateTodo.ts
View File

@ -130,7 +130,7 @@ export const useCreateTodo = () => {
let assignee; let assignee;
if (todoData.assignees && todoData.rotate && todoData?.assignees?.length !== 0) { if (todoData.assignees && todoData.rotate && todoData?.assignees?.length !== 0) {
assignee = todoData.assignees[index % todoData.assignees.length]; assignee = todoData.assignees[(index + 1) % todoData.assignees.length];
} }
const nextTodo = { const nextTodo = {
@ -140,7 +140,8 @@ export const useCreateTodo = () => {
familyId: profileData?.familyId, familyId: profileData?.familyId,
creatorId: currentUser?.uid, creatorId: currentUser?.uid,
connectedTodoId: ruleDocRef.id, connectedTodoId: ruleDocRef.id,
assignees: assignee ? [assignee] : todoData.assignees assignees: todoData.assignees,
currentAssignee: assignee
} }
batch.set(newDocRef, nextTodo) batch.set(newDocRef, nextTodo)

10
hooks/firebase/useUpdateTodo.ts
View File

@ -59,14 +59,15 @@ export const useUpdateTodo = () => {
const newDate = nextDates[index]; const newDate = nextDates[index];
let assignee; let assignee;
if (todoData.assignees && todoData.rotate && todoData?.assignees?.length !== 0) { if (todoData.assignees && todoData.rotate && todoData?.assignees?.length !== 0) {
assignee = todoData.assignees[index % todoData.assignees.length]; assignee = todoData.assignees[(index + 1) % todoData.assignees.length];
} }
if (newDate) { if (newDate) {
const nextTodo = { const nextTodo = {
...todoData, ...todoData,
date: newDate, date: newDate,
assignees: assignee ? [assignee] : todoData.assignees assignees: todoData.assignees,
currentAssignee: assignee
} }
let docRef = todo.ref; let docRef = todo.ref;
batch.update(docRef, nextTodo) batch.update(docRef, nextTodo)
@ -83,7 +84,7 @@ export const useUpdateTodo = () => {
let assignee; let assignee;
if (todoData.assignees && todoData.rotate && todoData?.assignees?.length !== 0) { if (todoData.assignees && todoData.rotate && todoData?.assignees?.length !== 0) {
assignee = todoData.assignees[index % todoData.assignees.length]; assignee = todoData.assignees[(index + 1) % todoData.assignees.length];
} }
const nextTodo = { const nextTodo = {
@ -93,7 +94,8 @@ export const useUpdateTodo = () => {
familyId: profileData?.familyId, familyId: profileData?.familyId,
creatorId: currentUser?.uid, creatorId: currentUser?.uid,
connectedTodoId: todoData.connectedTodoId, connectedTodoId: todoData.connectedTodoId,
assignees: assignee ? [assignee] : todoData.assignees assignees: todoData.assignees,
currentAssignee: assignee
} }
batch.set(newDocRef, nextTodo) batch.set(newDocRef, nextTodo)