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

corrected binding for Id to look at UserId field.

Browse Source
This commit is contained in:
Chris.Watts90@outlook.com 2017-02-03 12:20:26 +00:00
parent 9309d9bbf4
commit 86a1618819
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<title>Flexi Time Data Viewer</title> <title>Flexi Time Data Viewer</title>
<link rel="shortcut icon" href="/favicon.ico" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="https://uxsolutions.github.io/bootstrap-datepicker/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" /> <link href="https://uxsolutions.github.io/bootstrap-datepicker/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
<link href="spa.css" rel="stylesheet" type="text/css" /> <link href="spa.css" rel="stylesheet" type="text/css" />
@ -62,8 +62,8 @@
</thead> </thead>
<tbody data-bind="foreach: Users"> <tbody data-bind="foreach: Users">
<tr> <tr>
<td class="valign" data-bind="text: Id"></td> <td class="valign" data-bind="text: UserId"></td>
<td class="valign" data-bind="text: Id"></td> <td class="valign" data-bind="text: UserId"></td>
<td class="valign" data-bind="text: LastName"></td> <td class="valign" data-bind="text: LastName"></td>
<td class="valign" data-bind="text: FirstName"></td> <td class="valign" data-bind="text: FirstName"></td>
<td class="fit"><button data-bind="click: $root.goToUserDetails" class="btn btn-default">Details</button></td> <td class="fit"><button data-bind="click: $root.goToUserDetails" class="btn btn-default">Details</button></td>

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

@ -23,12 +23,12 @@ function DataVM() {
self.unassignedCardData = ko.observable(null); self.unassignedCardData = ko.observable(null);
self.selectedCalendarWeek = ko.observable(0); self.selectedCalendarWeek = ko.observable(0);
self.apiEndpoints = { self.apiEndpoints = {
root: "http://160.100.28.242:3000", root: "http://160.100.28.242:8800",
getUserList: "/userstest", getUserList: "/api/users",//"/userstest",
getUserDetails: "/users", getUserDetails: "/api/users",//"/users",
editUser: "/users/edit", editUser: "/api/users/edit",//"/users/edit",
getTimeLogs: "/timelogs", getTimeLogs: "/api/timelogs",//"/timelogs",
getUnassignedCards: "/unassignedcards" getUnassignedCards: "/api/cards/unassigned"//"/unassignedcards"
}; };
self.uiPages = { self.uiPages = {
users: "users", users: "users",
@ -105,19 +105,27 @@ function DataVM() {
self.handleEditedUser = function (user) { self.handleEditedUser = function (user) {
console.log("Post Edited User: " + user.Id); console.log("Post Edited User: " + user.Id);
//var url = self.apiEndpoints.root + self.apiEndpoints.editUser; //var url = self.apiEndpoints.root + self.apiEndpoints.editUser;
var url = self.createRequestUrl(self.apiEndpoints.editUser, null, true); var url = self.createRequestUrl(self.apiEndpoints.editUser, null, false);
var url = self.apiEndpoints.editUser;
console.log("posting to.." + url); console.log("posting to.." + url);
$.post(url, user, function () { $.post(url, user, function () {
console.log("finished posting.."); console.log("finished posting..");
}, "json") }, "json")
.done(function () { //.done(function () {
self.goToMenuOption("users"); // //self.goToMenuOption("users");
self.chosenUserDetails(null); // //self.chosenUserDetails(null);
}) // //self.goToMenuOption(self.menuOptions.home);
.fail(function () { // })
console.log("error - post edited user"); .fail(function (response) {
console.log(self.chosenUserDetails().Id); //due to unique way a 201 is a fail...
self.goToUserDetails(self.chosenUserDetails().Id); if (response.status === 201) {
self.goToMenuOption("users");
self.chosenUserDetails(null);
} else {
console.log("error - post edited user");
console.log(self.chosenUserDetails().UserId);
self.goToMenuOption(self.menuOptions.home);
}
}); });
}; };
self.getTimeLogData = function (userId, calendarWeek) { self.getTimeLogData = function (userId, calendarWeek) {
@ -143,7 +151,7 @@ function DataVM() {
self.unassignedCardData(res); self.unassignedCardData(res);
}).fail(function () { }).fail(function () {
console.log("error - getuserdetails"); console.log("error - getuserdetails");
self.goToMenuOption(self.uiPages.home); //go home. //self.goToMenuOption(self.uiPages.home); //go home. // no, dont want to go home here, cos just means we dont have any details?
}); });
}; };
Sammy(function () { Sammy(function () {
@ -211,7 +219,8 @@ function DataVM() {
}); });
console.log(self.chosenUserDetails()); console.log(self.chosenUserDetails());
self.handleEditedUser(self.chosenUserDetails()); self.handleEditedUser(self.chosenUserDetails());
return true; //self.goToMenuOption(self.menuOptions.home);
return false;
}); });
//default route (home page) //default route (home page)
this.get("", function () { this.app.runRoute("get", "#" + self.uiPages.users) }); this.get("", function () { this.app.runRoute("get", "#" + self.uiPages.users) });