diff --git a/app.py b/app.py index 85207db..fbe442a 100644 --- a/app.py +++ b/app.py @@ -1,5 +1,5 @@ import os -from datetime import datetime +from datetime import datetime, time, date from flask import Flask, render_template, request, redirect, url_for from flask_sqlalchemy import SQLAlchemy @@ -46,9 +46,19 @@ class Event(db.Model): @app.route('/') def index(): events = Event.query.all() - return render_template('index.html', events=events, datetime=datetime) + return render_template('index.html', events=events, datetime=datetime, date=date) + +@app.route('/events') +def events(): + events = Event.query.all() + return render_template('events.html', events=events, datetime=datetime, date=date) + +@app.route('/tasks') +def tasks(): + tasks = Task.query.all() + return render_template('tasks.html', str=str, tasks=tasks, datetime=datetime, date=date) @app.route('/task//') def task(task_id): task = Task.query.get_or_404(task_id) - return render_template('task.html', task=task, datetime=datetime) \ No newline at end of file + return render_template('task.html', str=str, task=task, datetime=datetime, date=date) \ No newline at end of file diff --git a/init_db.py b/init_db.py index 64ac6d7..ece185e 100644 --- a/init_db.py +++ b/init_db.py @@ -1,5 +1,7 @@ from app import db, Period, Task, Event +db.create_all() + period1 = Period(period=1, periodTime='08:30:00', weekendSchedule=True) period2 = Period(period=2, periodTime='09:00:00', weekendSchedule=True) diff --git a/templates/base.html b/templates/base.html index 6e2e187..9a8cfb8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -19,10 +19,10 @@ diff --git a/templates/events.html b/templates/events.html new file mode 100644 index 0000000..b7846a7 --- /dev/null +++ b/templates/events.html @@ -0,0 +1,25 @@ +{% extends 'base.html' %} +{% set currDay = datetime.now() %} +{% set currDay = currDay.strftime('%m-%d-%Y') %} + +{% block content %} +

{% block title %} Events {% endblock %}

+ Current Date: {{ currDay }}

+
+ {% for event in events if event.scheduled_date == currDay %} +
+ {% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %} +

Period {{ event.period_num }}
Time: {{ convertedTime.strftime("%I:%M %p") }}

+ + + {{ event.tasks.title }} + + +
+

{{ event.tasks.description }}

+
+
+
+ {% endfor %} +
+{% endblock %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index d81bd36..bf9dc08 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,22 +1,4 @@ {% extends 'base.html' %} {% block content %} -

{% block title %} Events {% endblock %}

-
- {% for event in events %} -
- {% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %} -

Period {{ event.period_num }}
Time: {{ convertedTime.strftime("%I:%M %p") }}

- - - {{ event.tasks.title }} - - -
-

{{ event.tasks.description }}

-
-
-
- {% endfor %} -
{% endblock %} \ No newline at end of file diff --git a/templates/task.html b/templates/task.html index 59c0025..0073f4b 100644 --- a/templates/task.html +++ b/templates/task.html @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% set createdTime = datetime.fromtimestamp(task.created_timestamp) %} +{% set createdTime = datetime.strptime(str(createdTime), '%Y-%m-%d %H:%M:%S') %} {% block content %}

{% block title %} {{ task.title }} {% endblock %}

@@ -12,7 +13,7 @@

{{ task.description }}

-

Created: {{ createdTime }}

+

Created: {{ createdTime.strftime('%Y-%m-%d %I:%M %p') }}

Due: {{ task.due_timestamp }}

diff --git a/templates/tasks.html b/templates/tasks.html new file mode 100644 index 0000000..399cf79 --- /dev/null +++ b/templates/tasks.html @@ -0,0 +1,22 @@ +{% extends 'base.html' %} + +{% block content %} +

{% block title %} Tasks {% endblock %}


+
+ {% for task in tasks %} + {% set createdTime = datetime.fromtimestamp(task.created_timestamp) %} + {% set createdTime = datetime.strptime(str(createdTime), '%Y-%m-%d %H:%M:%S') %} +
+ +

{{ task.title }}

+
+ + {{ task.description }} + +
+

Created: {{ createdTime }}

+
+
+
+ {% endfor %} +{% endblock %} \ No newline at end of file