From 4ad48419df34b7934ab61ee9cfd14b109fab7ccb Mon Sep 17 00:00:00 2001 From: modzeleg Date: Wed, 17 Mar 2021 15:58:40 +0100 Subject: [PATCH] T139 History table draft created --- .../klaus/controller/EventController.java | 9 ++---- src/main/resources/static/css/table.css | 17 +++++++++++ src/main/resources/static/html/mock.html | 28 ++++++++++++++---- .../klaus/controller/EventController.class | Bin 2560 -> 1681 bytes target/classes/static/css/table.css | 17 +++++++++++ target/classes/static/html/mock.html | 28 ++++++++++++++---- 6 files changed, 82 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/static/css/table.css create mode 100644 target/classes/static/css/table.css diff --git a/src/main/java/com/release11/klaus/controller/EventController.java b/src/main/java/com/release11/klaus/controller/EventController.java index 4d8e354..ff89857 100644 --- a/src/main/java/com/release11/klaus/controller/EventController.java +++ b/src/main/java/com/release11/klaus/controller/EventController.java @@ -28,18 +28,13 @@ import java.util.UUID; */ @Slf4j @RestController -@RequestMapping(path = "/event") +@RequestMapping(path = "/api/event") @AllArgsConstructor public class EventController { private final EtrackService service; @GetMapping - public ResponseEntity getHistory(@RequestBody(required = false) 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(); + public ResponseEntity getHistory(@RequestBody EventRequestDto event){ return new ResponseEntity(service.getEventsByDateTimeAndBusinessKeys(event), HttpStatus.OK); } } diff --git a/src/main/resources/static/css/table.css b/src/main/resources/static/css/table.css new file mode 100644 index 0000000..00d87b1 --- /dev/null +++ b/src/main/resources/static/css/table.css @@ -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; +} \ No newline at end of file diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html index 3b54cdf..caafe0a 100644 --- a/src/main/resources/static/html/mock.html +++ b/src/main/resources/static/html/mock.html @@ -8,6 +8,7 @@ + @@ -103,14 +104,31 @@
- +
- - - + + + - + + + + + + + + + + + + + + + + + +
TimestampStatus
TimestampStatus
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
diff --git a/target/classes/com/release11/klaus/controller/EventController.class b/target/classes/com/release11/klaus/controller/EventController.class index e92cacd276e851a6f4cb30b5279b2ab6a02d76c0..f188430728df3c08ddf653dc2361867bdfe242ca 100644 GIT binary patch delta 495 zcmYjO%PvDv6kX>&dfMCD_Ua3*(t4Ga*88n7Brz~B5d%az5Q#{LY5NOuW+r|CCG|)o zrvAaq)Gvs2Xrwned+l}i*=y~cQ;%PUy!Y?tR{)EsNEiZn^(N!0ZrLhqdSMH;gwKV9 zU!bJ+eQ~vBZU-F%C0rLFgw?gF!X7##qAp^H3kmgvzu zqrR+kun$>@oQr-o#q2G=g&`Ni$TyDdPoehYN6jf8oF0{{7uAz<M8;N>F~NFm zlEfBdz!Z<}nI_KgNI^2oL~x%u3TW>NQF}XuCb|p72bi~H?S|PlL+9Vn`Q1dIBakImT9e@y z`ZawL+RpR?`XBv`POoIwhSZ*cX*?rKcXjvNyLZpIt3Ut#?GFHRD9H$+Lqb?VCn5|< z-6^Xsx47o<$w~FV(yE?Xb_{N*%ZJ<+Tm0K9_r#KL7^Fhgv<&VtEG3e;b59(82Pj)Z z$;jwJRD!Ia8w$hKeeFLQHGNEl%l zaom#XRs3ZZU9HUDIPQVECqzZv;$FqEJ-%!UQyfK+#HfTZ1$U8R7;i-!-LZx1SQd9{ zvRG``Bnywbho(+M9cw9y`fGJrxSD>jU31QKL&b!INd@;X)kcRcXEF?yxCk`mWsm+< z$%1WUtDb3d&s*n59>c>#%Vb(g`^<*tOiyH@n8tkxGYV!g$1v2kl&e(FZJ~)Og$!-3 zGu+Od!kMTspf)ANxhy|1nC|$#0 z=t%fpOIVh$qTnf3spABhTE+A}b(~U(yDOS59QTMJN)@gR(SlBAwPEiEsBK-((mBHrUZe(29VAD5cvdYJxVxhjEE=Jl zsI%rZ*YxfBU|8&#w0jdR`O=>F6sME>M?^c`x276x&IT8Ij`3XcMJc#Tv9E1aNs48j zH$9UQTd-}1IAxMX8PY8&@P-%Ef@vG7*6>xIa2qV(&%vx? z91(bzOUI(=a-)L|RZ!1py^}5Vn@Q#gV4k{YjrH=jQ+0K|V)`3&CD3)VyNvrpW|+M| zo}Oq)WiX**13r32@q&z984;2SWW^#{fy;F_k5ReqRst z6!$wT-8-mM8+e8=Hp%)95%K}DCt$tOUy(>m4xd0e#s|I?yBWJ2O9b}ic;5*=I>yao z4Ca2vofo4&BQf?X#zXiK>9=_BJ)wl~oc{X>6VzL}F@ozzV2E;|?oQFi@EN`7t3|{X zw#lN{*ugGkm8a)UMh5UXT@f1kg6=QqqE8csmvp^)i7)9kkJkj^FW?c~{RPOQZ}Dh! z>=z_{Agh*$j{rI_n?dD9P&p_^Bj{bk=u7A;%7q261Hn`v8c&{J@h7bLs4Q4s4fO^U g^6MbdH$k>>im8!ZATRwDm + @@ -103,14 +104,31 @@
- +
- - - + + + - + + + + + + + + + + + + + + + + + +
TimestampStatus
TimestampStatus
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received
2020-02-02 10:56:23Request received