Skip to content

Commit

Permalink
Resolving Conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@clj13001
clj13001 committed Dec 7, 2016
2 parents 927ae5f + cc1257d commit ded9041
Show file tree
Hide file tree
Showing 21 changed files with 12 additions and 358 deletions.
0 documentation/diagrams/SDP_MobileUI.pptx → ...html/frameworks/Mobile UI Frameworks.pptx
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions WebContent/html/javascript/admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function show(){
}
}

if(html.localeCompare("")==0)
html = "<p>There are no requests to approve</p>";
if(html.localeCompare("<p>Please review the device requests below.</p>")==0)
html = "<p>There are no requests to approve.</p>";

//add to HTML page
document.getElementById('devContainer').innerHTML = html;
Expand Down
2 changes: 1 addition & 1 deletion WebContent/html/javascript/navbar.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions WebContent/html/javascript/shoppingCart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,47 @@ var dev1 = {
id: 1,
name:"George",
description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.",
hardware:"iphone",
hardware:"iPhone",
software:"apple",
};

var dev2 = {
id: 2,
name:"Greyson",
description:"Greyson is pretty cool.. I guess.",
hardware:"iphone",
hardware:"iPhone",
software:"apple",
};

var dev3 = {
id: 3,
name:"Linkin Park",
description:'"The hardest part of ending is starting again."',
hardware:"ipad",
description:'&quotThe hardest part of ending is starting again.&quot',
hardware:"iPad",
software:"apple",
};

var dev4 = {
id: 4,
name:"Abercrombie",
description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!",
hardware:"ipad",
hardware:"iPad",
software:"apple",
};

var dev5 = {
id: 5,
name:"Hulk",
description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.",
hardware:"computerStick",
hardware:"Computer Stick",
software:"intel",
};

var dev6 = {
id: 6,
name:"Captain America",
description:"&quotMake America Great Again.&quot Wait, thats someone else..",
hardware:"computerStick",
hardware:"Computer Stick",
software:"intel",
};

