Chris/FlexitimeTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make saturday sunday only visible if theres hours on them #92

Browse Source 
refine styling of dialog for create/edit of timelogs to remove dropdown entry and remove issue of deleting text in input control from before.
This commit is contained in:
Chris.Watts90@outlook.com 2018-03-06 11:54:21 +00:00
parent 5ff1ad5a5a
commit 5639724390
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
View File

@ -274,16 +274,18 @@
</thead>
<tbody>
<!-- ko foreach: TimeLogs-->
<tr>
<td class="valign" data-bind="text: DayOfWeek, contextMenu: $root.createContextMenu"></td>
<!-- ko foreach: Logs -->
<td class="valign" data-bind="text: $root.convertToDisplayTime(EventTime), contextMenu: $root.editContextMenu"></td>
<!-- ko if: !((DayOfWeek === "Saturday" || DayOfWeek=== "Sunday") && LogCount===0)-->
<tr>
<td class="valign" data-bind="text: DayOfWeek, contextMenu: $root.createContextMenu"></td>
<!-- ko foreach: Logs -->
<td class="valign" data-bind="text: $root.convertToDisplayTime(EventTime), contextMenu: $root.editContextMenu"></td>
<!-- /ko -->
<!-- ko foreach: new Array($root.correctLogOffset($parent.MaxDailyLogCount)-LogCount)-->
<td class="valign" data-bind="contextMenu: $root.createContextMenu"></td>
<!-- /ko -->
<td class="valign" data-bind="text: $root.convertToHours(DailyTotal), contextMenu: $root.createContextMenu"></td>
</tr>
<!-- /ko -->
<!-- ko foreach: new Array($root.correctLogOffset($parent.MaxDailyLogCount)-LogCount)-->
<td class="valign" data-bind="contextMenu: $root.createContextMenu"></td>
<!-- /ko -->
<td class="valign" data-bind="text: $root.convertToHours(DailyTotal), contextMenu: $root.createContextMenu"></td>
</tr>
<!-- /ko -->
<tr>
<td class="valign" data-bind="attr:{colspan: $root.correctLogOffset(MaxDailyLogCount)+1}, contextMenu: $root.createContextMenu">Weekly Total</td>
@ -335,20 +337,16 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4>MANUAL EDIT</h4>
</div>
<div class="modal-body" style="height: 300px;">
<div class="modal-body" style="height: 400px;">
<form action="#manualLog" method="post" class="form-group">
<input type="hidden" name="Id" data-bind="value: Id"/>
<div class="form-group">
<div class="input-group date" id="datetimepicker1">
<input type="text" class="form-control" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
<div id="datetimepicker1"></div>
</div>
<br/>
<div>
<div class="input-group">
<select data-bind="options: $root.possibleLogDirections,
<div class="input-group col-md-offset-1">
<select class="form-control" data-bind="options: $root.possibleLogDirections,
optionsText: function(item) { return item.Text },
optionsValue: function(item){ return item.value },
value: Direction,
@ -356,8 +354,10 @@
</div>
</div>
<br/>
<button type="submit" class="btn btn-primary">Submit</button>
<button type="button" class="btn btn-secondary close" data-dismiss="modal">Cancel</button>
<div class="pull-right">
<button type="submit" class="btn btn-primary">Submit</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</form>
</div>
</div>

1
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
View File

@ -402,6 +402,7 @@
.datetimepicker({
format: "YYYY-DD-MM HH:mm:ss",
date: new Date(date),
inline:true,
sideBySide:true,
minDate: moment(date).startOf("week"),
maxDate: moment(date).endOf("week")