first commit

Author: ave-63

.gitignore

@@ -0,0 +1,7 @@
+__pycache__/
+sched_venv/
+app.db
+*junk*
+sched.sublime-project
+sched.sublime-workspace
+urtext_log.txt

app/__init__.py

@@ -0,0 +1,12 @@
+from flask import Flask
+from config import Config
+from flask_sqlalchemy import SQLAlchemy
+from flask_migrate import Migrate
+
+
+app = Flask(__name__)
+app.config.from_object(Config)
+db = SQLAlchemy(app)
+migrate = Migrate(app, db)
+
+from app import routes, models

app/forms.py

@@ -0,0 +1,17 @@
+from flask_wtf import FlaskForm
+from wtforms import StringField, PasswordField, BooleanField, SubmitField
+from wtforms.validators import DataRequired
+
+
+class LoginForm(FlaskForm):
+    username = StringField('Username', validators=[DataRequired()])
+    password = PasswordField('Password', validators=[DataRequired()])
+    remember_me = BooleanField('Remember Me')
+    submit = SubmitField('Sign In')
+
+
+class ChangePassword(FlaskForm):
+    username = StringField('Username', validators=[DataRequired()])
+    password = PasswordField('Password', validators=[DataRequired()])
+    new_password = PasswordField('New Password', validators=[DataRequired()])
+    submit = SubmitField('Change Password')

app/models.py

