Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 26 additions & 1 deletion index.htm
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h3>
<div class="buttons">

<button id="update-daily">Update</button>
<button id="delete-daily">Delete</button>
<button id="delete-daily">Remove</button>

</div>

Expand All @@ -78,6 +78,31 @@ <h3>

</div>

<div id="delete-daily-task" class="hidden">

<div class="task">

<h3>
<label class="task-label" for="weekly-delete">Confirm delete</label>
</h3>

<svg id="close-delete-daily" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40" width="40px" height="40px"><path fill="red" d="M21.5 4.5H26.501V43.5H21.5z" transform="rotate(45.001 24 24)" /><path fill="red" d="M21.5 4.5H26.5V43.501H21.5z" transform="rotate(135.008 24 24)" /></svg>

</div>

<ul>
<li id="delete-daily-task-item"></li>
</ul>

<div class="buttons">

<button id="confirm-delete-daily">Delete</button>
<button id="cancel-delete-daily">Cancel</button>

</div>

</div>

<div class="current">
<h3 id="ad-hoc-title" class="hidden"></h3>
<ul id="ad-hoc-list" class="hidden"></ul>
Expand Down
52 changes: 44 additions & 8 deletions script.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ const closeUpdateAdHoc = document.getElementById("close-update-ad-hoc");
const adHocTitle = document.getElementById("ad-hoc-title");
const adHocList = document.getElementById("ad-hoc-list");
const dailyInput = document.getElementById("daily-input");
const deleteDailyTask = document.getElementById("delete-daily-task");
const deleteDailyTaskItem = document.getElementById("delete-daily-task-item");
const closeDeleteDaily = document.getElementById("close-delete-daily");
const confirmDeleteDaily = document.getElementById("confirm-delete-daily");
const cancelDeleteDaily = document.getElementById("cancel-delete-daily");

// weekly
const days = document.querySelectorAll("h2");
Expand Down Expand Up @@ -326,7 +331,7 @@ let diff = new Date(thisYear, thisMonth, thisDay).getTime();
}

editDailyTask.innerHTML = tasks["Daily"]["Ad hoc"].map(el => `
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value)" />
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value);" />
<li>
<label id="edit">
${el}
Expand All @@ -343,7 +348,7 @@ let diff = new Date(thisYear, thisMonth, thisDay).getTime();
closeUpdateAdHoc.addEventListener("click", event => {

editDailyTask.innerHTML = tasks["Daily"]["Ad hoc"].map(el => `
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value)" />
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value);" />
<li>
<label>
${el}
Expand All @@ -358,12 +363,17 @@ let diff = new Date(thisYear, thisMonth, thisDay).getTime();

});

// delete ad hoc
// remove ad hoc

const editAdHoc = item => modifyAdHoc = item;

deleteDaily.addEventListener("click", event => {

deleteDailyTask.classList.toggle("hidden");
edit.classList.toggle("hidden");

deleteDailyTaskItem.innerText = modifyAdHoc;

let removeItem = tasks["Daily"]["Ad hoc"];

for (let i = 0; i < removeItem.length; i++) {
Expand All @@ -374,7 +384,33 @@ let diff = new Date(thisYear, thisMonth, thisDay).getTime();
}

editDailyTask.innerHTML = tasks["Daily"]["Ad hoc"].map(el => `
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value)" />
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value);" />
<li>
<label id="edit">
${el}
</label>
</li>`).join("");

});

// confirm daily delete

