Fix problem

Author: VasylyshynDmytro

core/src/main/resources/messages.properties

@@ -129,6 +129,7 @@ greenCity.pages.table.address=Address
 greenCity.pages.table.place.name=Place Name
 greenCity.pages.table.category=Category
 greenCity.pages.table.opening.hours=Opening Hours
+greenCity.pages.table.day=Day
 greenCity.pages.table.monday=MONDAY
 greenCity.pages.table.tuesday=TUESDAY
 greenCity.pages.table.wednesday=WEDNESDAY
@@ -146,8 +147,9 @@ greenCity.pages.table.file=File
 greenCity.pages.table.week.day=Week Day
 greenCity.pages.table.open.time=Open Time
 greenCity.pages.table.close.time=Close Time
-greenCity.pages.table.break.start=Break(Start)
-greenCity.pages.table.break.end=Break(End)
+greenCity.pages.table.break.time=Break Time
+greenCity.pages.table.break.lat=Lat
+greenCity.pages.table.break.lng=Lng
 greenCity.pages.table.break.start.p=start break
 greenCity.pages.table.break.end.p=end break
 greenCity.pages.table.delete.break.title=Delete break hours

core/src/main/resources/messages_ua.properties

@@ -129,11 +129,13 @@ greenCity.pages.table.photo=\u0424\u043E\u0442\u043E
 greenCity.pages.table.type=\u0422\u0438\u043F
 greenCity.pages.table.host.path=\u0428\u043B\u044F\u0445\u0020\u0434\u043E\u0020\u0445\u043E\u0441\u0442\u0443
 greenCity.pages.table.file=\u0424\u0430\u0439\u043B
+greenCity.pages.table.day=\u0414\u0435\u043d\u044c
 greenCity.pages.table.week.day=\u0414\u0435\u043D\u044C\u0020\u0422\u0438\u0436\u043D\u044F
 greenCity.pages.table.open.time=\u0427\u0430\u0441\u0020\u0432\u0456\u0434\u043A\u0440\u0438\u0442\u0442\u044F
 greenCity.pages.table.close.time=\u0427\u0430\u0441\u0020\u0417\u0430\u043A\u0440\u0438\u0442\u0442\u044F
-greenCity.pages.table.break.start=\u041F\u0435\u0440\u0435\u0440\u0432\u0430\u000a(\u043F\u043E\u0447\u0430\u0442\u043E\u043A)
-greenCity.pages.table.break.end=\u041F\u0435\u0440\u0435\u0440\u0432\u0430\u0020(\u043A\u0456\u043D\u0435\u0446\u044C)
+greenCity.pages.table.break.time=\u0427\u0430\u0441\u0020\u043f\u0435\u0440\u0435\u0440\u0432\u0438
+greenCity.pages.table.break.lat=\u0428\u0438\u0440\u043e\u0442\u0430
+greenCity.pages.table.break.lng=\u0414\u043e\u0432\u0433\u043e\u0442\u0430
 greenCity.pages.table.add.break.hours=\u0414\u043E\u0434\u0430\u0442\u0438\u0020\u0447\u0430\u0441\u0020\u043F\u0435\u0440\u0435\u0440\u0432\u0438
 greenCity.pages.table.delete.break.title=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438\u0020\u0433\u043E\u0434\u0438\u043D\u0438\u0020\u043F\u0435\u0440\u0435\u0440\u0432\u0438
 greenCity.pages.table.delete.add.discount=\u0414\u043E\u0434\u0430\u0442\u0438\u0020\u0417\u043D\u0438\u0436\u043A\u0443

core/src/main/resources/templates/core/management_places.html

@@ -166,7 +166,7 @@ <h2 class="text-describe">[[#{greenCity.places.page.h}]]</h2>
                                 </div>
                             </div>
                         </th>
-                        <th colspan="3">
+                        <th colspan="4">
                             <span class="header-text">[[#{greenCity.pages.table.opening.hours}]]</span>
                         </th>
                         <th rowspan="2">
@@ -210,10 +210,10 @@ <h2 class="text-describe">[[#{greenCity.places.page.h}]]</h2>
                             </div>
                         </th>
                         <th rowspan="2">
-                            <span class="header-text">Lat</span>
+                            <span class="header-text">[[#{greenCity.pages.table.break.lat}]]</span>
                         </th>
                         <th rowspan="2">
-                            <span class="header-text">Lng</span>
+                            <span class="header-text">[[#{greenCity.pages.table.break.lng}]]</span>
                         </th>
                         <th rowspan="2">
                             <span>[[#{greenCity.pages.table.image}]]</span>
@@ -222,10 +222,11 @@ <h2 class="text-describe">[[#{greenCity.places.page.h}]]</h2>
                             <span>[[#{greenCity.pages.table.actions}]]</span>
                         </th>
                     </tr>
-                    <tr>
-                        <th>Day</th>
-                        <th>Open Time</th>
-                        <th>Close Time</th>
+                    <tr rowspan="4">
+                        <th>[[#{greenCity.pages.table.day}]]</th>
+                        <th>[[#{greenCity.pages.table.open.time}]]</th>
+                        <th>[[#{greenCity.pages.table.close.time}]]</th>
+                        <th>[[#{greenCity.pages.table.break.time}]]</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -242,7 +243,7 @@ <h2 class="text-describe">[[#{greenCity.places.page.h}]]</h2>
                             <td th:text="${place.getId()}"></td>
                             <td th:text="${place.getName()}"></td>
                             <td th:text="${place.getStatus()}"></td>
-                            <td colspan="3">
+                            <td colspan="4">
                                 <div th:if="${!place.getOpeningHoursList().isEmpty()}">
                                     <table class="table table-borderless m-0 table-child">
                                         <tbody>
@@ -251,6 +252,9 @@ <h2 class="text-describe">[[#{greenCity.places.page.h}]]</h2>
                                                 <td th:text="${openingHours.weekDay}"></td>
                                                 <td th:text="${openingHours.openTime}"></td>
                                                 <td th:text="${openingHours.closeTime}"></td>
+                                                <td th:if="${openingHours.breakTime != null}"
+                                                    th:text="${openingHours.breakTime.startTime} + ' - ' + ${openingHours.breakTime.endTime}"></td>
+                                                <td th:if="${openingHours.breakTime == null}">---</td>
                                             </tr>
                                         </th:block>
                                         </tbody>