stc

commit 5873469b42de4f9636bb2ba6b17809c2c0f8c9a5
parent 0429ddc408d4b65132c5846db320c716744fc9d5
Author: Youth Employment Program Production <youthemployment22@gmail.com>
Date:   Tue, 23 Apr 2024 15:33:16 -0600

Add Notes to project pages as well as generated report pages

Diffstat:
M
app/templates/admin/agreements/projects/index.html
 | 
4
++--
M
app/templates/admin/bound_timedata_report/widget.html
 | 
14
++++++++++++++

2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/app/templates/admin/agreements/projects/index.html b/app/templates/admin/agreements/projects/index.html
@@ -25,7 +25,6 @@
 	<div class="current-pay-period">
 	<table>
 		<tr>
-			<th>Entry ID</th>
 			<th>Date</th>
 			<th>Employee</th>
 			<th>Time</th>
@@ -33,10 +32,10 @@
 			<th>Out</th>
 			<th>Lunch</th>
 			<th>Perdiem</th>
+			<th>Note</th>
 		</tr>
 	{% for entry in payperiod_times %}
 		<tr>
-			<td>{{entry['_id']}}</td>
 			<td>{{entry['date'].date().isoformat()}}</td>
 			<td>{{entry.modified_by.0}}</td>
 			{% if entry['clock_out'] %}<td>{{(entry['clock_out'][-1]-entry['clock_in'][-1])}}</td>{% else %}<td>Clocked In</td>{% endif %}
@@ -44,6 +43,7 @@
 			{% if entry['clock_out'] %}<td>{{entry['clock_out'][-1].time().isoformat(timespec='minutes')}}</td>{% else %}<td>Clocked In</td>{% endif %}
 			{% if entry['lunch'] %}<td>{{entry['lunch']}}</td>{% else %}<td>&nbsp;</td>{% endif %}<!-- make this an image of checkbox so can link to toggle route... -->
 			{% if entry['perdiem'] %}<td>{{entry['perdiem']}}</td>{% else %}<td>&nbsp;</td>{% endif %}<!-- make this an image of checkbox so can link to toggle route... -->
+			<td>{{entry['note']}}</td>
 		</tr>
 	{% endfor %}
 	</table>
diff --git a/app/templates/admin/bound_timedata_report/widget.html b/app/templates/admin/bound_timedata_report/widget.html
@@ -122,6 +122,20 @@
 				</tr>
 			{% endfor %}
 			</table></div>
+			<table>
+				<tr>
+					<th>Date</th>
+					<th>Employee</th>
+					<th>Note</th>
+				</tr>
+				{% for item in times['times'] %}
+				<tr>
+					<td>{{item['date'].date().isoformat()}}</td>
+					<td>{{item['modified_by'][0]}}</td>
+					<td>{{item['note']}}</td>
+				</tr>
+				{% endfor %}
+			</table>
 			{% endfor %}
 
 	</section>