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

Merge branch 'TodayButtonNotWorking-_83' into Release0.2

Browse Source
This commit is contained in:
chris.watts90@outlook.com 2017-04-21 09:22:07 +01:00
commit 5e86dae944
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,14 +10,14 @@
<link href="css/knockout.contextmenu.css" rel="stylesheet" type="text/css"/> <link href="css/knockout.contextmenu.css" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.min.css" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.min.css" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.0.0/knockout-min.js" type="text/javascript"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.0.0/knockout-min.js" type="text/javascript"></script>
<script src="js/knockout.contextmenu.js" type="text/javascript"></script> <script src="js/knockout.contextmenu.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/sammy.js/0.7.6/sammy.js" type="text/javascript"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/sammy.js/0.7.6/sammy.js" type="text/javascript"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/momentjs/2.10.6/moment.min.js"></script> <script src="https://cdn.jsdelivr.net/momentjs/2.10.6/moment.min.js" type="text/javascript"></script>
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.1/js/bootstrap-datepicker.js"></script>--> <!--<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.1/js/bootstrap-datepicker.js"></script>-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
</head> </head>
<body data-bind="css: {footerBody: errorData() !== null}"> <body data-bind="css: {footerBody: errorData() !== null}">
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
@ -254,6 +254,9 @@
<div class="col-md-3 col-xs-12"> <div class="col-md-3 col-xs-12">
<div id="datePickerContainer"> <div id="datePickerContainer">
<div id="weeklyDatePicker"></div> <div id="weeklyDatePicker"></div>
<div class="text-center">
<button class="btn btn-default form-control" type="button" id="manualTodayButton" data-bind="click: $root.goToToday">Today</button>
</div>
</div> </div>
</div> </div>
<div class="col-md-9 col-xs-12 well"> <div class="col-md-9 col-xs-12 well">

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

@ -52,6 +52,11 @@
} }
location.hash = url; location.hash = url;
}; };
self.goToToday = function() {
self.goToTimeLogs(self.chosenTimeLogUserId,
null,
null);
};
self.assignErrorObject = function(errCode, errMessage, errorSource) { self.assignErrorObject = function(errCode, errMessage, errorSource) {
var errDat = { var errDat = {
errorCode: errCode, errorCode: errCode,
@ -176,9 +181,9 @@
} }
moment.locale("en", { week: { dow: 1 } }); moment.locale("en", { week: { dow: 1 } });
$("#weeklyDatePicker").datetimepicker({ $("#weeklyDatePicker").datetimepicker({
//showTodayButton: true,
format: "DD/MM/YYYY", format: "DD/MM/YYYY",
inline: true, inline: true,
showTodayButton: true,
calendarWeeks: true, calendarWeeks: true,
maxDate: "now", maxDate: "now",
date: selectedDate date: selectedDate
@ -369,12 +374,13 @@
]); ]);
function editlog (data) { function editlog (data) {
self.manualLog(data); self.manualLog(data);
$('#manualLogDialog').modal("show"); $("#manualLogDialog").modal("show");
$('#datetimepicker1').datetimepicker({ $("#datetimepicker1").datetimepicker({
format: "YYYY-DD-MM HH:mm:ss", format: "YYYY-DD-MM HH:mm:ss",
date: new Date(data.EventTime), date: new Date(data.EventTime),
minDate: moment(new Date(data.EventTime)).startOf('week'), sideBySide: true,
maxDate: moment(new Date(data.EventTime)).endOf('week') minDate: moment(new Date(data.EventTime)).startOf("week"),
maxDate: moment(new Date(data.EventTime)).endOf("week")
}); });
self.assignUpdateHandler(); self.assignUpdateHandler();
}; };