remove test error message code, plus some additional tidying, removing old comments.
plus removed unnecessary menu options. #38
This commit is contained in:
parent
b8cd5792cf
commit
4c18778a79
@ -1,7 +1,7 @@
|
|||||||
function DataVM() {
|
function DataVM() {
|
||||||
"use strict";
|
"use strict";
|
||||||
var self = this;
|
var self = this;
|
||||||
self.menuOptions = ["Users", "Data", "Stats", "Other"];
|
self.menuOptions = ["Home"];
|
||||||
self.chosenMenuItemId = ko.observable();
|
self.chosenMenuItemId = ko.observable();
|
||||||
self.userList = ko.observable(null);
|
self.userList = ko.observable(null);
|
||||||
self.chosenUserDetails = ko.observable(null);
|
self.chosenUserDetails = ko.observable(null);
|
||||||
@ -12,11 +12,11 @@
|
|||||||
self.errorData = ko.observable(null);
|
self.errorData = ko.observable(null);
|
||||||
self.apiEndpoints = {
|
self.apiEndpoints = {
|
||||||
root: "http://localhost:8800",
|
root: "http://localhost:8800",
|
||||||
getUserList: "/api/users",//"/userstest",
|
getUserList: "/api/users",
|
||||||
getUserDetails: "/api/users",//"/users",
|
getUserDetails: "/api/users",
|
||||||
editUser: "/api/users/edit",//"/users/edit",
|
editUser: "/api/users/edit",
|
||||||
getTimeLogs: "/api/timelogs",//"/timelogs",
|
getTimeLogs: "/api/timelogs",
|
||||||
getUnassignedCards: "/api/cards/unassigned"//"/unassignedcards"
|
getUnassignedCards: "/api/cards/unassigned"
|
||||||
};
|
};
|
||||||
self.uiPages = {
|
self.uiPages = {
|
||||||
users: "users",
|
users: "users",
|
||||||
@ -200,10 +200,6 @@
|
|||||||
if (!data.events.changeDate) {
|
if (!data.events.changeDate) {
|
||||||
$("#weeklyDatePicker").on("changeDate", function (e) {
|
$("#weeklyDatePicker").on("changeDate", function (e) {
|
||||||
var kk = e.date;
|
var kk = e.date;
|
||||||
//console.log(
|
|
||||||
// "1: Iso Week Number: " + moment(kk).isoWeek() + " of " +
|
|
||||||
// moment(kk).weeksInYear()
|
|
||||||
//);
|
|
||||||
self.selectedCalendarWeek(moment(kk).isoWeek());
|
self.selectedCalendarWeek(moment(kk).isoWeek());
|
||||||
self.goToTimeLogs(self.chosenTimeLogUserId, null, [{ key: "selectedDate", value: moment(kk).format("MM-DD-YYYY") }]);
|
self.goToTimeLogs(self.chosenTimeLogUserId, null, [{ key: "selectedDate", value: moment(kk).format("MM-DD-YYYY") }]);
|
||||||
});
|
});
|
||||||
@ -313,8 +309,6 @@
|
|||||||
self.searchUsers(query);
|
self.searchUsers(query);
|
||||||
else
|
else
|
||||||
self.getUserList(pageSize, pageNumber);
|
self.getUserList(pageSize, pageNumber);
|
||||||
self.assignErrorObject(101, "An Error has occurred.. run away!!!", "test");
|
|
||||||
//$.get("http://localhost:3000", { menu: this.params.menu }, self.chosenMenuData);
|
|
||||||
});
|
});
|
||||||
this.get("#userData/:userId", function () {
|
this.get("#userData/:userId", function () {
|
||||||
self.chosenMenuItemId("Data");
|
self.chosenMenuItemId("Data");
|
||||||
@ -322,7 +316,6 @@
|
|||||||
self.getUserDetails(this.params.userId);
|
self.getUserDetails(this.params.userId);
|
||||||
self.userTimeLogData(null);
|
self.userTimeLogData(null);
|
||||||
self.getUnassignedCardData();
|
self.getUnassignedCardData();
|
||||||
//$.get("http://localhost:3000", { menu: this.params.menu }, self.chosenMenuData);
|
|
||||||
});
|
});
|
||||||
this.get("#timelogs/:userId", function () {
|
this.get("#timelogs/:userId", function () {
|
||||||
var selectedDate = this.params.selectedDate;
|
var selectedDate = this.params.selectedDate;
|
||||||
@ -330,9 +323,6 @@
|
|||||||
self.userList(null);
|
self.userList(null);
|
||||||
self.chosenUserDetails(null);
|
self.chosenUserDetails(null);
|
||||||
self.chosenTimeLogUserId = this.params.userId;
|
self.chosenTimeLogUserId = this.params.userId;
|
||||||
//if (!selectedDate) {
|
|
||||||
// selectedDate = new Date();
|
|
||||||
//}
|
|
||||||
self.getTimeLogData(this.params.userId, selectedDate);
|
self.getTimeLogData(this.params.userId, selectedDate);
|
||||||
});
|
});
|
||||||
this.get("#newUser", function () {
|
this.get("#newUser", function () {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user