@@ -0,0 +1,81 @@
+from app import db
+from datetime import datetime
+
+
+class User(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    username = db.Column(db.String(64), index=True, unique=True)
+    email = db.Column(db.String(120), index=True, unique=True)
+    password_hash = db.Column(db.String(128))
+    posts = db.relationship('Post', backref='author', lazy='dynamic')
+    r1_bids = db.relationship('UserBids', backref='bidder', lazy='dynamic')
+
+    def __repr__(self):
+        return '<User {}>'.format(self.username)
+
+
+class Post(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    body = db.Column(db.String(140))
+    timestamp = db.Column(db.DateTime, index=True, default=datetime.utcnow)
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+
+    def __repr__(self):
+        return '<Post {}>'.format(self.body)
+
+
+class Section(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    bids = db.relationship('SectionBid', backref='sect', lazy='dynamic')
+    choice_num = db.Column(db.Integer, unique=True)  # 1-127 or so, to match spreadsheet
+    start_time = db.Column(db.Time)  # use with datetime.time()
+    end_time = db.Column(db.Time)
+    mon_wed = db.Column(db.Boolean)  # class meets Monday Wednesday
+    tue_thu = db.Column(db.Boolean)  # class meets Tuesday Thursday
+    mtwth = db.Column(db.Boolean)   # class meets 4 days: MTWTh
+    course = db.Column(db.String(4))  # eg '228A'
+    room = db.Column(db.String(6))   # eg '1003B'
+    units = db.Column(db.Integer)   # eg, 3 or 5
+    semester = db.Column(db.String(6))  # eg, 'Sp2020' or 'Fa2020'
+    taken_by = db.Column(db.String(25))  # eg 'Tchertchian E'
+
+    def __repr__(self):
+        return '<Section choice {}, math {}, id {}>'.format(self.choice_num, self.course, self.id)
+
+
+class SectionBid(db.Model):
+    # each row represents one teacher's bid on one class
+    id = db.Column(db.Integer, primary_key=True)
+    bid = db.Column(db.Integer)
+    section_id = db.Column(db.Integer, db.ForeignKey('section.id'))
+    user_bids_id = db.Column(db.Integer, db.ForeignKey('user_bids.id'))
+
+    def __repr__(self):
+        return '<SectionBid id {}, bid {}, section_id {}, user_bids_id {}>'.format(self.id, 
+            self.bid, self.section_id, self.user_bids_id)
+
+
+
+class UserBids(db.Model):
+    # collection of one teacher's round 1 bids
+    id = db.Column(db.Integer, primary_key=True)
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+    timestamp = db.Column(db.DateTime, index=True, default=datetime.utcnow)
+    primary = db.Column(db.Boolean)  # only 1 UserBids w/ this true per user
+    bid_1_prep = db.Column(db.Integer)
+    bid_2_prep = db.Column(db.Integer)
+    bid_3_prep = db.Column(db.Integer)
+    bid_4_prep = db.Column(db.Integer)
+    bid_5_prep = db.Column(db.Integer)
+    min_acc_units = db.Column(db.Integer)  # minimum acceptable unit total, eg, 13
+    max_acc_units = db.Column(db.Integer)  # maximum acceptable unit total, eg, 17
+    min_des_units = db.Column(db.Integer)  # minimum desired unit total, eg 14
+    max_des_units = db.Column(db.Integer)  # maximum desired unit total, eg 16
+    section_bids = db.relationship('SectionBid', backref='from_userbids', lazy='dynamic')
+
+    def __repr__(self):
+        return '<UserBids id {}, user_id {}, primary {}>'.format(self.id,
+            self.user_id, self.primary)
+
+# TODO: SchedOpt, SchedOptSection, SchedOptProj (joining table?)
+

app/routes.py

@@ -0,0 +1,49 @@
+from flask import render_template, flash, redirect, url_for
+from app import app
+from app.forms import LoginForm, ChangePassword
+
+
+@app.route('/')
+@app.route('/index')
+def index():
+    user = {'username': 'bensm'}
+    posts = [
+        {
+            'author': {'username': 'John'},
+            'body': 'Beautiful day in Portland!'
+        },
+        {
+            'author': {'username': 'Susan'},
+            'body': 'The Avengers movie was so cool!'
+        }
+    ]
+    return render_template('index.html', title='Home', user=user, posts=posts)
+
+
+@app.route('/login', methods=['GET', 'POST'])
+def login():
+    user = {'username': 'bensm'}
+    form = LoginForm()
+    if form.validate_on_submit():
+        flash('Login requested for user {}, remember_me={}'.format(
+            form.username.data, form.remember_me.data))
+        return redirect('/index')
+    return render_template('login.html', title='Sign In', user=user, form=form)
+
+
+@app.route('/history')
+def history():
+    user = {'username': 'bensm'}
+    return render_template('history.html', title='History', user=user)
+
+
+@app.route('/password', methods=['GET', 'POST'])
+def password():
+    user = {'username': 'bensm'}
+    form = ChangePassword()
+    if form.validate_on_submit():
+        flash('Password changed successfully')
+        return redirect('/index')
+    return render_template(
+        'password.html', user=user,
+        title='Change Password', form=form)

app/templates/base.html

@@ -0,0 +1,29 @@
+<html>
+    <head>
+        {% if title %}
+        <title>{{ title }} - Scheduleer</title>
+        {% else %}
+        <title>Welcome to Scheduleer!</title>
+        {% endif %}
+    </head>
+    <body>
+        <div>
+            Hi {{ user.username }}, you currently have xx credits.
+            <a href="{{ url_for('index') }}">Home</a>
+            <a href="{{ url_for('login') }}">Login</a>
+            <a href="{{ url_for('history') }}">History</a>
+            <a href="{{ url_for('password') }}">Change Password</a>
+        </div>
+        <hr>
+        {% with messages = get_flashed_messages() %}
+        {% if messages %}
+        <ul>
+            {% for message in messages %}
+            <li>{{ message }}</li>
+            {% endfor %}
+        </ul>
+        {% endif %}
+        {% endwith %}
+        {% block content %}{% endblock %}
+    </body>
+</html>

app/templates/history.html

@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% block content %}
+        <h1>{{ user.username }}'s history: </h1>
+        <div><p>For Spring 2020, Spent xx schedule dollars, with yy remaining, for schedule:</p>
+            <p> Insert Schedule here. </p>
+        </div>
+        <div><p>Semester: Fall 2020, Spent xx schedule dollars, with yy remaining, for schedule:</p>
+            <p> Insert Schedule here. </p>
+        </div>
+{% endblock %}

app/templates/index.html

@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block content %}
+        <h1>Hello, {{ user.username }}!</h1>
+        {% for post in posts %}
+        <div><p>{{ post.author.username }} says: <b>{{ post.body }}</b></p></div>
+        {% endfor %}
+{% endblock %}

app/templates/login.html

@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+
+{% block content %}
+    <h1>Sign In</h1>
+    <form action="" method="post" novalidate>
+        {{ form.hidden_tag() }}
+        <p>
+            {{ form.username.label }}<br>
+            {{ form.username(size=32) }}<br>
+            {% for error in form.username.errors %}
+            <span style="color: red;">[{{ error }}]</span>
+            {% endfor %}
+        </p>
+        <p> {{ form.password.label }}<br>
+            {{ form.password(size=40) }}<br>
+            {% for error in form.password.errors %}
+            <span style="color: blue;">[{{ error }}]</span>
+            {% endfor %}
+        </p>
+        <p>{{ form.remember_me() }} {{ form.remember_me.label }}</p>
+        <p>{{ form.submit() }}</p>
+    </form>
+{% endblock %}

app/templates/password.html

@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block content %}
+    Change your password here bro!
+{% endblock %}