diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
index cd5fadc..ba936f5 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
@@ -1,7 +1,7 @@
Flexi Time Data Viewer
-
+
@@ -62,8 +62,8 @@
- |
- |
+ |
+ |
|
|
|
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
index 0610c00..37fff59 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
@@ -23,12 +23,12 @@ function DataVM() {
self.unassignedCardData = ko.observable(null);
self.selectedCalendarWeek = ko.observable(0);
self.apiEndpoints = {
- root: "http://160.100.28.242:3000",
- getUserList: "/userstest",
- getUserDetails: "/users",
- editUser: "/users/edit",
- getTimeLogs: "/timelogs",
- getUnassignedCards: "/unassignedcards"
+ root: "http://160.100.28.242:8800",
+ getUserList: "/api/users",//"/userstest",
+ getUserDetails: "/api/users",//"/users",
+ editUser: "/api/users/edit",//"/users/edit",
+ getTimeLogs: "/api/timelogs",//"/timelogs",
+ getUnassignedCards: "/api/cards/unassigned"//"/unassignedcards"
};
self.uiPages = {
users: "users",
@@ -105,19 +105,27 @@ function DataVM() {
self.handleEditedUser = function (user) {
console.log("Post Edited User: " + user.Id);
//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);
$.post(url, user, function () {
console.log("finished posting..");
}, "json")
- .done(function () {
- self.goToMenuOption("users");
- self.chosenUserDetails(null);
- })
- .fail(function () {
- console.log("error - post edited user");
- console.log(self.chosenUserDetails().Id);
- self.goToUserDetails(self.chosenUserDetails().Id);
+ //.done(function () {
+ // //self.goToMenuOption("users");
+ // //self.chosenUserDetails(null);
+ // //self.goToMenuOption(self.menuOptions.home);
+ // })
+ .fail(function (response) {
+ //due to unique way a 201 is a fail...
+ 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) {
@@ -143,7 +151,7 @@ function DataVM() {
self.unassignedCardData(res);
}).fail(function () {
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 () {
@@ -211,7 +219,8 @@ function DataVM() {
});
console.log(self.chosenUserDetails());
self.handleEditedUser(self.chosenUserDetails());
- return true;
+ //self.goToMenuOption(self.menuOptions.home);
+ return false;
});
//default route (home page)
this.get("", function () { this.app.runRoute("get", "#" + self.uiPages.users) });