stc

commit 8022195cce686c91b9c7eb96725092e7f30032bf
parent b741aff192e92cdff681ac47233ef38dd8c5067b
Author: Nikolas Mazur <nikolas@pop-os.localdomain>
Date:   Fri, 31 Mar 2023 22:38:35 -0600

CSS changes and pay-period updates

Diffstat:
M
app/routes.py
 | 
3
++-
M
app/static/css/main.css
 | 
12
++++++++++++
M
app/templates/admin/employee_report/widget.html
 | 
31
++++++++++++++++++-------------
M
app/templates/admin/pay_period_report/widget.html
 | 
13
+++++++------
M
seeds.py
 | 
2
+-

5 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/app/routes.py b/app/routes.py
@@ -604,7 +604,8 @@ 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)
+    time = mongo.db.time_collection.find({})
+    return render_template ('admin/reports/pay_period_report.html', users=users, pay=pay, time=time, ORGNAME=OrganizationName)
 
 # @app.route("/dev/fleetdata")
 # @login_required
diff --git a/app/static/css/main.css b/app/static/css/main.css
@@ -26,6 +26,9 @@ a,a.visited,a.hover {
 	color:#000;
 }
 
+::selection{
+	background: var(--zoning)
+}
 /********** NAVIGATION **********/
 header {
 	font-size:1.5em;
@@ -173,6 +176,15 @@ header #logout {
 		padding: 2em 5em 3em 5em;
 	}
 }
+.employee-overlook table tr:nth-child(even) {
+	background-color:var(--maincolor);
+}
+.employee-overlook table td:nth-child(odd) {
+	text-align:left;
+}
+.employee-overlook table td:nth-child(even) {
+	text-align:right;
+}
 /***####### FLEET WIDGET #######***/
 .safetychecks{
 	display:block;
diff --git a/app/templates/admin/employee_report/widget.html b/app/templates/admin/employee_report/widget.html
@@ -1,15 +1,20 @@
 <section class="agreements">
-	<h3>Employee Overlook</h3>
-	<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 user.is_active %} Employee is active {% else %} Employee is inactive {% endif %}</div>
-	</div>
+	<section class="employee-overlook">
+		<h3>Employee Overlook</h3>
+		<div class="usercard">
+			<h4>{{ user.fname }} {{ user.mname }}. {{ user.lname }}</h3>
+			<table>
+				<tr><td>Username</td><td>{{ user.username }}</td></tr>
+				<tr><td>Birthday</td><td>{{ user.birthday }}</td></tr>
+				<tr><td>Role</td><td>{{ user.role }}</td></tr>
+				<tr><td>Branch</td><td>{{ user.branch }}</td></tr>
+				<tr><td>Phone Number</td><td>{{ user.phonenumber }}</td></tr>
+				<tr><td>Address</td><td>{{ user.address }}</td></tr>
+				<tr><td>Email</td><td>{{ user.email }}</td></tr>
+				<tr><td>Pay Value</td><td>{{ user.pay_value }}</td></tr>
+				<tr><td>Pay Period</td><td>{{ user.pay_period }}</td></tr>
+				<tr><td>Active</td><td>{% if user.is_active %} Employee is active {% else %} Employee is inactive {% endif %}</td></tr>
+			</table>
+		</div>
+	</section>
 </section>
diff --git a/app/templates/admin/pay_period_report/widget.html b/app/templates/admin/pay_period_report/widget.html
@@ -1,23 +1,24 @@
 <section class="agreements">
 	<h3>Pay-Period Overlook</h3>
 	{% for user in users %}
-		{% if pay_period == hourly %}
+		{% if user.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="total-progress">Amount Due: ${{ user.pay_value |round(2)}}</div> <!-- Multiply hours by pay-value -->
+					<div class="progress-bar">Total Time: {{ time.hour }} hours, {{ time.minute }} minutes.</div>
 					<div class="progress-bar">Pay Rate: ${{ user.pay_value }}</div>
-					<div class="progress-bar">Pay Period: {{ user.pay_period }}</div>
+					<div class="progress-bar">Pay Period: Hourly</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="total-progress">Amount Due: ${{ user.pay_value / 24|round(2) }}</div> <!-- Divide pay-value by 24 -->
+					<div class="progress-bar">Total Time: {{ time.hour }} hours, {{ time.minute }} minutes.</div>
 					<div class="progress-bar">Pay Rate: ${{ user.pay_value }}</div>
+					<div class="progress-bar">Pay Period: Salaried</div>
 				</div>
 			</a>
 		{% endif %}
diff --git a/seeds.py b/seeds.py
@@ -43,7 +43,7 @@ user1 = {
         'email': 'kolemazur@gmail.com',
         'pay_period': 'hourly',
         'pay_value': 15.12,
-        'is_active':True
+        'is_active':False
         }
 
 #pw is 'password2'