From f44212ad1f0fb3ff88f53de981e756df601d1f2f Mon Sep 17 00:00:00 2001 From: "a.puchkina" Date: Fri, 7 Jun 2024 00:30:03 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BD=D0=B5=D1=88=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=B2=D0=B8=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../8.5/executionHistory/executionHistory.bin | Bin 405941 -> 405941 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes lab4-5/.gradle/8.5/fileHashes/fileHashes.bin | Bin 73615 -> 73615 bytes lab4-5/.gradle/8.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.5/fileHashes/resourceHashesCache.bin | Bin 63855 -> 64501 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../demo/products/api/ProductController.class | Bin 8682 -> 8682 bytes .../resources/main/templates/default.html | 4 +- .../build/resources/main/templates/index.html | 26 +++++-- .../main/templates/order-details.html | 66 +++++++++-------- .../resources/main/templates/orders.html | 70 +++++++++--------- .../resources/main/templates/product.html | 59 +++++++++------ .../resources/main/templates/profile.html | 4 +- .../CartItemController.class.uniqueId0 | Bin 7219 -> 0 bytes .../stash-dir/OrderController.class.uniqueId1 | Bin 5440 -> 0 bytes .../stash-dir/OrderService.class.uniqueId2 | Bin 6205 -> 0 bytes .../ProductController.class.uniqueId0 | Bin 0 -> 8682 bytes .../UserProfileController.class.uniqueId3 | Bin 5719 -> 0 bytes .../compileJava/previous-compilation-data.bin | Bin 78336 -> 78336 bytes lab4-5/data.mv.db | Bin 348160 -> 360448 bytes .../demo/products/api/ProductController.java | 8 -- .../src/main/resources/templates/default.html | 4 +- .../src/main/resources/templates/index.html | 26 +++++-- .../resources/templates/order-details.html | 66 +++++++++-------- .../src/main/resources/templates/orders.html | 70 +++++++++--------- .../src/main/resources/templates/product.html | 59 +++++++++------ .../src/main/resources/templates/profile.html | 4 +- 27 files changed, 262 insertions(+), 204 deletions(-) delete mode 100644 lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/CartItemController.class.uniqueId0 delete mode 100644 lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/OrderController.class.uniqueId1 delete mode 100644 lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/OrderService.class.uniqueId2 create mode 100644 lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/ProductController.class.uniqueId0 delete mode 100644 lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/UserProfileController.class.uniqueId3 diff --git a/lab4-5/.gradle/8.5/executionHistory/executionHistory.bin b/lab4-5/.gradle/8.5/executionHistory/executionHistory.bin index 323e033308efff0f4dd2dd9b6a6500af12c0fcea..991c1b97a68c4e64f5e031bf5542b99e8be73a79 100644 GIT binary patch delta 1293 zcmdn`SYqpAi4Fc9N|nauS((WhS(T>g<{6pA#fb%_rb(t5c}AHG5Foj^(4&k`z~S@G z;D!|8FS%`IOMmCh6W;tiOo~w;U*h}X9a4-Ei5J-vE1sB|ZB~p>U=#@BmipFoEN-=Z z{v_?{Lp%3Q4vg#-Sa!ViUXa0;Jd63&N6*?p zh@SW7oO}o|Fw8YY!61|L)+#Cjs;D@NYKUpnBzJ3i@&kioe?##TD)C#B$^r(TTnk>uM zos*xQnFm#+Tl|2Txo>Hc@6F>!|9lq-fvEZ?z&JU-C?&N>HzlbcV0DIvg(kmCQD#{O@~dd7W;lrP&+v^1V{buGeoARF%&+Ka0-|n? z0$5#IW=<;9HR#C%qHf;gsi_Jq8$g!qOjUz09;Yfo7#wM8!62!BhFiHAyGn~wi=bwS zOSV7Qapm~-!rX+_%lk!ZH-Z)25@Ti%_?p^$@$NJkGYR8)7b@+qZv+aVC&lK*wC#;) zjBg{9(o-u+lZ^7RN|O@POR`Jy^NJIVO;a<G`j*$idEOZK}(@>5ZPuGSdY-n7F6=yD@Wbk8@{w!Y}Z#X$@C*O0jgpln)}tWx0IQ z=T$H@OuxXy$TB@fgxO)bSOk**%bWcVzi-!yU|Pq*@(IYCekX>>lI6$7-k;kgW0_Kz zS^k0q8xxr1MN|ru{)s;IyIk15L%R3uQRRQ%=l`6(C4otU`Ld;1|zd?q!%QO2;f0)cv!0`uc@^zi*e|IqIZEsIu%3$<-Ue_>{ z?;%gN*R*^XNTR(*qNU$-+KoX z((Dy|5y@gUN%^0=u)?p@50ei*(42ljpRH{BX(eVKMv=XH0s$kv=6R(R#YI(V<{4?}6&YoTS*hujY38{M5Fos{(4&k`fPaHs z%l|zaXC4z5v9Jo(XxscfOo~xp>g?p zh@SW7oO}o_dgnewlp{%+b3Iu1nuidPaG=Nru*e^%$b=xy$?KDZprTVALDW?Tb58!3 zB*eWDtoFxUM#k-v9Yf5-7zE5L09UsQM?sI61#4CACO5CAB0mGp87;8a-mcsh3%3*-=!$CfH;#yQ#HdOqHjbPdkc#4Q%aLzenn3c+rYX{D}vRf zW#*(pU4x!XAnK-0o|>w_0%A|znX1OJ9mIH?st93lq^SjiME)6Wg^R&+~@nL!{m=yjL#+~nNSZ zjZiWzFitWnF)uF6OEM}cD9OtxEX+2~E=o+xgybg1xzj%?GsB1pnR|PjJJS<>0cL^fPoL)6)okNua^ku3v~Bvl z3Z{nX7nm4XrpJgdJ4_dgU=m>2b#2av?OG8`>sVNR-uwD~`kfdiOP2pY)^^EQrW9tD z{}Z=dnckSdBrlSiRbU~YB|UMP_+EqJj9)?%?*o-@Nnp}oIoP}Z%Jc^bO#0H7=RZ33 z&u}*z(60(na@pN(r?pFut*XgWX^)sLC(EoiJtC3mjX<{C5?hs{&r}zvF}U@bZsVG4 za9d@1jvTW9%eSwKo^5ZCV-97U{xF%Tfa5gKb^i>n>rDT$sbVxlLioibAU$YP{hK9sq^D_paa%f3<;CD>X*X*VyhX%Aeoe9C>&0!3UbtFX*$CZ9lEV?87M1rJH-H$NZsP_Ws_Uu(%|~iPz_R UXgAMb0%B$$X4!6@!CH3`03s(t`Tzg` diff --git a/lab4-5/.gradle/8.5/executionHistory/executionHistory.lock b/lab4-5/.gradle/8.5/executionHistory/executionHistory.lock index c809c1c590d6fb885e640cdbc19e08cf0d2c5883..54c814e74decca91fe53f0477a18a10102a37db5 100644 GIT binary patch literal 17 VcmZQ(JvC?1mxq&2Fn|H`YXCp~1}^{r literal 17 VcmZQ(JvC?1mxq&2Fn|H`WdJ|s1{VMT diff --git a/lab4-5/.gradle/8.5/fileHashes/fileHashes.bin b/lab4-5/.gradle/8.5/fileHashes/fileHashes.bin index c12c0a0a31bfcf70607156c69b3530e3792b6d34..651c7c8f40fcca7581f11f373a7051764e9ec852 100644 GIT binary patch delta 1233 zcmb7Ddq`7J9NwABe9!H!Tz9jk^Fc{NFhvk8Q3^^cSEM32l_aQqC5U8Egk?b@cCZ68 zT{d;<-9%Y51;qzwMrf8c8PuZ3xDow3(@0miTe{|vA^WA&C@B2N@?^g5(DtZKM zHClm9nd%PfvNuARv+ z={f~}Bva;rdNE(x-E}gFr%g2VnRp_7K(QN-2P$mA%kj|GIHfrBv-8xAbJTp!?T7|@ zZY{-aM)igeD{l>)H54ftpWT{NhtB6l>PiMiV&cXfq`idX8VBDqLD1B+TX8`BX@6@~ z=Wugc(VK6fvtth8K0(SpS5+8(uwnh!+k5lm*A!gxoSzZqFe=vA2z3m-MLD=V+(pV^*{!g>iQb~7 zzE;BKYT|;lna>-$GFV+3WSY5fZSdn75Vmk%+F@)9jox{J5BR`Ror%Yb23U6`6-kA_ zSDhza)OXN8n)%AvulP%N#NX%P1+ij76E;`$8Hu+Sgq5|FMJoh)uIY^^Rs^_I8d0GG z8IVu}Xw)MD681O@M44}deq|Jz69I}XstLJ@iLePpIZ!joSwj|`7#s$Q#fuYlq1mpZ zVKuMq=IDFfZ2H#np;BVWzrb4V8Jbz~)FvieO)CvKQl%AfB?d1|5Y8?YDv$vR9hInuSA@ui>I|b@`!sDOgcH+s#65<5<(On-9 zIS7iuReKT-w@d$eBs`>K yj3>PoF>N+=BGw4{FjfePXr!f5q}I$VQp~cu_gaDNj}Gp==icY{{GQ+Q+?~$K=&X$C zN*Sz5SPk3D+8Fzfq`T(w^4AQuQcsxAT#FJgAKO~K!GRPNbiG-^4E5-=@XF0^!cq6Y z9WMM>xCidcmcp?;QuE_m5`j;_Dosb>x`FVc)}q4Qu?K*Q3(#S-9)7wrs1TXL&&{;f zmp+lPVH+a-bBS}fC;APg@{Wg}4VenvGVOSjslk|&acR=+Ag3pw5p6jJli{%&zN}Hg z+RDX>3|23hpXOG1d28{4z6Z@}0<`-#xKp58F;p9sW^q+4U`9iM5iT{TgxIL1ZrOeq zU!)|STBuLwV1lHwFZAy;<=PeZ)f8FM)2Z!J~PzRs0eWbtf=9fmV=#* zm=h0L4na4<`by4eP1xB)(X=LlZZantTjPjjfi+b@u4L`23Krl+R86+ca7#6Zy1hWJ za8y3lOXF>~;q{Yyk&g(-eTvJoA`^1_Lfo@LrsvHu$)H;;@#}bJFhpb}2l5XFniI3s-Uy!14F_03?CNx(<15Ie-Z>t_@9G0a* z0=9u&ip=@_cbY^x&xpc(q1*2*Aqt0j&c;wm0l9#)j>wjKq`Ub;qVk6SLc8U3{v*Do zA4$Itb~Egg&|?1SaQ| zMV`M}O_)kTzoyaLz=-l?K*``g8OSUHL9XtB8!Yc+06&l(k`*zx?uL`0@~x`U4xf4hlh z6&Ii`Uz`;`&TKT}3%FgUJ{da22G4avfs?~gLOY*fxV77h;yuVRt3%Er$iX@yP`e*c z;)mdJoc{4l{+HuRS^90&RCHILc6nTjO;bu#js~o~NF%&$4i3j1|8I^z_Z)K^l7kf} PS`OBb`*P2qlLNso@RFFo diff --git a/lab4-5/.gradle/8.5/fileHashes/fileHashes.lock b/lab4-5/.gradle/8.5/fileHashes/fileHashes.lock index 3ef077b14b59659ca8ce7a6f8eacefb1c041e270..396d62e48b8dee77ba68490b0c6936121b1c2c96 100644 GIT binary patch literal 17 VcmZSXt@?G-Z$?cc0~lzi002Dj1q}cI literal 17 VcmZSXt@?G-Z$?cc0~n}12LL^<1b z!GGR&$?A&cV^G1Xn|l=xGVynrJzTc`-d~8|Z_UlFDhn6|j_zN4mFvV^U8tz{=DVr} zOakY(eYCePo^}*!!1u|l8XNiZRIhJ!{$2@H*}r+M1|t)HQ4rH4w}e=T;II14OSK*{ z^Q&YXWT@VzJrTS3)mpAJgSTgemvRzhvG>s3c^zi0b<4#6? zHwz~p>GlIq!Pv=nO)fFXE!=$3Y<(-E-sZ+VC)xS)uH@)+ac_Vq`MG(s;}J;?{?~gl z9jey|K=m!09C#)}z<*PSx z;B)-ZDY34 delta 152 zcmV;J0B8U8_XF?p1F$q00XmaS81S=I8F2`+-XXXGv#unU0kd5uC<2q6D5E&D#MrZ*H{yf=C$oXP z$p^Dy#1IIRip*b=)jlwjG0iZudCh16v-!@z1GCZ62n4g8Mj-){64=QC8@aI|SQN93 G?BWb;Z9?1t diff --git a/lab4-5/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/lab4-5/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9303cf0569aefc22b46a42d366ad2b6e9c2b8c37..fbc89b6ec10bb6da1806714f8f53364c4e0217cc 100644 GIT binary patch literal 17 VcmZQ(yAFC41jzyhCT*whW^Q)=Dss)n|$X{Vy29#O8d8R@jBLIzRA3^{C delta 126 zcmaFm{K|QQxvXd@gE&JOgDOKggBC*tgFZtkgDFGhWFOfY-bMyah9(9chE@hihPKI9 zW&bF414Vim1Q{kVNH9!hP-B?Fpv^Fq!2rlNW0=O^%`koPC%K)X3xKK?0`)Cs5M@}x aAj_~EsA|RJ1M*i`*8yeLZ=R_T$Or(iS|92F diff --git a/lab4-5/build/resources/main/templates/default.html b/lab4-5/build/resources/main/templates/default.html index 4f42e71..25350f5 100644 --- a/lab4-5/build/resources/main/templates/default.html +++ b/lab4-5/build/resources/main/templates/default.html @@ -28,8 +28,8 @@
@@ -64,4 +60,22 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab4-5/build/resources/main/templates/order-details.html b/lab4-5/build/resources/main/templates/order-details.html index e48449b..21995d5 100644 --- a/lab4-5/build/resources/main/templates/order-details.html +++ b/lab4-5/build/resources/main/templates/order-details.html @@ -3,39 +3,41 @@
-

Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]

- -

Товары заказа отсутствуют

- - - - - - - - - - - - - - - - - - - - - -
Название товараЦветРазмерЦенаКоличество
+
+

Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]

+ +

Товары заказа отсутствуют

+ + + + + + + + + + + + + + + + + + + + + +
Название товараЦветРазмерЦенаКоличество
+ + +

Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб

+ - -

Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб

- - +
diff --git a/lab4-5/build/resources/main/templates/orders.html b/lab4-5/build/resources/main/templates/orders.html index 3ffe78b..669d042 100644 --- a/lab4-5/build/resources/main/templates/orders.html +++ b/lab4-5/build/resources/main/templates/orders.html @@ -3,42 +3,44 @@
- - - -

Данные отсутствуют

- - - - - - - - - - - - - - - - - -
IDДата
-
- -
-
+
+

Личный кабинет

+ + +

Данные отсутствуют

+ + + + + + + + + + + + + + + + + +
IDДата
+
+ +
+
+ + +
+ Создать заказ +
- -
- Создать заказ -
- +
\ No newline at end of file diff --git a/lab4-5/build/resources/main/templates/product.html b/lab4-5/build/resources/main/templates/product.html index 3767bc1..b296f9b 100644 --- a/lab4-5/build/resources/main/templates/product.html +++ b/lab4-5/build/resources/main/templates/product.html @@ -11,20 +11,8 @@

Данные отсутствуют

-

Товары

- - - -
-
+
Добавить товар
@@ -74,14 +62,9 @@ currentPage=${currentPage}) }" />
-
-
    -
  • - [[${stat.typeId}]]: - [[${#numbers.formatDecimal(stat.totalPrice, 1, 2)}]] ₽ -
    • -
-
+
@@ -89,4 +72,36 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab4-5/build/resources/main/templates/profile.html b/lab4-5/build/resources/main/templates/profile.html index 157f1e3..34cc51b 100644 --- a/lab4-5/build/resources/main/templates/profile.html +++ b/lab4-5/build/resources/main/templates/profile.html @@ -8,7 +8,7 @@

Личный кабинет

-
    +
diff --git a/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/CartItemController.class.uniqueId0 b/lab4-5/build/tmp/compileJava/compileTransaction/stash-dir/CartItemController.class.uniqueId0 deleted file mode 100644 index 708fb82121ee3a8323de04f73f30f1b4eae1be4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7219 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 Cpm`1e diff --git a/lab4-5/build/tmp/compileJava/previous-compilation-data.bin b/lab4-5/build/tmp/compileJava/previous-compilation-data.bin index 8fc1f51dfb9d8218bbb87b75fdb74bcf5e88abbf..d08f74aa6ec9891d59271a2a09649e7923683925 100644 GIT binary patch delta 70 zcmV-M0J;Bw{<2{p?wZvjIscE Cx(_}8 diff --git a/lab4-5/data.mv.db b/lab4-5/data.mv.db index 6c7b74d569bd9038f87eab294fb0d8a1b1b7bca6..a1003066fd46a9a34eff956a51060bdf85da000d 100644 GIT binary patch delta 20505 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 diff --git a/lab4-5/src/main/java/com/example/demo/products/api/ProductController.java b/lab4-5/src/main/java/com/example/demo/products/api/ProductController.java index 4582a6d..741a88e 100644 --- a/lab4-5/src/main/java/com/example/demo/products/api/ProductController.java +++ b/lab4-5/src/main/java/com/example/demo/products/api/ProductController.java @@ -110,10 +110,6 @@ public class ProductController { @GetMapping("/edit/") public String create(Model model) { model.addAttribute(PRODUCT_ATTRIBUTE, new ProductDto()); - /*model.addAttribute("stats", - productService.getTotal().stream() - .map(this::toGroupedDto) - .toList()); */ model.addAttribute("types", typeService.getAll().stream() .map(this::toTypeDto) @@ -139,10 +135,6 @@ public class ProductController { if (id <= 0) { throw new IllegalArgumentException(); } - /*model.addAttribute("stats", - productService.getTotal().stream() - .map(this::toGroupedDto) - .toList()); */ model.addAttribute("types", typeService.getAll().stream() .map(this::toTypeDto) diff --git a/lab4-5/src/main/resources/templates/default.html b/lab4-5/src/main/resources/templates/default.html index 4f42e71..25350f5 100644 --- a/lab4-5/src/main/resources/templates/default.html +++ b/lab4-5/src/main/resources/templates/default.html @@ -28,8 +28,8 @@
@@ -64,4 +60,22 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab4-5/src/main/resources/templates/order-details.html b/lab4-5/src/main/resources/templates/order-details.html index e48449b..21995d5 100644 --- a/lab4-5/src/main/resources/templates/order-details.html +++ b/lab4-5/src/main/resources/templates/order-details.html @@ -3,39 +3,41 @@
-

Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]

- -

Товары заказа отсутствуют

- - - - - - - - - - - - - - - - - - - - - -
Название товараЦветРазмерЦенаКоличество
+
+

Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]

+ +

Товары заказа отсутствуют

+ + + + + + + + + + + + + + + + + + + + + +
Название товараЦветРазмерЦенаКоличество
+ + +

Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб

+ - -

Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб

- - +
diff --git a/lab4-5/src/main/resources/templates/orders.html b/lab4-5/src/main/resources/templates/orders.html index 3ffe78b..669d042 100644 --- a/lab4-5/src/main/resources/templates/orders.html +++ b/lab4-5/src/main/resources/templates/orders.html @@ -3,42 +3,44 @@
- - - -

Данные отсутствуют

- - - - - - - - - - - - - - - - - -
IDДата
-
- -
-
+
+

Личный кабинет

+ + +

Данные отсутствуют

+ + + + + + + + + + + + + + + + + +
IDДата
+
+ +
+
+ + +
+ Создать заказ +
- -
- Создать заказ -
- +
\ No newline at end of file diff --git a/lab4-5/src/main/resources/templates/product.html b/lab4-5/src/main/resources/templates/product.html index 3767bc1..b296f9b 100644 --- a/lab4-5/src/main/resources/templates/product.html +++ b/lab4-5/src/main/resources/templates/product.html @@ -11,20 +11,8 @@

Данные отсутствуют

-

Товары

- - - -
-
+
Добавить товар
@@ -74,14 +62,9 @@ currentPage=${currentPage}) }" />
-
-
    -
  • - [[${stat.typeId}]]: - [[${#numbers.formatDecimal(stat.totalPrice, 1, 2)}]] ₽ -
    • -
-
+
@@ -89,4 +72,36 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab4-5/src/main/resources/templates/profile.html b/lab4-5/src/main/resources/templates/profile.html index 157f1e3..34cc51b 100644 --- a/lab4-5/src/main/resources/templates/profile.html +++ b/lab4-5/src/main/resources/templates/profile.html @@ -8,7 +8,7 @@

Личный кабинет

-
    +