From 2b8514b8e25d1a1f6859804e2c6c2b5e9d95d7ed Mon Sep 17 00:00:00 2001
From: "DozorovaA.A" <a.bestugeva2003@gmail.com>
Date: Tue, 13 Jun 2023 09:42:54 +0400
Subject: [PATCH] add create appointment

---
 data.mv.db                                    | Bin 65536 -> 90112 bytes
 .../AppointmentMVCController.java             |   9 +++++----
 src/main/resources/templates/appointment.html |  17 +++++++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/data.mv.db b/data.mv.db
index f41c8186a44129e5aaebec2365ef347371fe053c..8f3d4072eb2605d2353d5c3e4524d2173e2cfcb3 100644
GIT binary patch
delta 8433
zcmeHMTWlOx89p<6UvFwVPGaK{drgh)BwI6=Gq-isq%xrm0?TdGG)YC;xh5vA*GlXV
z5b7EWM5RiQ<WQ(6Qc(>pBBJqjf~us7lp+vPFv$ZFpn$kk;=vExc_frGXKu&d-6nBF
z0LgxtnO*Omf6xDam;XO=bIG~Oss2aGLdlq{m`B6w-igoHWuD`>l6hoy>S&p_%+vit
zo6M3kY0sEP>|<qJHFQpr?R-stxfQ+J+R`0-#qEBydM#&}(dv`-6prB;eY(sGHol%L
z3sB}tQ})T3GAvE&hwbBKsdTJTnJFs@j*sJHO|<0F%)~QxSv3t^GBmk#!ajC<qB7-$
zU7D$wW!{lwRNMLR-aG(c57P(O1Ovc{IRJL<1K?Bm#hnMqbK-~JAkVDX-8(eUpOqxT
z&@|1?s)lMxnqg)QTM?k3>HuWFoO_*Nhfuoq<7`HeMQB3F{b_Ay3O#+kAB}H+7QOz?
zfV=pn%cL(PmRYtRJ+S;_E^7&rYVv~Ner-9Ebldn&#x36ea>7mg4Y7%Klt6Ed_vWk&
z-hyGg1@7DbSYpt*$DUv<17-L2;)}a&?<uy$O5k?^NM(Ayf+|;vMN7?*R1Nc%7TxL5
zoq_)Hc$q!VocUcBntmmVrsg})B`1Sk8Xei{?VAQ2UN6l~%^tU{hi3Lg`=_DWzCPA*
z&n)yspLuYhe3Q>C+QkiybDjx{M@3J}Z?6hENhojQvLXrPg&?CskWrar6e=noXB0wJ
zae~N5q%yB)4I<U4tgC+36<IA+OmlWxpE5sP-pq-$C?YMWI32y@-1o3a0*m6ZR)+<>
zxOmyo@D~S#ra{xD!}1CbJ?eB+ErSX~BY~KlLdC&}-;Ki1gD`lm<W)W_O-`J!KaQ)O
z*ChNBei$buF9(qD0~IwR+`$kNdbop@>cy%{wnWF;IJtDBI*C+p9El2*mpI`&QLsiB
zEJS~u8L0ZP2za$1oAT;yGrdr}Y*L{#$sQew;b%{k1u7IyVE94+c}e0Wxmv*K^%l@2
z4RYaIoM3SZeupfLA9y?bH_Z@KA%3u6{ElO(7)k)s!TlNk>d^sy#x#JhyFltuOcVGo
zjeZV5P}D;dYteiYF{GkNl4cqXCY~{Lqteo21^b7yT*q>}i5~iP*RVn=&D$~<Rhlj<
zoJQ4@<!_H9D;}j~Fr~GZ+IG7aPYtzyDDlOPiwr1$2=@)SAbJ=5`SFpCbx^EeJh~E_
zg5vv)K=IW42dcsyqk^ayNqIdRn^YMzL<w46YGExCwSBm2%*MJIGYAYAWUZp=a~mB%
zEUgqwd2SU<L&P;gsbB54j?#@DOqpF6rac6X$&;Jh(?9BCnRRKj)}@hX__{RyPe@}d
zb+I&Bar2;wlB9FKG`csce_&Fn=Qb}g=v}jSyTwKF#7B2hbSFo5if3uj@|7zrZ=uhP
zcB2OucC!{li*{c^SzyjgccG`RK97DglS7$BY^;CMgL)Q6(3?veAAuB)^1hrpkoJna
z^;*R6QXt!EAls2elV!Z@CPqc4UMZRqQEr)oxcvw{qF}3**ubjN4T|J1Z|Sr}<keVU
z<j{3-hzN{I>ij)Sv_xFdN)s(O67~?jpm<C{n`+wbE7Zo|-{G}RiUKKqM^AnW3ygwJ
zAMZq;IJ~9mTYBuad=DtCvVaotVV-l2cLj>J96IM_Yb#`J18UULz612X(bEjMpa|$!
z`wOl9)`!lIL(i&Rh`ZK}j(lN*+wp2Hi{`Fn2i0I3CF&QdaYd@SBtk8$$V#H^%yhPM
zb>{uHl;nH3dA{R{k8_Ki+DC@{=5xqzK4-CvdCljHcg1cKKQm{44ZyKofc@C@-oXL%
z`(khUjpWxEwil)Q&SoGFaZ{kU=lXt@^g7HO0EGiB_p$5%dVWC5@Pea3QFFg}p_C$B
zWzdEG-MhM%-+qq8Eh%~MuGr?L@}0l%n@uHXHdU(GgnqLLNwZl{aI>l6kG$~y$CAxK
zDn!r}qdT}}km9n7cd`jcW0ZvR3qC-JXLoQH6}5DAttPBTiLMzCcU=)mbjQRT)d0UD
z6`A0pL^kPWWdq%6iWn?As$K_ovfLCXupTJ7qdTG*hhsFO6MCaW5{|CXY{H4JGU$&>
znY;x<5ReAW4=LUwbv1as?uztp5qO(!2^|A&T|DBD4Y?k@et%;M7`<B+f#g6^@Q*Jj
zD^M(jC>}(Y)XYW?7`P2f{$LC7ed**^YkG|#xQ;OzSBn(mS}`!L<+uqmqQ;-FIghjA
zjhfax0EicjT78W5JziIq$|nz_i{r(d5#Y<D@TL0rQVG89F)+SN++OZshZ)d@7;7uM
zbs3DXrmh)l>w>suL0kcKPZxLGsU{L9PfeF-jZ`V-X{eFnYYaLxilH9q9fA5CPu`jZ
z(Qwk{E456pPLvw`a(`<RnZ6foJ5XR=tmzX8g69~YG_<0jim6LbQ9_+Qml(%7?bJ=t
zXi&dbM-a@9>Stx~+VKbg<9c_X;e#s&$as*<oV^|oknwZ+I;G(+G}CY_!&$R+3+pCp
zhq9T%0rqrat#aP-RQsQjZh84&OA72597&;JVIajY1H)<b*7QG9Ol5F1;~s^R%=?DU
zW;Z4P%R4Ctre4HzaFG7&@NaXs#yd*PHqo7Sw`a>q$EgMWK8p@6b)(N;)owD8zH+sg
z5b^kXu?so#_oA(f5A2V0zWMN*LR(`8Le01%A@XcGD-f6X$>uKc_EwLbBqgal-i2_&
zzRo;k#?J{0(UuS<N#Zjt9gQ9SU@)$Z4B_q0_-O*9r?HXjQ;DhLKRg8cXuvgOR_zb2
zqmG66tXrQ|qwlGmWsh(0gqj>!;Vb4F0NBeQ_r^Q`2>^1J#_)9x<ZgTkfaDy=AJ~Qe
zAAtO!{WX20)uY-WiZ*G!i?~*^p(Ck+KfwN1CGW%s04pZgcQEpd*Nw-S9?u3-?NKt-
z&ZOtJTnK!TcoSdL=oAdK&yU>Aqp$xPdaC}1>4`c33>%LXGZZvAzxls?D(DR~@>b+J
z?mku29|l(IP6I_AANa+yd~HS7vL=J$%MVRz@%d?$w_?{r(;C-^*qZYiX=y$G7oW7<
y><o?!_jBQNzsuFPy~Biq3~ZJ{lXFj!3x$v3B$`Yj64NyqAKZ%&v&tA-%>Ntk{&)cZ

delta 2849
zcmds3TZ|J`7(Qp(Znu}+w(P=kS@r_Uc7<^>Go5xivr$%sa0wc2SrXxa>C6-wmbTl=
zwh#>62L&_{^atxL3L0D@7_tn8h!Fu3eGy@eF_8yR9}FS!L8BoqOYn4B+7gguP4vM&
z^gn0L|IeKHzss52SxYWw?pP{ubf`b3Y>`66xF)h)lURmfXk~Lcx<z7D_N9(4c=Mve
zrg8$$_<V|eM1I=^w_J{yldai##RgXsZkYaq6J{rQ$PG8b$igMvc7)I}EFj8+5lZ9`
zTG&ToFNseZbA0f1V@|EO+|t<rKjvC%o;9DqR14G$9o0_{jhbx;ISxC2p{S1hEEg8_
zcRs4c`A|LX)W19Jw_C~m7c_is%8z#9&TeXo=XtZ!j4&U5uMV+KrlYDBjzl%}UZX`Y
z8dv5h-|mV0yd`Vlm&-{tDXVveCFEiu%{pWB1;<ifHgEFc>!!wYmQy#qxE}`_>uRQ$
z5XFWqVczm8c|}BhG3}ZaIgrh0ayP38<x#La5`hUVg3OJ#@P{yMydCC`&4jh%5*&MN
z7Nv;r#(0}09A<=JxFofkSdD>};hEs*>4D=3Xa3-PJjcai)+um2L6h-wya-DMXT!De
z`levv3Lg{|jw}}^A}?~#bFmpNUvhL(XOVf&d4x;|nfJd;Vh&km)RPH`sk3DN2wAp$
z4Tr=d`YV6_X7S1;4srCLmPkfoQHfP#I^3_Nl+9W~3b4E&216>r`YE`1#o<y)`8?gP
zkz6=6*xOL4ROnPpk^CVa$zQgBa0Bl`w~*6>47?_R!5>phS+o};XH}o!(}CGIL^>;B
z9ilhd^KE^&0UjB%!m%4ttrS#(0l(;jRoO-?!-`Aol<)8Ri&^+Sain1wm!zVU^dJfF
zYpPRZ=&f>=bb@Fps%29|Rdih5q$P>u60ulH5;(F%a1eqlPp2YVwd$v{p{ibnjE=DW
zK!A=ZN;)n_m2DEk-Hq<!#al9*%4%h3i#YoV&teKI%<UCFD>9maGJ4o;po(7nM*nQ_
zCpO6Kw00>Kn5w}k!x|I_tXc(DSezl!jyqvn##aTWYHVKQ0tGm037i(YIf=jptv1%W
zRgQPF9H*cA{YwnJ!a7P(V8ek{67**d?4#;g6Imr&+-#jiaD+1hE%s1ZAmCZuqx%!9
z@V^5=_X9xiZW((82Et94gCTV)oEcmQ)4y`U#|bCQ%S?q`*;ZILSU2y1(1Ed|&3ONa
zyu1c-S8Ba#Nh|&;KByIKi83$9Yy|{cxRf6NPrL!nr+qCI@WOOF5`7|;juJ8&s070t
z475Ee6hw9sT||c{3grsFwjtx+$zwEu;OLU+k<?<PX@Y_|rGg34f~7RFvwf6+OY+CX
zeNht>-*#d+7vGLieuo$Du$sqeE>Or-;81IYLrR%VYI&p)duX!N7DP(O$>vwB#&e52
zJ6VRiEcLvn56{hST!XFB<dq(v)6sNNQ(;-Q8O~&!_KMQsvG=Fxdz06(zB_xXrb{W~
zTE&BKg$E&#@E}m+fqpY)a-Z1v6J|`$HGFWV|CL{|>YOQGlPBYg|L{;UOmnVF@G*3M
zWKdgaIHCaV<QihQJBQocLFR5>yN`0J&#(2HnsH;k-HX@eH#~&v{{IJWnT1uP2vtZS
zlEXy|SIhyfrrh93_d?==@!@49y7$oTKK*oWm&a=EXtZNgR}je5dkUn$j{jZ<-I*qQ
zA9E#^+mksAyR$9CV!e*4V@_YcX<qF}T*ZcuY9(J3t6HU1TBUGAKf-PO95=1}3)Ciz
AjsO4v

diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java
index f3e3fca..be47708 100644
--- a/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java
+++ b/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java
@@ -26,17 +26,18 @@ public class AppointmentMVCController
                 appointmentService.findAllAppointments().stream()
                         .map(AppointmentDTO::new)
                         .toList());
+        model.addAttribute("appointmentDTO", new AppointmentDTO());
         return "appointment";
     }
 
     @PostMapping("/create")
-    public String createAppointment(String name, Model model){
+    public String createAppointment(@ModelAttribute AppointmentDTO appointmentDTO, Model model){
 
         Random r = new Random();
-        var app = new Appointment(r.nextLong(), name);
+        var app = new Appointment(r.nextLong(), appointmentDTO.getName());
         appointmentService.addAppointment(new AppointmentDTO(app));
-        model.addAttribute("appointmentName", name);
-        model.addAttribute("appointmentDTO", new AppointmentDTO(appointmentService.addAppointment(new AppointmentDTO(app))));
+//        model.addAttribute("appointmentName", name);
+//        model.addAttribute("appointmentDTO", new AppointmentDTO(appointmentService.addAppointment(new AppointmentDTO(app))));
         return "redirect:/appointment";
 
     }
diff --git a/src/main/resources/templates/appointment.html b/src/main/resources/templates/appointment.html
index 212a7f3..f5c3762 100644
--- a/src/main/resources/templates/appointment.html
+++ b/src/main/resources/templates/appointment.html
@@ -6,6 +6,19 @@
 </head>
 <body>
   <div layout:fragment="content">
+    <div>
+      <form action="#" th:action="@{/appointment/create}" th:object="${appointmentDTO}" method="post">
+        <div class="mb-3">
+          <label for="name" class="form-label">Название</label>
+          <input type="text" class="form-control" id="name" th:field="${appointmentDTO.name}" required="true">
+        </div>
+        <div class="mb-3">
+          <button type="submit" class="btn btn-primary button-fixed">
+            <span >Добавить</span>
+          </button>
+        </div>
+      </form>
+    </div>
     <div class="table-responsive">
       <table class="table">
         <thead>
@@ -19,8 +32,8 @@
         <tr th:each="appointment, iterator: ${appointments}">
           <td th:text="${appointment.id}"/>
           <td ><!--<td th:text="${appointment.name}"/>-->
-          <form th:action="@{/appointment/edit/{id}(id=*{id})}" th:object="${appointment}"  th:method="post">
-            <input type="text" class="form-control" id="name" th:value="*{name}" style="width: 60%; display: inline-block" >
+          <form th:action="@{/appointment/edit/{id}(id=*{id})}" th:object="${appointmentDTO}"  th:method="post">
+            <input type="text" class="form-control" id="nameAppointment" th:field="${appointmentDTO.name}" th:value="${appointment.name}" style="width: 60%; display: inline-block" >
             <button class="btn btn-warning button-fixed button-sm"
                     type="submit" style="display: inline-block"> Изменить
             </button>