diff --git a/frontend/www/scripts/exercise.js b/frontend/www/scripts/exercise.js index 24ef1862893160cb60522c397b57e83eaa214efe..57d5d9d08baa192d7a92f3ef70c5321a97f46cf0 100644 --- a/frontend/www/scripts/exercise.js +++ b/frontend/www/scripts/exercise.js @@ -4,7 +4,14 @@ let deleteButton; let editButton; let oldFormData; -class MuscleGroup { +const name = "name"; +const description = "description"; +const duration = "duration"; +const calories = "calories"; +const muscleGroup = "muscleGroup"; +const unit = "unit"; + +class MuscleGroup { constructor(type) { this.isValidType = false; this.validTypes = ["Legs", "Chest", "Back", "Arms", "Abdomen", "Shoulders"] @@ -14,7 +21,7 @@ class MuscleGroup { setMuscleGroupType = (newType) => { this.isValidType = false; - + if(this.validTypes.includes(newType)){ this.isValidType = true; this.type = newType; @@ -24,7 +31,7 @@ class MuscleGroup { } } - + getMuscleGroupType = () => { console.log(this.type, "SWIOEFIWEUFH") return this.type; @@ -42,19 +49,19 @@ function handleCancelButtonDuringEdit() { cancelButton.removeEventListener("click", handleCancelButtonDuringEdit); const form = document.querySelector("#form-exercise"); - if (oldFormData.has("name")) form.name.value = oldFormData.get("name"); - if (oldFormData.has("description")) form.description.value = oldFormData.get("description"); - if (oldFormData.has("duration")) form.duration.value = oldFormData.get("duration"); - if (oldFormData.has("calories")) form.calories.value = oldFormData.get("calories"); - if (oldFormData.has("muscleGroup")) form.muscleGroup.value = oldFormData.get("muscleGroup"); - if (oldFormData.has("unit")) form.unit.value = oldFormData.get("unit"); - - oldFormData.delete("name"); - oldFormData.delete("description"); - oldFormData.delete("duration"); - oldFormData.delete("calories"); - oldFormData.delete("muscleGroup"); - oldFormData.delete("unit"); + if (oldFormData.has(name)) form.name.value = oldFormData.get(name); + if (oldFormData.has(description)) form.description.value = oldFormData.get(description); + if (oldFormData.has(duration)) form.duration.value = oldFormData.get(duration); + if (oldFormData.has(calories)) form.calories.value = oldFormData.get(calories); + if (oldFormData.has(muscleGroup)) form.muscleGroup.value = oldFormData.get(muscleGroup); + if (oldFormData.has(unit)) form.unit.value = oldFormData.get(unit); + + oldFormData.delete(name); + oldFormData.delete(description); + oldFormData.delete(duration); + oldFormData.delete(calories); + oldFormData.delete(muscleGroup); + oldFormData.delete(unit); } @@ -66,12 +73,12 @@ async function createExercise() { document.querySelector("select").removeAttribute("disabled") const form = document.querySelector("#form-exercise"); const formData = new FormData(form); - const body = {"name": formData.get("name"), - "description": formData.get("description"), - "duration": formData.get("duration"), - "calories": formData.get("calories"), - "muscleGroup": formData.get("muscleGroup"), - "unit": formData.get("unit")}; + const body = {name: formData.get(name), + description: formData.get(description), + duration: formData.get(duration), + calories: formData.get(calories), + muscleGroup: formData.get(muscleGroup), + unit: formData.get(unit)}; const response = await sendRequest("POST", `${HOST}/api/exercises/`, body); @@ -145,12 +152,12 @@ async function updateExercise(id) { const selectedMuscleGroup = new MuscleGroup(formData.get("muscleGroup")); - const body = {"name": formData.get("name"), - "description": formData.get("description"), - "duration": formData.get("duration"), - "calories": formData.get("calories"), - "muscleGroup": selectedMuscleGroup.getMuscleGroupType(), - "unit": formData.get("unit")}; + const body = {name: formData.get(name), + description: formData.get(description), + duration: formData.get(duration), + calories: formData.get(calories), + muscleGroup: selectedMuscleGroup.getMuscleGroupType(), + unit: formData.get("unit")}; const response = await sendRequest("PUT", `${HOST}/api/exercises/${id}/`, body); if (!response.ok) { @@ -167,15 +174,15 @@ async function updateExercise(id) { deleteButton.className += " hide"; cancelButton.className += " hide"; editButton.className = editButton.className.replace(" hide", ""); - + cancelButton.removeEventListener("click", handleCancelButtonDuringEdit); - - oldFormData.delete("name"); - oldFormData.delete("description"); - oldFormData.delete("duration"); - oldFormData.delete("calories"); - oldFormData.delete("muscleGroup"); - oldFormData.delete("unit"); + + oldFormData.delete(name); + oldFormData.delete(description); + oldFormData.delete(duration); + oldFormData.delete(calories); + oldFormData.delete(muscleGroup); + oldFormData.delete(unit); } window.addEventListener("DOMContentLoaded", async () => { @@ -196,7 +203,7 @@ window.addEventListener("DOMContentLoaded", async () => { deleteButton.addEventListener("click", (async (id) => deleteExercise(id)).bind(undefined, exerciseId)); okButton.addEventListener("click", (async (id) => updateExercise(id)).bind(undefined, exerciseId)); return; - } + } //create setReadOnly(false, "#form-exercise"); @@ -206,4 +213,4 @@ window.addEventListener("DOMContentLoaded", async () => { okButton.addEventListener("click", async () => createExercise()); cancelButton.addEventListener("click", handleCancelButtonDuringCreate); -}); \ No newline at end of file +});