diff --git a/.classpath b/.classpath deleted file mode 100644 index fceb480..0000000 --- a/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/.project b/.project index 63896e3..4637376 100644 --- a/.project +++ b/.project @@ -10,8 +10,22 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature + org.eclipse.wst.jsdt.core.jsNature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 3a21537..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css similarity index 100% rename from html/css/stylesheet.css rename to WebContent/html/css/stylesheet.css diff --git a/html/frameworks/Admin Page Returns 2.png b/WebContent/html/frameworks/Admin Page Returns 2.png similarity index 100% rename from html/frameworks/Admin Page Returns 2.png rename to WebContent/html/frameworks/Admin Page Returns 2.png diff --git a/html/frameworks/Admin Page Returns.png b/WebContent/html/frameworks/Admin Page Returns.png similarity index 100% rename from html/frameworks/Admin Page Returns.png rename to WebContent/html/frameworks/Admin Page Returns.png diff --git a/html/frameworks/All Items.png b/WebContent/html/frameworks/All Items.png similarity index 100% rename from html/frameworks/All Items.png rename to WebContent/html/frameworks/All Items.png diff --git a/html/frameworks/Data Page.png b/WebContent/html/frameworks/Data Page.png similarity index 100% rename from html/frameworks/Data Page.png rename to WebContent/html/frameworks/Data Page.png diff --git a/html/frameworks/Header Example.png b/WebContent/html/frameworks/Header Example.png similarity index 100% rename from html/frameworks/Header Example.png rename to WebContent/html/frameworks/Header Example.png diff --git a/html/frameworks/Main Page.png b/WebContent/html/frameworks/Main Page.png similarity index 100% rename from html/frameworks/Main Page.png rename to WebContent/html/frameworks/Main Page.png diff --git a/html/frameworks/Order Page.png b/WebContent/html/frameworks/Order Page.png similarity index 100% rename from html/frameworks/Order Page.png rename to WebContent/html/frameworks/Order Page.png diff --git a/html/frameworks/Return 1.png b/WebContent/html/frameworks/Return 1.png similarity index 100% rename from html/frameworks/Return 1.png rename to WebContent/html/frameworks/Return 1.png diff --git a/html/frameworks/Return 2.png b/WebContent/html/frameworks/Return 2.png similarity index 100% rename from html/frameworks/Return 2.png rename to WebContent/html/frameworks/Return 2.png diff --git a/html/frameworks/Shopping List.png b/WebContent/html/frameworks/Shopping List.png similarity index 100% rename from html/frameworks/Shopping List.png rename to WebContent/html/frameworks/Shopping List.png diff --git a/html/imgs/computerStick.png b/WebContent/html/imgs/computerStick.png similarity index 100% rename from html/imgs/computerStick.png rename to WebContent/html/imgs/computerStick.png diff --git a/html/imgs/ipad.png b/WebContent/html/imgs/ipad.png similarity index 100% rename from html/imgs/ipad.png rename to WebContent/html/imgs/ipad.png diff --git a/html/imgs/iphone.png b/WebContent/html/imgs/iphone.png similarity index 100% rename from html/imgs/iphone.png rename to WebContent/html/imgs/iphone.png diff --git a/html/imgs/synchrony-financial-logo-dlpx.png b/WebContent/html/imgs/synchrony-financial-logo-dlpx.png similarity index 100% rename from html/imgs/synchrony-financial-logo-dlpx.png rename to WebContent/html/imgs/synchrony-financial-logo-dlpx.png diff --git a/html/imgs/synchrony-financial-logo-dlpx_1.ico b/WebContent/html/imgs/synchrony-financial-logo-dlpx_1.ico similarity index 100% rename from html/imgs/synchrony-financial-logo-dlpx_1.ico rename to WebContent/html/imgs/synchrony-financial-logo-dlpx_1.ico diff --git a/html/imgs/synchrony-financial-logo-dlpx_1.png b/WebContent/html/imgs/synchrony-financial-logo-dlpx_1.png similarity index 100% rename from html/imgs/synchrony-financial-logo-dlpx_1.png rename to WebContent/html/imgs/synchrony-financial-logo-dlpx_1.png diff --git a/html/imgs/ticket.png b/WebContent/html/imgs/ticket.png similarity index 100% rename from html/imgs/ticket.png rename to WebContent/html/imgs/ticket.png diff --git a/html/imgs/user_icon.png b/WebContent/html/imgs/user_icon.png similarity index 100% rename from html/imgs/user_icon.png rename to WebContent/html/imgs/user_icon.png diff --git a/html/javascript/listing.js b/WebContent/html/javascript/listing.js similarity index 98% rename from html/javascript/listing.js rename to WebContent/html/javascript/listing.js index 5d1c0bc..6275ffe 100644 --- a/html/javascript/listing.js +++ b/WebContent/html/javascript/listing.js @@ -112,7 +112,7 @@ function show(){ function getUnavailableItems(){ var unavailable = new Array; var unavailable_str = localStorage.getItem('unavailable'); - if(unavailable_str !== ""){ + if(unavailable_str !== "" && unavailable_str !== null){ unavailable = JSON.parse(unavailable_str); } return unavailable; diff --git a/WebContent/html/javascript/navbar.js b/WebContent/html/javascript/navbar.js new file mode 100644 index 0000000..6e62706 --- /dev/null +++ b/WebContent/html/javascript/navbar.js @@ -0,0 +1 @@ +document.getElementById('navbaruniversal').innerHTML = '
' \ No newline at end of file diff --git a/html/javascript/nhpup_1.1.js b/WebContent/html/javascript/nhpup_1.1.js similarity index 100% rename from html/javascript/nhpup_1.1.js rename to WebContent/html/javascript/nhpup_1.1.js diff --git a/html/javascript/request.js b/WebContent/html/javascript/request.js similarity index 97% rename from html/javascript/request.js rename to WebContent/html/javascript/request.js index 6279c41..41018f2 100644 --- a/html/javascript/request.js +++ b/WebContent/html/javascript/request.js @@ -119,7 +119,7 @@ function getCartItems(){ //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) { + if (cart_str !== null && cart_str !== "") { cart = JSON.parse(cart_str); } return cart; @@ -128,7 +128,7 @@ function getCartItems(){ function getUnavailableItems(){ var unavailable = new Array; var unavailable_str = localStorage.getItem('unavailable'); - if(unavailable_str !== ""){ + if(unavailable_str !== "" && unavailable_str !== null){ unavailable = JSON.parse(unavailable_str); } return unavailable; diff --git a/html/javascript/return.js b/WebContent/html/javascript/return.js similarity index 95% rename from html/javascript/return.js rename to WebContent/html/javascript/return.js index c296d8b..6298caa 100644 --- a/html/javascript/return.js +++ b/WebContent/html/javascript/return.js @@ -204,7 +204,7 @@ function getUnavailableIDs() { var unavailable = new Array; var unavailable_str = localStorage.getItem('unavailable'); - if(unavailable_str !== ""){ + if(unavailable_str !== "" && unavailable_str !== null){ unavailable = JSON.parse(unavailable_str); } return unavailable; diff --git a/html/javascript/shoppingCart.js b/WebContent/html/javascript/shoppingCart.js similarity index 98% rename from html/javascript/shoppingCart.js rename to WebContent/html/javascript/shoppingCart.js index de1e66e..498d818 100644 --- a/html/javascript/shoppingCart.js +++ b/WebContent/html/javascript/shoppingCart.js @@ -224,7 +224,7 @@ This function gets unavailable items from local storage. function getUnavailableItems(){ var unavailable = new Array; //make new array var unavailable_str = localStorage.getItem('unavailable'); //get the string from local storage - if(unavailable_str !== ''){ //as long as its not null + if(unavailable_str !== '' && unavailable_str !== null){ //as long as its not null unavailable = JSON.parse(unavailable_str); //make into array } return unavailable; //return value is an array diff --git a/html/table.css b/WebContent/html/table.css similarity index 100% rename from html/table.css rename to WebContent/html/table.css diff --git a/html/webpages/homePage.html b/WebContent/html/webpages/index.html similarity index 100% rename from html/webpages/homePage.html rename to WebContent/html/webpages/index.html diff --git a/html/webpages/listingPage.html b/WebContent/html/webpages/listingPage.html similarity index 100% rename from html/webpages/listingPage.html rename to WebContent/html/webpages/listingPage.html diff --git a/html/webpages/map.html b/WebContent/html/webpages/map.html similarity index 100% rename from html/webpages/map.html rename to WebContent/html/webpages/map.html diff --git a/html/webpages/requestPage.html b/WebContent/html/webpages/requestPage.html similarity index 100% rename from html/webpages/requestPage.html rename to WebContent/html/webpages/requestPage.html diff --git a/html/webpages/returnPage.html b/WebContent/html/webpages/returnPage.html similarity index 100% rename from html/webpages/returnPage.html rename to WebContent/html/webpages/returnPage.html diff --git a/html/webpages/shoppingCart.html b/WebContent/html/webpages/shoppingCart.html similarity index 100% rename from html/webpages/shoppingCart.html rename to WebContent/html/webpages/shoppingCart.html diff --git a/db/Workbench Schema.mwb b/db/Workbench Schema.mwb index 8683818..25df763 100644 Binary files a/db/Workbench Schema.mwb and b/db/Workbench Schema.mwb differ diff --git a/db/Workbench Schema.mwb.bak b/db/Workbench Schema.mwb.bak index 499f83d..8683818 100644 Binary files a/db/Workbench Schema.mwb.bak and b/db/Workbench Schema.mwb.bak differ diff --git a/html/javascript/navbar.js b/html/javascript/navbar.js deleted file mode 100644 index f34276e..0000000 --- a/html/javascript/navbar.js +++ /dev/null @@ -1 +0,0 @@ -document.getElementById('navbaruniversal').innerHTML = '
' \ No newline at end of file diff --git a/src/features/ReturnHandler.java b/src/features/ReturnHandler.java index 4a795b9..4d73b34 100644 --- a/src/features/ReturnHandler.java +++ b/src/features/ReturnHandler.java @@ -17,8 +17,6 @@ public boolean changeAvailability(String type, Device[] db) return true; } - - public