stc

commit 4cc6f477a08b2dd97a643d0d1c199999ad693ffc
parent 0509d8f621697bbe2b9e8416f7825619dc7730f2
Author: Brennen T. Mazur <brennen@madis.cool>
Date:   Sun,  2 Apr 2023 23:36:16 -0600

Merge branch 'auth' of git.brennen.work:stc into auth

Diffstat:
M
app/static/css/main.css
 | 
16
++++++++++++++++
M
app/templates/admin/pay_period_report/widget.html
 | 
26
++++++++++++++++----------
M
app/templates/knowlegebase/index.html
 | 
38
++++++++++++++++++++++++++++++++++++++

3 files changed, 70 insertions(+), 10 deletions(-)
diff --git a/app/static/css/main.css b/app/static/css/main.css
@@ -265,6 +265,22 @@ header #logout {
 	text-align:left;
 }
 
+/********** DOCUMENTATION **********/
+.documentation-container {
+	text-align: center;
+	margin-left: 10vw;
+	margin-right: 10vw;
+}
+.documentation-header {
+	padding-top: 5vh;
+}
+.intro-documentation {
+	padding-top: 2vh;
+}
+.input-example {
+	width: 50px;
+}
+
 /********** Footer **********/
 footer {
 	margin-top:4em;
diff --git a/app/templates/admin/pay_period_report/widget.html b/app/templates/admin/pay_period_report/widget.html
@@ -4,21 +4,27 @@
 		{% 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: ${{ (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: Hourly</div>
+				<div class="usercard">
+					<h4>{{ user.fname }} {{ user.mname }}. {{ user.lname }}</h3>
+					<table>
+						<tr><td>Estimated Payment:</td><td>${{ (user.pay_value)|round(2) }}</td></tr> <!-- Multiply hours by pay-value -->
+						<tr><td>Total Time:</td><td>{{user.total_hours}}.</td></tr>
+						<tr><td>Pay Rate:</td><td>${{ user.pay_value }}</td></tr>
+						<tr><td>Pay Period</td><td>Hourly</td></tr>
+					</table>
 				</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: ${{ (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 class="usercard">
+					<h4>{{ user.fname }} {{ user.mname }}. {{ user.lname }}</h3>
+					<table>
+						<tr><td>Estimated Payment:</td><td>${{ (user.pay_value / 24)|round(2) }}</td></tr> <!-- Multiply hours by pay-value -->
+						<!-- <tr><td>Total Time:</td><td>{{user.total_hours}}.</td></tr> -->
+						<tr><td>Pay Rate:</td><td>${{ user.pay_value }}</td></tr>
+						<tr><td>Pay Period</td><td>Salaried</td></tr>
+					</table>
 				</div>
 			</a>
 		{% endif %}
diff --git a/app/templates/knowlegebase/index.html b/app/templates/knowlegebase/index.html
@@ -0,0 +1,38 @@
+{% extends 'base.html' %}
+
+{% block title %}User Documentation{% endblock %}
+
+{% block content %}
+	<section class="documentation-container">
+		<section class="">
+			<h3 class="documentation-header">User Documentation</h3>
+			<p class="intro-documentation">
+                Hello! Welcome to the <span class="italics">Simple Time Card</span> web application.
+            </p>
+            <p class="crew-login-documentation">
+                The usage for crew memebers is meant to be as simple as possible. After logging in you'll
+                have access to the "Dashboard" where you can clock in to the "Project" that you're currently
+                working on.
+                <!-- Should you forget to clock in, or out, you can change your hours by using the hour:minute AM/PM
+                and select either the update or delete button. -->
+            </p>
+            <p class="crew-vehicle-documentation">
+                Additionally you can checkout a vehicle by selecting said vehicle, inputting the
+                starting mileage, selecting the checks for components that are functional, and any other 
+                pertient information. You may only have one vehicle checked out at a time. When done you can
+                check the vehicle back in by inserting the ending mileage and any potential incidents.
+                <br />
+                For example:
+                <select>
+                    <option>Vehicle 1</option>
+                    <option>Vehicle 2</option>
+                    <option>Vehicle 3</option>
+                </select>
+                <input class="input-example" name="start_mileage" type="number" value="">
+            </p>
+            <p class="end-documentation">
+                For best security practices users should logout whenever not interacting with the application.
+            </p>
+		</section>
+	</section>
+{% endblock %}