From b385f73d070c8ee22f3634d942f4ae0f10007dd8 Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sat, 6 Feb 2021 11:02:57 +0200 Subject: [PATCH 01/21] created templates of forms and the list, started with database models and add some functions --- app/database/models.py | 31 ++++++++++++ app/internal/todo_list.py | 88 +++++++++++++++++++++++++++++++++++ app/static/todo_list.css | 78 +++++++++++++++++++++++++++++++ app/templates/tasks_list.html | 39 ++++++++++++++++ app/templates/todo_form.html | 30 ++++++++++++ 5 files changed, 266 insertions(+) create mode 100644 app/internal/todo_list.py create mode 100644 app/static/todo_list.css create mode 100644 app/templates/tasks_list.html create mode 100644 app/templates/todo_form.html diff --git a/app/database/models.py b/app/database/models.py index 3e7c1782..d2091e4e 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -43,11 +43,27 @@ class User(Base): is_active = Column(Boolean, default=False) events = relationship("UserEvent", back_populates="participants") + tasks = relationship( + "Task", cascade="all, delete", back_populates="owner") def __repr__(self): return f'' +class UserTask(Base): + __tablename__ = "user_task" + + id = Column(Integer, primary_key=True, index=True) + user_id = Column('user_id', Integer, ForeignKey('users.id')) + event_id = Column('task_id', Integer, ForeignKey('tasks.id')) + + tasks = relationship("Task", back_populates="participants") + participants = relationship("User", back_populates="tasks") + + def __repr__(self): + return f'' + + class Event(Base): __tablename__ = "events" @@ -176,3 +192,18 @@ def __repr__(self): f'{self.start_day_in_month}/{self.start_month}-' f'{self.end_day_in_month}/{self.end_month}>' ) + + +class Task(Base): + __tablename__ = "tasks" + + id = Column(Integer, primary_key=True, index=True) + title = Column(String) + description = Column(String) + is_done = Column(Boolean, nullable=False) + is_important = Column(Boolean, nullable=False) + date = Column(DateTime, nullable = False) + time = Column(DateTime, nullable = False) + owner_id = Column(Integer, ForeignKey("users.id")) + + owner = relationship("User", back_populates="tasks") \ No newline at end of file diff --git a/app/internal/todo_list.py b/app/internal/todo_list.py new file mode 100644 index 00000000..877c7184 --- /dev/null +++ b/app/internal/todo_list.py @@ -0,0 +1,88 @@ +from datetime import datetime +from operator import attrgetter +from typing import List +from urllib.request import Request + +from fastapi import Depends +from requests import Session +from sqlalchemy.exc import SQLAlchemyError + +from app.database.database import get_db +from app.database.models import Task, UserTask +from app.internal.utils import create_model +from app.main import router +from app.routers.event import by_id + + +def create_task(db, title, description, date, time, owner_id, is_important=None) -> Task: + """Creates and saves a new task.""" + + task = create_model( + db, Task, + title=title, + description=description, + date=date, + time=time, + owner_id=owner_id, + is_important=is_important, + is_done=False + ) + create_model( + db, UserTask, + user_id=owner_id, + task_id=task.id + ) + return task + + +def sort_by_time(tasks: List[Task]) -> List[Task]: + """Sorts the tasks by the start of the task.""" + + temp = tasks.copy() + return sorted(temp, key=attrgetter('time')) + + +def get_tasks(session: Session, **param): + """Returns all tasks filter by param.""" + + try: + tasks = list(session.query(Task).filter_by(**param)) + except SQLAlchemyError: + return [] + else: + return tasks + + +def is_date_before(date: datetime) -> bool: + """Check if the start date is earlier than the end date""" + + return date < datetime.now() + + +@router.delete("/{task_id}") +def delete_task(request: Request, + task_id: int, + db: Session = Depends(get_db)): + + # TODO: Check if the user is the owner of the task. + task = by_id(db, task_id) + participants = get_participants_emails_by_task(db, task_id) + try: + # Delete task + db.delete(task) + + # Delete user_task + db.query(UserTask).filter(UserTask.task_id == task_id).delete() + + db.commit() + + except (SQLAlchemyError, TypeError): + return templates.TemplateResponse( + "task/taskview.html", {"request": request, "task_id": task_id}, + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR) + if participants and task.start > datetime.now(): + pass + # TODO: Send them a cancellation notice + # if the deletion is successful + return RedirectResponse( + url="/calendar", status_code=status.HTTP_200_OK) \ No newline at end of file diff --git a/app/static/todo_list.css b/app/static/todo_list.css new file mode 100644 index 00000000..8ce59b1b --- /dev/null +++ b/app/static/todo_list.css @@ -0,0 +1,78 @@ +.form-style { + font: 95% Arial, Helvetica, sans-serif; + max-width: 400px; + margin: 10px auto; + padding: 16px; + background: #F7F7F7; +} + +#table { + max-width: 500px; +} + +.form-style h1 { + background: #004d99; + padding: 20px 0; + font-size: 140%; + font-weight: 300; + text-align: center; + color: #fff; + margin: -16px -16px 16px -16px; +} + +.form-style input[type="text"], +.form-style input[type="date"], +.form-style input[type="time"], +.form-style textarea { + -webkit-transition: all 0.30s ease-in-out; + -moz-transition: all 0.30s ease-in-out; + -ms-transition: all 0.30s ease-in-out; + -o-transition: all 0.30s ease-in-out; + outline: none; + box-sizing: border-box; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + width: 100%; + background: #fff; + margin-bottom: 4%; + border: 1px solid #ccc; + padding: 3%; + color: #555; + font: 95% Arial, Helvetica, sans-serif; +} + +.form-style input[type="text"]:focus, +.form-style input[type="date"]:focus, +.form-style input[type="time"]:focus, +.form-style textarea:focus { + box-shadow: 0 0 5px #43D1AF; + padding: 3%; + border: 1px solid #43D1AF; +} + +th, td { + padding-right: 30px; + padding-top: 20px; + text-align: left; +} + +button { + padding: 2%; + background-color: #80bfff; + text-align: right; + margin-left: 85% +} + +.edit { + text-decoration: none; + background-color: #eafaf6; + border-style: solid; + border-color: #004d99; + border-radius: 10px; +} + +button:hover { + background-color: #004d99; + color: white; + box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19); +} diff --git a/app/templates/tasks_list.html b/app/templates/tasks_list.html new file mode 100644 index 00000000..1fdf3920 --- /dev/null +++ b/app/templates/tasks_list.html @@ -0,0 +1,39 @@ + + + + + + Daily tasks + + +
+

Todo-List

+ + + + + + + + {% for task in tasks %} + {% if task.is_important %} + + + + + + + {% endif %} + {% else %} + + + + + + + {% endelse %} + {% endfor %} + +
TimeTaskDescription
{{task.time}}{{task.title}}{{task.description}}Edit
{{task.time}}{{task.title}}{{task.description}}Edit
+ + \ No newline at end of file diff --git a/app/templates/todo_form.html b/app/templates/todo_form.html new file mode 100644 index 00000000..8ea03252 --- /dev/null +++ b/app/templates/todo_form.html @@ -0,0 +1,30 @@ + + + + + + Todo-List + + +
+

Add Task

