diff --git a/verse/adminpage.py b/verse/adminpage.py index 1dd2b42..b158900 100644 --- a/verse/adminpage.py +++ b/verse/adminpage.py @@ -26,10 +26,6 @@ def AdminPage(): if adminuserform.validate_on_submit(): if adminuserform.delete.data: DeleteUsers(adminuserform) - if adminuserform.tutors.data: - ToggleUsersAsTutors(adminuserform, True) - if adminuserform.nottutors.data: - ToggleUsersAsTutors(adminuserform, False) template = render_template( "admin.html", @@ -50,23 +46,6 @@ def DeleteUsers(adminuserform): userform.errors.append(f"User {useremail} deleted!") -def ToggleUsersAsTutors(adminuserform, is_tutor): - for userform in adminuserform: - if "user" in userform.id: - if userform.data: - useremail = userform.label.text - user = User.query.filter_by(email=useremail).first() - ToggleUserTutorinDb(user, is_tutor) - userform.errors.append(f"Is User {useremail} tutor {is_tutor}") - - -def ToggleUserTutorinDb(user, is_tutor): - try: - user.tutor = is_tutor - db.session.commit() - except (InvalidRequestError, DataError, InterfaceError, DatabaseError): - db.session.rollback() - def DeleteUserFromDb(user): try: diff --git a/verse/forms/adminuserform.py b/verse/forms/adminuserform.py index 1a6ffae..aeda2e4 100644 --- a/verse/forms/adminuserform.py +++ b/verse/forms/adminuserform.py @@ -20,8 +20,4 @@ class AdminUserForm(FlaskForm): return UserListForm() - tutors = SubmitField("Are tutors") - - nottutors = SubmitField("Are not tutors") - delete = SubmitField("Delete") diff --git a/verse/models/distribusi_file_model.py b/verse/models/distribusi_file_model.py new file mode 100644 index 0000000..e69de29 diff --git a/verse/models/usermodel.py b/verse/models/usermodel.py index 254fe3f..9522024 100644 --- a/verse/models/usermodel.py +++ b/verse/models/usermodel.py @@ -15,8 +15,6 @@ class User(UserMixin, db.Model): currentdistribusi = db.Column(db.String(300), nullable=True, unique=False) resethash = db.Column(db.String(300), nullable=True, unique=True) resettime = db.Column(db.DateTime) - # active = db.Column(db.Boolean, default=False) - tutor = db.Column(db.Boolean, default=False) admin = db.Column(db.Boolean, default=False) def __repr__(self): diff --git a/verse/static/css/style.css b/verse/static/css/style.css index d244b7e..2f772a8 100644 --- a/verse/static/css/style.css +++ b/verse/static/css/style.css @@ -149,12 +149,6 @@ input[type="submit"]:disabled:focus { background-color: #62b264; } -#tutors { - color: black; - background-color: #62b264; -} - - /* unvisited link */ a:link { color: #fff600; diff --git a/verse/statuspengguna/helper.py b/verse/statuspengguna/helper.py index 76c0c4b..022326e 100644 --- a/verse/statuspengguna/helper.py +++ b/verse/statuspengguna/helper.py @@ -77,10 +77,7 @@ class UserHelper: def distribusi_limit_reached(): user = User.query.filter_by(email=current_user.email).first() distribusiamount = len(DistribusisInfo.getuserdistribusis(user.email)) - if user.tutor and distribusiamount > 14: - print("tutor already has 15 distribusis") - return True - if not user.tutor and distribusiamount > 4: - print("user already has 5 distribusis") + if distribusiamount > 19: + print("user already has 20 distribusis") return True return False diff --git a/verse/statuspengguna/static/css/style.css b/verse/statuspengguna/static/css/style.css index d244b7e..fb743fc 100644 --- a/verse/statuspengguna/static/css/style.css +++ b/verse/statuspengguna/static/css/style.css @@ -149,11 +149,6 @@ input[type="submit"]:disabled:focus { background-color: #62b264; } -#tutors { - color: black; - background-color: #62b264; -} - /* unvisited link */ a:link { diff --git a/verse/templates/base/admin.html b/verse/templates/base/admin.html index 2272dc2..e0f4982 100644 --- a/verse/templates/base/admin.html +++ b/verse/templates/base/admin.html @@ -14,9 +14,6 @@

Admin Page

-

Here you can bulk delete distribusis and users or make users into tutors - These actions cannot be undone! -

List of distribusis

@@ -53,12 +50,6 @@ {% endif %} {% endfor %} -
- {{ adminuserform.tutors }} -
-
- {{ adminuserform.nottutors }} -
{{ adminuserform.delete }}