Merge pull request #34 from filips123/fix-lunch-updater

Author: filips123

API/gimvicurnik/updaters/eclassroom.py

@@ -533,7 +533,13 @@ def _parse_daily_lunch_schedule(self, date, tables):
             if "Dijaki prihajate v jedilnico" in table[0][0]:
                 continue
 
-            for row in table:
+            for index, row in enumerate(table):
+                # Handle multiple times in the same cell
+                times = row[0].split("\n", 1)
+                if len(times) == 2:
+                    row[0] = times[0]
+                    table[index + 1][0] = times[1]
+
                 # Skip header
                 if row[0] and "ura" in row[0]:
                     continue

API/gimvicurnik/utils/ical.py

@@ -32,7 +32,7 @@ def create_school_calendar(details, timetables, hours, name, timetable=True, sub
     calendar.add("X-PUBLISHED-TTL", vDuration(timedelta(hours=1)))
     calendar.add("REFRESH-INTERVAL", vDuration(timedelta(hours=1)))
 
-    year = datetime.now().year if datetime.now().date() > date(datetime.now().year, 9, 1) else datetime.now().year - 1
+    year = datetime.now().year if datetime.now().date() >= date(datetime.now().year, 9, 1) else datetime.now().year - 1
 
     weekdays = ["SU", "MO", "TU", "WE", "TH", "FR", "SA"]
     weektable = [[None for i in range(10)] for j in range(6)]
@@ -146,8 +146,8 @@ def create_schedule_calendar(query, name):
     calendar.add("X-WR-CALNAME", name)
     calendar.add("X-WR-CALDESC", name)
     calendar.add("NAME", name)
-    calendar.add("X-PUBLISHED-TTL", vDuration(timedelta(hours=12)))
-    calendar.add("REFRESH-INTERVAL", vDuration(timedelta(hours=12)))
+    calendar.add("X-PUBLISHED-TTL", vDuration(timedelta(hours=1)))
+    calendar.add("REFRESH-INTERVAL", vDuration(timedelta(hours=1)))
 
     for model in query:
         with start_span(op="event") as span:

website/public/index.html

@@ -13,7 +13,7 @@
     <link rel="alternate" type="application/atom+xml" title="Okrožnice - Gimnazija Vič" href="<%= VUE_APP_API %>/feeds/circulars.atom" />
     <link rel="alternate" type="application/atom+xml" title="Nadomeščanja - Gimnazija Vič" href="<%= VUE_APP_API %>/feeds/substitutions.atom" />
     <link rel="alternate" type="application/atom+xml" title="Jedilniki - Gimnazija Vič" href="<%= VUE_APP_API %>/feeds/menus.atom" />
-    <link rel="alternate" type="application/atom+xml" title="Razporedi kosil - Gimnazija Vič" href="<%= VUE_APP_API %>/feeds/schedules.atom" />
+    <link rel="alternate" type="application/atom+xml" title="Razporedi delitve kosila - Gimnazija Vič" href="<%= VUE_APP_API %>/feeds/schedules.atom" />
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
   </head>