+ {% if model.any_id is defined %} +
+ +
+ {% endif %} +
+ + + + + + + + + + +
+
+ + From 73d9f378e47a1602a7c3e3263a0d28bd33be208d Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sun, 7 Feb 2021 17:00:30 +0200 Subject: [PATCH 02/21] created to do list functions, templates an routers --- app/database/models.py | 20 +-- app/internal/todo_list.py | 92 ++++++++------ app/routers/dayview.py | 4 +- app/routers/todo_list.py | 53 ++++++++ app/static/dayview.css | 90 ++++++++++++++ app/templates/dayview.html | 221 ++++++++++++++++++++++++---------- app/templates/tasks_list.html | 2 +- app/templates/todo_form.html | 2 +- 8 files changed, 367 insertions(+), 117 deletions(-) create mode 100644 app/routers/todo_list.py diff --git a/app/database/models.py b/app/database/models.py index d2091e4e..79139d6d 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -4,7 +4,7 @@ from typing import Dict, Any from sqlalchemy import (DDL, Boolean, Column, DateTime, ForeignKey, Index, - Integer, String, event, UniqueConstraint) + Integer, String, event, UniqueConstraint, Date, Time) from sqlalchemy.dialects.postgresql import TSVECTOR from sqlalchemy.exc import IntegrityError, SQLAlchemyError from sqlalchemy.orm import relationship, Session @@ -50,20 +50,6 @@ def __repr__(self): return f'' -class UserTask(Base): - __tablename__ = "user_task" - - id = Column(Integer, primary_key=True, index=True) - user_id = Column('user_id', Integer, ForeignKey('users.id')) - event_id = Column('task_id', Integer, ForeignKey('tasks.id')) - - tasks = relationship("Task", back_populates="participants") - participants = relationship("User", back_populates="tasks") - - def __repr__(self): - return f'' - - class Event(Base): __tablename__ = "events" @@ -202,8 +188,8 @@ class Task(Base): description = Column(String) is_done = Column(Boolean, nullable=False) is_important = Column(Boolean, nullable=False) - date = Column(DateTime, nullable = False) - time = Column(DateTime, nullable = False) + date = Column(Date, nullable = False) + time = Column(Time, nullable = False) owner_id = Column(Integer, ForeignKey("users.id")) owner = relationship("User", back_populates="tasks") \ No newline at end of file diff --git a/app/internal/todo_list.py b/app/internal/todo_list.py index 877c7184..73f343a3 100644 --- a/app/internal/todo_list.py +++ b/app/internal/todo_list.py @@ -1,20 +1,19 @@ from datetime import datetime from operator import attrgetter -from typing import List -from urllib.request import Request +from typing import List, Dict, Optional, Any -from fastapi import Depends +from fastapi import HTTPException from requests import Session from sqlalchemy.exc import SQLAlchemyError +from starlette import status -from app.database.database import get_db -from app.database.models import Task, UserTask +from app.database.models import Task +from app.dependencies import logger from app.internal.utils import create_model -from app.main import router -from app.routers.event import by_id -def create_task(db, title, description, date, time, owner_id, is_important=None) -> Task: +def create_task(db, title, description, date, time, owner_id, + is_important) -> Task: """Creates and saves a new task.""" task = create_model( @@ -27,11 +26,6 @@ def create_task(db, title, description, date, time, owner_id, is_important=None) is_important=is_important, is_done=False ) - create_model( - db, UserTask, - user_id=owner_id, - task_id=task.id - ) return task @@ -59,30 +53,56 @@ def is_date_before(date: datetime) -> bool: return date < datetime.now() -@router.delete("/{task_id}") -def delete_task(request: Request, - task_id: int, - db: Session = Depends(get_db)): +def by_id(db, task_id): + task = db.query(Task).filter_by(id=task_id).one() + return task - # TODO: Check if the user is the owner of the task. - task = by_id(db, task_id) - participants = get_participants_emails_by_task(db, task_id) - try: - # Delete task - db.delete(task) - # Delete user_task - db.query(UserTask).filter(UserTask.task_id == task_id).delete() +def is_fields_types_valid(to_check: Dict[str, Any], types: Dict[str, Any]): + """validate dictionary values by dictionary of types""" + errors = [] + for field_name, field_type in to_check.items(): + if types[field_name] and not isinstance(field_type, types[field_name]): + errors.append( + f"{field_name} is '{type(field_type).__name__}' and" + + f"it should be from type '{types[field_name].__name__}'") + logger.warning(errors) + if errors: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, detail=errors) - db.commit() - except (SQLAlchemyError, TypeError): - return templates.TemplateResponse( - "task/taskview.html", {"request": request, "task_id": task_id}, - status_code=status.HTTP_500_INTERNAL_SERVER_ERROR) - if participants and task.start > datetime.now(): - pass - # TODO: Send them a cancellation notice - # if the deletion is successful - return RedirectResponse( - url="/calendar", status_code=status.HTTP_200_OK) \ No newline at end of file +def get_task_with_editable_fields_only(task: Dict[str, Any] + ) -> Dict[str, Any]: + """Remove all keys that are not allowed to update""" + + return {i: task[i] for i in UPDATE_TASKS_FIELDS if i in task} + + +def _update_task(db: Session, task_id: int, task_to_update: Dict) -> task: + try: + # Update database + db.query(Task).filter(Task.id == task_id).update( + task_to_update, synchronize_session=False) + + db.commit() + return by_id(db, task_id) + except (AttributeError, SQLAlchemyError) as e: + logger.exception(str(e)) + raise HTTPException( + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, + detail="Internal server error") + + +def update_task(task_id: int, task: Dict, db: Session + ) -> Optional[Task]: + # TODO Check if the user is the owner of the task. + old_task = by_id(db, task_id) + task_to_update = get_task_with_editable_fields_only(task) + is_fields_types_valid(task_to_update, UPDATE_TASKS_FIELDS) + check_change_dates_allowed(old_task, task_to_update) + if not task_to_update: + return None + task_updated = _update_task(db, task_id, task_to_update) + # TODO: Send emails to recipients. + return task_updated \ No newline at end of file diff --git a/app/routers/dayview.py b/app/routers/dayview.py index 53fab46f..df584ad1 100644 --- a/app/routers/dayview.py +++ b/app/routers/dayview.py @@ -6,7 +6,7 @@ from sqlalchemy import and_, or_ from app.database.database import get_db -from app.database.models import Event, User +from app.database.models import Event, User, Task from app.dependencies import TEMPLATES_PATH from app.internal import zodiac @@ -106,6 +106,8 @@ async def dayview(request: Request, date: str, db_session=Depends(get_db)): and_(Event.start < day_end, day_end < Event.end))) events_n_attrs = [(event, DivAttributes(event, day)) for event in events] zodiac_obj = zodiac.get_zodiac_of_day(db_session, day) + tasks = db_session.query(Task).filter(Task.owner_id == user.id)\ + .filter(Task.date == day.date()) return templates.TemplateResponse("dayview.html", { "request": request, "events": events_n_attrs, diff --git a/app/routers/todo_list.py b/app/routers/todo_list.py new file mode 100644 index 00000000..6926d388 --- /dev/null +++ b/app/routers/todo_list.py @@ -0,0 +1,53 @@ +from datetime import datetime +from urllib.request import Request + +from fastapi import Depends, APIRouter +from requests import Session +from sqlalchemy.exc import SQLAlchemyError +from starlette import status +from starlette.responses import RedirectResponse + +from app.config import templates +from app.database.database import get_db +from app.database.models import User +from app.internal.todo_list import create_task + +router = APIRouter( + prefix="/task", + tags=["task"], + responses={404: {"description": "Not found"}}, +) + + +@router.delete("/{task_id}") +def delete_task(request: Request, + task_id: int, + db: Session = Depends(get_db)): + # TODO: Check if the user is the owner of the task. + task = by_id(db, task_id) + try: + # Delete task + db.delete(task) + + db.commit() + + except (SQLAlchemyError, TypeError): + return templates.TemplateResponse( + "dayview.html", {"request": request, "task_id": task_id}, + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR) + # TODO: Send them a cancellation notice + # if the deletion is successful + return RedirectResponse( + url="/calendar", status_code=status.HTTP_200_OK) + + +@router.post("/add") +async def add_task(title: str, description: str, datestr: str, timestr: str, + session=Depends(get_db), is_important: bool = False): + # TODO: add a login session + user = session.query(User).filter_by(username='test1').first() + create_task(session, title, description, + datetime.strptime(datestr, '%Y-%m-%d') + .date(), datetime.strptime(timestr, '%H:%M').time(), + user.id, is_important) + return RedirectResponse(f"/day/{datestr}") diff --git a/app/static/dayview.css b/app/static/dayview.css index 1c50d3e3..638e3bd0 100644 --- a/app/static/dayview.css +++ b/app/static/dayview.css @@ -101,4 +101,94 @@ html { background-color: var(--borders-variant); border-radius:50px; box-shadow: 1px 1px 2px #999; +} + +.todo-style { + font: 95% Arial, Helvetica, sans-serif; + background: #F7F7F7; +} + +#table { + max-width: 500px; +} + +.open-button { + background-color: var(--primary); + color: #fff; + margin-top: 12px; + font-family: "Consolas"; + font-size: 20px; + padding: 14px; + border-radius: 20px; + transition-duration: 0.4s; + box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19); +} + +.open-button:hover { + background-color: #ccddff; + color: #00001a; + box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19); +} + +.todo-style h1 { + color: #fff; + text-align: center; +} + +.todo-style input[type="text"], +.todo-style input[type="date"], +.todo-style input[type="time"], +.todo-style textarea { + -webkit-transition: all 0.30s ease-in-out; + -moz-transition: all 0.30s ease-in-out; + -ms-transition: all 0.30s ease-in-out; + -o-transition: all 0.30s ease-in-out; + outline: none; + box-sizing: border-box; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + width: 100%; + background: #fff; + margin-bottom: 4%; + border: 1px solid #ccc; + padding: 3%; + color: #555; + font: 95% Arial, Helvetica, sans-serif; +} + +.todo-style input[type="text"]:focus, +.todo-style input[type="date"]:focus, +.todo-style input[type="time"]:focus, +.todo-style textarea:focus { + box-shadow: 0 0 5px #43D1AF; + padding: 3%; + border: 1px solid #43D1AF; +} + +.todo-style th, .todo-style td { + padding-right: 30px; + padding-top: 20px; + text-align: left; +} + +.todo-style button { + border-radius: 20px; + padding: 2%; + text-align: right; + background-color: #80bfff; +} + + +.edit { + text-decoration: none; + background-color: #eafaf6; + border-style: solid; + border-color: #004d99; + border-radius: 10px; +} + +.todo-style button:hover { + background-color: var(--primary); + color: white; + box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19); } \ No newline at end of file diff --git a/app/templates/dayview.html b/app/templates/dayview.html index 29a804b6..8f8e19f9 100644 --- a/app/templates/dayview.html +++ b/app/templates/dayview.html @@ -1,68 +1,167 @@ - - - - - - - dayview - - -
- - {{month}} - {{day}} - {% if zodiac %} -
- zodiac sign + + + + + + + dayview + + +
+ + {{month}} + {{day}} + {% if zodiac %} +
+ zodiac sign +
+ {% endif %} +
+ + + +
+
@@ -86,18 +101,41 @@

