stc

commit 5e78cc9c1c2d09b38c5ff34334aa28ab7c61fefe
parent ef6289fec9ec0f440133b6d67090e13e58fee9a3
Author: Brennen T. Mazur <brennen@madis.cool>
Date:   Thu, 26 Jan 2023 11:27:44 -0700

added clock to /hours

Diffstat:
M
app/routes.py
 | 
4
++--
M
app/templates/dashboard/punchclock/index.html
 | 
3
++-

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/routes.py b/app/routes.py
@@ -11,6 +11,7 @@ from flask_login import current_user, login_user, logout_user, login_required
 from app.models import User, Time, Fleet, Agreement, Projects
 
 OrganizationName = 'Youth Employment Program' # Maybe pass this as a value though the object for relevant pages???
+user_data = {'fname':'Brennen','lname':'Mazur','role':'Crew Lead','clocked_in':True}
 
 # DB Connection & LoginManager init
 mongo = PyMongo(app)
@@ -64,7 +65,6 @@ def dashboard():
     form=PunchclockWidget()
     currenttime=datetime.datetime.utcnow()
 
-    user_data = {'fname':'Brennen','lname':'Mazur','role':'Crew Lead','clocked_in':True}
     available_projects = [('stc webapp'),('stcapp','STC Webapp'),('yepsite','YEP Website'),('volday','Volunteer Day')]
 
     return render_template('dashboard/layout.html',currenttime=currenttime,user=user_data,projects=available_projects,form=form,ORGNAME=OrganizationName)
@@ -75,7 +75,7 @@ def admin():
 
 @app.route("/hours")#modify to take userid ex. /hours<userid> for "admin"
 def hours():#userid goes into call to db to get user[] -> then returns formatted table (punchclock/index.html
-    return render_template ('dashboard/punchclock/index.html',ORGNAME=OrganizationName)
+    return render_template ('dashboard/punchclock/index.html',user=user_data,ORGNAME=OrganizationName)
 
 @app.route("/fleet")
 def fleet():
diff --git a/app/templates/dashboard/punchclock/index.html b/app/templates/dashboard/punchclock/index.html
@@ -6,7 +6,8 @@
 
 {% block content %}
 	<section class="hours-grid">
-		<h3>username</h3><!-- abstract to 'welcome' function more like python var insert. IF logged in user has permission allow this username section to be a dropdown for modifying user time sheets. -->
+		<h3>{{ user.fname }} {{ user.lname }}</h3><!-- IF logged in user has permission allow this username section to be a dropdown for modifying user time sheets. -->
+		<h1 id="clock"></h1>
 		<div><!-- abstract to payPeriod() -->
 			<h6>$payperiod range</h6>
 		</div>