Skip to content

Commit

Permalink
Adding feature to source holidays based on location
Browse files Browse the repository at this point in the history 
Closes #11
  • Loading branch information
@thamara
thamara committed Jul 16, 2020
1 parent 08bbc2c commit cdbdd21
Show file tree
Hide file tree
Showing 5 changed files with 401 additions and 50 deletions.
8 changes: 8 additions & 0 deletions css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,14 @@ input:disabled + .slider {
border-bottom: 4px solid var(--table-total-border);
}

.common-window .window-tab {
padding-top: 10px;
}

.common-window .tab-content {
padding-top: 10px;
}

.common-window p.header-help {
font-variant-caps: all-petite-caps;
font-size: 15px;
Expand Down
119 changes: 112 additions & 7 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
},
"dependencies": {
"bootstrap": "^4.5.0",
"date-holidays": "^1.6.1",
"electron-store": "^5.2.0",
"is-online": "^8.4.0",
"jquery": "^3.5.1",
Expand Down
120 changes: 85 additions & 35 deletions src/workday-waiver.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,92 @@
Workday Waiver Manager
<p class="header-help">Changes take effect when closing this window</p>
</div>
<ul class="nav nav-tabs window-tab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="add-waiver-tab" data-toggle="tab" href="#add-waiver" role="tab" aria-controls="add-waiver" aria-selected="true">Add Waiver</a>
</li>
<li class="nav-item">
<a class="nav-link" id="holiday-tab" data-toggle="tab" href="#holiday" role="tab" aria-controls="holiday" aria-selected="false">Holiday</a>
</li>
</ul>

<section>
<div class="section-title">Add Waiver</div>
<form>
<table>
<tbody>
<tr>
<td></td>
<th>Start date</th>
<td></td>
<th>End date</th>
</tr>
<tr>
<th>From</th>
<td><input id="start-date" type="date"></td>
<th>to</th>
<td><input id="end-date" type="date"></td>
</tr>
<tr>
<th>Hours</th>
<td>
<input type="text" id="hours" maxlength=8 pattern="^\d+:\d+$" placeholder="HH:mm" size=8>
</td>
</tr>
<tr>
<th>Reason</th>
<td colspan="3"><input id="reason" type="text" maxlength="30" size="60" placeholder="Reason for the waiver"></td>
</tr>
</tbody>
</table>
<br>
<button class="waive-button" id="waive-button" type="button">
Waive
</button>
</form>
</section>
<div class="tab-content">
<div class="tab-pane fade show active" id="add-waiver" role="tabpanel" aria-labelledby="add-waiver-tab">
<form>
<table>
<tbody>
<tr>
<td></td>
<th>Start date</th>
<td></td>
<th>End date</th>
</tr>
<tr>
<th>From</th>
<td><input id="start-date" type="date"></td>
<th>to</th>
<td><input id="end-date" type="date"></td>
</tr>
<tr>
<th>Hours</th>
<td>
<input type="text" id="hours" maxlength=8 pattern="^\d+:\d+$" placeholder="HH:mm" size=8>
</td>
</tr>
<tr>
<th>Reason</th>
<td colspan="3"><input id="reason" type="text" maxlength="30" size="60" placeholder="Reason for the waiver"></td>
</tr>
</tbody>
</table>
<br>
<button class="waive-button" id="waive-button" type="button">
Waive
</button>
</form>
</div>
<div class="tab-pane fade" id="holiday" role="tabpanel" aria-labelledby="holiday-tab">
<form>
<table>
<tbody>
<tr id="holiday-year">
<th>Year</th>
<td><select id="year" name="year"></select></td>
</tr>
<tr id="holiday-country">
<th>Country:</th>
<td><select id="country" name="country"></select></td>
</tr>
<tr id="holiday-state">
<th>State:</th>
<td><select id="state" name="state"></select></td>
</tr>
<tr id="holiday-city">
<th>City:</th>
<td><select id="city" name="city"></select></td>
</tr>
</tbody>
</table>
<hr>
<table id="holiday-list-table">
<thead>
<tr>
<th>Date</th>
<th>Holiday</th>
<th>On working day</th>
<th>Conflicts?</th>
<th>Import?</th>
</tr>
</thead>
<tbody></tbody>
</table>
<br>
<button class="waive-button" id="holiday-button" type="button">
Source selected holidays
</button>
</form>
</div>
</div>

<section>
<div class="section-title">Waived workday list</div>
Expand Down

0 comments on commit cdbdd21

Please sign in to comment.