Skip to content

Integration check: Recurring tasks must have a date. #406

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

Merged
FrankFaulstich merged 2 commits into from
May 12, 2026
Merged

Integration check: Recurring tasks must have a date. #406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
107d520
Integration check: Recurring tasks must have a date.
FrankFaulstich May 12, 2026
ffb44c2
Correction 1
FrankFaulstich May 12, 2026
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
77 changes: 53 additions & 24 deletions sl/SL_Menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ def navigate_to(menu_name):
:param menu_name: The key of the menu to navigate to (must exist in menu_map).
"""
st.session_state.menu = menu_name
st.session_state.feedback = None
st.rerun()

def set_feedback(message, type='success'):
Expand Down Expand Up @@ -1457,6 +1456,16 @@ def view_add_task_form():
st.markdown("<div style='padding-top: 28px;'></div>", unsafe_allow_html=True)
is_recurring = st.checkbox(_("Recurring"))

validation_error = is_recurring and not due_date
if validation_error:
st.markdown("""
<style>
div[data-testid="stDateInput"] > div {
border: 2px solid red !important;
}
</style>
""", unsafe_allow_html=True)

# Frequency options for recurring tasks
freq_options = ["daily", "on all business days", "weekly", "monthly", "userdefined"]
freq_labels = [_("daily"), _("on all business days"), _("weekly"), _("monthly"), _("userdefined")]
Expand All @@ -1480,10 +1489,15 @@ def view_add_task_form():
st.markdown('</div>', unsafe_allow_html=True)

st.divider()
if validation_error:
st.error(_("A due date is required for recurring tasks."))

col_btn1, col_btn2 = st.columns(2)
with col_btn1:
if st.button(_("Add Task"), type="primary", use_container_width=True):
if not name:
if validation_error:
pass
elif not name:
st.error(_("Please enter a name."))
elif name.lower() in existing_tasks:
set_feedback(_("A task with this name already exists in this project."), 'error')
Expand Down Expand Up @@ -1607,6 +1621,16 @@ def view_edit_task_form():
with col_rec:
is_recurring = st.checkbox(_("Recurring"), value=task_details.get('recurring', False))

validation_error = is_recurring and not st.session_state.edit_due_date
if validation_error:
st.markdown("""
<style>
div[data-testid="stDateInput"] > div {
border: 2px solid red !important;
}
</style>
""", unsafe_allow_html=True)

freq_options = ["daily", "on all business days", "weekly", "monthly", "userdefined"]
freq_labels = [_("daily"), _("on all business days"), _("weekly"), _("monthly"), _("userdefined")]
curr_freq = task_details.get('frequency', 'daily')
Expand All @@ -1631,31 +1655,36 @@ def view_edit_task_form():
st.markdown('</div>', unsafe_allow_html=True)

st.divider()
if validation_error:
st.error(_("A due date is required for recurring tasks."))

col_save, col_cancel = st.columns(2)
with col_save:
if st.button(_("Save Changes"), type="primary", use_container_width=True):
final_due = st.session_state.edit_due_date.isoformat() if st.session_state.edit_due_date else None
new_status = 'done' if is_done else 'open'

if st.session_state.tracker.update_task(
main_project,
task_name,
new_name,
final_due,
is_today,
st.session_state.edit_task_note,
new_status,
recurring=is_recurring,
frequency=final_freq,
userdefined_days=ud_days
):
set_feedback(_("Task updated successfully."))
if 'edit_due_date' in st.session_state: del st.session_state.edit_due_date
if 'edit_task_note' in st.session_state: del st.session_state.edit_task_note
st.session_state.context = {}
navigate_to(return_to)
else:
st.error(_("Error: Could not update task."))
if not validation_error: # Proceed only if no validation error
final_due = st.session_state.edit_due_date.isoformat() if st.session_state.edit_due_date else None
new_status = 'done' if is_done else 'open'

if st.session_state.tracker.update_task(
main_project,
task_name,
new_name,
final_due,
is_today,
st.session_state.edit_task_note,
new_status,
recurring=is_recurring,
frequency=final_freq,
userdefined_days=ud_days,
task_id=task_id
):
set_feedback(_("Task updated successfully."))
if 'edit_due_date' in st.session_state: del st.session_state.edit_due_date
if 'edit_task_note' in st.session_state: del st.session_state.edit_task_note
st.session_state.context = {}
navigate_to(return_to)
else:
st.error(_("Error: Could not update task."))

with col_cancel:
if st.button(_("Cancel"), use_container_width=True):
Expand Down
Loading