Merge branch 'eskim' into develop

src/main/webapp/WEB-INF/views/mob/goods/GoodsSizeInfoFormMob.html

@@ -51,7 +51,7 @@
 											</thead>
 											<tbody>
 												<th:block th:each="measurement, status : ${measurementList}" th:if="${status.first}">
-												<th:block th:if="${typeCd == '상의'}">
+												<th:block th:if="${measurement.typecd == '상의'}">
 												<tr>
 													<td scope="col">가슴둘레</td>
 												</tr>
@@ -65,8 +65,7 @@
 													<td scope="col">총길이</td>
 												</tr>
 												</th:block>
-												<th:block th:unless="${typeCd == '상의'}">
-												</th:block>
+												<th:block th:unless="${measurement.typecd == '상의'}">
 												<tr>
 													<td scope="col">허리둘레</td>
 												</tr>
@@ -119,7 +118,8 @@
 												</tr>
 											</thead>
 											<tbody>
-												<tr th:each="measurement, status : ${measurementList}" th:if="${not status.first}">
+												<th:block th:each="measurement, status : ${measurementList}" th:with="count=${(measurement.typecd =='상의')? 4: 5}">
+												<tr th:if="${not status.first and status.index <= count}">
 													<td th:if="${measurement.size1}" th:text="${measurement.size1}">95</td>
 													<td th:if="${measurement.size2}" th:text="${measurement.size2}">95</td>
 													<td th:if="${measurement.size3}" th:text="${measurement.size3}">95</td>
@@ -133,6 +133,7 @@
 													<td th:if="${measurement.size11}" th:text="${measurement.size11}">95</td>
 													<td th:if="${measurement.size12}" th:text="${measurement.size12}">95</td>
 												</tr>
+												</th:block>
 											</tbody>
 										</table>
 									</div>

src/main/webapp/WEB-INF/views/web/goods/GoodsSizeInfoFormWeb.html

@@ -51,7 +51,7 @@
 											</thead>
 											<tbody>
 												<th:block th:each="measurement, status : ${measurementList}" th:if="${status.first}">
-												<th:block th:if="${typeCd == '상의'}">
+												<th:block th:if="${measurement.typecd == '상의'}">
 												<tr>
 													<td scope="col">가슴둘레</td>
 												</tr>
@@ -65,8 +65,7 @@
 													<td scope="col">총길이</td>
 												</tr>
 												</th:block>
-												<th:block th:unless="${typeCd == '상의'}">
-												</th:block>
+												<th:block th:unless="${measurement.typecd == '상의'}">
 												<tr>
 													<td scope="col">허리둘레</td>
 												</tr>
@@ -83,6 +82,7 @@
 													<td scope="col">총길이</td>
 												</tr>
 												</th:block>
+												</th:block>
 											</tbody>
 										</table>
 									</div>
@@ -103,7 +103,7 @@
 												<col th:if="${measurement.size12}" th:attr="width=${typeWith+'%'}">
 											</colgroup>
 											<thead>
-												<tr th:each="measurement, status : ${measurementList}" th:if="${status.first}" th:with="sizeCount=${measurement.sizeCount}">
+												<tr th:each="measurement, status : ${measurementList}" th:if="${status.first}" >
 													<th scope="col" th:if="${measurement.size1}" th:text="${measurement.size1}">M</th>
 													<th scope="col" th:if="${measurement.size2}" th:text="${measurement.size2}">M</th>
 													<th scope="col" th:if="${measurement.size3}" th:text="${measurement.size3}">M</th>
@@ -119,7 +119,8 @@
 												</tr>
 											</thead>
 											<tbody>
-												<tr th:each="measurement, status : ${measurementList}" th:if="${not status.first}">
+												<th:block th:each="measurement, status : ${measurementList}" th:with="count=${(measurement.typecd =='상의')? 4: 5}">
+												<tr th:if="${not status.first and status.index <= count}">
 													<td th:if="${measurement.size1}" th:text="${measurement.size1}">95</td>
 													<td th:if="${measurement.size2}" th:text="${measurement.size2}">95</td>
 													<td th:if="${measurement.size3}" th:text="${measurement.size3}">95</td>
@@ -133,6 +134,7 @@
 													<td th:if="${measurement.size11}" th:text="${measurement.size11}">95</td>
 													<td th:if="${measurement.size12}" th:text="${measurement.size12}">95</td>
 												</tr>
+												</th:block>
 											</tbody>
 										</table>
 									</div>