more stuff
This commit is contained in:
16
app.py
16
app.py
@@ -1,5 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
from datetime import datetime
|
from datetime import datetime, time, date
|
||||||
from flask import Flask, render_template, request, redirect, url_for
|
from flask import Flask, render_template, request, redirect, url_for
|
||||||
from flask_sqlalchemy import SQLAlchemy
|
from flask_sqlalchemy import SQLAlchemy
|
||||||
|
|
||||||
@@ -46,9 +46,19 @@ class Event(db.Model):
|
|||||||
@app.route('/')
|
@app.route('/')
|
||||||
def index():
|
def index():
|
||||||
events = Event.query.all()
|
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/<int:task_id>/')
|
@app.route('/task/<int:task_id>/')
|
||||||
def task(task_id):
|
def task(task_id):
|
||||||
task = Task.query.get_or_404(task_id)
|
task = Task.query.get_or_404(task_id)
|
||||||
return render_template('task.html', task=task, datetime=datetime)
|
return render_template('task.html', str=str, task=task, datetime=datetime, date=date)
|
@@ -1,5 +1,7 @@
|
|||||||
from app import db, Period, Task, Event
|
from app import db, Period, Task, Event
|
||||||
|
|
||||||
|
db.create_all()
|
||||||
|
|
||||||
|
|
||||||
period1 = Period(period=1, periodTime='08:30:00', weekendSchedule=True)
|
period1 = Period(period=1, periodTime='08:30:00', weekendSchedule=True)
|
||||||
period2 = Period(period=2, periodTime='09:00:00', weekendSchedule=True)
|
period2 = Period(period=2, periodTime='09:00:00', weekendSchedule=True)
|
||||||
|
@@ -19,10 +19,10 @@
|
|||||||
<div class="collapse navbar-collapse" id="navbarNav">
|
<div class="collapse navbar-collapse" id="navbarNav">
|
||||||
<ul class="navbar-nav">
|
<ul class="navbar-nav">
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="#">Tasks</a>
|
<a class="nav-link" href="/events">Events</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="#">About</a>
|
<a class="nav-link" href="/tasks">Tasks</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
25
templates/events.html
Normal file
25
templates/events.html
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
{% set currDay = datetime.now() %}
|
||||||
|
{% set currDay = currDay.strftime('%m-%d-%Y') %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<span><h1>{% block title %} Events {% endblock %}</h1></span>
|
||||||
|
<b>Current Date: {{ currDay }} </b> <br> <br>
|
||||||
|
<div>
|
||||||
|
{% for event in events if event.scheduled_date == currDay %}
|
||||||
|
<div>
|
||||||
|
{% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %}
|
||||||
|
<p><b>Period {{ event.period_num }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p>
|
||||||
|
<b>
|
||||||
|
<a href="/task/{{ event.tasks.id }}">
|
||||||
|
{{ event.tasks.title }}
|
||||||
|
</a>
|
||||||
|
</b>
|
||||||
|
<div>
|
||||||
|
<p>{{ event.tasks.description }}</p>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
@@ -1,22 +1,4 @@
|
|||||||
{% extends 'base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<span><h1>{% block title %} Events {% endblock %}</h1></span>
|
|
||||||
<div>
|
|
||||||
{% for event in events %}
|
|
||||||
<div>
|
|
||||||
{% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %}
|
|
||||||
<p><b>Period {{ event.period_num }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p>
|
|
||||||
<b>
|
|
||||||
<a href="/task/{{ event.tasks.id }}">
|
|
||||||
{{ event.tasks.title }}
|
|
||||||
</a>
|
|
||||||
</b>
|
|
||||||
<div>
|
|
||||||
<p>{{ event.tasks.description }}</p>
|
|
||||||
</div>
|
|
||||||
<hr>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
@@ -1,5 +1,6 @@
|
|||||||
{% extends 'base.html' %}
|
{% extends 'base.html' %}
|
||||||
{% set createdTime = datetime.fromtimestamp(task.created_timestamp) %}
|
{% set createdTime = datetime.fromtimestamp(task.created_timestamp) %}
|
||||||
|
{% set createdTime = datetime.strptime(str(createdTime), '%Y-%m-%d %H:%M:%S') %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<span><h1>{% block title %} {{ task.title }} {% endblock %}</h1></span>
|
<span><h1>{% block title %} {{ task.title }} {% endblock %}</h1></span>
|
||||||
@@ -12,7 +13,7 @@
|
|||||||
<p>{{ task.description }}</p>
|
<p>{{ task.description }}</p>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<p>Created: {{ createdTime }} </p>
|
<p>Created: {{ createdTime.strftime('%Y-%m-%d %I:%M %p') }} </p>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<p>Due: {{ task.due_timestamp }}</p>
|
<p>Due: {{ task.due_timestamp }}</p>
|
||||||
|
22
templates/tasks.html
Normal file
22
templates/tasks.html
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<span><h1>{% block title %} Tasks {% endblock %}</h1></span> <br>
|
||||||
|
<div>
|
||||||
|
{% for task in tasks %}
|
||||||
|
{% set createdTime = datetime.fromtimestamp(task.created_timestamp) %}
|
||||||
|
{% set createdTime = datetime.strptime(str(createdTime), '%Y-%m-%d %H:%M:%S') %}
|
||||||
|
<div>
|
||||||
|
<a href="/task/{{ task.id }}">
|
||||||
|
<p><b>{{ task.title }}</b> </p>
|
||||||
|
</a>
|
||||||
|
<b>
|
||||||
|
{{ task.description }}
|
||||||
|
</b>
|
||||||
|
<div>
|
||||||
|
<p>Created: {{ createdTime }}</p>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% endblock %}
|
Reference in New Issue
Block a user