-

Todo List

+

Todo List

-
+
+ + {% for task in tasks %} + {% if task.is_important %} + + + + + + + {% else %} + + + + + + + {% endif %} + {% endfor %} +
Time Task Description
{{task.time}}{{task.title}}{{task.description}}Edit
{{task.time}}{{task.title}}{{task.description}}Edit
@@ -106,62 +144,112 @@

Todo List

-
-
- {% for i in range(24)%} -
- {% set i = i|string() %} - {{i.zfill(2)}}:00 +
+ -
- {% for event, attr in events %} - {% set totaltime = 'visible'%} - {% if attr.length < 60 %} - {% set size = 'title_size_small' %} - {% set totaltime = 'invisible'%} - {% if attr.length < 45 %} - {% set size = 'title_size_Xsmall' %} - {% if attr.length < 30 %} - {% set size = 'title_size_tiny' %} - {% endif %} - {% endif %} - {% endif %} -
-

{{ event.title }}

- {% if totaltime == 'visible' %} -

- {{attr.total_time}}

+
+
+
+ {% for i in range(24)%} +
+ {% set i = i|string() %} + {{i.zfill(2)}}:00 +
+ {% endfor %} +
+
+ {% for event, attr in events %} + {% set totaltime = 'visible'%} + {% if attr.length < 60 %} + {% set size = 'title_size_small' %} + {% set totaltime = 'invisible'%} + {% if attr.length < 45 %} + {% set size = 'title_size_Xsmall' %} + {% if attr.length < 30 %} + {% set size = 'title_size_tiny' %} + {% endif %} {% endif %} + {% endif %} +
+

{{ event.title }}

+ {% if totaltime == 'visible' %} +

+ {{attr.total_time}}

+ {% endif %} +
+ {% endfor %}
- {% endfor %} -
-
- {% for i in range(25)%} -
---
- {% endfor %} -
-
- {% for event, attr in events %} -
- - +
+ {% for i in range(25)%} +
---
+ {% endfor %} +
+
+ {% for event, attr in events %} +
+ + +
+ {% endfor %}
- {% endfor %}
-
- + \ No newline at end of file diff --git a/app/templates/tasks_list.html b/app/templates/tasks_list.html deleted file mode 100644 index 573991eb..00000000 --- a/app/templates/tasks_list.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - Daily tasks - - -
-

Todo-List

- - - - - - - - {% for task in tasks %} - {% if task.is_important %} - - - - - - - {% endif %} - {% else %} - - - - - - - {% endelse %} - {% endfor %} - -
TimeTaskDescription
{{task.time}}{{task.title}}{{task.description}}Edit
{{task.time}}{{task.title}}{{task.description}}Edit
- - \ No newline at end of file diff --git a/app/templates/todo_form.html b/app/templates/todo_form.html deleted file mode 100644 index cb744fa5..00000000 --- a/app/templates/todo_form.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - Todo-List - - -
-

Add Task

- {% if model.any_id is defined %} -
- -
- {% endif %} -
- - - - - - - - - - -
-
- - From f97a1485a14868d40682c380f011fba61463228c Mon Sep 17 00:00:00 2001 From: liaarbel Date: Fri, 12 Feb 2021 22:22:12 +0200 Subject: [PATCH 04/21] added if tasks done and added tests --- app/routers/todo_list.py | 33 +++++++--- app/templates/dayview.html | 130 +++++++++++++++++++------------------ tests/test_todo_list.py | 95 +++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 72 deletions(-) create mode 100644 tests/test_todo_list.py diff --git a/app/routers/todo_list.py b/app/routers/todo_list.py index 8858e295..70ac783a 100644 --- a/app/routers/todo_list.py +++ b/app/routers/todo_list.py @@ -19,12 +19,10 @@ @router.post("/delete") -def delete_task( - taskId: int = Form(...), - datestr: str = Form(...), - db: Session = Depends(get_db)): +def delete_task(taskId: int = Form(...), db: Session = Depends(get_db)): # TODO: Check if the user is the owner of the task. task = by_id(db, taskId) + datestr = task.date.strftime('%Y-%m-%d') try: # Delete task db.delete(task) @@ -49,20 +47,37 @@ async def add_task(title: str = Form(...), description: str = Form(...), user = session.query(User).filter_by(username='test1').first() create_task(session, title, description, datetime.strptime(datestr, '%Y-%m-%d') - .date(), datetime.strptime(timestr, '%H:%M').time(), + .date(), datetime.strptime(timestr, '%H:%M:%S').time(), user.id, is_important) return RedirectResponse(f"/day/{datestr}", status_code=303) @router.post("/edit") -async def edit_task(task_id: int = Form(...), title: str = Form(...), description: str = Form(...), - datestr: str = Form(...), timestr: str = Form(...), - is_important: bool = Form(False), session=Depends(get_db)): +async def edit_task(task_id: int = Form(...), title: str = Form(...), + description: str = Form(...), + datestr: str = Form(...), timestr: str = Form(...), + is_important: bool = Form(False), session=Depends(get_db)): task = by_id(session, task_id) task.title = title task.description = description task.date = datetime.strptime(datestr, '%Y-%m-%d').date() - task.time = datetime.strptime(timestr, '%H:%M').time() + task.time = datetime.strptime(timestr, '%H:%M:%S').time() task.is_important = is_important session.commit() return RedirectResponse(f"/day/{datestr}", status_code=303) + + +@router.post("/setDone/{task_id}") +async def set_task_done(task_id: int, session=Depends(get_db)): + task = by_id(session, task_id) + task.is_done = True + session.commit() + return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", status_code=303) + + +@router.post("/setUndone/{task_id}") +async def set_task_undone(task_id: int, session=Depends(get_db)): + task = by_id(session, task_id) + task.is_done = False + session.commit() + return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", status_code=303) \ No newline at end of file diff --git a/app/templates/dayview.html b/app/templates/dayview.html index 8c7cdaa0..a6853b77 100644 --- a/app/templates/dayview.html +++ b/app/templates/dayview.html @@ -28,7 +28,6 @@ $('#deleteTaskId').val(taskId); $('#deleteTaskForm').submit(); } - @@ -101,39 +100,45 @@

-

Todo List

+

Todo + List