confirmDeleteDaily.addEventListener("click", event => {

deleteDailyTask.classList.toggle("hidden");
edit.classList.toggle("hidden");

let removeItem = tasks["Daily"]["Ad hoc"];

for (let i = 0; i < removeItem.length; i++) {
if (removeItem[i] === modifyAdHoc) {
tasks["Daily"]["Ad hoc"].splice(i, 1);
modifyAdHoc = "";
}
}

editDailyTask.innerHTML = tasks["Daily"]["Ad hoc"].map(el => `
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value);" />
<li>
<label id="edit">
${el}
Expand All @@ -389,7 +425,7 @@ let diff = new Date(thisYear, thisMonth, thisDay).getTime();
modifyAdHoc = "";

selectWeeklyTaskList.innerHTML = Object.keys(tasks["Weekly"]).map(el => `
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value)" />
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value);" />
<li>
<label>
${el}
Expand Down Expand Up @@ -442,7 +478,7 @@ let diff = new Date(thisYear, thisMonth, thisDay).getTime();
// weekly selection list

selectWeeklyTaskList.innerHTML = Object.keys(tasks["Weekly"]).map(el => `
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value)" />
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value);" />
<li>
<label>
${el}
Expand Down Expand Up @@ -493,7 +529,7 @@ let diff = new Date(thisYear, thisMonth, thisDay).getTime();
modifyAdHoc = "";

selectWeeklyTaskList.innerHTML = Object.keys(tasks["Weekly"]).map(el => `
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value)" />
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value);" />
<li>
<label>
${el}
Expand All @@ -515,7 +551,7 @@ let diff = new Date(thisYear, thisMonth, thisDay).getTime();
modifyAdHoc = "";

selectWeeklyTaskList.innerHTML = Object.keys(tasks["Weekly"]).map(el => `
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value)" />
<input type="radio" name="edit" value="${el}" onclick="editAdHoc(this.value);" />
<li>
<label>
${el}
Expand Down
12 changes: 6 additions & 6 deletions styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ h3 {
margin-bottom: 1em;
}

#insert-daily-task, #update-daily-task, #select-weekly-task, #insert-weekly-task, #update-weekly-task, #delete-weekly-task {
#insert-daily-task, #update-daily-task, #delete-daily-task , #select-weekly-task, #insert-weekly-task, #update-weekly-task, #delete-weekly-task {
border: 2px solid blue;
border-radius: 6px;
margin-top: 8px;
Expand All @@ -73,7 +73,7 @@ h3 {
border-radius: 6px;
}

#insert-daily-task, #edit, #update-daily-task, #select-weekly-task, #insert-weekly-task, #select-weekly-task, #edit-weekly-task, #update-weekly-task, #delete-weekly-task {
#insert-daily-task, #edit, #update-daily-task, #delete-daily-task, #select-weekly-task, #insert-weekly-task, #select-weekly-task, #edit-weekly-task, #update-weekly-task, #delete-weekly-task {
margin: auto;
min-width: 300px;
max-width: 500px;
Expand All @@ -99,7 +99,7 @@ h3 {
justify-content: space-around;
}

#insert-daily, #update-daily, #modify-daily, #delete-daily, #add-weekly, #edit-weekly, #insert-weekly, #update-weekly, #delete-weekly, #modify-weekly, #confirm-delete-weekly, #cancel-delete-weekly, #confirm-modify-weekly {
#insert-daily, #update-daily, #modify-daily, #delete-daily, #confirm-delete-daily, #cancel-delete-daily, #add-weekly, #edit-weekly, #insert-weekly, #update-weekly, #delete-weekly, #modify-weekly, #confirm-delete-weekly, #cancel-delete-weekly, #confirm-modify-weekly {
margin-top: 8px;
margin-left: 8px;
margin-bottom: 8px;
Expand All @@ -118,8 +118,8 @@ h2, h3 {
font-family: Tahoma;
}

h3 {
font-size: 1.17em;
.current h3 {
font-size: 1.1em;
}

#task-list li, #edit-daily-task li, #select-weekly-task-list li, #edit-weekly-task-list li {
Expand All @@ -133,7 +133,7 @@ h3 {
margin-left: -1.75em;
}

#edit-daily-task, #delete-daily-task, #select-weekly-task-list, #edit-weekly-task-list {
#edit-daily-task, #select-weekly-task-list, #edit-weekly-task-list {
margin-left: 15%;
margin-top: 1em;
margin-bottom: 1em;
Expand Down