Miscellaneous cleanup and beautification

Workout.js

@@ -1,49 +1,60 @@
 class Workout {
-    constructor(cont, plan) {
+
+// ----------
+constructor(cont, plan) {
     const wo_cont = document.createElement("div");
     wo_cont.classList.add("workout-wrapper");
     cont.appendChild(wo_cont);
-        this.cont = wo_cont;
+
+    // Inputs to the class. Workout plan and container to display it in
+    this.container = wo_cont;
     this.plan = plan;
 
+    // Status tracking information
     this.action = "";
     this.set_idx = 0;
     this.exercise_idx = 0;
     this.workout_done = 0;
 
-        // this.show_debug_status = 1;
+    // Enable debug
-    }
+    this.show_debug_status = 1;
+}
 
-    text_element(typ, txt) {
+// ----------
-        const ret_elem = document.createElement(typ);
+text_element(typ, txt) {
-        ret_elem.textContent = txt;
+    const el = document.createElement(typ);
+    el.textContent = txt;
 
-        return ret_elem;
+    return el;
-    }
+}
 
-    render_workout_header() {
+// ----------
-        this.cont.appendChild(this.text_element("h1", this.plan.name));
+render_workout_header() {
-    }
+    this.container.appendChild(this.text_element("h1", this.plan.name));
+}
 
-    render_debug_status() {
+// ----------
+render_debug_status() {
     const dbg_div = document.createElement("div");
     dbg_div.classList.add("app_debug");
 
     const dt = document.createElement("p");
     dt.setAttribute("id", "app_debug_div");
     dbg_div.appendChild(dt);
-        this.cont.appendChild(dbg_div);
+    this.container.appendChild(dbg_div);
-    }
+}
 
-    update_debug_info() {
+// ----------
+update_debug_info() {
     if (this.show_debug_status) {
-            const dt = this.cont.querySelector("#app_debug_div");
+        const dt = this.container.querySelector("#app_debug_div");
         const done_str = (this.workout_done === 1) ? "Done " : "";
         dt.textContent = `${done_str}Action: ${this.action} Current: Set-${this.set_idx}/Exercise-${this.exercise_idx}`;
     }
-    }
+}
 
-    render_exercise(prnt, el, idx) {
+// ----------
+render_exercise(prnt, el, idx) {
     const tblr = document.createElement("tr");
     tblr.setAttribute("class", `exercise-row exercise-idx-${idx} exercise-pending`);
 
@@ -67,9 +78,10 @@ class Workout {
     tblr.appendChild(col);
 
     prnt.appendChild(tblr);
-    }
+}
 
-    render_set(el, idx) {
+// ----------
+render_set(el, idx) {
     const wo = this;
 
     // Table with one set
@@ -106,10 +118,11 @@ class Workout {
     });
     tbl.appendChild(tblb);
 
-        this.cont.appendChild(tbl);
+    this.container.appendChild(tbl);
-    }
+}
 
-    render_workout() {
+// ----------
+render_workout() {
     const wo = this;
     this.render_workout_header();
     if (this.show_debug_status) {
@@ -120,11 +133,12 @@ class Workout {
     })
 
     this.update_debug_info();
-    }
+}
 
-    update_active_item() {
+// ----------
+update_active_item() {
     // Make current active exercise row inactive
-        const curr_active_tr = this.cont.querySelector(".exercise-row.active");
+    const curr_active_tr = this.container.querySelector(".exercise-row.active");
     if (curr_active_tr != null) {
         curr_active_tr.classList.remove("active");
     }
@@ -132,7 +146,7 @@ class Workout {
     // Set active exercise row
     let qstr = `table.set-table-idx-${this.set_idx} tr.exercise-idx-${this.exercise_idx}`;
     console.log(`Looking for ${qstr}`);
-        const next_active_tr = this.cont.querySelector(qstr);
+    const next_active_tr = this.container.querySelector(qstr);
     console.log(next_active_tr);
     if (next_active_tr != null) {
         next_active_tr.classList.add("active");
@@ -140,14 +154,15 @@ class Workout {
 
     // Mark workout done
     qstr = `table tr.exercise-pending`;
-        let pending_trs = this.cont.querySelectorAll(qstr);
+    let pending_trs = this.container.querySelectorAll(qstr);
     console.log(`Remaining to be done ${pending_trs.length}`);
     if (pending_trs.length === 0) {
         this.workout_done = 1;
     }
-    }
+}
 
-    handle_exercise_advance() {
+// ----------
+handle_exercise_advance() {
     const curr_exercise_max_idx = this.plan.set[this.set_idx].exercise.length-1;
     const curr_set_max_idx = this.plan.set.length-1;
 
@@ -167,9 +182,10 @@ class Workout {
     }
 
     this.update_active_item();
-    }
+}
 
-    handle_exercise_regress() {
+// ----------
+handle_exercise_regress() {
     const curr_set_max_idx = this.plan.set.length-1;
 
     console.log(`workout done ${this.workout_done}`);
@@ -186,27 +202,28 @@ class Workout {
     }
 
     this.update_active_item();
-    }
+}
 
-    handle_exercise_done() {
+// ----------
+handle_exercise_done() {
     // Set active exercise row
     let qstr = `table.set-table-idx-${this.set_idx} tr.exercise-idx-${this.exercise_idx} input`;
     console.log(`Looking for ${qstr}`);
-        const active_chkbox = this.cont.querySelector(qstr);
+    const active_chkbox = this.container.querySelector(qstr);
 
     if (!active_chkbox.checked) {
         active_chkbox.checked = true;
         active_chkbox.disabled = true;
         qstr = `table.set-table-idx-${this.set_idx} tr.exercise-idx-${this.exercise_idx}`;
-            const active_tr = this.cont.querySelector(qstr);
+        const active_tr = this.container.querySelector(qstr);
         active_tr.classList.remove("exercise-pending");
     }
 
     this.update_active_item();
-    }
+}
 
-
+// ----------
-    handle_key_press(app, ev) {
+handle_key_press(app, ev) {
     if (this.workout_done) {
         return;
     }
@@ -229,9 +246,10 @@ class Workout {
     }
 
     app.update_debug_info();
-    }
+}
 
-    render() {
+// ----------
+render() {
     const app = this;
     this.render_workout();
     this.update_active_item();
@@ -239,6 +257,7 @@ class Workout {
     document.addEventListener('keydown', function(ev) {
         app.handle_key_press(app, ev);
     });
-    }
+}
+
 }