- +
+ {% for task in tasks %} {% if task.is_important %} + {% else %} + + {% endif %} + {% if task.is_done %} + + {% else %} + + {% endif %} + {% if task.is_important %} - - {% else %} - - - - + {% else %} + {% endif %} - {% endif %} {% endfor %}
Time Task DescriptionIs Done?
{{task.time}} {{task.title}} {{task.description}}
Edit
{{task.time}}{{task.title}}{{task.description}}Edit
@@ -188,68 +193,67 @@

-

-
-
- {% for i in range(24)%} -
- {% set i = i|string() %} - {{i.zfill(2)}}:00 -
- {% endfor %} +
+
+ {% for i in range(24)%} +
+ {% set i = i|string() %} + {{i.zfill(2)}}:00
-
- {% for event, attr in events %} - {% set totaltime = 'visible'%} - {% if attr.length < 60 %} - {% set size = 'title_size_small' %} - {% set totaltime = 'invisible'%} - {% if attr.length < 45 %} - {% set size = 'title_size_Xsmall' %} - {% if attr.length < 30 %} - {% set size = 'title_size_tiny' %} - {% endif %} - {% endif %} + {% endfor %} +
+
+ {% for event, attr in events %} + {% set totaltime = 'visible'%} + {% if attr.length < 60 %} + {% set size = 'title_size_small' %} + {% set totaltime = 'invisible'%} + {% if attr.length < 45 %} + {% set size = 'title_size_Xsmall' %} + {% if attr.length < 30 %} + {% set size = 'title_size_tiny' %} + {% endif %} + {% endif %} + {% endif %} +
+

{{ event.title }}

+ {% if totaltime == 'visible' %} +

+ {{attr.total_time}}

{% endif %} -
-

{{ event.title }}

- {% if totaltime == 'visible' %} -

- {{attr.total_time}}

- {% endif %} -
- {% endfor %}
-
- {% for i in range(25)%} -
---
- {% endfor %} -
-
- {% for event, attr in events %} -
- - -
- {% endfor %} + {% endfor %} +
+
+ {% for i in range(25)%} +
---
+ {% endfor %} +
+
+ {% for event, attr in events %} +
+ +
+ {% endfor %}
- +
+ \ No newline at end of file diff --git a/tests/test_todo_list.py b/tests/test_todo_list.py new file mode 100644 index 00000000..861e23ef --- /dev/null +++ b/tests/test_todo_list.py @@ -0,0 +1,95 @@ +from datetime import date, time + +import pytest +from sqlalchemy.orm.exc import NoResultFound + +from app.database.models import Task, User +from app.internal.todo_list import by_id +from tests.utils import create_model, delete_instance + +DATE = date(2021, 2, 2) +TIME = time(20, 0) + + +@pytest.fixture +def task(session, user): + task_example = create_model( + session, Task, id=1, title="Test", description="test my create", + is_done=False, is_important=False, date=DATE, time=TIME, + owner_id=1, owner=user + ) + yield task_example + delete_instance(session, task_example) + + +@pytest.fixture +def task2(session, user): + task_example = create_model( + session, Task, id=1, title="Test2", description="test my create2", + is_done=False, is_important=True, date=DATE, time=TIME, + owner_id=1, owner=user + ) + yield task_example + delete_instance(session, task_example) + + +@pytest.fixture +def test1(): + return User(username='test1', email='blala@something.com', + password='123456', full_name='any name') + + +def test_if_task_deleted(home_test_client, task: Task, session): + response = home_test_client.post("/task/delete", data={"taskId": task.id}) + assert response.status_code == 302 + with pytest.raises(NoResultFound): + by_id(session, task.id) + + +def test_if_task_created(home_test_client, session, task: Task, test1): + session.add(test1) + response = home_test_client.post("/task/add", + data={"title": task.title, + "description": task.description, + "datestr": task.date, + "timestr": task.time, + "is_important": task.is_important, + "session": session}) + assert response.status_code == 303 + task_ex = by_id(session, task.id) + assert task == task_ex + + +def test_if_task_edited(home_test_client, session, task2: Task): + response = home_test_client.post("/task/edit", + data={"task_id": task2.id, + "title": task2.title, + "description": task2.description, + "datestr": task2.date, + "timestr": task2.time, + "is_important": task2.is_important, + "session": session}) + assert response.status_code == 303 + task_ex = by_id(session, task2.id) + assert task2.title == task_ex.title + assert task2.description == task_ex.description + assert task2.time == task_ex.time + assert task2.is_important == task_ex.is_important + + +def test_if_task_has_done(home_test_client, session, task: Task): + response = home_test_client.post(f"/task/setDone/{task.id}", + data={"task_id": task.id, + "session": session}) + assert response.status_code == 303 + task_ex = by_id(session, task.id) + assert task_ex.is_done is True + + +def test_if_task_has_not_done(home_test_client, session, task: Task): + response = home_test_client.post(f"/task/setUndone/{task.id}", + data={"task_id": task.id, + "session": session}) + assert response.status_code == 303 + task_ex = by_id(session, task.id) + assert task_ex.is_done is False \ No newline at end of file From 7e1a2da8a6fdb0efb24d69be053948e84de99142 Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sat, 13 Feb 2021 16:55:53 +0200 Subject: [PATCH 05/21] fixed test of creating task --- tests/test_todo_list.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/test_todo_list.py b/tests/test_todo_list.py index 861e23ef..e20e5dff 100644 --- a/tests/test_todo_list.py +++ b/tests/test_todo_list.py @@ -14,7 +14,7 @@ @pytest.fixture def task(session, user): task_example = create_model( - session, Task, id=1, title="Test", description="test my create", + session, Task, title="Test", description="test my create", is_done=False, is_important=False, date=DATE, time=TIME, owner_id=1, owner=user ) @@ -25,7 +25,7 @@ def task(session, user): @pytest.fixture def task2(session, user): task_example = create_model( - session, Task, id=1, title="Test2", description="test my create2", + session, Task, title="Test2", description="test my create2", is_done=False, is_important=True, date=DATE, time=TIME, owner_id=1, owner=user ) @@ -34,9 +34,13 @@ def task2(session, user): @pytest.fixture -def test1(): - return User(username='test1', email='blala@something.com', - password='123456', full_name='any name') +def test1(session): + user_example = create_model( + session, User, username="test1", email="test@something.com", + password="123456", full_name="My test", language="English" + ) + yield user_example + delete_instance(session, user_example) def test_if_task_deleted(home_test_client, task: Task, session): @@ -47,7 +51,6 @@ def test_if_task_deleted(home_test_client, task: Task, session): def test_if_task_created(home_test_client, session, task: Task, test1): - session.add(test1) response = home_test_client.post("/task/add", data={"title": task.title, "description": task.description, From 568c8d6ea5b7cf222be6f8d541d04298e8eda53f Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sat, 13 Feb 2021 22:55:03 +0200 Subject: [PATCH 06/21] changed test_if_task_has_done data parameters --- app/routers/todo_list.py | 6 ++++-- tests/test_todo_list.py | 11 +++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/routers/todo_list.py b/app/routers/todo_list.py index 70ac783a..699fa126 100644 --- a/app/routers/todo_list.py +++ b/app/routers/todo_list.py @@ -72,7 +72,8 @@ async def set_task_done(task_id: int, session=Depends(get_db)): task = by_id(session, task_id) task.is_done = True session.commit() - return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", status_code=303) + return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", + status_code=303) @router.post("/setUndone/{task_id}") @@ -80,4 +81,5 @@ async def set_task_undone(task_id: int, session=Depends(get_db)): task = by_id(session, task_id) task.is_done = False session.commit() - return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", status_code=303) \ No newline at end of file + return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", + status_code=303) diff --git a/tests/test_todo_list.py b/tests/test_todo_list.py index e20e5dff..50f9e313 100644 --- a/tests/test_todo_list.py +++ b/tests/test_todo_list.py @@ -36,7 +36,7 @@ def task2(session, user): @pytest.fixture def test1(session): user_example = create_model( - session, User, username="test1", email="test@something.com", + session, User, username="test1", email="test@gmail.com", password="123456", full_name="My test", language="English" ) yield user_example @@ -80,12 +80,11 @@ def test_if_task_edited(home_test_client, session, task2: Task): assert task2.is_important == task_ex.is_important -def test_if_task_has_done(home_test_client, session, task: Task): - response = home_test_client.post(f"/task/setDone/{task.id}", - data={"task_id": task.id, - "session": session}) +def test_if_task_has_done(home_test_client, session, task2: Task): + response = home_test_client.post(f"/task/setDone/{task2.id}", + data={"task_id": task2.id}) assert response.status_code == 303 - task_ex = by_id(session, task.id) + task_ex = by_id(session, task2.id) assert task_ex.is_done is True From b1442a48f20549343202f206f49eea7d70eef292 Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sun, 14 Feb 2021 22:39:31 +0200 Subject: [PATCH 07/21] fixed tests - if task has done, and fixed models examples --- app/database/models.py | 1 + app/main.py | 7 +- app/routers/todo_list.py | 16 +++- app/templates/dayview.html | 168 ++++++++++++++++++++++--------------- tests/test_todo_list.py | 45 ++++++---- 5 files changed, 142 insertions(+), 95 deletions(-) diff --git a/app/database/models.py b/app/database/models.py index f03d33af..4516b109 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -302,6 +302,7 @@ class Task(Base): owner = relationship("User", back_populates="tasks") + # insert language data # Credit to adrihanu https://stackoverflow.com/users/9127249/adrihanu diff --git a/app/main.py b/app/main.py index e0ccf642..346655bb 100644 --- a/app/main.py +++ b/app/main.py @@ -8,11 +8,6 @@ from app.internal import daily_quotes, json_data_loader from app.internal.languages import set_ui_language from app.routers.salary import routes as salary -from app.routers import ( - agenda, calendar, categories, dayview, email, - event, invitation, profile, search, telegram, whatsapp, todo_list -) -from app.telegram.bot import telegram_bot def create_tables(engine, psql_environment): @@ -42,7 +37,7 @@ def create_tables(engine, psql_environment): from app.routers import ( # noqa: E402 agenda, calendar, categories, celebrity, currency, dayview, email, event, four_o_four, invitation, profile, search, - weekview, telegram, whatsapp, + weekview, telegram, whatsapp, todo_list, ) json_data_loader.load_to_db(next(get_db())) diff --git a/app/routers/todo_list.py b/app/routers/todo_list.py index 699fa126..be4becf2 100644 --- a/app/routers/todo_list.py +++ b/app/routers/todo_list.py @@ -1,13 +1,14 @@ from datetime import datetime from fastapi import Depends, APIRouter, Form +from fastapi.encoders import jsonable_encoder from requests import Session from sqlalchemy.exc import SQLAlchemyError from starlette import status -from starlette.responses import RedirectResponse +from starlette.responses import RedirectResponse, JSONResponse from app.config import templates -from app.database.database import get_db +from app.dependencies import get_db from app.database.models import User from app.internal.todo_list import create_task, by_id @@ -44,10 +45,10 @@ async def add_task(title: str = Form(...), description: str = Form(...), datestr: str = Form(...), timestr: str = Form(...), is_important: bool = Form(False), session=Depends(get_db)): # TODO: add a login session - user = session.query(User).filter_by(username='test1').first() + user = session.query(User).filter_by(username='test_username').first() create_task(session, title, description, datetime.strptime(datestr, '%Y-%m-%d') - .date(), datetime.strptime(timestr, '%H:%M:%S').time(), + .date(), datetime.strptime(timestr, '%H:%M').time(), user.id, is_important) return RedirectResponse(f"/day/{datestr}", status_code=303) @@ -83,3 +84,10 @@ async def set_task_undone(task_id: int, session=Depends(get_db)): session.commit() return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", status_code=303) + + +@router.get("/{task_id}") +async def get_task(task_id, session=Depends(get_db)): + task = by_id(session, task_id) + data = jsonable_encoder(task) + return JSONResponse(content=data) \ No newline at end of file diff --git a/app/templates/dayview.html b/app/templates/dayview.html index e31e85e6..6257b18a 100644 --- a/app/templates/dayview.html +++ b/app/templates/dayview.html @@ -1,14 +1,18 @@ - - - - - - - dayview - - + - - -
- {% if view == 'day' %} - - {{month}} - {{day}} - {% if zodiac %} -
- zodiac sign -
- {% endif %} - {% else %} - {{day}} / {{month}} - {% endif %} -
- @@ -112,16 +123,26 @@

