Changeset f8007b3 for src/main

Timestamp:

09/03/21 11:34:33 (3 years ago)

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

194776a

Parents:

f0d5cb7

Message:

Ovozmozeno e azuriranje na podatoci za primeni sredstva preku banka

Location:

src/main

Files:

• java/it/finki/charitable/controller/UserProfileController.java (modified) (3 diffs)
• resources/templates/myProfile.html (modified) (3 diffs)

src/main/java/it/finki/charitable/controller/UserProfileController.java

@@ -1 +1 @@
 package it.finki.charitable.controller;
 
-import it.finki.charitable.entities.AppUser;
-import it.finki.charitable.entities.DonationInformation;
-import it.finki.charitable.entities.DonationPost;
-import it.finki.charitable.entities.MainUser;
+import it.finki.charitable.entities.*;
 import it.finki.charitable.security.PasswordEncoder;
 import it.finki.charitable.services.DonationPostService;
+import it.finki.charitable.services.FundsCollectedService;
 import it.finki.charitable.services.UserService;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -23 +21 @@
     private final UserService userService;
     private final DonationPostService donationPostService;
+    private final FundsCollectedService fundsCollectedService;
 
-    public UserProfileController(UserService userService, DonationPostService donationPostService) {
+    public UserProfileController(UserService userService, DonationPostService donationPostService, FundsCollectedService fundsCollectedService) {
         this.userService = userService;
         this.donationPostService = donationPostService;
+        this.fundsCollectedService = fundsCollectedService;
     }
 
@@ -105 +105 @@
     }
 
+    @RequestMapping("/addFunds")
+    public String addFunds(@RequestParam Long postid,
+                           @RequestParam String type,
+                           @RequestParam float amount) {
+
+        DonationPost post = donationPostService.getById(postid);
+        FundsCollected funds = new FundsCollected(type, amount);
+        fundsCollectedService.save(funds);
+
+        post.getFundsCollected().add(funds);
+        donationPostService.save(post);
+        return "redirect:/myPosts";
+    }
+
     @ModelAttribute("user")
     public AppUser addAttributes() {

src/main/resources/templates/myProfile.html

@@ -241 +241 @@
                                             <a class="btn btn-sm btn-outline-secondary"
                                                th:href="@{/post(postid=${post.id})}">Open</a>
-                                            <a class="btn btn-sm btn-success" href="#">Add Collected Funds</a>
+                                            <button type="button" class="btn btn-primary" data-bs-toggle="modal"
+                                                    th:data-bs-target="'#a' + ${post.id}">
+                                                Add collected funds
+                                            </button>
                                             <a class="btn btn-sm btn-danger"
                                                th:href="@{/deletePost(postid=${post.id})}">Delete</a>
@@ -250 +253 @@
                                     <img th:src="${post.imagesPath[0]}" width="200" height="250"
                                          style="object-fit: contain">
+                                </div>
+                            </div>
+                            <div class="modal fade" th:id="'a' + ${post.id}" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
+                                 aria-labelledby="staticBackdropLabel" aria-hidden="true">
+                                <div class="modal-dialog modal-dialog-centered">
+                                    <div class="modal-content">
+                                        <div class="modal-header">
+                                            <h5 class="modal-title" id="staticBackdropLabel">Add funds</h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                        </div>
+                                        <div class="modal-body">
+                                            <div class="card-body">
+                                                <form th:id="'my-form' + ${post.id}" th:action="@{/addFunds(postid=${post.id})}" method="post">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <select class="input-group-text" name="type">
+                                                                <option value="Bank donation">Bank donation</option>
+                                                                <option value="Phone donation">Phone donation</option>
+                                                            </select>
+                                                        </div>
+                                                        <div class="col">
+                                                            <input type="number" class="input-group-text" name="amount">
+                                                        </div>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                        <div class="modal-footer">
+                                            <input class="btn btn-primary" type="submit" th:form="'my-form' + ${post.id}">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
@@ -260 +294 @@
     </div>
 </div>
+
+
 <script src="/js/bootstrap.min.js"></script>
 <script th:inline="javascript">