/collection/info: extract inlined JS code into separate file.

Addressed to #221

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/Url.java

@@ -79,6 +79,7 @@ public final class Url {
 	public static final String MAIN_CSS               = "/static/styles/main.css";
 	public static final String CATALOG_UTILS_JS       = "/public/js/CatalogUtils.js";
 	public static final String SERIES_ADD_JS          = "/public/js/series/add.js";
+	public static final String COLLECTION_INFO_JS     = "/public/js/collection/info.js";
 
 	public static final String BOOTSTRAP_CSS          = "/public/bootstrap/css/bootstrap.min.css";
 	public static final String BOOTSTRAP_JS           = "/public/bootstrap/js/bootstrap.min.js";
@@ -141,13 +142,15 @@ public static Map<String, String> asMap(boolean serveContentFromSingleHost) {
 			map.put("MAIN_CSS", MAIN_CSS);
 			map.put("CATALOG_UTILS_JS", CATALOG_UTILS_JS);
 			map.put("SERIES_ADD_JS", SERIES_ADD_JS);
+			map.put("COLLECTION_INFO_JS", COLLECTION_INFO_JS);
 		} else {
 			// Use separate domain for our own resources
 			map.put("GET_IMAGE_PAGE", STATIC_RESOURCES_URL + GET_IMAGE_PAGE);
 			map.put("FAVICON_ICO", STATIC_RESOURCES_URL + FAVICON_ICO);
 			map.put("MAIN_CSS", STATIC_RESOURCES_URL + MAIN_CSS);
 			map.put("CATALOG_UTILS_JS", STATIC_RESOURCES_URL + CATALOG_UTILS_JS);
 			map.put("SERIES_ADD_JS", STATIC_RESOURCES_URL + SERIES_ADD_JS);
+			map.put("COLLECTION_INFO_JS", STATIC_RESOURCES_URL + COLLECTION_INFO_JS);
 
 			// Use CDN for external resources like frameworks
 			map.put("BOOTSTRAP_CSS", BOOTSTRAP_CSS_CDN);

src/main/javascript/collection/info.js

@@ -0,0 +1,31 @@
+function initPage(statByCategories, statByCountries) {
+	google.charts.load('44', {'packages':['corechart']});
+	google.charts.setOnLoadCallback(function() {
+		drawChart('categories-chart', createCategoriesDataTable(statByCategories));
+		drawChart('countries-chart', createCountriesDataTable(statByCountries));
+	});
+}
+
+function drawChart(containerId, table) {
+	var options = {
+		pieHole: 0.3
+	};
+	var chart = new google.visualization.PieChart(document.getElementById(containerId));
+	chart.draw(table, options);
+};
+
+function createCategoriesDataTable(stat) {
+	var table = new google.visualization.DataTable();
+	table.addColumn('string', 'Category');
+	table.addColumn('number', 'Quantity of stamps');
+	table.addRows(stat);
+	return table;
+};
+
+function createCountriesDataTable(stat) {
+	var table = new google.visualization.DataTable();
+	table.addColumn('string', 'Country');
+	table.addColumn('number', 'Quantity of stamps');
+	table.addRows(stat);
+	return table;
+};

src/main/webapp/WEB-INF/views/collection/info.html

@@ -208,48 +208,23 @@ <h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories
 		/*/-->
 			<!-- Charts -->
 			<script src="https://www.gstatic.com/charts/loader.js"></script>
+			<script src="../../../../javascript/collection/info.js" th:src="${COLLECTION_INFO_JS}"></script>
 			<script th:inline="javascript">
 				/*<![CDATA[*/
-				
-				var drawChart = function(containerId, table) {
-					var options = {
-						pieHole: 0.3
-					};
-					var chart = new google.visualization.PieChart(document.getElementById(containerId));
-					chart.draw(table, options);
-				};
-				
-				var createCategoriesDataTable = function() {
-					var table = new google.visualization.DataTable();
-					table.addColumn('string', 'Category');
-					table.addColumn('number', 'Quantity of stamps');
-					
+				$(function() {
 					/*[+
-					table.addRows([[${statOfCollectionByCategories}]]);
+					initPage(
+						[[${statOfCollectionByCategories}]],
+						[[${statOfCollectionByCountries}]]
+					);
 					+]*/
 
 					/*[- */
-					table.addRows([
+					initPage([
 						['Animals', 94],
 						['Prehistoric animals', 37],
 						['Sport', 1]
-					]);
-					/* -]*/
-					
-					return table;
-				};
-				
-				var createCountriesDataTable = function() {
-					var table = new google.visualization.DataTable();
-					table.addColumn('string', 'Country');
-					table.addColumn('number', 'Quantity of stamps');
-					
-					/*[+
-					table.addRows([[${statOfCollectionByCountries}]]);
-					+]*/
-					
-					/*[- */
-					table.addRows([
+					], [
 						['Russia', 5],
 						['USA', 2],
 						['Australia', 11],
@@ -261,14 +236,6 @@ <h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories
 						['Korea', 2]
 					]);
 					/* -]*/
-					
-					return table;
-				};
-				
-				google.charts.load('44', {'packages':['corechart']});
-				google.charts.setOnLoadCallback(function() {
-					drawChart('categories-chart', createCategoriesDataTable());
-					drawChart('countries-chart', createCountriesDataTable());
 				});
 
 				/*]]>*/