-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
modified some look and feel on some pages based on feedback
- Loading branch information
Showing
3 changed files
with
94 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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"> </td> | ||
| <!-- <tr class="totals-row"> --> | ||
| <tr> | ||
| <td><strong>Pay Period Hours</strong></td> | ||
| <td> </td> | ||
| <td colspan="6"> </td> | ||
| <td> | ||
| <strong><s:property value="#payPeriodTotal" /></strong> | ||
| </td> | ||
| <s:if test="#unionned"> | ||
| <td> </td> | ||
| </s:if> | ||
| </tr> | ||
| <s:if test="#payPeriodAmount > 0.0"> | ||
| <tr> | ||
| <td><strong>Pay Period Amount</strong></td> | ||
| <td> </td> | ||
| <td colspan="6"> </td> | ||
| <td> | ||
| <strong><s:property value="#payPeriodTotal" /></strong> | ||
| <strong>$<s:property value="#payPeriodAmount" /></strong> | ||
| </td> | ||
| <s:if test="#unionned"> | ||
| <td> </td> | ||
| <td> </td> | ||
| </s:if> | ||
| </tr> | ||
| <s:if test="#payPeriodAmount > 0.0"> | ||
| <tr class="totals-row"> | ||
| <td><strong>Pay Period Amount</strong></td> | ||
| <td colspan="7"> </td> | ||
| <td> | ||
| <strong>$<s:property value="#payPeriodAmount" /></strong> | ||
| </td> | ||
| <s:if test="#unionned"> | ||
| <td> </td> | ||
| </s:if> | ||
| </tr> | ||
| </tr> | ||
| </s:if> | ||
| </table> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters