diff --git a/application/meal_planner/static/css/planner.css b/application/meal_planner/static/css/planner.css index 258199a..ca7680d 100644 --- a/application/meal_planner/static/css/planner.css +++ b/application/meal_planner/static/css/planner.css @@ -116,7 +116,7 @@ } .custom-label { - background:rgb(211, 211, 211); + background:rgb(195, 113, 243); margin-bottom: 3px; padding: 2px 5px; border-radius: 1px; @@ -154,3 +154,13 @@ .my-list-item:hover { background-color: whitesmoke; } + + +.old-event-label { + background:rgb(230, 230, 230); + margin-bottom: 3px; + padding: 2px 5px; + border-radius: 1px; + font-size: 12px; + font-weight: bold; +} \ No newline at end of file diff --git a/application/meal_planner/static/js/mealPlannerHandler.js b/application/meal_planner/static/js/mealPlannerHandler.js index 25f1b2a..21d31fc 100644 --- a/application/meal_planner/static/js/mealPlannerHandler.js +++ b/application/meal_planner/static/js/mealPlannerHandler.js @@ -151,6 +151,9 @@ async function createCalender() { let firstDay = new Date(year, month - 1, 1); let numDays = new Date(year, month, 0).getDate(); let startDay = firstDay.getDay(); + let today = new Date() + let todays_day = today.getUTCDate() + console.log(todays_day) let calender_table = document.createElement('table') calender_table.setAttribute('id', 'calender_table') @@ -172,13 +175,15 @@ async function createCalender() { let eventsHTML = ""; if (eventsByDay[day]) { eventsByDay[day].forEach(event => { - if(event.event_type==="recipe" && event.has_missing_ingredients){ + if(todays_day > day){ + eventsHTML += `
${event.event_shortname}
`; + } else if (event.event_type==="recipe" && event.has_missing_ingredients){ eventsHTML += `
${event.event_shortname}
`; } else if (event.event_type==="recipe" && !event.has_missing_ingredients){ eventsHTML += `
${event.event_shortname}
`; } else if (event.event_type==="take out"){ eventsHTML += `
${event.event_shortname}
`; - } else { + } else if (event.event_type==="custom") { eventsHTML += `
${event.event_shortname}
`; } @@ -187,6 +192,10 @@ async function createCalender() { table_cell.innerHTML = `
${day}
${eventsHTML}
`; table_cell.classList.add("calendar-cell"); + if(todays_day === day){ + table_cell.classList.add('calendar-cell-today') + } + table_cell.dataset.day = day; tableRow.append(table_cell)