commit ed6cf9a3bbf2f6607d304ac4db9db7c662a8f5bb
parent c33c2fa30b12a631a31af5bf878d8c91abccc82a
Author: Brennen T. Mazur <brennen@madis.cool>
Date: Sun, 26 Mar 2023 20:45:28 -0600
Merge branch 'auth' of git.brennen.work:stc into auth
Diffstat:
5 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/app/routes.py b/app/routes.py
@@ -600,12 +600,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,15 @@
<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">Username: {{ user.username }}</div>
+ <div class="progress-bar">Email: {{ user.email }}</div>
+ <div class="progress-bar">Phonenumber: {{ user.phonenumber }}</div>
+ <div class="progress-bar">Branch: {{ user.branch }}</div>
+ <div class="progress-bar">Role: {{ user.role }}</div>
+ <div class="progress-bar">Pay Value: ${{ user.pay_value }}</div>
+ <div class="progress-bar">Pay Period: {{ user.pay_period }}</div>
+ <div class="progress-bar">Address: {{ user.address }}</div>
+ <div class="progress-bar">Birthday: {{ user.birthday }}</div>
+ <div class="progress-bar">Active: {% if is_active == True %} Employee is active {% else %} Employee is inactive {% endif %}</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,25 @@
<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>
- <!-- 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>
+ <h3>Pay-Period Overlook</h3>
+ {% for user in users %}
+ {% if pay_period == hourly %}
+ <!-- Hourly -->
+ <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 class="progress-bar">Pay Period: {{ user.pay_period }}</div>
+ </div>
+ </a>
+ {% else %}
+ <!-- Salaried -->
+ <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>
+ {% endif %}
+ {% 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 %} -->
diff --git a/seeds.py b/seeds.py
@@ -41,8 +41,8 @@ user1 = {
'branch': 'Lander',
'phonenumber': '3074380460',
'email': 'kolemazur@gmail.com',
- 'pay_period': 'salaried',
- 'pay_value': 43000,
+ 'pay_period': 'hourly',
+ 'pay_value': 15.12,
'is_active':True
}
