commit 50fa4b495956362589b481606e1cac0a00abfdc4
parent 5e78cc9c1c2d09b38c5ff34334aa28ab7c61fefe
Author: Brennen T. Mazur <brennen@madis.cool>
Date: Thu, 26 Jan 2023 14:12:46 -0700
cleaned up route and widget
Diffstat:
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/app/routes.py b/app/routes.py
@@ -65,7 +65,7 @@ def dashboard():
form=PunchclockWidget()
currenttime=datetime.datetime.utcnow()
- available_projects = [('stc webapp'),('stcapp','STC Webapp'),('yepsite','YEP Website'),('volday','Volunteer Day')]
+ available_projects = [('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)
diff --git a/app/templates/dashboard/punchclock/widget.html b/app/templates/dashboard/punchclock/widget.html
@@ -1,15 +1,9 @@
<section class="punchclock">
<h2 id="clock"></h2>
- <button><a href="{{ url_for('hours') }}">Modify Hours</a></button><!--routes to userhours.html-->
<form action="" method="" novalidate>
- <select name="Project Name"><!--replace w/ selectProject() or FOR EACH loop for array passed as available Projects... Leaning towards latter -->
- <option value="#">$#</option><!-- for/while loop displaying each $projectName user has permission for -->
- <option value="2" selected>second project</option>
- <option value="3">third project</option>
- </select>
<p>{{ form.projectsSel.label }}<br>{{ form.projectsSel(choices=projects[]) }}</p>
<p>{{ form.lunchBox() }} {{ form.lunchBox.label }}
- {{ form.perdiumBox() }} {{ form.perdiumBox.label }}</p>
+ {{ form.perdiumBox() }} {{ form.perdiumBox.label }}</p>
<p>{{ form.clockin() }}</p>
</form>
<!-- Add iff satement for clocked_in==True
@@ -18,5 +12,6 @@
<p>{ form.lunchBox() }} {{ form.lunchBox.label }}</p>
<p>{ form.perdiumBox() }} {{ form.perdiumBox.label }}</p>
-->
+ <button><a href="{{ url_for('hours') }}">Change Hours</a></button><!--routes to userhours.html-->
<h2>{{ user.fname }} {{ user.lname }}</h2><!-- something like currenttime above -->
</section>