From d4ec68801c55c984a95af00540dc5eea60f43cf5 Mon Sep 17 00:00:00 2001
From: sibow <sibow@bloomington.in.gov>
Date: Wed, 26 Feb 2025 13:24:15 -0500
Subject: [PATCH] modified some look and feel on some pages based on feedback

---
 src/main/webapp/WEB-INF/jsp/approve.jsp       |  49 +++----
 src/main/webapp/WEB-INF/jsp/dailySummary.jsp  | 133 +++++++++---------
 .../webapp/WEB-INF/jsp/payrollProcess.jsp     |   1 +
 3 files changed, 94 insertions(+), 89 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/approve.jsp b/src/main/webapp/WEB-INF/jsp/approve.jsp
index f8205195..35bb4662 100644
--- a/src/main/webapp/WEB-INF/jsp/approve.jsp
+++ b/src/main/webapp/WEB-INF/jsp/approve.jsp
@@ -158,43 +158,44 @@
 		<h1>Approved Leave in this Pay Period </h1>
 		<s:set var="leave_requests" value="leaveRequests" />
 		<%@ include file="leaves_approved.jsp" %>
+		<br />
 	    </s:if>	    
             <s:if test="hasTimeIssues()">
               <s:set var="timeIssuesTitle" value="'Outstanding Issues'" />
               <s:set var="timeIssues" value="timeIssues" />
               <%@ include file="timeIssues.jsp" %>
             </s:if>
-						<div class="monetary-hours-tables">							
-							<s:if test="hasTmwrpRun()">
-								<s:if test="tmwrpRun.hasWeek1Rows()">
-									<s:set var="rows" value="tmwrpRun.week1Rows" />
-									<s:set var="weeklyTitle" value="'Week 1 (Earn Codes)'" />
-									<s:set var="whichWeek" value="'week-one'" />
-									<%@ include file="weeklyTmwrp.jsp" %>
-								</s:if>
-								<s:if test="tmwrpRun.hasWeek2Rows()">
-									<s:set var="rows" value="tmwrpRun.week2Rows" />
-									<s:set var="weeklyTitle" value="'Week 2 (Earn Codes)'" />
-									<s:set var="whichWeek" value="'week-two'" />
-									<%@ include file="weeklyTmwrp.jsp" %>
-								</s:if>
-							</s:if>
+	    <div class="monetary-hours-tables">
+		<s:if test="hasTmwrpRun()">
+		    <s:if test="tmwrpRun.hasWeek1Rows()">
+			<s:set var="rows" value="tmwrpRun.week1Rows" />
+			<s:set var="weeklyTitle" value="'Week 1 (Earn Codes)'" />
+			<s:set var="whichWeek" value="'week-one'" />
+			<%@ include file="weeklyTmwrp.jsp" %>
+		    </s:if>
+		    <s:if test="tmwrpRun.hasWeek2Rows()">
+			<s:set var="rows" value="tmwrpRun.week2Rows" />
+			<s:set var="weeklyTitle" value="'Week 2 (Earn Codes)'" />
+			<s:set var="whichWeek" value="'week-two'" />
+			<%@ include file="weeklyTmwrp.jsp" %>
+		    </s:if>
+		</s:if>
             </div>
-						<s:if test="hasUnscheduleds()">
-							<s:set var="unscheduledTitle" value="'Unscheduled Times'" />
-							<s:set var="unscheduleds" value="unscheduleds" />
-							<%@ include file="unscheduledTimes.jsp" %>				
-						</s:if>								
+	    <s:if test="hasUnscheduleds()">
+		<s:set var="unscheduledTitle" value="'Unscheduled Times'" />
+		<s:set var="unscheduleds" value="unscheduleds" />
+		<%@ include file="unscheduledTimes.jsp" %>				
+	    </s:if>								
           </div>
         </s:if>
       </s:iterator>
     </s:if>
-
+    
     <div class="approval-button-row">
       <s:if test="isUserCurrentEmployee()">
-				<s:if test="hasNotApprovedEmps()">
-					<s:submit name="action" type="button" value="Approve" class="button"/>
-				</s:if>
+	  <s:if test="hasNotApprovedEmps()">
+	      <s:submit name="action" type="button" value="Approve" class="button"/>
+	  </s:if>
       </s:if>
     </div>
   </s:if>
diff --git a/src/main/webapp/WEB-INF/jsp/dailySummary.jsp b/src/main/webapp/WEB-INF/jsp/dailySummary.jsp
index d122a0a6..617a00d8 100644
--- a/src/main/webapp/WEB-INF/jsp/dailySummary.jsp
+++ b/src/main/webapp/WEB-INF/jsp/dailySummary.jsp
@@ -1,76 +1,79 @@
 <table class="pay-period-summary-total width-full">
 	<tr>
-		<th>Week</th>
-		<th width="10%">Mon</th>
-		<th width="10%">Tue</th>
-		<th width="10%">Wed</th>
-		<th width="10%">Thu</th>
-		<th width="10%">Fri</th>
-		<th width="10%">Sat</th>
-		<th width="10%">Sun</th>
-		<s:if test="#unionned">
-			<th width="10%">Total</th>
-			<th>FLSA Total</th>
-		</s:if>
-		<s:else>
-			<th>Total</th>
-		</s:else>
+	    <th>Week</th>
+	    <th width="10%">Mon</th>
+	    <th width="10%">Tue</th>
+	    <th width="10%">Wed</th>
+	    <th width="10%">Thu</th>
+	    <th width="10%">Fri</th>
+	    <th width="10%">Sat</th>
+	    <th width="10%">Sun</th>
+	    <s:if test="#unionned">
+		<th width="10%">Total</th>
+		<th>FLSA Total</th>
+	    </s:if>
+	    <s:else>
+		<th>Total</th>
+	    </s:else>
 	</tr>
 	<s:iterator value="#daily" var="one" >
