Main menu test

public/scripts/employeeDetail.js

@@ -0,0 +1,213 @@
+let hideEmployeeSavedAlertTimer = undefined;
+
+document.addEventListener("DOMContentLoaded", () => {
+	// TODO: Things that need doing when the view is loaded
+	getSaveActionElement().addEventListener("click", saveActionClick);
+});
+
+// Save
+function saveActionClick(event) {
+	// TODO: Actually save the employee via an AJAX call
+	if (!validateSave()) {
+		return;
+	}
+
+	const saveActionElement = event.target;
+	saveActionElement.disabled = true;
+
+	const employeeId = getEmployeeId();
+	const employeeIdIsDefined = ((employeeId != null) && (employeeId.trim() !== ""));
+	const saveActionUrl = ("/api/employeeDetail/"
+		+ (employeeIdIsDefined ? employeeId : ""));
+	const saveEmployeeRequest = {
+		id: employeeId,
+		firstName: getEmployeeFirstName(),
+		lastName: getEmployeeLastName(),
+		password: getEmployeePassword(),
+		type: getEmployeeType()
+	};
+
+	if (employeeIdIsDefined) {
+		ajaxPatch(saveActionUrl, saveEmployeeRequest, (callbackResponse) => {
+			saveActionElement.disabled = false;
+
+			if (isSuccessResponse(callbackResponse)) {
+				displayEmployeeSavedAlertModal();
+			}
+		});
+	} else {
+		ajaxPost(saveActionUrl, saveEmployeeRequest, (callbackResponse) => {
+			saveActionElement.disabled = false;
+
+			if (isSuccessResponse(callbackResponse)) {
+				displayEmployeeSavedAlertModal();
+
+				if ((callbackResponse.data != null)
+					&& (callbackResponse.data.employee != null)
+					&& (callbackResponse.data.employee.id.trim() !== "")) {
+
+					document.getElementById("employeeID").classList.remove("hidden");
+
+					setEmployeeId(callbackResponse.data.employee.id.trim());
+				}
+			}
+		});
+	}
+};
+
+
+
+function validateSave() {
+	const employeeFirstName = getEmployeeFirstName();
+	if ((employeeFirstName == null) || (employeeFirstName.trim() === "")) {
+		displayError("Please provide your first name.");
+		employeeFirstName.focus();
+		employeeFirstName.select();
+		return false;
+	}
+
+	const employeeLastName = getEmployeeLastName();
+	if ((employeeLastName == null) || (employeeLastName.trim() === "")) {
+		displayError("Please provide your last name.");
+		employeeLastName.focus();
+		employeeLastName.select();
+		return false;
+	}
+
+	const employeePassword = getEmployeePassword();
+	if ((employeePassword == null) || (employeePassword.trim() === "") || (employeePassword != getEmployeeConfirmPassword())) {
+		displayError("The password you entered is not correct.");
+		employeePassword.focus();
+		employeePassword.select();
+		return false;
+	}
+
+	const employeeType = getEmployeeType();
+	if ((employeeType == null) || (employeeType.trim() === "")) {
+		displayError("Please provide a valid employee type.");
+		employeeType.focus();
+		employeeType.select();
+		return false;
+	}
+
+	return true;
+}
+
+function displayEmployeeSavedAlertModal() {
+	if (hideEmployeeSavedAlertTimer) {
+		clearTimeout(hideEmployeeSavedAlertTimer);
+	}
+
+	const savedAlertModalElement = getSavedAlertModalElement();
+	savedAlertModalElement.style.display = "none";
+	savedAlertModalElement.style.display = "block";
+
+	hideEmployeeSavedAlertTimer = setTimeout(hideEmployeeSavedAlertModal, 1200);
+}
+
+function hideEmployeeSavedAlertModal() {
+	if (hideEmployeeSavedAlertTimer) {
+		clearTimeout(hideEmployeeSavedAlertTimer);
+	}
+
+	getSavedAlertModalElement().style.display = "none";
+}
+
+function ajaxPost(resourceRelativeUri, data, callback) {
+	return ajax(resourceRelativeUri, "POST", data, callback);
+}
+
+function ajaxPatch(resourceRelativeUri, data, callback) {
+	return ajax(resourceRelativeUri, "PATCH", data, callback);
+}
+
+function ajax(resourceRelativeUri, verb, data, callback) {
+	const httpRequest = new XMLHttpRequest();
+
+	if (httpRequest == null) {
+		return httpRequest;
+	}
+
+	httpRequest.onreadystatechange = () => {
+		if (httpRequest.readyState === XMLHttpRequest.DONE) {
+			if ((httpRequest.status >= 200) && (httpRequest.status < 300)) {
+				handleSuccessResponse(httpRequest, callback);
+			} else {
+				handleFailureResponse(httpRequest, callback);
+			}
+		}
+	};
+
+	httpRequest.open(verb, resourceRelativeUri, true);
+	if (data != null) {
+		httpRequest.setRequestHeader('Content-Type', 'application/json');
+		httpRequest.send(JSON.stringify(data));
+	} else {
+		httpRequest.send();
+	}
+
+	return httpRequest;
+}
+// End save
+
+// Getters and setters
+
+function getSaveActionElement() {
+	return document.getElementById("saveButton");
+}
+
+function getSavedAlertModalElement() {
+	return document.getElementById("employeeSavedAlertModal");
+}
+
+function getEmployeeFirstName() {
+	return getEmployeeFirstNameElement().value;
+}
+
+function getEmployeeFirstNameElement() {
+	return document.getElementById("employeeFirstName");
+}
+
+function getEmployeeLastName() {
+	return getEmployeeLastNameElement().value;
+}
+
+function getEmployeeLastNameElement() {
+	return document.getElementById("employeeLastName");
+}
+
+function getEmployeePassword() {
+	return getEmployeePasswordElement().value;
+}
+
+function getEmployeePasswordElement() {
+	return document.getElementById("employeePassword");
+}
+
+function getEmployeeConfirmPassword() {
+	return getEmployeeConfirmPasswordElement().value;
+}
+
+function getEmployeeConfirmPasswordElement() {
+	return document.getElementById("employeeConfirmPassword");
+}
+
+function getEmployeeType() {
+	return getEmployeeTypeElement().value;
+}
+
+function getEmployeeTypeElement() {
+	return document.getElementById("employeeType");
+}
+
+function getEmployeeId() {
+	return getEmployeeIdElement().value;
+}
+function setEmployeeId(employeeId) {
+	getEmployeeIdElement().value = employeeId;
+}
+function getEmployeeIdElement() {
+	return document.getElementById("employeeId");
+}
+
+// End getters and setters

