-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
Icon/Image Select: Basic Example (Javascript)
+ + + + + + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html new file mode 100644 index 0000000..b6c4cc7 --- /dev/null +++ b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html @@ -0,0 +1,57 @@ + + + +Icon/Image Select: Nano Example (Javascript)
+ + + + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html new file mode 100644 index 0000000..ab60e43 --- /dev/null +++ b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html @@ -0,0 +1,57 @@ + + + +Icon/Image Select: Vectoral Example (Javascript)
+ + + + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example4.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example4.html new file mode 100644 index 0000000..5ae105e --- /dev/null +++ b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example4.html @@ -0,0 +1,57 @@ + + + +Icon/Image Select: Horizontal Example (Javascript)
+ + + + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/images/.DS_Store new file mode 100644 index 0000000..fc019e8 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/.DS_Store differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/control/.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/images/control/.DS_Store new file mode 100644 index 0000000..50dfa3d Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/control/.DS_Store differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/control/icon-select/.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/images/control/icon-select/.DS_Store new file mode 100644 index 0000000..86ce6b4 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/control/icon-select/.DS_Store differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/control/icon-select/arrow.png b/WebContent/html/javascript/iconselect.js-1.0/images/control/icon-select/arrow.png new file mode 100644 index 0000000..4917ceb Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/control/icon-select/arrow.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/images/icons/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/.DS_Store differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/1.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/1.png new file mode 100644 index 0000000..d0f3dbb Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/1.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/10.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/10.png new file mode 100644 index 0000000..9a768a2 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/10.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/11.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/11.png new file mode 100644 index 0000000..ab66234 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/11.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/12.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/12.png new file mode 100644 index 0000000..898ef18 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/12.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/13.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/13.png new file mode 100644 index 0000000..8a7845d Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/13.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/14.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/14.png new file mode 100644 index 0000000..d322297 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/14.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/2.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/2.png new file mode 100644 index 0000000..98906de Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/2.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/3.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/3.png new file mode 100644 index 0000000..a56adfe Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/3.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/4.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/4.png new file mode 100644 index 0000000..6870eac Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/4.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/5.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/5.png new file mode 100644 index 0000000..f753084 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/5.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/6.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/6.png new file mode 100644 index 0000000..ca9f8d3 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/6.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/7.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/7.png new file mode 100644 index 0000000..2d0b685 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/7.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/8.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/8.png new file mode 100644 index 0000000..23766e8 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/8.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/images/icons/9.png b/WebContent/html/javascript/iconselect.js-1.0/images/icons/9.png new file mode 100644 index 0000000..663ab69 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/images/icons/9.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/lib/.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/lib/.DS_Store new file mode 100644 index 0000000..8d15528 Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/lib/.DS_Store differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/lib/control/.DS_Store b/WebContent/html/javascript/iconselect.js-1.0/lib/control/.DS_Store new file mode 100644 index 0000000..fafc36b Binary files /dev/null and b/WebContent/html/javascript/iconselect.js-1.0/lib/control/.DS_Store differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/lib/control/iconselect.js b/WebContent/html/javascript/iconselect.js-1.0/lib/control/iconselect.js new file mode 100644 index 0000000..3939777 --- /dev/null +++ b/WebContent/html/javascript/iconselect.js-1.0/lib/control/iconselect.js @@ -0,0 +1,322 @@ + +/** + * + * Created with NetBeans IDE + * + * Code : Icon Select JS + * Version : 1.0 + * + * User : Bugra OZDEN + * Site : http://www.bugraozden.com + * Mail : bugra.ozden@gmail.com + * + * Date : 10/30/13 + * Time : 01:10 PM + * + */ + +IconSelect.DEFAULT = {}; +IconSelect.DEFAULT.SELECTED_ICON_WIDTH = 48; +IconSelect.DEFAULT.SELECTED_ICON_HEIGHT = 48; +IconSelect.DEFAULT.SELECTED_BOX_PADDING = 1; +IconSelect.DEFAULT.SELECTED_BOX_PADDING_RIGHT = 12; +IconSelect.DEFAULT.ICONS_WIDTH = 32; +IconSelect.DEFAULT.ICONS_HEIGHT = 32; +IconSelect.DEFAULT.BOX_ICON_SPACE = 1; +IconSelect.DEFAULT.HORIZONTAL_ICON_NUMBER = 3; +IconSelect.DEFAULT.VECTORAL_ICON_NUMBER = 3; + +IconSelect.COMPONENT_ICON_FILE_PATH = "../javascript/iconselect.js-1.0/images/control/icon-select/arrow.png"; + +function IconSelect($$elementID, $$parameters) { + + var _icons = []; + var _selectedIndex = -1; + var _boxScroll; + + var _default = IconSelect.DEFAULT; + + function _init() { + + //parametreler boş gelirse + if(!$$parameters) $$parameters = {}; + //En üst elementi seç + if(_View.setIconSelectElement($$elementID)){ + + //set parameters + $$parameters = _Model.checkParameters($$parameters); + //create UI + var ui = _View.createUI($$parameters, $$elementID); + //basıldığında göster/gizle + _View.iconSelectElement.onclick = function(){ + _View.showBox(); + }; + + //Başlangıçta gizle + _View.showBox(false); + + //Nesneye basıldığında gizlemeyi iptal et. + _View.iconSelectElement.addEventListener('click', function($event){ + $event.stopPropagation(); + }); + + //dışarı basıldığında gizle. + window.addEventListener('click', function(){ + _View.showBox(false); + }); + + }else{ + alert("Element not found."); + } + + } + + //Tüm iconları yeniden yükle. + this.refresh = function($icons){ + + _icons = []; + + var setSelectedIndex = this.setSelectedIndex; + + for(var i = 0; i < $icons.length; i++){ + $icons[i].element = _View.createIcon($icons[i].iconFilePath, $icons[i].iconValue, i, $$parameters); + $icons[i].element.onclick = function(){ + setSelectedIndex(this.childNodes[0].getAttribute('icon-index')); + + }; + _icons.push($icons[i]); + + } + + var horizontalIconNumber = Math.round(($icons.length) / $$parameters.vectoralIconNumber); + + _View.boxElement.style.height = (($$parameters.iconsHeight + 2) * horizontalIconNumber) + + ((horizontalIconNumber + 1) * $$parameters.boxIconSpace); + this.setSelectedIndex(0); + + }; + + //icon listesini al. + this.getIcons = function(){ return _icons; }; + + //iconu seçili hale gelir. + this.setSelectedIndex = function($index){ + + var icon; + + if(_icons.length > $index) + icon = _icons[$index]; + + if(icon){ + //eski icondan seçilme özelliğini kaldır. + if(_selectedIndex != -1) _icons[_selectedIndex].element.setAttribute('class','icon'); + _selectedIndex = $index; + _View.selectedIconImgElement.setAttribute('src', icon.iconFilePath); + if(_selectedIndex != -1) _icons[_selectedIndex].element.setAttribute('class','icon selected'); + if(_selectedIndex != -1) $('#profimg').attr("src","../imgs/my-icons-collection-128px/png/" + icon.iconValue + ".png"); + } + + _View.iconSelectElement.dispatchEvent(new Event('changed')); + + //_View.showBox(false); + + }; + + this.getSelectedIndex = function(){ return _selectedIndex; }; + this.getSelectedValue = function(){ return _icons[_selectedIndex].iconValue }; + this.getSelectedFilePath = function(){ return _icons[_selectedIndex].iconFilePath }; + + + + //### VIEW CLASS ### + + function _View(){} + + _View.iconSelectElement; + _View.boxElement; + _View.boxScrollElement; + _View.selectedIconImgElement; + _View.selectedIconElement; + + _View.showBox = function($isShown){ + + if($isShown == null) { + $isShown = (_View.boxElement.style.display == "none") ? true : false; + } + + if($isShown) { + _View.boxElement.style.display = "block"; + _View.boxScrollElement.style.display = "block"; + _boxScroll = (_boxScroll) ? _boxScroll : new iScroll($$elementID + "-box-scroll"); + }else{ + _View.boxElement.style.display = "none"; + _View.boxScrollElement.style.display = "none"; + } + + _View.boxElement.style.display = ($isShown) ? "block" : "none"; + + + + }; + + _View.setIconSelectElement = function($elementID){ + _View.iconSelectElement = document.getElementById($elementID); + return _View.iconSelectElement; + }; + + _View.clearUI = function(){ + _View.iconSelectElement.innerHTML = ""; + }; + + _View.clearIcons = function(){ + _View.boxElement.innerHTML = ""; + }; + + _View.createUI = function($parameters){ + + /* HTML MODEL + +
+
+
+ */
+
+ _View.clearUI();
+
+ _View.iconSelectElement.setAttribute('class', 'icon-select');
+
+ var selectedBoxElement = document.createElement('div');
+ selectedBoxElement.setAttribute('class' ,'selected-box');
+
+ var selectedIconElement = document.createElement('div');
+ selectedIconElement.setAttribute('class' ,'selected-icon');
+
+ _View.selectedIconImgElement = document.createElement('img');
+ _View.selectedIconImgElement.setAttribute('src', '');
+ selectedIconElement.appendChild(_View.selectedIconImgElement);
+
+ var componentIconElement = document.createElement('div');
+ componentIconElement.setAttribute('class', 'component-icon');
+
+ var componentIconImgElement = document.createElement('img');
+ componentIconImgElement.setAttribute('src', IconSelect.COMPONENT_ICON_FILE_PATH );
+ componentIconElement.appendChild(componentIconImgElement);
+
+ _View.boxScrollElement = document.createElement('div');
+ _View.boxScrollElement.setAttribute('id',$$elementID + "-box-scroll");
+ _View.boxScrollElement.setAttribute('class', 'box');
+
+ _View.boxElement = document.createElement('div');
+
+ //_View.boxElement.setAttribute('class', 'box');
+ _View.boxScrollElement.appendChild(_View.boxElement);
+
+ _View.selectedIconImgElement.setAttribute('width', $parameters.selectedIconWidth);
+ _View.selectedIconImgElement.setAttribute('height', $parameters.selectedIconHeight);
+ selectedIconElement.style.width = $parameters.selectedIconWidth;
+ selectedIconElement.style.height = $parameters.selectedIconHeight;
+ selectedBoxElement.style.width = $parameters.selectedIconWidth + $parameters.selectedBoxPadding + $parameters.selectedBoxPaddingRight;
+ selectedBoxElement.style.height = $parameters.selectedIconHeight + ($parameters.selectedBoxPadding * 2);
+ selectedIconElement.style.top = $parameters.selectedBoxPadding;
+ selectedIconElement.style.left = $parameters.selectedBoxPadding;
+ componentIconElement.style.bottom = 4 + $parameters.selectedBoxPadding;
+
+ _View.boxScrollElement.style.left = parseInt(selectedBoxElement.style.width) + 1;
+
+ _View.boxScrollElement.style.width = (($parameters.iconsWidth + 2) * $parameters.vectoralIconNumber) +
+ (($parameters.vectoralIconNumber + 1) * $parameters.boxIconSpace);
+ _View.boxScrollElement.style.height = (($parameters.iconsHeight + 2) * $parameters.horizontalIconNumber) +
+ (($parameters.horizontalIconNumber + 1) * $parameters.boxIconSpace);
+
+ _View.boxElement.style.left = _View.boxScrollElement.style.left;
+ _View.boxElement.style.width = _View.boxScrollElement.style.width;
+
+ _View.iconSelectElement.appendChild(selectedBoxElement);
+ selectedBoxElement.appendChild(selectedIconElement);
+ selectedBoxElement.appendChild(componentIconElement);
+ selectedBoxElement.appendChild(_View.boxScrollElement);
+
+
+ var results = {};
+ results['iconSelectElement'] = _View.iconSelectElement;
+ results['selectedBoxElement'] = selectedBoxElement;
+ results['selectedIconElement'] = selectedIconElement;
+ results['selectedIconImgElement'] = _View.selectedIconImgElement;
+ results['componentIconElement'] = componentIconElement;
+ results['componentIconImgElement'] = componentIconImgElement;
+
+ return results;
+
+
+ //trigger: created ( run setValues )
+
+ };
+
+ _View.createIcon = function($iconFilePath, $iconValue, $index, $parameters){
+
+ /* HTML MODEL
+
+
+ 
+ 
+
+
+ 
+
+ 
+ 
+
+
+ 
+ 
+ 
+ 
+
+ 
' + devices[i].name + '' + devices[i].description + '
' - } - } - - if(html.localeCompare("")==0) - html += "
There are no devices with the search criteria: " + this.textContent + "
"; - - //add to HTML page - document.getElementById('devContainer').innerHTML = html; - - //now we need to add event listeners to all the request buttons - var requestbuttons = document.getElementsByClassName('requestbutton'); - for(var i = 0; i < requestbuttons.length; i++){ - requestbuttons[i].addEventListener('click',addToCart); - } -} - -function readFilter() { - //Constrcts a filter object for use in the database library that corresponds to the checked optionsin the sidebar - var hw_type; - var sw_type; - -} - -function addToCart(){ - var id = this.getAttribute('id'); - id = parseInt(id.replace(/[^0-9\.]/g,''),10); //this gets just the numerical value from the id! - if(!inCart(id)){ //if not in the cart - var cart = getCartItems(); //this is an array - cart.push(id); //push to bottom of cart - localStorage.setItem('cart', JSON.stringify(cart)); - $('#added').fadeIn(1000); - $('#added').fadeIn(1000); - $('#added').fadeOut(1000); - } - else{ - $('#already').fadeIn(1000); - $('#already').fadeIn(1000); - $('#already').fadeOut(1000); - } -} - -function inCart(id){ - var cart = getCartItems(); - if(cart.length == 0) //if nothing's in the cart - return 0; - else{ //something is in the cart - for(var i = 0; i < cart.length; i++){ - if(cart[i] === id) - return 1; - } - } - return 0; -} - -function getCartItems(){ - //initiate array for them - var cart = new Array; - //get them from local storage - var cart_str = localStorage.getItem('cart'); - //if there is at least one object already we need to convert it from JSON to string - if (cart_str !== null && cart_str !== "") { - cart = JSON.parse(cart_str); - } - return cart; -} - -function getUnavailableItems(){ - var unavailable = new Array; - var unavailable_str = localStorage.getItem('unavailable'); - if(unavailable_str !== "" && unavailable_str !== null){ - unavailable = JSON.parse(unavailable_str); - } - return unavailable; -} - -function isUnavailable(id){ - var unavailable = getUnavailableItems(); - if(unavailable.length == 0) - return 0; - else{ - for(var i = 0; i < unavailable.length; i++){ - if(unavailable[i] == (id+1)) - return 1; - } - } - return 0; -} - -//this code allows a message to appear that indicates that the item was successfully placed in the shopping cart. diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp new file mode 100644 index 0000000..b1cca96 --- /dev/null +++ b/WebContent/html/javascript/request.jsp @@ -0,0 +1,195 @@ +<%@ page import = "database.MySQLAccess,entities.ListedDevice" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> + + + + +Checked out: " - htmlString+=checkout.toISOString().substring(0,10); - htmlString+="
You've had this device for "; - var milliseconds=new Date().getTime()-checkout.getTime(); - var seconds=Math.floor(milliseconds/1000); - var minutes=Math.floor(seconds/60); - var hours=Math.floor(minutes/60); - var days=Math.floor(hours/24); - var weeks=Math.floor(days/7); - var months=Math.floor(weeks/4); - if(months>=2) htmlString+=months+" months"; - else - { - htmlString+= weeks+ " week"; - if(weeks!=1) htmlString+="s"; - } - htmlString+="!"; - htmlString+="
"; - } - if(i==0) htmlString+="Couldn't find any devices to return. Why not go order some?"; - document.getElementById("devContainer").innerHTML = htmlString; - - var returnbuttons = document.getElementsByClassName('returnbutton'); - for (var i = 0; i < returnbuttons.length; i++) { - returnbuttons[i].addEventListener('click',returnDevice); - } -} - -function returnDevice() -{ - var id = this.getAttribute('id'); - id = parseInt(id.replace(/[^0-9\.]/g,''), 10); - if(isUnavailable(id)) - { - var unavailable = getUnavailableIDs(); - unavailable.splice(unavailable.indexOf(id),1); - localStorage.setItem('unavailable',JSON.stringify(unavailable)); - $('#return').fadeIn(1000); - $('#return').fadeIn(1000); - $('#return').fadeOut(1000); - } - else - alert("That's already marked available. Something may have gone wrong."); - populateDeviceList(); -} - -function getCheckedOutDevices(user, filter) -//Eventually this will return information about all devices checked out by *user* -//Right now there is only one user, and the function just returns IDs of all checked out devicess. -//'Filter' is passed as a two-element array representing a range of milliseconds. -//If the checkout date for a device falls within that range, then it will be included in the results. -//The filter may be null. If so, all checked out devices will be returned. -{ - var unavailable = getUnavailableIDs(); - var checkedDevices = new Array(); - for (var i = 0; i < unavailable.length; i++) { - for (var j = 0; j < devices.length; j++) { - if(unavailable[i] == devices[j].id) - { - if(filter!=null) - { - var checkedOutMillis = devices[j].checkout.getTime(); - if(filter[0]
-
-
- Admin View Approvals
- -
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+Approved!
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/html/webpages/adminApprove.html b/WebContent/html/webpages/adminApprove.html
new file mode 100644
index 0000000..f73865e
--- /dev/null
+++ b/WebContent/html/webpages/adminApprove.html
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+ Welcome to the admin page
+ +
+
+
+ Admin View Approvals
+ +
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/adminLocation.jsp
new file mode 100644
index 0000000..7e8db38
--- /dev/null
+++ b/WebContent/html/webpages/adminLocation.jsp
@@ -0,0 +1,389 @@
+<%@ page import = "database.MySQLAccess,entities.Location" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+
+
+
+
+
+
+ Approved!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%
+//database connection
+MySQLAccess myaccess = new MySQLAccess();
+//database query
+Location[] locations = myaccess.getLocations();
+//string representation of array.
+String locationString = Location.arrayToString(locations);
+locationString = locationString.replace("'","\\'");
+%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/html/webpages/index.jsp b/WebContent/html/webpages/index.jsp
index 34d4747..df2fa47 100644
--- a/WebContent/html/webpages/index.jsp
+++ b/WebContent/html/webpages/index.jsp
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:WebContent/html/webpages/index.jsp
@@ -77,4 +78,4 @@
-
+
\ No newline at end of file
diff --git a/WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.jsp
index d2f6067..c7ec3f2 100644
--- a/WebContent/html/webpages/listingPage.jsp
+++ b/WebContent/html/webpages/listingPage.jsp
@@ -1,79 +1,86 @@
-
-
-
-
-
-
-
-
-
-
- Location Listing
+ +| Name | +Address | +Town | +State | +Zip Code | +
|---|
-
-
- <%@ include file="../javascript/listing.jsp" %>
-
-
+
+
+
+
+
+
+
+
+
+
+ Device Dictionary
- -
+
+
+ <%@ include file="../javascript/listing.jsp" %>
+
+
\ No newline at end of file
diff --git a/WebContent/html/webpages/locationRedirect.jsp b/WebContent/html/webpages/locationRedirect.jsp
new file mode 100644
index 0000000..967f9da
--- /dev/null
+++ b/WebContent/html/webpages/locationRedirect.jsp
@@ -0,0 +1,64 @@
+<%@ page import = "database.MySQLAccess,entities.Location" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+
+
+
+
+
+
+ Device Dictionary
+ +Redirect Page
+You shouldn't be seeing this page :)
+ +<% +//make instance +MySQLAccess myaccess = new MySQLAccess(); +String name = request.getParameter("name").replace("\"","\\\""); +String address = request.getParameter("address").replace("\"","\\\""); +String town = request.getParameter("town").replace("\"","\\\""); +String state = request.getParameter("state"); +String zip = request.getParameter("zip"); +//add form was submitted +if(request.getParameter("add") != null){ + Location location = new Location(name,address,town,state,zip); + myaccess.addLocation(location); +} +//modify form was submitted +if(request.getParameter("modify") != null){ + //getParameter() always returns string + String strID = request.getParameter("id"); + //turn to int for constructor + int id = Integer.parseInt(strID); + Location location = new Location(id,name,address,town,state,zip); + myaccess.modifyLocation(location); +} +//delete form was submitted +if(request.getParameter("delete") != null){ + String strID = request.getParameter("id"); + int id = Integer.parseInt(strID); + myaccess.deleteLocation(id); +} +%> + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/map.html b/WebContent/html/webpages/map.html index 5256954..09d9fec 100644 --- a/WebContent/html/webpages/map.html +++ b/WebContent/html/webpages/map.html @@ -1,89 +1,89 @@ - - - - - - - - - -Our Wonderful Synchrony Financial Map!
- - - - - - - - + + + + + + + + + +Our Wonderful Synchrony Financial Map!
+ + + + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/profileSettings.html b/WebContent/html/webpages/profileSettings.html new file mode 100644 index 0000000..ea0abb4 --- /dev/null +++ b/WebContent/html/webpages/profileSettings.html @@ -0,0 +1,125 @@ + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/html/webpages/requestPage.html b/WebContent/html/webpages/requestPage.jsp
similarity index 83%
rename from WebContent/html/webpages/requestPage.html
rename to WebContent/html/webpages/requestPage.jsp
index a8c93d2..d9f010f 100644
--- a/WebContent/html/webpages/requestPage.html
+++ b/WebContent/html/webpages/requestPage.jsp
@@ -66,22 +66,22 @@
@@ -98,7 +98,7 @@
+
+
+
+
+
+
+ ![]()
+
+ +
Change profile image:
+ +Available Devices
Already in Cart
- + <%@ include file="../javascript/request.jsp" %> \ No newline at end of file diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp new file mode 100644 index 0000000..08a267d --- /dev/null +++ b/WebContent/html/webpages/returnComplete.jsp @@ -0,0 +1,39 @@ +<%@ page import = "database.MySQLAccess,entities.RentedDevice" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + + + + + + + +Returning Devices
+Thanks for returning some devices!
+ +<% +//make instance +MySQLAccess myaccess = new MySQLAccess(); +//get string from request form +String devices = request.getParameter("devicesToReturn"); +myaccess.returnDevices(devices); +%> + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/returnPage.html b/WebContent/html/webpages/returnPage.html deleted file mode 100644 index fdcda6c..0000000 --- a/WebContent/html/webpages/returnPage.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - -
-
- Devices to Be Returned
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp
new file mode 100644
index 0000000..7cf5b9f
--- /dev/null
+++ b/WebContent/html/webpages/returnPage.jsp
@@ -0,0 +1,278 @@
+<%@ page import = "database.MySQLAccess,entities.RentedDevice" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+
+
+
+
+
+
+ Returned
-
+
+
+
+
+
+
+
+<%
+//database connection
+MySQLAccess myaccess = new MySQLAccess();
+//String userID = cookie implementation exists here.
+//19 is just for testing purposes. Replaced by userID later.
+RentedDevice[] mydevices = myaccess.getUserDevices("19");
+//string representation of array.
+String deviceString = RentedDevice.arrayToString(mydevices);
+%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/index.jsp b/WebContent/index.jsp
index 62f5aa4..82aeb2f 100644
--- a/WebContent/index.jsp
+++ b/WebContent/index.jsp
@@ -1,6 +1,7 @@
<%@ page import = "database.MySQLAccess" %>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
+<%@ page import = "java.sql.*" %>
@@ -19,6 +20,10 @@
Devices to Be Returned
+ +
+
+
+