Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Updated code to deal with dates that wrap around the new year

Browse source
This commit is contained in:
Pieter-Jan Cassiman 2019-12-05 19:19:36 +01:00
parent 15f8f6c5d9
commit a71f7434d1
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/views/general.py
View file

@ -6,15 +6,15 @@ from flask import Flask, render_template, make_response
from flask import request from flask import request
from flask import Blueprint, abort from flask import Blueprint, abort
from flask import current_app as app from flask import current_app as app
from flask import render_template, send_from_directory, url_for from flask import send_from_directory, url_for
from flask_login import login_required from flask_login import login_required
import yaml
from models import Location, Order from models import Location, Order
# import views # import views
from views.order import get_orders from views.order import get_orders
import yaml
general_bp = Blueprint("general_bp", __name__) general_bp = Blueprint("general_bp", __name__)
@ -29,6 +29,7 @@ def home() -> str:
"home.html", orders=get_orders(), recently_closed=recently_closed "home.html", orders=get_orders(), recently_closed=recently_closed
) )
@general_bp.route("/css") @general_bp.route("/css")
def css(): def css():
"Generate the css" "Generate the css"
@ -54,17 +55,26 @@ def css():
# Check each theme in the dictionary and return the first one that is "correct" # Check each theme in the dictionary and return the first one that is "correct"
for theme in themes.values(): for theme in themes.values():
start_day, start_month = theme['start'].split('/') start_day, start_month = theme['start'].split('/')
start_day = int(start_day)
start_month = int(start_month)
end_day, end_month = theme['end'].split('/') end_day, end_month = theme['end'].split('/')
end_day = int(end_day)
end_month = int(end_month)
if end_month < start_month:
# Hacky (werkt nu maar kan beter)
end_month += 12
if theme['type'] == 'static-date': if theme['type'] == 'static-date':
if (((int(start_month) == current_month) and if (((start_month == current_month) and
(int(start_day) <= current_day)) or (start_day <= current_day)) or
(int(start_month) <= current_month)): (start_month <= current_month)):
if (((int(end_month) == current_month) and if (((end_month == current_month) and
(int(end_day) >= current_day)) or (end_day >= current_day)) or
(int(end_month) > current_month)): (end_month > current_month)):
f = open("app/static/css/themes/"+theme['file']) f = open("app/static/css/themes/"+theme['file'])
break break
@ -75,6 +85,7 @@ def css():
f = open("app/static/css/main.css") f = open("app/static/css/main.css")
response = make_response(f.read()) response = make_response(f.read())
response.headers['Content-Type'] = 'text/css' response.headers['Content-Type'] = 'text/css'
f.close()
return response return response