From fb62bfc2a5bc7a4c749d772d129bb7393954b988 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Wed, 12 Apr 2017 23:31:56 -0400 Subject: [PATCH] Formatting of Statistics Page --- WebContent/html/javascript/statistics.jsp | 12 +- WebContent/html/webpages/index.jsp | 2 +- WebContent/html/webpages/map.jsp | 89 -------------- WebContent/html/webpages/statisticsPage.jsp | 126 +++++++++++++++----- 4 files changed, 105 insertions(+), 124 deletions(-) delete mode 100644 WebContent/html/webpages/map.jsp diff --git a/WebContent/html/javascript/statistics.jsp b/WebContent/html/javascript/statistics.jsp index efa5edd..ff97eab 100644 --- a/WebContent/html/javascript/statistics.jsp +++ b/WebContent/html/javascript/statistics.jsp @@ -59,9 +59,9 @@ function displayData() { // Set chart options var options = {'title':'Chart of Devices', - 'width':700, - 'height':700, - 'backgroundColor':'#94969A'}; + 'width':600, + 'height':400, + 'backgroundColor':'#E9EAEB'}; // Instantiate and draw our chart, passing in some options. var chart = new google.visualization.PieChart(document.getElementById('piechart')); @@ -86,11 +86,11 @@ function displayData() { ]); var options = {'title':'Devices in terms of Status', - 'width':700, - 'height':700, + 'width':600, + 'height':400, 'bar': {groupWidth: "75%"}, 'legend': { position: "none" }, - 'backgroundColor':'#94969A'}; + 'backgroundColor':'#E9EAEB'}; // Instantiate and draw our chart, passing in some options. var chart = new google.visualization.ColumnChart(document.getElementById('colchart')); diff --git a/WebContent/html/webpages/index.jsp b/WebContent/html/webpages/index.jsp index 8b1e8c1..b1672aa 100644 --- a/WebContent/html/webpages/index.jsp +++ b/WebContent/html/webpages/index.jsp @@ -67,7 +67,7 @@

Just curious to see what devices we have to offer? You've come to the right place.

- +

Map

Wanna see the distribution of devices throughout the world? Check it out! HERE!

diff --git a/WebContent/html/webpages/map.jsp b/WebContent/html/webpages/map.jsp deleted file mode 100644 index ac0a458..0000000 --- a/WebContent/html/webpages/map.jsp +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - - - -

Our Wonderful Synchrony Financial Map!

- -
- - - - - - \ No newline at end of file diff --git a/WebContent/html/webpages/statisticsPage.jsp b/WebContent/html/webpages/statisticsPage.jsp index 2d3320a..8444c67 100644 --- a/WebContent/html/webpages/statisticsPage.jsp +++ b/WebContent/html/webpages/statisticsPage.jsp @@ -1,26 +1,45 @@ - - - - - - - - - Synchrony Financial - - - - - - - - - - -
-

-
-
+ + + + + + + + +

Distribution of Devices Nationwide

+ +
+ + + +

Device Availability Statistics

+
+
+
+
+
+
<%@ include file="../javascript/statistics.jsp" %> - + \ No newline at end of file