stc

commit 65f18c2f41165f6b6fcd5e5ffaa9b26e5d6845b2
parent e1f73f8b58075deb2bb58f5f408162c65123ac62
Author: Brennen T. Mazur <brennen@madis.cool>
Date:   Fri, 31 Mar 2023 12:20:24 -0600

fix login page on root url, removed default value for fleet checkout, fix some spacing formatting, added employee aggregation and selection for reporting

Diffstat:
M
app/routes.py
 | 
20
+++++++++++++-------

1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/app/routes.py b/app/routes.py
@@ -104,7 +104,7 @@ def logout():
 ####                              ####
 #######    Login/Root Route    #######
 ####                              ####
-@app.route('/')
+@app.route('/', methods=['GET', 'POST'])
 @app.route("/login", methods=['GET', 'POST'])
 def login():
     if current_user.is_authenticated:
@@ -211,7 +211,6 @@ def dashboard():
 #   Temp values, change to db dependent values
     #availableVehicles = ['Vehicle 1', 'Vehicle 2', 'Vehicle 3', 'Vehicle 4']
     availableVehicles = mongo.db.fleet_collection.find_one({'_id':'Fleet Pool'},{'available':1})['available']
-    currentProject = 'Project 2'
     lastMileage = 103483
 #currently gets ALL projects TODO make filter by available agreements/projects
     availableProjects = []
@@ -245,7 +244,7 @@ def dashboard():
     clockoutform.projectsSel.choices = availableProjects
     fleetoutform.vehicle.choices = availableVehicles
     #fleetoutform.vehicle.default = availableVehicles[0]# Doesn't function
-    fleetoutform.start_mileage.data = lastMileage
+    #fleetoutform.start_mileage.data = lastMileage
     crewform.time.data = datetime.datetime.now()
     crewform.projectSel.choices = availableProjects
     crewform.projectSel.data = availableProjects[0]
@@ -592,12 +591,12 @@ def knowlegebase():
 @app.route('/admin/reports/agreement')
 @login_required
 def agreement_report():
-    return render_template ('admin/reports/agreement_report.html', ORGNAME=OrganizationName)
+    return render_template('admin/reports/agreement_report.html', ORGNAME=OrganizationName)
 
-@app.route('/admin/reports/agreements/<agreement>')
+@app.route('/admin/reports/agreements')
 @login_required
 def project_report():
-    return render_template ('admin/reports/project.html')
+    return render_template('admin/reports/project.html')
 
 # Payperiod Routes
 @app.route('/admin/reports/pay-period', methods=['GET'])
@@ -605,7 +604,7 @@ def project_report():
 def pay_period_report():
     pay = mongo.db.time_collection.find({})
     users = mongo.db.user_collection.find({})
-    return render_template ('admin/reports/pay_period_report.html', users=users, pay=pay, ORGNAME=OrganizationName)
+    return render_template('admin/reports/pay_period_report.html', users=users, pay=pay, ORGNAME=OrganizationName)
 
 # @app.route("/dev/fleetdata")
 # @login_required
@@ -613,6 +612,13 @@ def pay_period_report():
 #     allfleetdata = mongo.db.fleet_collection.find()
 #     return render_template('dev/fleetdata.html', allfleetdata=allfleetdata)
 
+@app.route('/admin/reports/employees')
+@login_required
+def report_employees():
+    users = mongo.db.user_collection.find()
+    hours = mongo.db.time_collection.find()
+    return render_template ('admin/employee_report/index.html', hours=hours, users=users, ORGNAME=OrganizationName)
+
 @app.route('/admin/reports/employee/<username>')
 @login_required
 def employee_report(username):