- fix collisions between js script from main page and the application,
- fix problem with special characters for etrack,
This commit is contained in:
		| @@ -11,58 +11,82 @@ | ||||
| </head> | ||||
|  | ||||
| <body> | ||||
| <hr> | ||||
| <section class="page-section" id="main-section"> | ||||
|     <div class="row"> | ||||
|         <div class="column"> | ||||
|             <br>To see your activity history use the form below | ||||
|             <form action="#" th:action="@{/etrack/__${clientUUID}__}" th:object="${eventRequestDto}" method="post"> | ||||
|                 <input type="text" th:name="clientUUID" th:value="${clientUUID}" hidden /> | ||||
|                 <br><label>Mocked response id:</label><br> | ||||
|                 <input type="text" th:name="mockedResponseId" th:id="mockedResponseId" th:placeholder="all" /> | ||||
|                 <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">mockedResponseId | ||||
|                     error | ||||
|                 </td> | ||||
|                 <br><label>Date from:</label><br> | ||||
|                 <input type="datetime-local" th:field="*{localDateTimeFrom}"/> | ||||
|                 <td th:if="${#fields.hasErrors('localDateTimeFrom')}" th:errors="*{localDateTimeFrom}">localDateTimeFrom | ||||
|                     Error | ||||
|                 </td> | ||||
|                 <br><label>Date to:</label><br> | ||||
|                 <input type="datetime-local" th:field="*{localDateTimeTo}"/> | ||||
|                 <td th:if="${#fields.hasErrors('localDateTimeTo')}" th:errors="*{localDateTimeTo}">localDateTimeTo | ||||
|                     Error | ||||
|                 </td> | ||||
|                 <div th:if="${#fields.hasAnyErrors()}"> | ||||
|                     <p th:each="err : ${#fields.allErrors()}" th:text="${err}">...</p> | ||||
| <div id="container"> | ||||
|     <div id="header"></div> | ||||
|     <div id="container1"> | ||||
|         <div id="sidebar"></div> | ||||
|         <div id="child-body"> | ||||
|             <section class="page-section" id="main-section"> | ||||
|                 <div class="row"> | ||||
|                     <div class="column"> | ||||
|                         <br>To see your activity history use the form below | ||||
|                         <form action="#" th:action="@{/etrack/__${clientUUID}__}" th:object="${eventRequestDto}" method="post"> | ||||
|                             <input type="text" th:name="clientUUID" th:value="${clientUUID}" hidden /> | ||||
|                             <br><label>Mocked response id:</label><br> | ||||
|                             <input type="text" th:name="mockedResponseId" th:id="mockedResponseId" th:placeholder="all" /> | ||||
|                             <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">mockedResponseId | ||||
|                                 error | ||||
|                             </td> | ||||
|                             <br><label>Date from:</label><br> | ||||
|                             <input type="datetime-local" th:field="*{localDateTimeFrom}"/> | ||||
|                             <td th:if="${#fields.hasErrors('localDateTimeFrom')}" th:errors="*{localDateTimeFrom}">localDateTimeFrom | ||||
|                                 Error | ||||
|                             </td> | ||||
|                             <br><label>Date to:</label><br> | ||||
|                             <input type="datetime-local" th:field="*{localDateTimeTo}"/> | ||||
|                             <td th:if="${#fields.hasErrors('localDateTimeTo')}" th:errors="*{localDateTimeTo}">localDateTimeTo | ||||
|                                 Error | ||||
|                             </td> | ||||
|                             <div th:if="${#fields.hasAnyErrors()}"> | ||||
|                                 <p th:each="err : ${#fields.allErrors()}" th:text="${err}">...</p> | ||||
|                             </div> | ||||
|                             <input type="submit" value="See my history"/> | ||||
|                         </form> | ||||
|                     </div> | ||||
|                     <div class="column"> | ||||
|                         <br> | ||||
|                         <table> | ||||
|                             <thead> | ||||
|                             <tr> | ||||
|                                 <th class="tr-pageable"><p class="btn-sort" id="btn-sort-0">#</p></th> | ||||
|                                 <th class="tr-pageable"><p class="btn-sort activeButton" id="btn-sort-1">MessageId</p></th> | ||||
|                                 <th class="tr-pageable"><p class="btn-sort" id="btn-sort-2">TimeStamp</p></th> | ||||
|                                 <th class="tr-pageable"><p class="btn-sort" id="btn-sort-3">Action</p></th> | ||||
|                             </tr> | ||||
|                             </thead> | ||||
|                             <tbody id="table-body"> | ||||
|                             </tbody> | ||||
|                         </table> | ||||
|                         <div class="container "> | ||||
|                             <div id="pagination-wrapper"></div> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <input type="submit" value="See my history"/> | ||||
|             </form> | ||||
|         </div> | ||||
|         <div class="column"> | ||||
|             <br> | ||||
|                 <table> | ||||
|                     <thead> | ||||
|                     <tr> | ||||
|                         <th class="tr-pageable"><p class="btn-sort" id="btn-sort-0">#</p></th> | ||||
|                         <th class="tr-pageable"><p class="btn-sort active" id="btn-sort-1">MessageId</p></th> | ||||
|                         <th class="tr-pageable"><p class="btn-sort" id="btn-sort-2">TimeStamp</p></th> | ||||
|                         <th class="tr-pageable"><p class="btn-sort" id="btn-sort-3">Action</p></th> | ||||
|                     </tr> | ||||
|                     </thead> | ||||
|                     <tbody id="table-body"> | ||||
|                     </tbody> | ||||
|                 </table> | ||||
|             <div class="container "> | ||||
|                 <div id="pagination-wrapper"></div> | ||||
|             </div> | ||||
|             </section> | ||||
|         </div> | ||||
|     </div> | ||||
| </section> | ||||
| </div> | ||||
| <div id="foot"></div> | ||||
| </div> | ||||
|  | ||||
|  | ||||
|  | ||||
| <hr> | ||||
| <script> | ||||
| $.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/navbar.html", function(data){ | ||||
|     $("#header").html(data); | ||||
| }); | ||||
| $.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/sidebar.html", function(data){ | ||||
|     $("#sidebar").html(data); | ||||
| }); | ||||
| $.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/footer.html", function(data){ | ||||
|     $("#foot").html(data); | ||||
| }); | ||||
| </script> | ||||
| <script type="text/javascript" th:inline="javascript"> | ||||
| var listForPagination = /*[[${eventList}]]*/; | ||||
| </script> | ||||
| <script src="/js/etrackPaggination.js"></script> | ||||
|  | ||||
| </body> | ||||
| </html> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Szakalakamaka
					Szakalakamaka