Expand Down Expand Up @@ -82,7 +82,7 @@ function show(){
var id = cart[i]; //this gets the id value from the cart
for(var j = 0; j < devices.length; j++){ //iterate device list
if(devices[j].id === id){ //match the id's "nhpup.popup(' ');"
html += '<div> <input class = "deviceCheckbox" type = "checkbox" id = "' + id + '"> </input><a class = "divlink" href = "#" onmouseover = "'+ part1 + devices[j].description + part2 + '"><div id = "ticket' + id +'" class = "ticket"><p class = "tickettext">' + devices[j].name + '</p></div></a></div>'; //create listing of all the devices
html += '<div> <input class = "deviceCheckbox" type = "checkbox" id = "' + id + '"> </input><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + devices[j].hardware + '<br><br>' + devices[j].description + part2 + '"><div id = "ticket' + id +'" class = "ticket"><p class = "tickettext">' + devices[j].name + '</p></div></a></div>'; //create listing of all the devices
break; //break out of loop when we match
}
}
Expand Down
124 changes: 1 addition & 123 deletions WebContent/html/webpages/map.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,134 +70,12 @@ <h2>Our Wonderful Synchrony Financial Map!</h2>
{imagePath: 'https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/m'});
}
var locations = [
{lat: 47.610150, lng: -122.201516}, //Bellevue, WA
{lat: 47.610150, lng: -122.201516}, //Bellevue, WA
{lat: 37.774929, lng: -122.419416}, //San Francisco, CA
{lat: 37.338208, lng: -121.886329}, //San Jose, CA
{lat: 33.641132, lng: -117.918669}, //Costa Mesa, CA
{lat: 40.760779, lng: -111.891047}, //Salt Lake City, UT
{lat: 40.760779, lng: -111.891047}, //Salt Lake City, UT
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 33.448377, lng: -112.074037}, //Phoenix, AZ
{lat: 14.599512, lng: 120.984219}, //Manilla, Philippines
{lat: 14.599512, lng: 120.984219}, //Manilla, Philippines
{lat: 14.599512, lng: 120.984219}, //Manilla, Philippines
{lat: 14.599512, lng: 120.984219}, //Manilla, Philippines
{lat: 14.599512, lng: 120.984219}, //Manilla, Philippines
{lat: 14.599512, lng: 120.984219}, //Manilla, Philippines
{lat: 17.385044, lng: 78.486671}, //Hyderabad, India
{lat: 17.385044, lng: 78.486671}, //Hyderabad, India
{lat: 17.385044, lng: 78.486671}, //Hyderabad, India
{lat: 17.385044, lng: 78.486671}, //Hyderabad, India
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 44.080543, lng: -103.231015}, //Rapid City, SD
{lat: 39.023617, lng: -94.69357}, //Merriam, KS
{lat: 39.023617, lng: -94.69357}, //Merriam, KS
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 36.372854, lng: -94.208817}, //Bentonville, AR
{lat: 33.150674, lng: -96.823612}, //Frisco, TX
{lat: 33.150674, lng: -96.823612}, //Frisco, TX
{lat: 33.150674, lng: -96.823612}, //Frisco, TX
{lat: 33.150674, lng: -96.823612}, //Frisco, TX
{lat: 33.150674, lng: -96.823612}, //Frisco, TX
{lat: 33.150674, lng: -96.823612}, //Frisco, TX
{lat: 33.150674, lng: -96.823612}, //Frisco, TX
{lat: 33.150674, lng: -96.823612}, //Frisco, TX
{lat: 44.953703, lng: -93.089958}, //St. Paul, MN
{lat: 44.953703, lng: -93.089958}, //St. Paul, MN
{lat: 44.953703, lng: -93.089958}, //St. Paul, MN
{lat: 41.878114, lng: -87.629798}, //Chicago, IL
{lat: 41.878114, lng: -87.629798}, //Chicago, IL
{lat: 41.878114, lng: -87.629798}, //Chicago, IL
{lat: 41.878114, lng: -87.629798}, //Chicago, IL
{lat: 41.878114, lng: -87.629798}, //Chicago, IL
{lat: 41.878114, lng: -87.629798}, //Chicago, IL
{lat: 41.878114, lng: -87.629798}, //Chicago, IL
{lat: 39.689504, lng: -84.168827}, //Kettering, OH
{lat: 39.689504, lng: -84.168827}, //Kettering, OH
{lat: 39.689504, lng: -84.168827}, //Kettering, OH
{lat: 39.689504, lng: -84.168827}, //Kettering, OH
{lat: 34.075376, lng: -84.29409}, //Alpharetta, GA
{lat: 40.798947, lng: -81.378447}, //Canton, OH
{lat: 40.798947, lng: -81.378447}, //Canton, OH
{lat: 40.798947, lng: -81.378447}, //Canton, OH
{lat: 40.798947, lng: -81.378447}, //Canton, OH
{lat: 40.798947, lng: -81.378447}, //Canton, OH
{lat: 40.798947, lng: -81.378447}, //Canton, OH
{lat: 35.227087, lng: -80.843127}, //Charloette, NC
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 28.538335, lng: -81.379236}, //Orlando, FL
{lat: 40.593964, lng: -74.604906}, //Bridgewater, NJ
{lat: 40.593964, lng: -74.604906}, //Bridgewater, NJ
{lat: 40.593964, lng: -74.604906}, //Bridgewater, NJ
{lat: 40.593964, lng: -74.604906}, //Bridgewater, NJ
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 41.053430, lng: -73.538734}, //Stamford, CT
{lat: 42.345927, lng: -71.552287} //Marlborough, MA
{lat: 41.053430, lng: -73.538734} //Stamford, CT
]
</script>
<script src="https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/markerclusterer.js">
Expand Down
Binary file added bin/features/RequestHandler.class
View file
Binary file not shown.
Binary file added db/ER Diagram.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added db/Schema.mwb
View file
Binary file not shown.
Binary file removed db/Workbench Schema.mwb
View file
Binary file not shown.
Binary file removed db/Workbench Schema.mwb.bak
View file
Binary file not shown.
Binary file removed db/er.png
View file
Binary file not shown.
Binary file removed db/seniordesign.mwb
View file
Binary file not shown.
Loading

0 comments on commit ded9041

Please sign in to comment.