public/scripts/master.js

@@ -145,7 +145,7 @@ function clearError() {
 
 function displayError(errorMessage) {
 	if ((errorMessage == null) || (errorMessage === "")) {
-		return;
+		return false;	//Just to prevent invalid URL redirects, returns false
 	}
 
 	const errorMessageDisplayElement = getErrorMessageDisplayElement();
@@ -154,7 +154,7 @@ function displayError(errorMessage) {
 	if ((errorMessageContainerElement == null)
 		|| (errorMessageDisplayElement == null)) {
 
-		return;
+		return false;	//Just to prevent invalid URL redirects, returns false
 	}
 
 	errorMessageDisplayElement.innerHTML = errorMessage;
@@ -185,9 +185,9 @@ function signOutActionClickHandler() {
 			&& (callbackResponse.data.redirectUrl != null)
 			&& (callbackResponse.data.redirectUrl !== "")) {
 
-			window.location.replace(callbackResponse.data.redirectUrl);
+			window.location.replace(callbackResponse.data.redirectUrl);	//This sends it back to redirect URL
 		} else {
-			window.location.replace("/");
+			window.location.replace("/");	//This sends it back to app main view if there isn't a redirect URL
 		}
 	});
 }

public/scripts/signIn.js

@@ -1,8 +1,21 @@
 document.addEventListener("DOMContentLoaded", () => {
-	// TODO: Anything you want to do when the page is loaded?
 });
 
 function validateForm() {
-	// TODO: Validate the user input
+	var employeeID = document.getElementById("employeeID").value;
+	var pass = document.getElementById("password").value;
+
+	if((isNaN(employeeID)) || (employeeID == ""))
+	{
+		alert("Enter a valid ID number")
+		return false;
+	}
+
+	if(pass == "")
+	{
+		alert("Enter a password")
+		return false;
+	}
+
 	return true;
-}
+};

src/app.ts

@@ -7,6 +7,7 @@ import * as fileSystem from "fs";
 import bodyParser from "body-parser";
 import compression from "compression";
 import session from "express-session";
+import { Resources } from "./resourceLookup";
 
 // Load environment variables from .env file, where API keys and passwords are configured
 dotenv.config({ path: ".env" });
@@ -46,4 +47,6 @@ fileSystem.readdirSync(__dirname + "/routes").forEach(function (routeConfig: str
 	}
 });
 
+Resources.loadStrings();
+
 export default app;

src/controllers/commands/employees/activeEmployeeExistsQuery.ts

@@ -0,0 +1,21 @@
+import { EmployeeModel } from "../models/employeeModel";
+import { Resources, ResourceKey } from "../../../resourceLookup";
+import * as EmployeeRepository from "../models/employeeModel";
+import { CommandResponse, Employee } from "../../typeDefinitions";
+import * as EmployeeHelper from "./helpers/employeeHelper";
+
+export const execute = async (): Promise<CommandResponse<Employee>> => {
+	return EmployeeRepository.queryActiveExists()
+	.then((queriedActiveUser: (EmployeeModel | null)): Promise<CommandResponse<Employee>> => {
+		if (queriedActiveUser) {
+			return Promise.resolve(<CommandResponse<Employee>>{
+				status: 200,
+				data: EmployeeHelper.mapEmployeeData(queriedActiveUser)});
+			}
+
+			return Promise.reject(<CommandResponse<Employee>>{
+				status: 404,
+				message: Resources.getString(ResourceKey.EMPLOYEES_UNABLE_TO_QUERY)
+			});
+		});
+	};

src/controllers/commands/employees/clearActiveUserCommand.ts

@@ -0,0 +1,20 @@
+import { ActiveUserModel } from "../models/activeUserModel";
+import { Resources, ResourceKey } from "../../../resourceLookup";
+import * as ActiveUserRepository from "../models/activeUserModel";
+import { CommandResponse, ActiveUser } from "../../typeDefinitions";
+import * as DatabaseConnection from "../models/databaseConnection";
+
+export const execute = async (sessionKey: string): Promise<CommandResponse<ActiveUser>> => {
+	return ActiveUserRepository.queryBySessionKey(sessionKey, await DatabaseConnection.createTransaction())
+	.then((activeUser: (ActiveUserModel | null)): Promise<CommandResponse<ActiveUser>> => {
+		if (activeUser) {
+			return Promise.resolve(<CommandResponse<ActiveUser>>{
+				status: 200
+			});
+		}
+		return Promise.reject(<CommandResponse<ActiveUser>>{
+			status: 404,
+			message: Resources.getString(ResourceKey.USER_SESSION_NOT_FOUND)
+		});
+	});
+};