commit bfb95bb2b97447131dab90011a57f131c852a349
parent d6e30ccd20291f580667c57556427dd40c689550
Author: Nikolas Mazur <nikolas@pop-os.localdomain>
Date: Sun, 26 Mar 2023 15:37:13 -0600
Add if statement for differentiating pay value
Diffstat:
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/app/templates/admin/pay_period_report/widget.html b/app/templates/admin/pay_period_report/widget.html
@@ -1,21 +1,25 @@
<section class="agreements">
- <h3>Pay-period Overlook</h3>
- <!-- Hourly -->
+ <h3>Pay-Period Overlook</h3>
{% 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="{{ 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>
+ {% 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/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
}