stc

commit a6497c75320260a8c70cea63fe05092a0b639b47
parent fc7b7fdfafaf510b1d50309b3b5bad5d51664aa3
Author: Brennen T. Mazur <brennen@madis.cool>
Date:   Thu, 23 Feb 2023 00:48:33 -0700

seed bugfix, starting to think about reading roles

Diffstat:
M
app/routes.py
 | 
14
++++++++++----
M
seeds.py
 | 
7
+++----

2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/app/routes.py b/app/routes.py
@@ -105,12 +105,16 @@ def load_user(username):
 @app.route("/dashboard", methods=['GET', 'POST'])
 @login_required
 def dashboard():
+
+#    all_permissions=mongo.db.permissions_collection.find_one('current_user.role')
+#    dashperms=all_permissions['dashboard']
+
     clockform=PunchclockWidget()
     fleetoutform=FleetCheckoutForm()
     fleetinform=FleetCheckinForm()
     currenttime=datetime.datetime.utcnow()
 
-    available_projects = {'STC Webapp':'stcapp','YEP Website':'yepsite','Volunteer Day':'volday'}
+    available_projects = {'STC Webapp':'stcapp','YEP Website':'yepsite','Volunteer Day':'volday'} #not used/not working
     if fleetoutform.validate_on_submit():
         mongo.db.fleet_collection.insert_one({'date':datetime.datetime.today(), # NEED to work on modular way of storing safety checks... might condence to single true if all checked. else returns false and records false datavalue.label in incident_report[] If incident report, remove vehicle from available pool and display widget in admin layout
                                               'vehicle':fleetoutform.vehicle.data,
@@ -121,12 +125,14 @@ def dashboard():
     return render_template('dashboard/layout.html',currenttime=currenttime,projects=available_projects,clockform=clockform,fleetinform=fleetinform,fleetoutform=fleetoutform,ORGNAME=OrganizationName)
 
 @app.route("/admin")
-#@login_required
+@login_required
 def admin():
+    #all_permissions=mongo.db.permissions_collection.find_one({"label":current_user.role})
+    #admnperms=all_permissions.admin
     return render_template ('admin/layout.html',ORGNAME=OrganizationName)
 
 @app.route("/hours")#modify to take userid ex. /hours<userid> for "admin" currently pulls from current_user... simply always pass username to hours(if possible set a default to current_user)
-#@login_required
+@login_required
 def hours():#userid goes into call to db to get user[] -> then returns formatted table (punchclock/index.html
     return render_template ('dashboard/punchclock/index.html',ORGNAME=OrganizationName)
 
@@ -136,7 +142,7 @@ def hours():#userid goes into call to db to get user[] -> then returns formatted
 #    return render_template('dashboard/fleet/index.html',ORGNAME=OrganizationName)
 
 @app.route("/admin/roles")
-#@login_required
+@login_required
 def roles():
     admnform = AdmnPermissionsForm()
     dashform = DashPermissionsForm()
diff --git a/seeds.py b/seeds.py
@@ -36,7 +36,7 @@ user1 = {
         'username': 'nikolasmmazur',
         'birthday': '1999-03-26',
         'password_hash': 'pbkdf2:sha256:260000$DBIF9Dfq1OcsYwSk$37f5cc231ff2c97cc7a6b60f25c767380574f1c01cc17069da4f3e7e25ba3370',
-        'role': 'Developer',
+        'role': 'developer',
         'address': '275 DuPont Dr, Lander Wy 82520',
         'branch': 'Lander',
         'phonenumber': '3074380460',
@@ -54,7 +54,7 @@ user2 = {
         'username': 'brennentmazur',
         'birthday': '1997-04-28',
         'password_hash': 'pbkdf2:sha256:260000$ukazhSEG3m9xH2oL$5cc00ff3411f614720287c18f615d71578face70abc990ea5def89f520b0ac2c',
-        'role': 'Developer',
+        'role': 'crewlead',
         'branch': 'Dillon',
         'phonenumber': 3074380491,
         'address': '705 N Railroad Ave, Dillon MT, 59725',
@@ -63,7 +63,6 @@ user2 = {
         'pay_value': 43000,
         'is_active':True
         }
-#added usr nad has password of [eYMvPaQFGCihlq]
 
 # Time documents
 time1 = {
@@ -92,7 +91,7 @@ time2 = {
 fleet1 = {
     'date': datetime.datetime.today(),
     'operator': 'brennentmazur', #forign key to userID
-    'safety_checks': [True,True,True,True,True]#array for different safety checks
+    'safety_checks': [True,True,True,True,True],#array for different safety checks
     'additional_notes': 'Oil needs checked',
     'vehicle': 'The Big Truck', #vehicleID
     'incident_report': '',