Js - eliminate global parameters

Author: aviadamar

app/config.py.example

@@ -55,14 +55,18 @@ def display(self) -> str:
         """Returns day date inf the format of 00 MONTH 00"""
         return self.date.strftime("%d %B %y").upper()
 
+    def set_id(self) -> str:
+        """Returns day date inf the format of 00-mon-0000"""
+        return self.date.strftime("%d-%b-%Y")
+
     @classmethod
     def get_user_local_time(cls) -> datetime:
         greenwich = pytz.timezone('GB')
         return greenwich.localize(datetime.now())
 
     @classmethod
     def convert_str_to_date(cls, date_string: str) -> datetime:
-        return datetime.strptime(date_string, '%d %B %y')
+        return datetime.strptime(date_string, '%d-%b-%Y')
 
     @classmethod
     def is_weekend(cls, date: date) -> bool:

app/routers/calendar_grid.py

@@ -1,49 +1,46 @@
-function setToggle(elementClass, targetElement, classToAdd) {
+function setToggle(elementClass, targetElement, classToAdd, lastIndex) {
     const allDays = document.getElementsByClassName(elementClass);
-    for (let i = window['lastIndex']; i < allDays.length; ++i) {
+    for (let i = lastIndex; i < allDays.length; ++i) {
         allDays[i].addEventListener("click", function () {
             const target = document.getElementById(targetElement);
             target.classList.toggle(classToAdd);
         })
     }
-    window['lastIndex'] += allDays.length - window['lastIndex'];
 }
 
-
 document.addEventListener(
     'DOMContentLoaded', function () {
-        window['lastIndex'] = 0;
-        window['last'] = 0;
-        setToggle("day", "day-view", "day-view-visible");
+        setToggle("day", "day-view", "day-view-visible", 0);
     }
 )
 
-function loadWeek(lastDay) {
-    if (lastDay === window['last']) {
+function loadWeek(lastDay, index) {
+    if (lastDay.dataset.last === "false") {
         return false;
     }
-    const path = '/calendar/month/' + lastDay;
+    lastDay.dataset.last = false;
+    const path = '/calendar/month/' + lastDay.id;
+    alert(path);
     const newDays = document.createElement('html');
-    window['last'] = lastDay;
     fetch(path).then(function (response) {
         return response.text();
     }).then(function (html) {
         const newDiv = document.createElement("div");
         newDays.innerHTML = html
         newDiv.appendChild(newDays);
         document.getElementById("calender-grid").append(newDays);
-        setToggle("day", "day-view", "day-view-visible");
+        setToggle("day", "day-view", "day-view-visible", index);
     });
 }
 
 window.addEventListener(
     'scroll', function () {
-        const tolerance = 1;
+        const tolerance = 100;
         if (window.scrollY + window.innerHeight + tolerance < document.documentElement.scrollHeight) {
             return false;
         }
         const allDays = document.querySelectorAll('.day');
-        const lastDay = allDays[allDays.length - 1].id;
-        loadWeek(lastDay);
+        const lastDay = allDays[allDays.length - 1];
+        loadWeek(lastDay, allDays.length);
     }
 )

app/static/js/grid_scripts.js

@@ -1,7 +1,7 @@
 {% for week in weeks_block %}
 <div class="week">
     {% for day in week.days %}
-    <div class="{{day.css['day_container']}}" id="{{day.display()}}">
+    <div class="{{day.css['day_container']}}" id="{{day.set_id()}}">
         <div class="month-day-header">
             <div class="{{day.css['date']}}">{{day}}</div>
             <div><a href="#" class="add-small">+</a></div>

app/templates/calendar/add_week.html

@@ -25,7 +25,7 @@ def test_get_calendar(client):
 
     @staticmethod
     def test_get_calendar_extends(client):
-        response = client.get(f"/calendar/month/{DAY.display()}")
+        response = client.get(f"/calendar/month/{DAY.set_id()}")
         assert response.ok
         assert b"08" in response.content
 
@@ -103,6 +103,10 @@ def test_is_weekend():
     def test_display_day():
         assert DAY.display() == '03 MAY 88'
 
+    @staticmethod
+    def test_set_id():
+        assert DAY.set_id() == '03-May1988'
+
     @staticmethod
     def test_display_str():
         assert str(DAY) == '03'