commit d6e30ccd20291f580667c57556427dd40c689550
parent 9c9766c429b18838d0f3b2b1d0e1be83d020f310
Author: Nikolas Mazur <nikolas@pop-os.localdomain>
Date: Sun, 26 Mar 2023 12:07:07 -0600
Fix variables and routing for reports
Diffstat:
4 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/app/routes.py b/app/routes.py
@@ -545,12 +545,12 @@ def project_report():
return render_template ('admin/reports/project.html')
# Payperiod Routes
-@app.route('/admin/reports/pay-period')
+@app.route('/admin/reports/pay-period', methods=['GET'])
@login_required
def pay_period_report():
- pay = mongo.db.time_collection.find()
- user = mongo.db.user_colelction.find()
- return render_template ('admin/reports/pay_period_report.html', user=user, pay=pay, ORGNAME=OrganizationName)
+ 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)
# @app.route("/dev/fleetdata")
# @login_required
diff --git a/app/templates/admin/employee_report/widget.html b/app/templates/admin/employee_report/widget.html
@@ -1,12 +1,12 @@
<section class="agreements">
<h3>Employee Overlook</h3>
- <div class="progress">First Middle Last
- <div class="total-progress">Username</div>
- <div class="progress-bar">email</div>
- <div class="progress-bar">Phone Number</div>
- <div class="progress-bar">Branch</div>
- <div class="progress-bar">Address</div>
- <div class="progress-bar">Birthday</div>
- <div class="progress-bar">Role</div>
+ <div class="progress"> {{ user.fname }} {{ user.mname }}. {{ user.lname }}
+ <div class="total-progress">{{ user.username }}</div>
+ <div class="progress-bar">{{ user.email }}</div>
+ <div class="progress-bar">{{ user.phonenumber }}</div>
+ <div class="progress-bar">{{ user.branch }}</div>
+ <div class="progress-bar">{{ user.address }}</div>
+ <div class="progress-bar">{{ user.birthday }}</div>
+ <div class="progress-bar">{{ user.role }}</div>
</div>
</section>
diff --git a/app/templates/admin/pay_period_report/widget.html b/app/templates/admin/pay_period_report/widget.html
@@ -1,15 +1,21 @@
<section class="agreements">
<h3>Pay-period Overlook</h3>
<!-- Hourly -->
- <a href="/admin/reports/employee/<username>" onClick="alert('route to /admin/reports/employee/<username>')"><div class="progress">{{ user.fname }} {{ user.mname }}. {{ user.lname }}
- <div class="total-progress">Amount Due: totalmoney</div> <!-- Multiply hours by pay-value -->
- <div class="progress-bar">Total Time: 40 hours, 15 minutes</div>
- <div class="progress-bar">Pay Rate: ${{ user.pay_value }}</div>
- </div></a>
+ {% for user in users %}
+ <a href="{{ url_for('employee_report',username=user.username) }}">
+ <div class="progress">{{ user.fname }} {{ user.mname }}. {{ user.lname }}
+ <div class="total-progress">Amount Due: totalmoney</div> <!-- Multiply hours by pay-value -->
+ <div class="progress-bar">Total Time: 40 hours, 15 minutes</div>
+ <div class="progress-bar">Pay Rate: ${{ user.pay_value }}</div>
+ </div>
+ </a>
<!-- Salaried -->
- <a href="/admin/reports/employee/<username>" onClick="alert('route to /admin/reports/employee/<username>')"><div class="progress">Brennen Mazur
- <div class="total-progress">Amount Due: totalmoney</div> <!-- Divide pay-value by 24 -->
- <div class="progress-bar">Total Time: 35 hours, 16 minutes</div>
- <div class="progress-bar">Pay Rate: $65,000</div>
- </div></a>
-</section>
+ <a href="{{ url_for('employee_report',username=user.username) }}">
+ <div class="progress">{{ user.fname }} {{ user.mname }}. {{ user.lname }}
+ <div class="total-progress">Amount Due: totalmoney</div> <!-- Divide pay-value by 24 -->
+ <div class="progress-bar">Total Time: 35 hours, 16 minutes</div>
+ <div class="progress-bar">Pay Rate: ${{ user.pay_value }}</div>
+ </div>
+ </a>
+ {% endfor %}
+</section>
+\ No newline at end of file
diff --git a/app/templates/admin/reports/agreement_report.html b/app/templates/admin/reports/agreement_report.html
@@ -0,0 +1,14 @@
+{% extends 'base.html' %}
+
+{% block title %}Agreement Reports{% endblock %}
+
+{% block content %}
+ <section class="admin-grid">
+ returned values from admin check is array of permissive ACCESS else return 'missing permissions response'
+ {%- for x in ['reports','agreement_report','roles','users'] %}
+ {% include 'admin/'~x~'/widget.html' %}
+ {%- else-%}
+ {{ 'You do not have permission to access this page' }}
+ {%- endfor %}
+ </section>
+{% endblock %} -->
