improve: on the collection page show a hint when a series has multiple images

Fix #1420

Author: php-coder

src/main/java/ru/mystamps/web/feature/collection/RowMappers.java

@@ -50,6 +50,7 @@ private RowMappers() {
 		Boolean perforated   = rs.getBoolean("perforated");
 		Integer previewId    = JdbcUtils.getInteger(rs, "preview_id");
 		Integer numberOfStamps = rs.getInt("number_of_stamps");
+		Integer numberOfImages = rs.getInt("number_of_images");
 
 		return new SeriesInCollectionDto(
 			seriesId,
@@ -59,7 +60,8 @@ private RowMappers() {
 			perforated,
 			quantity,
 			previewId,
-			numberOfStamps
+			numberOfStamps,
+			numberOfImages
 		);
 	}
 

src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionDto.java

@@ -33,4 +33,5 @@ public class SeriesInCollectionDto {
 	// quantity holds number of stamps in a series, while user may
 	// have less stamps in his collection
 	private final Integer numberOfStamps;
+	private final Integer numberOfImages;
 }

src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java

@@ -32,7 +32,7 @@ public final class ResourceUrl {
 	public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
 
 	// MUST be updated when any of our resources were modified
-	public static final String RESOURCES_VERSION = "v0.4.4.1";
+	public static final String RESOURCES_VERSION = "v0.4.4.2";
 
 	// CheckStyle: ignore LineLength for next 16 lines
 	private static final String CATALOG_UTILS_JS      = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";

src/main/resources/ru/mystamps/i18n/Messages.properties

@@ -198,6 +198,7 @@ t_stamps_by_countries = Stamps by countries
 t_unspecified = Unspecified
 t_cost = The cost
 t_how_much = how much?
+t_images_counter = {0} images
 
 # collection/estimation.html
 t_series = Series

src/main/resources/ru/mystamps/i18n/Messages_ru.properties

@@ -197,6 +197,7 @@ t_stamps_by_countries = Марки по странам
 t_unspecified = Не указана
 t_cost = Стоимость
 t_how_much = сколько?
+t_images_counter = изображений: {0}
 
 # collection/estimation.html
 t_series = Серия

src/main/resources/sql/collection_dao_queries.properties

@@ -18,6 +18,12 @@ collection.find_series_by_collection_id = \
         , s.quantity \
         , s.perforated \
         , cs.number_of_stamps \
+        , ( \
+           SELECT COUNT(*) \
+             FROM series_images si \
+            WHERE si.series_id = s.id \
+              AND si.hidden = FALSE\
+        ) AS number_of_images \
         , ( \
              SELECT si.image_id \
                FROM series_images si \

src/main/webapp/WEB-INF/static/styles/main.css

@@ -119,8 +119,14 @@ label {
 .image-gallery figure {
 	/* margin: <top> <right> <bottom> <left> */
 	margin: 15px 0 15px 15px;
+	position: relative;
 }
 .image-gallery figcaption {
 	margin-top: 5px;
 	text-align: center;
 }
+.image-gallery .image-counter {
+	position: absolute;
+	top: 10px;
+	left: 10px;
+}

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

@@ -143,6 +143,9 @@ <h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories
 											 th:alt="${desc}"
 											 th:title="${desc}"
 											 th:src="@{${GET_IMAGE_PREVIEW_PAGE}(id=${series.previewId})}" />
+										<span class="label label-default image-counter"
+											th:if="${series.numberOfImages &gt; 1}"
+											th:text="#{t_images_counter(${series.numberOfImages})}">5 images</span>
 									</a>
 									<figcaption>
 										<a href="../series/info.html" th:href="@{${INFO_SERIES_PAGE}(id=${series.id})}" th:text="${desc}">
@@ -173,6 +176,7 @@ <h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories
 								<figure>
 									<a href="../series/info.html">
 										<img src="http://via.placeholder.com/250" alt="Prehistoric animals, Italy, 22&nbsp;stamps" title="Prehistoric animals, Italy, 22&nbsp;stamps" />
+										<span class="label label-default image-counter">2 images</span>
 									</a>
 									<figcaption>
 										<a href="../series/info.html">Prehistoric animals, Italy, 22&nbsp;stamps</a>