-		<s:set var="jobKey" value="#one.key" />		
-		<s:set var="jobVal" value="#one.value" />
-		<s:iterator value="#jobVal" var="day" >		
-			<s:set var="dayKey" value="#day.key" />
-			<s:set var="dayVal" value="#day.value" />			
-			<s:if test="#dayKey == 0">
-				<!-- to-do: output the correct JobID into `data-job-id` below -->
-				<tr data-job-id="<s:property value='#jobKey.job_id' />">
-					<td>
-						Week 1 - <small>(<s:property value="#week1DateRange" />)</small><br>
-						<small><s:property value="#jobKey" /></small>
-					</td>
-			</s:if>
-			<s:if test="#dayKey == 8">
-				<s:if test="#unionned">
-					<td><s:property value="#week1Flsa" /></td>
-				</s:if>
-				</tr>
-				<!-- to-do: output the correct JobID into `data-job-id` below -->
-				<tr data-job-id="<s:property value='#jobKey.job_id' />">
-					<td>
-						Week 2 - <small>(<s:property value="#week2DateRange" />)</small><br>
-						<small><s:property value="#jobKey" /></small>
-					</td>
-			</s:if>
-			<td><s:property value="dayVal" /></td>
-			<s:if test="#dayKey == 15">
-				<s:if test="#unionned">
-					<td><s:property value="#week2Flsa" /></td>
-				</s:if>
-				</tr>
-			</s:if>
-		</s:iterator>
+	    <s:set var="jobKey" value="#one.key" />		
+	    <s:set var="jobVal" value="#one.value" />
+	    <s:iterator value="#jobVal" var="day" >		
+		<s:set var="dayKey" value="#day.key" />
+		<s:set var="dayVal" value="#day.value" />			
+		<s:if test="#dayKey == 0">
+		    <!-- to-do: output the correct JobID into `data-job-id` below -->
+		    <tr data-job-id="<s:property value='#jobKey.job_id' />">
+			<td>
+			    Week 1 - <small>(<s:property value="#week1DateRange" />)</small><br>
+			    <small><s:property value="#jobKey" /></small>
+			</td>
+		</s:if>
+		<s:if test="#dayKey == 8">
+		    <s:if test="#unionned">
+			<td><s:property value="#week1Flsa" /></td>
+		    </s:if>
+		    </tr>
+		    <!-- to-do: output the correct JobID into `data-job-id` below -->
+		    <tr data-job-id="<s:property value='#jobKey.job_id' />">
+			<td>
+			    Week 2 - <small>(<s:property value="#week2DateRange" />)</small><br>
+			    <small><s:property value="#jobKey" /></small>
+			</td>
+		</s:if>
+		<td><s:property value="dayVal" /></td>
+		<s:if test="#dayKey == 15">
+		    <s:if test="#unionned">
+			<td><s:property value="#week2Flsa" /></td>
+		    </s:if>
+		    </tr>
+		</s:if>
+	    </s:iterator>
 	</s:iterator>
-	<tr class="totals-row">
-		<td><strong>Pay Period Hours</strong></td>
-		<td colspan="7">&nbsp;</td>
+	<!-- <tr class="totals-row"> -->
+	<tr>
+	    <td><strong>Pay Period Hours</strong></td>
+	    <td>&nbsp;</td>
+	    <td colspan="6">&nbsp;</td>
+	    <td>
+		<strong><s:property value="#payPeriodTotal" /></strong>
+	    </td>
+	    <s:if test="#unionned">
+		<td>&nbsp;</td>
+	    </s:if>
+	</tr>
+	<s:if test="#payPeriodAmount > 0.0">
+	    <tr>
+		<td><strong>Pay Period Amount</strong></td>
+		<td>&nbsp;</td>
+		<td colspan="6">&nbsp;</td>
 		<td>
-			<strong><s:property value="#payPeriodTotal" /></strong>
+		    <strong>$<s:property value="#payPeriodAmount" /></strong>
 		</td>
 		<s:if test="#unionned">
-			<td>&nbsp;</td>
+		    <td>&nbsp;</td>
 		</s:if>
-	</tr>
-	<s:if test="#payPeriodAmount > 0.0">
-		<tr class="totals-row">
-			<td><strong>Pay Period Amount</strong></td>
-			<td colspan="7">&nbsp;</td>
-			<td>
-				<strong>$<s:property value="#payPeriodAmount" /></strong>
-			</td>
-			<s:if test="#unionned">
-				<td>&nbsp;</td>
-			</s:if>
-		</tr>
+	    </tr>
 	</s:if>
 </table>
diff --git a/src/main/webapp/WEB-INF/jsp/payrollProcess.jsp b/src/main/webapp/WEB-INF/jsp/payrollProcess.jsp
index 033e0365..04251621 100644
--- a/src/main/webapp/WEB-INF/jsp/payrollProcess.jsp
+++ b/src/main/webapp/WEB-INF/jsp/payrollProcess.jsp
@@ -163,6 +163,7 @@
 				<h1>Approved Leave in this Pay Period </h1>
 				<s:set var="leave_requests" value="leaveRequests" />
 				<%@ include file="leaves_approved.jsp" %>
+				<br />
 			    </s:if>						
 			    <s:if test="hasTimeIssues()">
 				<s:set var="timeIssuesTitle" value="'Outstanding Issues'" />