X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=b698fcbef94b73d790c6346e9bc8db7b5f4e7e33;hb=836c33fc94dbb75d241717b7db6a3718edcc0464;hp=01a949e019eddbf9919f333d252a05aeb7dcd4e7;hpb=c675dc8a489ef6e495a643473fab16fa5c261e27;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 01a949e..b698fcb 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -4,7 +4,7 @@ from http.server import HTTPServer from urllib.parse import urlparse, parse_qs from os.path import split as path_split from jinja2 import Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader -from plomtask.days import Day +from plomtask.days import Day, todays_date from plomtask.misc import HandledException from plomtask.db import DatabaseConnection @@ -29,9 +29,11 @@ class TaskHandler(BaseHTTPRequestHandler): try: conn, site, params = self._init_handling() if 'calendar' == site: - html = self.do_GET_calendar(conn) + start = params.get('start', [''])[0] + end = params.get('end', [''])[0] + html = self.do_GET_calendar(conn, start, end) elif 'day' == site: - date = params.get('date', ['2024-01-01'])[0] + date = params.get('date', [todays_date()])[0] html = self.do_GET_day(conn, date) else: raise HandledException('Test!') @@ -41,14 +43,14 @@ class TaskHandler(BaseHTTPRequestHandler): except HandledException as error: self._send_msg(error) - def do_GET_calendar(self, conn: DatabaseConnection): + def do_GET_calendar(self, conn: DatabaseConnection, start: str, end: str): """Show Days.""" return self.server.jinja.get_template('calendar.html').render( - days=Day.all(conn)) + days=Day.all(conn, date_range=(start, end))) def do_GET_day(self, conn: DatabaseConnection, date: str): """Show single Day.""" - day = Day.by_date(conn, date) + day = Day.by_date(conn, date, create=True) return self.server.jinja.get_template('day.html').render(day=day) def do_POST(self): @@ -59,7 +61,7 @@ class TaskHandler(BaseHTTPRequestHandler): postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1) if 'day' == site: - date = params.get('date', ['2024-01-01'])[0] + date = params.get('date', [None])[0] self.do_POST_day(conn, date, postvars) conn.commit() conn.close()