From 963b33f170867a6750ed7b1004cdd560ec97db6d Mon Sep 17 00:00:00 2001 From: crunk Date: Sun, 21 Apr 2024 22:09:44 +0200 Subject: [PATCH] working version alpha --- verse/models/distribusimodel.py | 4 ---- verse/start.py | 2 -- verse/static/js/dropdown.js | 5 ++--- verse/upload.py | 10 ++++------ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/verse/models/distribusimodel.py b/verse/models/distribusimodel.py index 11aad04..d8f114e 100644 --- a/verse/models/distribusimodel.py +++ b/verse/models/distribusimodel.py @@ -9,14 +9,10 @@ class Distribusis(db.Model): id = db.Column(db.Integer, primary_key=True) distribusiname = db.Column(db.String(300), nullable=False, unique=True) userid = db.Column(db.Integer, db.ForeignKey("users.id")) - term = db.Column(db.String(5), nullable=False, unique=False) category = db.Column(db.String(500), nullable=True, unique=False) - - # Academic year eg:2020-2021, so no need for a Datetime object year = db.Column(db.String(9), nullable=True, unique=False) tags = db.Column(db.String(500), nullable=True, unique=False) publictheme = db.Column(db.String(300), unique=True, nullable=True) - visible = db.Column(db.Boolean, default=False) def __repr__(self): diff --git a/verse/start.py b/verse/start.py index 1ddc540..e3da5d0 100644 --- a/verse/start.py +++ b/verse/start.py @@ -59,7 +59,6 @@ def index(): distribusisindex[distribusi.distribusiname] = singledistribusi years = uploadform.year.choices categories = uploadform.category.choices - adminuser = isadminuser() template = render_template( "index.html", @@ -100,7 +99,6 @@ def publicthemes(path): distribusi = Distribusis.query.filter_by(distribusiname=path).first() publicthemefolder = f"publicthemes/{distribusi.distribusiname}/" cssfile = f"{publicthemefolder}/{distribusi.publictheme}.css" - print(cssfile) return send_from_directory("themes", cssfile, as_attachment=True) diff --git a/verse/static/js/dropdown.js b/verse/static/js/dropdown.js index e0ce738..505d4a8 100644 --- a/verse/static/js/dropdown.js +++ b/verse/static/js/dropdown.js @@ -24,9 +24,8 @@ function filterSelection(c, name, id) { } function resetDropDownButtons(){ - document.getElementById("Academicyear").innerText = "Academic year"; - document.getElementById("Term").innerText = "Term"; - document.getElementById("Course").innerText = "Course"; + document.getElementById("Year").innerText = "Year"; + document.getElementById("Category").innerText = "Category"; allactivebuttons = document.getElementsByClassName("activebtn"); for(var i = 0;allactivebuttons.length; i++) { removeClass(allactivebuttons[i], "activebtn"); diff --git a/verse/upload.py b/verse/upload.py index 2ffbca3..6e3a336 100644 --- a/verse/upload.py +++ b/verse/upload.py @@ -22,9 +22,8 @@ def UploadNewDistribusi(uploadfolder): newdistribusi = Distribusis( distribusiname=uploadform.sitename.data, userid=user.id, - term=uploadform.term.data, - course=uploadform.course.data, - year=uploadform.academicyear.data, + category=uploadform.category.data, + year=uploadform.year.data, tags=uploadform.tags.data, ) user.currentdistribusi = uploadform.sitename.data @@ -66,9 +65,8 @@ def UploadUpdatedFiles(uploadfolder): distribusi = Distribusis.query.filter_by( distribusiname=current_distribusi ).first() - distribusi.term = uploadform.term.data - distribusi.course = uploadform.course.data - distribusi.year = uploadform.academicyear.data + distribusi.category = uploadform.category.data + distribusi.year = uploadform.year.data distribusi.tags = uploadform.tags.data distribusi.visible = False db.session.commit()