Merge branch 'master' of https://github.com/RugeljGG/AdventOfCode

# Conflicts:
#	Website/main.py

Author: RugeljGG

Website/html/template.html

@@ -10,9 +10,7 @@
         Last refresh: {{ts}}
     </div>
     <div id="links", style="width:50%; float: left; text-align: right">
-        <a href="/2017">2017</a> 
-        <a href="/2018">2018</a> 
-        <a href="/2019">2019</a>
+		{{links|safe}}
     </div>
 </div>
 <p></p>
@@ -49,6 +47,7 @@
 	var dataSet;
 	var last_refresh;
 	var visible = ['Name', 'Score'];
+	const year = {{year}}
 	$.ajaxSetup({
     async: false
 	});
@@ -66,7 +65,7 @@
 			if (key == 'ID'){my_item.visible= false}
 			if (i<columns.length-14 && !(visible.includes(key))){my_item.visible = false} // only show last 7*2 columns. 
 			my_item.type = 'non-empty-string'
-			if (i>3){t_columns.push(i)};
+			if (i>2){t_columns.push(i)};
 			my_columns.push(my_item);
 	});
 	document.getElementById("refresh").innerHTML = "Last refresh: " + last_refresh;
@@ -97,8 +96,18 @@
 							var a2 = a1[1].split(':')
 							var hour = Number(a2[a2.length-3]);
 							var day = a1[0].split('.')[0]
-							console.log(hour);
-							if (hour >= 9 && hour <16 && day % 7 > 1 ) {
+							var month = a1[0].split('.')[1]
+							//console.log(hour);
+							var dow = 0;
+							if (year == 2020) {
+								dow = day % 7}
+							else if (year == 2019) {
+								dow = (day+5) % 7}
+							else if (year == 2018) {
+								dow = (day+4) % 7}
+							else if (year == 2017) {
+								dow = (day+3) % 7}
+							if (month == 12 && hour >= 9 && hour <16 && dow < 5) {
 								color = 'red'}
 							}
 						}

Website/main.py

@@ -62,15 +62,18 @@ def duration(year, *args, **kwargs):
 @app.route('/')
 @app.route('/<year>')
 def index(year='2020', duration=False):
-    if str(year) not in YEARS:
-        year = '2019'
+    year=str(year)
+    if year not in YEARS:
+        year = '2020'
+    links = '\r\n'.join(['<a href="/{y}">{y}</a>'.format(y=y) for y in YEARS if y!= year])
     name = 'AoC {}'.format(year)
     ts = cache[duration][year]['ts']
     prefix = 'get_duration/' if duration else 'get_results/'
     return flask.render_template('template.html', 
                                  name=name, 
                                  year=year, 
                                  ts=ts,
+                                 links=links,
                                  prefix=prefix)