Todo {% for task in tasks %} {% if task.is_important %} - {% else %} + {% else %} - {% endif %} + {% endif %} {{task.time}} {{task.title}} {{task.description}} {% if task.is_done %} -
+ +
+ +
+ {% else %} -
+ +
+ +
+ {% endif %} {% if task.is_important %}

-
-
- {% if view == 'day'%} - {% for hour in range(24)%} -
- {% set hour = hour|string() %} - {{hour.zfill(2)}}:00 -
- {% endfor %} - {% endif %} -
-
- {% for event, attr in events %} -
-

{{ event.title }}

- {% if attr.total_time_visible %} -

{{attr.total_time}}

- {% endif %} -
- {% endfor %} -
-
- {% for i in range(25)%} -
---
- {% endfor %} -
-
+
+
+ {% if view == 'day'%} + {% for hour in range(24)%} +
+ {% set hour = hour|string() %} + {{hour.zfill(2)}}:00 +
+ {% endfor %} + {% endif %} +
+
+ {% for event, attr in events %} +
+

{{ + event.title }}

+ {% if attr.total_time_visible %} +

+ {{attr.total_time}}

+ {% endif %} +
+ {% endfor %} +
+
+ {% for i in range(25)%} +
---
+ {% endfor %} +
+
- {% for event, attr in events %} -
- - -
- {% endfor %} -
+ {% for event, attr in events %} +
+ +
- - + {% endfor %} +
+
+ + \ No newline at end of file diff --git a/tests/test_todo_list.py b/tests/test_todo_list.py index 50f9e313..df35b17a 100644 --- a/tests/test_todo_list.py +++ b/tests/test_todo_list.py @@ -1,3 +1,4 @@ +import json from datetime import date, time import pytest @@ -5,29 +6,29 @@ from app.database.models import Task, User from app.internal.todo_list import by_id -from tests.utils import create_model, delete_instance +from app.internal.utils import create_model, delete_instance DATE = date(2021, 2, 2) TIME = time(20, 0) @pytest.fixture -def task(session, user): +def task(session, test1): task_example = create_model( session, Task, title="Test", description="test my create", is_done=False, is_important=False, date=DATE, time=TIME, - owner_id=1, owner=user + owner_id=1, owner=test1 ) yield task_example delete_instance(session, task_example) @pytest.fixture -def task2(session, user): +def task2(session, test1): task_example = create_model( session, Task, title="Test2", description="test my create2", is_done=False, is_important=True, date=DATE, time=TIME, - owner_id=1, owner=user + owner_id=1, owner=test1 ) yield task_example delete_instance(session, task_example) @@ -36,8 +37,8 @@ def task2(session, user): @pytest.fixture def test1(session): user_example = create_model( - session, User, username="test1", email="test@gmail.com", - password="123456", full_name="My test", language="English" + session, User, username="test_username", email="testtodo@gmail.com", + password="123456", full_name="My test", language_id=1 ) yield user_example delete_instance(session, user_example) @@ -54,8 +55,10 @@ def test_if_task_created(home_test_client, session, task: Task, test1): response = home_test_client.post("/task/add", data={"title": task.title, "description": task.description, - "datestr": task.date, - "timestr": task.time, + "datestr": task.date.strftime( + '%Y-%m-%d'), + "timestr": task.time.strftime( + '%H:%M'), "is_important": task.is_important, "session": session}) assert response.status_code == 303 @@ -68,8 +71,10 @@ def test_if_task_edited(home_test_client, session, task2: Task): data={"task_id": task2.id, "title": task2.title, "description": task2.description, - "datestr": task2.date, - "timestr": task2.time, + "datestr": task2.date.strftime( + '%Y-%m-%d'), + "timestr": task2.time.strftime( + '%H:%M:%S'), "is_important": task2.is_important, "session": session}) assert response.status_code == 303 @@ -80,12 +85,14 @@ def test_if_task_edited(home_test_client, session, task2: Task): assert task2.is_important == task_ex.is_important -def test_if_task_has_done(home_test_client, session, task2: Task): - response = home_test_client.post(f"/task/setDone/{task2.id}", - data={"task_id": task2.id}) +def test_if_task_has_done(home_test_client, session, task: Task): + response = home_test_client.post(f"/task/setDone/{task.id}", + data={"task_id": task.id}) assert response.status_code == 303 - task_ex = by_id(session, task2.id) - assert task_ex.is_done is True + response = home_test_client.get(f"/task/{task.id}", data={}) + content = response.content.decode('utf-8') + content = json.loads(content) + assert content['is_done'] is True def test_if_task_has_not_done(home_test_client, session, task: Task): @@ -93,5 +100,7 @@ def test_if_task_has_not_done(home_test_client, session, task: Task): data={"task_id": task.id, "session": session}) assert response.status_code == 303 - task_ex = by_id(session, task.id) - assert task_ex.is_done is False \ No newline at end of file + response = home_test_client.get(f"/task/{task.id}", data={}) + content = response.content.decode('utf-8') + content = json.loads(content) + assert content['is_done'] is False From 36ed6839f1c57fc6b49e48b7e5265e5f6093ea36 Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sun, 14 Feb 2021 23:32:32 +0200 Subject: [PATCH 08/21] added newline --- app/internal/todo_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/internal/todo_list.py b/app/internal/todo_list.py index 79c8cfaa..cfa0efb4 100644 --- a/app/internal/todo_list.py +++ b/app/internal/todo_list.py @@ -38,4 +38,4 @@ def sort_by_time(tasks: List[Task]) -> List[Task]: def by_id(db, task_id): task = db.query(Task).filter_by(id=task_id).one() - return task \ No newline at end of file + return task From 3e7c4a3dbcda3dec834f5d9007a367371a77cab6 Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sun, 14 Feb 2021 23:39:16 +0200 Subject: [PATCH 09/21] removed imports and changed parameters name --- app/internal/todo_list.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/app/internal/todo_list.py b/app/internal/todo_list.py index cfa0efb4..4bce8920 100644 --- a/app/internal/todo_list.py +++ b/app/internal/todo_list.py @@ -1,18 +1,11 @@ -from datetime import datetime, date, time from operator import attrgetter -from typing import List, Dict, Optional, Any +from typing import List -from fastapi import HTTPException -from requests import Session -from sqlalchemy.exc import SQLAlchemyError -from starlette import status - -from app.database.models import Task, User -from app.dependencies import logger +from app.database.models import Task from app.internal.utils import create_model -def create_task(db, title, description, date, time, owner_id, +def create_task(db, title, description, datestr, timestr, owner_id, is_important) -> Task: """Creates and saves a new task.""" @@ -20,8 +13,8 @@ def create_task(db, title, description, date, time, owner_id, db, Task, title=title, description=description, - date=date, - time=time, + date=datestr, + time=timestr, owner_id=owner_id, is_important=is_important, is_done=False From 28f9f9533ef142522f923d7fa2ce8650b95e3eee Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sun, 14 Feb 2021 23:42:17 +0200 Subject: [PATCH 10/21] added newline and changed parameter name --- app/routers/todo_list.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/routers/todo_list.py b/app/routers/todo_list.py index be4becf2..5949df4c 100644 --- a/app/routers/todo_list.py +++ b/app/routers/todo_list.py @@ -20,9 +20,9 @@ @router.post("/delete") -def delete_task(taskId: int = Form(...), db: Session = Depends(get_db)): +def delete_task(task_id: int = Form(...), db: Session = Depends(get_db)): # TODO: Check if the user is the owner of the task. - task = by_id(db, taskId) + task = by_id(db, task_id) datestr = task.date.strftime('%Y-%m-%d') try: # Delete task @@ -32,7 +32,7 @@ def delete_task(taskId: int = Form(...), db: Session = Depends(get_db)): except (SQLAlchemyError, TypeError): return templates.TemplateResponse( - "dayview.html", {"task_id": taskId}, + "dayview.html", {"task_id": task_id}, status_code=status.HTTP_500_INTERNAL_SERVER_ERROR) # TODO: Send them a cancellation notice # if the deletion is successful @@ -90,4 +90,4 @@ async def set_task_undone(task_id: int, session=Depends(get_db)): async def get_task(task_id, session=Depends(get_db)): task = by_id(session, task_id) data = jsonable_encoder(task) - return JSONResponse(content=data) \ No newline at end of file + return JSONResponse(content=data) From c1a902b50decb750f545f47875917dc63e12dfce Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sun, 14 Feb 2021 23:45:43 +0200 Subject: [PATCH 11/21] deleted spaces --- app/database/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/database/models.py b/app/database/models.py index 396c2f03..7b458e65 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -315,8 +315,8 @@ class Task(Base): description = Column(String) is_done = Column(Boolean, nullable=False) is_important = Column(Boolean, nullable=False) - date = Column(Date, nullable = False) - time = Column(Time, nullable = False) + date = Column(Date, nullable=False) + time = Column(Time, nullable=False) owner_id = Column(Integer, ForeignKey("users.id")) owner = relationship("User", back_populates="tasks") From 8891aca011319aaec0d2a3639548812ba389790e Mon Sep 17 00:00:00 2001 From: liaarbel Date: Sun, 14 Feb 2021 23:51:28 +0200 Subject: [PATCH 12/21] changed data parameter name --- tests/test_todo_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_todo_list.py b/tests/test_todo_list.py index df35b17a..fa8b91f2 100644 --- a/tests/test_todo_list.py +++ b/tests/test_todo_list.py @@ -45,7 +45,7 @@ def test1(session): def test_if_task_deleted(home_test_client, task: Task, session): - response = home_test_client.post("/task/delete", data={"taskId": task.id}) + response = home_test_client.post("/task/delete", data={"task_id": task.id}) assert response.status_code == 302 with pytest.raises(NoResultFound): by_id(session, task.id) From b7287f198dcbc3d5b53a89e66aed057c81666ee3 Mon Sep 17 00:00:00 2001 From: liaarbel Date: Tue, 16 Feb 2021 20:52:05 +0200 Subject: [PATCH 13/21] moved js to new file --- app/database/models.py | 4 ++-- app/internal/todo_list.py | 11 ++++++----- app/routers/dayview.py | 2 +- app/routers/todo_list.py | 14 ++++++++------ app/static/dayview.css | 8 ++++---- app/static/js/todo_list_modals.js | 15 +++++++++++++++ tests/test_todo_list.py | 4 ++-- 7 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 app/static/js/todo_list_modals.js diff --git a/app/database/models.py b/app/database/models.py index 7b458e65..92d5e78b 100644 --- a/app/database/models.py +++ b/app/database/models.py @@ -4,8 +4,8 @@ from typing import Any, Dict from sqlalchemy import ( - Boolean, Column, DateTime, DDL, event, Float, ForeignKey, Index, Integer, - JSON, String, Time, Date, UniqueConstraint) + Boolean, Column, Date, DateTime, DDL, event, Float, ForeignKey, Index, Integer, + JSON, String, Time, UniqueConstraint) from sqlalchemy.dialects.postgresql import TSVECTOR from sqlalchemy.exc import IntegrityError, SQLAlchemyError from sqlalchemy.ext.declarative.api import declarative_base diff --git a/app/internal/todo_list.py b/app/internal/todo_list.py index 4bce8920..e90612d3 100644 --- a/app/internal/todo_list.py +++ b/app/internal/todo_list.py @@ -1,14 +1,16 @@ from operator import attrgetter from typing import List +from sqlalchemy import Date, Time +from sqlalchemy.orm import Session + from app.database.models import Task from app.internal.utils import create_model -def create_task(db, title, description, datestr, timestr, owner_id, - is_important) -> Task: +def create_task(db: Session, title: str, description: str, datestr: Date, + timestr: Time, owner_id: int, is_important: bool) -> Task: """Creates and saves a new task.""" - task = create_model( db, Task, title=title, @@ -24,11 +26,10 @@ def create_task(db, title, description, datestr, timestr, owner_id, def sort_by_time(tasks: List[Task]) -> List[Task]: """Sorts the tasks by the start of the task.""" - temp = tasks.copy() return sorted(temp, key=attrgetter('time')) -def by_id(db, task_id): +def by_id(db: Session, task_id: int) -> Task: task = db.query(Task).filter_by(id=task_id).one() return task diff --git a/app/routers/dayview.py b/app/routers/dayview.py index 95350565..3f3bac01 100644 --- a/app/routers/dayview.py +++ b/app/routers/dayview.py @@ -5,7 +5,7 @@ from fastapi import APIRouter, Depends, HTTPException, Request from fastapi.templating import Jinja2Templates -from app.database.models import Event, User, Task +from app.database.models import Event, Task, User from app.dependencies import get_db, TEMPLATES_PATH from app.routers.user import get_all_user_events from app.internal import zodiac diff --git a/app/routers/todo_list.py b/app/routers/todo_list.py index 5949df4c..83f72b23 100644 --- a/app/routers/todo_list.py +++ b/app/routers/todo_list.py @@ -8,8 +8,8 @@ from starlette.responses import RedirectResponse, JSONResponse from app.config import templates -from app.dependencies import get_db from app.database.models import User +from app.dependencies import get_db from app.internal.todo_list import create_task, by_id router = APIRouter( @@ -43,7 +43,8 @@ def delete_task(task_id: int = Form(...), db: Session = Depends(get_db)): @router.post("/add") async def add_task(title: str = Form(...), description: str = Form(...), datestr: str = Form(...), timestr: str = Form(...), - is_important: bool = Form(False), session=Depends(get_db)): + is_important: bool = Form(False), + session: Session = Depends(get_db)): # TODO: add a login session user = session.query(User).filter_by(username='test_username').first() create_task(session, title, description, @@ -57,7 +58,8 @@ async def add_task(title: str = Form(...), description: str = Form(...), async def edit_task(task_id: int = Form(...), title: str = Form(...), description: str = Form(...), datestr: str = Form(...), timestr: str = Form(...), - is_important: bool = Form(False), session=Depends(get_db)): + is_important: bool = Form(False), + session: Session = Depends(get_db)): task = by_id(session, task_id) task.title = title task.description = description @@ -69,7 +71,7 @@ async def edit_task(task_id: int = Form(...), title: str = Form(...), @router.post("/setDone/{task_id}") -async def set_task_done(task_id: int, session=Depends(get_db)): +async def set_task_done(task_id: int, session: Session = Depends(get_db)): task = by_id(session, task_id) task.is_done = True session.commit() @@ -78,7 +80,7 @@ async def set_task_done(task_id: int, session=Depends(get_db)): @router.post("/setUndone/{task_id}") -async def set_task_undone(task_id: int, session=Depends(get_db)): +async def set_task_undone(task_id: int, session: Session = Depends(get_db)): task = by_id(session, task_id) task.is_done = False session.commit() @@ -87,7 +89,7 @@ async def set_task_undone(task_id: int, session=Depends(get_db)): @router.get("/{task_id}") -async def get_task(task_id, session=Depends(get_db)): +async def get_task(task_id: int, session: Session = Depends(get_db)): task = by_id(session, task_id) data = jsonable_encoder(task) return JSONResponse(content=data) diff --git a/app/static/dayview.css b/app/static/dayview.css index 9c745ed5..e806bcfa 100644 --- a/app/static/dayview.css +++ b/app/static/dayview.css @@ -113,15 +113,15 @@ html { } #table { - max-width: 500px; + max-width: 31.25em; } .open-button { background-color: var(--primary); color: #fff; - margin-top: 12px; - font-size: 20px; - padding: 14px; + margin-top: 0.75em; + font-size: 1.25em; + padding: 0.875em; border-radius: 20px; transition-duration: 0.4s; box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19); diff --git a/app/static/js/todo_list_modals.js b/app/static/js/todo_list_modals.js new file mode 100644 index 00000000..e452462d --- /dev/null +++ b/app/static/js/todo_list_modals.js @@ -0,0 +1,15 @@ +function openEditModal(taskId, taskTime, taskTitle, taskDescription, taskImportant){ + $('#Modal').modal("toggle"); + $('#editTaskId').val(taskId); + $('#customerTime2').val(taskTime); + $('#customerTitle2').val(taskTitle); + $('#customerDescrip2').val(taskDescription); + $('#isImportant2').prop('checked', taskImportant); + $('#editModal').modal("toggle"); +} + +function deleteModal() { + var taskId = $('#editTaskId').val(); + $('#deleteTaskId').val(taskId); + $('#deleteTaskForm').submit(); +} \ No newline at end of file diff --git a/tests/test_todo_list.py b/tests/test_todo_list.py index fa8b91f2..84f0c566 100644 --- a/tests/test_todo_list.py +++ b/tests/test_todo_list.py @@ -86,7 +86,7 @@ def test_if_task_edited(home_test_client, session, task2: Task): def test_if_task_has_done(home_test_client, session, task: Task): - response = home_test_client.post(f"/task/setDone/{task.id}", + response = home_test_client.post(f"/task/done/{task.id}", data={"task_id": task.id}) assert response.status_code == 303 response = home_test_client.get(f"/task/{task.id}", data={}) @@ -96,7 +96,7 @@ def test_if_task_has_done(home_test_client, session, task: Task): def test_if_task_has_not_done(home_test_client, session, task: Task): - response = home_test_client.post(f"/task/setUndone/{task.id}", + response = home_test_client.post(f"/task/undone/{task.id}", data={"task_id": task.id, "session": session}) assert response.status_code == 303 From b4134d1071be66303de308535811ac542c63670e Mon Sep 17 00:00:00 2001 From: liaarbel Date: Wed, 24 Feb 2021 01:29:37 +0200 Subject: [PATCH 14/21] changed modals names, change functions in js from jquery, reformatted and fixed styles --- app/routers/audio.py | 2 +- app/routers/dayview.py | 11 +- app/routers/todo_list.py | 118 +++-- app/static/dayview.css | 12 +- app/static/js/todo_list_modals.js | 24 +- app/templates/calendar_day_view.html | 456 ++++++++++-------- app/templates/dayview.html | 0 .../partials/calendar/calendar_base.html | 2 + 8 files changed, 359 insertions(+), 266 deletions(-) delete mode 100644 app/templates/dayview.html diff --git a/app/routers/audio.py b/app/routers/audio.py index 827f67ca..05372169 100644 --- a/app/routers/audio.py +++ b/app/routers/audio.py @@ -16,7 +16,7 @@ DEFAULT_SFX_VOL, ) from app.dependencies import SOUNDS_PATH, get_db, templates -from app.internal.security.dependancies import current_user +from app.internal.security.dependencies import current_user from fastapi import APIRouter, Depends, Form, Request from sqlalchemy.orm.session import Session from starlette.responses import RedirectResponse diff --git a/app/routers/dayview.py b/app/routers/dayview.py index aa31d402..896a7b82 100644 --- a/app/routers/dayview.py +++ b/app/routers/dayview.py @@ -8,6 +8,7 @@ from app.dependencies import get_db, templates from app.internal import zodiac from app.internal.todo_list import sort_by_time +from app.internal.utils import get_current_user from app.routers.user import get_all_user_events router = APIRouter() @@ -166,7 +167,8 @@ async def dayview( view="day", ): # TODO: add a login session - user = session.query(User).filter_by(username="test_username").first() + # user = session.query(User).filter_by(username="test_username").first() + user = get_current_user(session) if not user: error_message = "User not found." raise HTTPException( @@ -188,8 +190,10 @@ async def dayview( session=session, user_id=user.id, ) - tasks = session.query(Task).filter(Task.owner_id == user.id) \ - .filter(Task.date == day.date()) + tasks = (session.query(Task) + .filter(Task.owner_id == user.id) + .filter(Task.date == day.date()) + ) tasks = sort_by_time(list(tasks)) month = day.strftime("%B").upper() return templates.TemplateResponse( @@ -200,6 +204,7 @@ async def dayview( "all_day_events": all_day_events, "month": month, "day": day.day, + "date_str": date, "zodiac": zodiac_obj, "view": view, "tasks": tasks, diff --git a/app/routers/todo_list.py b/app/routers/todo_list.py index 83f72b23..e2e5abcb 100644 --- a/app/routers/todo_list.py +++ b/app/routers/todo_list.py @@ -1,29 +1,31 @@ from datetime import datetime -from fastapi import Depends, APIRouter, Form +from fastapi import APIRouter, Depends, Form, status from fastapi.encoders import jsonable_encoder -from requests import Session +from fastapi.responses import JSONResponse, RedirectResponse from sqlalchemy.exc import SQLAlchemyError -from starlette import status -from starlette.responses import RedirectResponse, JSONResponse +from sqlalchemy.orm import Session from app.config import templates -from app.database.models import User from app.dependencies import get_db -from app.internal.todo_list import create_task, by_id +from app.internal.todo_list import by_id, create_task +from app.internal.utils import get_current_user router = APIRouter( prefix="/task", tags=["task"], - responses={404: {"description": "Not found"}}, + responses={status.HTTP_404_NOT_FOUND: {"description": "Not found"}}, ) @router.post("/delete") -def delete_task(task_id: int = Form(...), db: Session = Depends(get_db)): +def delete_task( + task_id: int = Form(...), + db: Session = Depends(get_db), +) -> RedirectResponse: # TODO: Check if the user is the owner of the task. task = by_id(db, task_id) - datestr = task.date.strftime('%Y-%m-%d') + date_str = task.date.strftime('%Y-%m-%d') try: # Delete task db.delete(task) @@ -32,64 +34,100 @@ def delete_task(task_id: int = Form(...), db: Session = Depends(get_db)): except (SQLAlchemyError, TypeError): return templates.TemplateResponse( - "dayview.html", {"task_id": task_id}, - status_code=status.HTTP_500_INTERNAL_SERVER_ERROR) + "calendar_day_view.html", + {"task_id": task_id}, + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, + ) # TODO: Send them a cancellation notice # if the deletion is successful return RedirectResponse( - url=f"/day/{datestr}", status_code=302) + url=f"/day/{date_str}", + status_code=status.HTTP_302_FOUND, + ) @router.post("/add") -async def add_task(title: str = Form(...), description: str = Form(...), - datestr: str = Form(...), timestr: str = Form(...), - is_important: bool = Form(False), - session: Session = Depends(get_db)): - # TODO: add a login session - user = session.query(User).filter_by(username='test_username').first() - create_task(session, title, description, - datetime.strptime(datestr, '%Y-%m-%d') - .date(), datetime.strptime(timestr, '%H:%M').time(), - user.id, is_important) - return RedirectResponse(f"/day/{datestr}", status_code=303) +async def add_task( + title: str = Form(...), + description: str = Form(...), + date_str: str = Form(...), + time_str: str = Form(...), + is_important: bool = Form(False), + session: Session = Depends(get_db), +) -> RedirectResponse: + # TODO replace with a real user + user = get_current_user(session) + create_task( + session, + title, + description, + datetime.strptime(date_str, '%Y-%m-%d').date(), + datetime.strptime(time_str, '%H:%M').time(), + user.id, + is_important, + ) + return RedirectResponse( + f"/day/{date_str}", + status_code=status.HTTP_303_SEE_OTHER, + ) @router.post("/edit") -async def edit_task(task_id: int = Form(...), title: str = Form(...), - description: str = Form(...), - datestr: str = Form(...), timestr: str = Form(...), - is_important: bool = Form(False), - session: Session = Depends(get_db)): +async def edit_task( + task_id: int = Form(...), + title: str = Form(...), + description: str = Form(...), + date_str: str = Form(...), + time_str: str = Form(...), + is_important: bool = Form(False), + session: Session = Depends(get_db), +) -> RedirectResponse: task = by_id(session, task_id) task.title = title task.description = description - task.date = datetime.strptime(datestr, '%Y-%m-%d').date() - task.time = datetime.strptime(timestr, '%H:%M:%S').time() + task.date = datetime.strptime(date_str, '%Y-%m-%d').date() + task.time = datetime.strptime(time_str, '%H:%M:%S').time() task.is_important = is_important session.commit() - return RedirectResponse(f"/day/{datestr}", status_code=303) + return RedirectResponse( + f"/day/{date_str}", + status_code=status.HTTP_303_SEE_OTHER, + ) -@router.post("/setDone/{task_id}") -async def set_task_done(task_id: int, session: Session = Depends(get_db)): +@router.post("/done/{task_id}") +async def set_task_done( + task_id: int, + session: Session = Depends(get_db), +) -> RedirectResponse: task = by_id(session, task_id) task.is_done = True session.commit() - return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", - status_code=303) + return RedirectResponse( + f"/day/{task.date.strftime('%Y-%m-%d')}", + status_code=status.HTTP_303_SEE_OTHER, + ) -@router.post("/setUndone/{task_id}") -async def set_task_undone(task_id: int, session: Session = Depends(get_db)): +@router.post("/undone/{task_id}") +async def set_task_undone( + task_id: int, + session: Session = Depends(get_db), +) -> RedirectResponse: task = by_id(session, task_id) task.is_done = False session.commit() - return RedirectResponse(f"/day/{task.date.strftime('%Y-%m-%d')}", - status_code=303) + return RedirectResponse( + f"/day/{task.date.strftime('%Y-%m-%d')}", + status_code=status.HTTP_303_SEE_OTHER, + ) @router.get("/{task_id}") -async def get_task(task_id: int, session: Session = Depends(get_db)): +async def get_task( + task_id: int, + session: Session = Depends(get_db), +) -> JSONResponse: task = by_id(session, task_id) data = jsonable_encoder(task) return JSONResponse(content=data) diff --git a/app/static/dayview.css b/app/static/dayview.css index 5d4a78e9..950dc4bb 100644 --- a/app/static/dayview.css +++ b/app/static/dayview.css @@ -176,10 +176,11 @@ body { .open-button { background-color: var(--primary); + max-width: 10%; color: #fff; margin-top: 0.75em; + margin-left: 45.5%; font-size: 1.25em; - padding: 0.875em; border-radius: 20px; transition-duration: 0.4s; box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19); @@ -191,11 +192,20 @@ body { box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19); } +.top-todo { + background: #2B346A; +} + .todo-style h1 { color: #fff; text-align: center; } +.important { + border-bottom: 5px solid blue; + margin-left: 3em; +} + .todo-style input[type="text"], .todo-style input[type="date"], .todo-style input[type="time"], diff --git a/app/static/js/todo_list_modals.js b/app/static/js/todo_list_modals.js index e452462d..586f1637 100644 --- a/app/static/js/todo_list_modals.js +++ b/app/static/js/todo_list_modals.js @@ -1,15 +1,19 @@ function openEditModal(taskId, taskTime, taskTitle, taskDescription, taskImportant){ - $('#Modal').modal("toggle"); - $('#editTaskId').val(taskId); - $('#customerTime2').val(taskTime); - $('#customerTitle2').val(taskTitle); - $('#customerDescrip2').val(taskDescription); - $('#isImportant2').prop('checked', taskImportant); - $('#editModal').modal("toggle"); + document.getElementById('modal').addEventListener('show.bs.modal', function (event) { + document.getElementById('edit-task-id').value = taskId; + document.getElementById('customer-time2').value = taskTime; + document.getElementById('customer-title2').value = taskTitle; + document.getElementById('customer-descrip2').value = taskDescription; + document.getElementById('is-important2').checked = taskImportant + document.getElementById('edit-modal').addEventListener('show.bs.modal' ,function (event) { + + } + } + } function deleteModal() { - var taskId = $('#editTaskId').val(); - $('#deleteTaskId').val(taskId); - $('#deleteTaskForm').submit(); + var taskId = $('#edit-task-id').val(); + $('#delete-task-id').val(taskId); + $('#delete-task-form').submit(); } \ No newline at end of file diff --git a/app/templates/calendar_day_view.html b/app/templates/calendar_day_view.html index e9b754fb..7176f2f9 100644 --- a/app/templates/calendar_day_view.html +++ b/app/templates/calendar_day_view.html @@ -1,238 +1,272 @@ {% extends "partials/calendar/calendar_base.html" %} {% block body %}
- -
- {% if view == 'day' %} - - {{month}} - {{day}} - {% if zodiac %} -
- zodiac sign + +
+ {% if view == 'day' %} + + {{month}} + {{day}} + {% if zodiac %} +
+ zodiac sign +
+ {% endif %} + {% else %} + {{day}} / {{month}} + {% endif %}
- {% endif %} - {% else %} - {{day}} / {{month}} - {% endif %} -
- - - -
-