X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/git-logo.png?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=9a68221998ea81deea78a2770ac9a2f0e3bef470;hb=8310bdb39e4f3cba5ac90be1ec57b3df633f436b;hp=01a949e019eddbf9919f333d252a05aeb7dcd4e7;hpb=c675dc8a489ef6e495a643473fab16fa5c261e27;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 01a949e..9a68221 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -4,9 +4,10 @@ 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 +from plomtask.processes import Process TEMPLATES_DIR = 'templates' @@ -29,10 +30,21 @@ 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) + elif 'process' == site: + id_ = params.get('id', [None])[0] + try: + id_ = int(id_) if id_ else None + except ValueError as e: + raise HandledException(f'Bad ?id= value: {id_}') from e + html = self.do_GET_process(conn, id_) + elif 'processes' == site: + html = self.do_GET_processes(conn) else: raise HandledException('Test!') conn.commit() @@ -41,16 +53,27 @@ 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.""" + days = Day.all(conn, date_range=(start, end), fill_gaps=True) return self.server.jinja.get_template('calendar.html').render( - days=Day.all(conn)) + days=days, start=start, end=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_GET_process(self, conn: DatabaseConnection, id_: int | None): + """Show process of id_.""" + return self.server.jinja.get_template('process.html').render( + process=Process.by_id(conn, id_, create=True)) + + def do_GET_processes(self, conn: DatabaseConnection): + """Show all Processes.""" + return self.server.jinja.get_template('processes.html').render( + processes=Process.all(conn)) + def do_POST(self): """Handle any POST request.""" try: @@ -59,8 +82,15 @@ 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) + elif 'process' == site: + id_ = params.get('id', [None])[0] + try: + id_ = int(id_) if id_ else None + except ValueError as e: + raise HandledException(f'Bad ?id= value: {id_}') from e + self.do_POST_process(conn, id_, postvars) conn.commit() conn.close() self._redirect('/') @@ -69,11 +99,24 @@ class TaskHandler(BaseHTTPRequestHandler): def do_POST_day(self, conn: DatabaseConnection, date: str, postvars: dict): """Update or insert Day of date and fields defined in postvars.""" - comment = postvars['comment'][0] day = Day.by_date(conn, date, create=True) - day.comment = comment + day.comment = postvars['comment'][0] day.save(conn) + def do_POST_process(self, conn: DatabaseConnection, id_: int | None, + postvars: dict): + """Update or insert Process of id_ and fields defined in postvars.""" + process = Process.by_id(conn, id_, create=True) + if process: + process.title.set(postvars['title'][0]) + process.description.set(postvars['description'][0]) + effort = postvars['effort'][0] + try: + process.effort.set(float(effort)) + except ValueError as e: + raise HandledException(f'Bad effort value: {effort}') from e + process.save(conn) + def _init_handling(self): conn = DatabaseConnection(self.server.db) parsed_url = urlparse(self.path)