Skip to content
Snippets Groups Projects
Commit 479131e3 authored by Gian Bustamante (gib650)'s avatar Gian Bustamante (gib650)
Browse files

Update QueueingApp/src/main/webapp/customerQueuePage.jsp,... 

Update QueueingApp/src/main/webapp/customerQueuePage.jsp, QueueingApp/src/main/webapp/customerSignupPage.jsp, QueueingApp/src/main/webapp/landingPage.jsp, QueueingApp/src/main/webapp/style.css, QueueingApp/src/main/webapp/workerAddsCustomer.jsp, QueueingApp/src/main/webapp/workerRegisterPage.jsp, QueueingApp/src/main/webapp/workerReportPage.jsp, QueueingApp/src/main/webapp/workerView.jsp, QueueingApp/src/main/webapp/workerViewRegular.jsp
Deleted QueueingApp/src/main/webapp/TEMPORARYworkerRegisterPage.jsp
parent c630c5b5
No related branches found
No related tags found
8 merge requests!20Update QueueingApp/src/main/webapp/workerLogin.jsp,...,!19Update QueueingApp/src/main/webapp/workerLogin.jsp,...,!18Update QueueingApp/src/main/webapp/workerLogin.jsp,...,!17Update QueueingApp/src/main/webapp/workerLogin.jsp,...,!16Update QueueingApp/src/main/webapp/workerAddsCustomer.jsp,...,!15Update QueueingApp/src/main/webapp/customerQueuePage.jsp,...,!14Update QueueingApp/src/main/webapp/workerLogin.jsp,...,!13all updates to MAIN
Hide whitespace changes
Inline Side-by-side
Showing
with 56 additions and 92 deletions
QueueingApp/src/main/webapp/TEMPORARYworkerRegisterPage.jsp deleted 100644 → 0
+ 0
− 63
View file @ c630c5b5
//THIS IS A TEMPORARY WORKER REGISTER PAGE FOR TESTING PURPOSES
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="ISO-8859-1">
<title>Worker Register</title>
<link rel="stylesheet" href="style.css">
<!-- Fonts-->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Barlow:ital,wght@0,400;0,500;0,600;0,700;0,900;1,400&display=swap" rel="stylesheet">
</head>
<body>
<div class="NavBar">
<strong> QueueApp </strong>
<ul class="nav_choice">
<a href="WorkerRegisterServlet">Register</a> <!-- This will bring us to the workerLogin.jsp, so the "href=login" will call the servlet to handle this req -->
<a href="landingPgServlet">Home</a>
</ul>
</div>
<!-- login area. note that we need an action & maybe a get/post for the form -->
<div class="Login">
<br><br><br><br>
<form method="post" action="WorkerRegisterServlet">
<!-- TODO: the labels for the input boxes are in the center when they should be aligned left -->
<label for="username">Username:</label><br>
<textarea id="username" name="username" rows="1" cols="25"></textarea><br><br>
<label for="password">Password:</label><br>
<textarea id="password" name="password" rows="1" cols="25"></textarea><br><br>
<div class="userBttn">
<button>Register</button>
</div>
</form>
</div>
</body>
</html>
\ No newline at end of file
QueueingApp/src/main/webapp/customerQueuePage.jsp
+ 1
− 9
View file @ 479131e3
......@@ -18,15 +18,7 @@
</head>
<body>
<!--
This page will be fully communicating w/ the DB
Need to show to use their:
- Queue #
- How many people are in Queue rn
- avg time waiting?
functions?
- can canel queue with the button
-should bring back to landing page
This page is where the Customer can visualy see their Queue Information
-->
<%
......
QueueingApp/src/main/webapp/customerSignupPage.jsp
+ 3
− 0
View file @ 479131e3
......@@ -18,6 +18,9 @@
</head>
<body>
<!--
This page is for when customer signs up for a Queue
-->
<script>
//sends out an alert if there are error in the user input
......
QueueingApp/src/main/webapp/landingPage.jsp
+ 19
− 0
View file @ 479131e3
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<%@ page import="appQueue.*" %>
<!DOCTYPE html>
<html>
<head>
......@@ -16,6 +18,11 @@
</head>
<body>
<!--
This is the main page, it is the first page that any user will first
When the page is brought up it initializes all the connection to the databases and its tables
-->
<script>
//sends out an alert if there are error in the user login input
if(${customerLogin_isBlank == 'yes'}){
......@@ -28,6 +35,18 @@
</script>
<%
//initialize Database
DAO dao = new DAO();
dao.newDatabase();
//starts the mysql tables
WorkerDAO initWDAO = new WorkerDAO();
CustomerDAO initCDAO = new CustomerDAO();
initWDAO.newWorkerTable();
initCDAO.newCustomerTable();
session.removeAttribute("customerLogin_isBlank");
session.removeAttribute("customerLogin_isLong");
session.removeAttribute("customerLogin_emailDOE");
......
QueueingApp/src/main/webapp/style.css
+ 1
− 2
View file @ 479131e3
......@@ -284,9 +284,8 @@ body strong{
.left-side-panel-bottom {
text-align: center;
position: relative;
top: 310px;
top: 250px;
}
.delete-customer-container {
......
QueueingApp/src/main/webapp/workerAddsCustomer.jsp
+ 4
− 0
View file @ 479131e3
......@@ -18,6 +18,10 @@
</head>
<body>
<!--
This page is for the worker side only
This will let the worker add a customer manually to the Queue
-->
<script>
//sends out an alert if there are error in the user input
......
QueueingApp/src/main/webapp/workerRegisterPage.jsp
+ 5
− 1
View file @ 479131e3
......@@ -15,6 +15,10 @@
</head>
<body>
<!--
This page is only accessible to manager
This lets the manager create a new worker
-->
<script>
//sends out an alert if there are error in the user input
......@@ -88,4 +92,4 @@
</div>
</body>
</html>
</html>
\ No newline at end of file
QueueingApp/src/main/webapp/workerReportPage.jsp
+ 7
− 2
View file @ 479131e3
......@@ -17,6 +17,11 @@
</head>
<body>
<!--
This page is only accessible to manager
This lets the manager create a report
-->
<%
//checks first if the loggedin user is a manager
......@@ -37,7 +42,7 @@
<h1>New Report</h1>
<div class="details_container">
<form method="post" action="customerServlet">
<form method="post" action="WorkerReportServlet">
<div class="employee_details">
<label for="workerName">Worker Name:</label> <br>
......@@ -64,4 +69,4 @@
</div>
</body>
</html>
</html>
\ No newline at end of file
QueueingApp/src/main/webapp/workerView.jsp
+ 9
− 13
View file @ 479131e3
......@@ -6,8 +6,12 @@
<!DOCTYPE html>
<!-- other info
- this webpage is super long -->
<!--
This is the main view that a Manager would see
Here they can visually see the order of the customers in their perspective positions
- They can add and also remove customer here
- they can add new employee and create a new report as well
-->
<html>
<head>
......@@ -47,27 +51,19 @@
<div class="left-side-panel">
<div class="left-side-panel-top">
<div class="userBttn">
<button style="margin-top: 45px;" onclick="window.location.href='landingPgServlet'" >Home</button><br><br>
<button onclick="window.location.href='workerRegisterPage.jsp'">New Employee</button><br><br>
<button onclick="window.location.href='workerReportPage.jsp'">Make Report</button><br>
<button onclick="window.location.href='workerReportPage.jsp'">Make Report</button>
</div>
</div>
<div class="left-side-panel-bottom">
<div class="userBttn">
<button onclick="window.location.href='logoutServlet'">LogOut</button>
</div>
</div>
</div>
</div>
<div class="main-content">
......
QueueingApp/src/main/webapp/workerViewRegular.jsp
+ 7
− 2
View file @ 479131e3
......@@ -6,8 +6,13 @@
<!DOCTYPE html>
<!-- other info
- this webpage is super long -->
<!--
This is the main view that a regular worker would see
Here they can visually see the order of the customers in their perspective positions
- They can add and also remove customer here
-->
<html>
<head>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment