T139 History table draft created
This commit is contained in:
		| @@ -28,18 +28,13 @@ import java.util.UUID; | |||||||
|  */ |  */ | ||||||
| @Slf4j | @Slf4j | ||||||
| @RestController | @RestController | ||||||
| @RequestMapping(path = "/event") | @RequestMapping(path = "/api/event") | ||||||
| @AllArgsConstructor | @AllArgsConstructor | ||||||
| public class EventController { | public class EventController { | ||||||
|     private final EtrackService service; |     private final EtrackService service; | ||||||
|  |  | ||||||
|     @GetMapping |     @GetMapping | ||||||
|     public ResponseEntity getHistory(@RequestBody(required = false) EventRequestDto event){ |     public ResponseEntity getHistory(@RequestBody EventRequestDto event){ | ||||||
|         event = EventRequestDto.builder() |  | ||||||
|                 .localDateTimeFrom(LocalDateTime.of(2021, 3, 3, 10, 1)) |  | ||||||
|                 .localDateTimeTo(LocalDateTime.of(2021, 3, 30, 19, 40)) |  | ||||||
|                 .clientUUID(UUID.fromString("68f98c04-403c-4344-bed2-1db779a15ead")) |  | ||||||
|                 .build(); |  | ||||||
|         return new ResponseEntity(service.getEventsByDateTimeAndBusinessKeys(event), HttpStatus.OK); |         return new ResponseEntity(service.getEventsByDateTimeAndBusinessKeys(event), HttpStatus.OK); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										17
									
								
								src/main/resources/static/css/table.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								src/main/resources/static/css/table.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | |||||||
|  | .simpleTable { | ||||||
|  |     width: 100%; | ||||||
|  |     text-align: left; | ||||||
|  |     border: none; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .simpleTable tr.thead{ | ||||||
|  |     border-bottom: 1px solid gray; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .simpleTable td { | ||||||
|  |     font-size: 14px; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .simpleTable th { | ||||||
|  |     font-size: 24px; | ||||||
|  | } | ||||||
| @@ -8,6 +8,7 @@ | |||||||
|     <link rel="stylesheet" href="http://gordon.zipper.release11.com:8085/common.css" type="text/css"> |     <link rel="stylesheet" href="http://gordon.zipper.release11.com:8085/common.css" type="text/css"> | ||||||
|     <link rel="stylesheet" href="/Dependency/fontello-plus/css/fontello.css" type="text/css"/> |     <link rel="stylesheet" href="/Dependency/fontello-plus/css/fontello.css" type="text/css"/> | ||||||
|     <link rel="stylesheet" href="/css/modal.css" type="text/css"> |     <link rel="stylesheet" href="/css/modal.css" type="text/css"> | ||||||
|  |     <link rel="stylesheet" href="/css/table.css" type="text/css"> | ||||||
|     <link rel="preconnect" href="https://fonts.gstatic.com"> |     <link rel="preconnect" href="https://fonts.gstatic.com"> | ||||||
|     <link href="https://fonts.googleapis.com/css2?family=Acme&family=Josefin+Slab:wght@500&display=swap" rel="stylesheet"> |     <link href="https://fonts.googleapis.com/css2?family=Acme&family=Josefin+Slab:wght@500&display=swap" rel="stylesheet"> | ||||||
|     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> |     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> | ||||||
| @@ -103,14 +104,31 @@ | |||||||
|                                 <button>Search</button> |                                 <button>Search</button> | ||||||
|                             </div> |                             </div> | ||||||
|                             <div> |                             <div> | ||||||
|                                 <table id="historyTable"> |                                 <table id="historyTable" class="simpleTable"> | ||||||
|                                     <thead> |                                     <thead> | ||||||
|                                         <tr> |                                         <tr class="head"> | ||||||
|                                             <td>Timestamp</td> |                                             <th>Timestamp</th> | ||||||
|                                             <td>Status</td> |                                             <th>Status</th> | ||||||
|                                         </tr> |                                         </tr> | ||||||
|                                     </thead> |                                     </thead> | ||||||
|                                     <tbody></tbody> |                                     <tbody> | ||||||
|  |                                         <tr> | ||||||
|  |                                             <td>2020-02-02 10:56:23</td> | ||||||
|  |                                             <td>Request received</td> | ||||||
|  |                                         </tr> | ||||||
|  |                                         <tr> | ||||||
|  |                                             <td>2020-02-02 10:56:23</td> | ||||||
|  |                                             <td>Request received</td> | ||||||
|  |                                         </tr> | ||||||
|  |                                         <tr> | ||||||
|  |                                             <td>2020-02-02 10:56:23</td> | ||||||
|  |                                             <td>Request received</td> | ||||||
|  |                                         </tr> | ||||||
|  |                                         <tr> | ||||||
|  |                                             <td>2020-02-02 10:56:23</td> | ||||||
|  |                                             <td>Request received</td> | ||||||
|  |                                         </tr> | ||||||
|  |                                     </tbody> | ||||||
|                                 </table> |                                 </table> | ||||||
|                             </div> |                             </div> | ||||||
|                         </div> |                         </div> | ||||||
|   | |||||||
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										17
									
								
								target/classes/static/css/table.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								target/classes/static/css/table.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | |||||||
|  | .simpleTable { | ||||||
|  |     width: 100%; | ||||||
|  |     text-align: left; | ||||||
|  |     border: none; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .simpleTable tr.thead{ | ||||||
|  |     border-bottom: 1px solid gray; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .simpleTable td { | ||||||
|  |     font-size: 14px; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .simpleTable th { | ||||||
|  |     font-size: 24px; | ||||||
|  | } | ||||||
| @@ -8,6 +8,7 @@ | |||||||
|     <link rel="stylesheet" href="http://gordon.zipper.release11.com:8085/common.css" type="text/css"> |     <link rel="stylesheet" href="http://gordon.zipper.release11.com:8085/common.css" type="text/css"> | ||||||
|     <link rel="stylesheet" href="/Dependency/fontello-plus/css/fontello.css" type="text/css"/> |     <link rel="stylesheet" href="/Dependency/fontello-plus/css/fontello.css" type="text/css"/> | ||||||
|     <link rel="stylesheet" href="/css/modal.css" type="text/css"> |     <link rel="stylesheet" href="/css/modal.css" type="text/css"> | ||||||
|  |     <link rel="stylesheet" href="/css/table.css" type="text/css"> | ||||||
|     <link rel="preconnect" href="https://fonts.gstatic.com"> |     <link rel="preconnect" href="https://fonts.gstatic.com"> | ||||||
|     <link href="https://fonts.googleapis.com/css2?family=Acme&family=Josefin+Slab:wght@500&display=swap" rel="stylesheet"> |     <link href="https://fonts.googleapis.com/css2?family=Acme&family=Josefin+Slab:wght@500&display=swap" rel="stylesheet"> | ||||||
|     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> |     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> | ||||||
| @@ -103,14 +104,31 @@ | |||||||
|                                 <button>Search</button> |                                 <button>Search</button> | ||||||
|                             </div> |                             </div> | ||||||
|                             <div> |                             <div> | ||||||
|                                 <table id="historyTable"> |                                 <table id="historyTable" class="simpleTable"> | ||||||
|                                     <thead> |                                     <thead> | ||||||
|                                         <tr> |                                         <tr class="head"> | ||||||
|                                             <td>Timestamp</td> |                                             <th>Timestamp</th> | ||||||
|                                             <td>Status</td> |                                             <th>Status</th> | ||||||
|                                         </tr> |                                         </tr> | ||||||
|                                     </thead> |                                     </thead> | ||||||
|                                     <tbody></tbody> |                                     <tbody> | ||||||
|  |                                         <tr> | ||||||
|  |                                             <td>2020-02-02 10:56:23</td> | ||||||
|  |                                             <td>Request received</td> | ||||||
|  |                                         </tr> | ||||||
|  |                                         <tr> | ||||||
|  |                                             <td>2020-02-02 10:56:23</td> | ||||||
|  |                                             <td>Request received</td> | ||||||
|  |                                         </tr> | ||||||
|  |                                         <tr> | ||||||
|  |                                             <td>2020-02-02 10:56:23</td> | ||||||
|  |                                             <td>Request received</td> | ||||||
|  |                                         </tr> | ||||||
|  |                                         <tr> | ||||||
|  |                                             <td>2020-02-02 10:56:23</td> | ||||||
|  |                                             <td>Request received</td> | ||||||
|  |                                         </tr> | ||||||
|  |                                     </tbody> | ||||||
|                                 </table> |                                 </table> | ||||||
|                             </div> |                             </div> | ||||||
|                         </div> |                         </div> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user