Changeset a64f926 for src/main/java/it/finki/charitable/controller/DonationPostController.java

Timestamp:

01/26/22 15:53:24 (2 years ago)

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Parents:

6fa3d09

Message:

project complete

File:

• src/main/java/it/finki/charitable/controller/DonationPostController.java (modified) (4 diffs)

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

@@ -4 +4 @@
 import it.finki.charitable.services.*;
 import it.finki.charitable.util.FileUploadUtil;
+import org.dom4j.rule.Mode;
 import org.springframework.data.domain.*;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -292 +293 @@
     @RequestMapping(value="/report", method = RequestMethod.POST)
     public String report(@RequestParam Long postid,
-                         @RequestParam String description) {
+                         @RequestParam String description,
+                         Model model) {
 
         DonationPost donationPost = donationPostService.getById(postid);
@@ -302 +304 @@
 
         Reason reason = new Reason();
-        AppUser user = (AppUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        AppUser user = (AppUser) model.getAttribute("user");
         reason.setUser(user);
         reason.setDescription(description);
@@ -336 +338 @@
             {
                 float dailyAverage = post.getTotalFundsCollected() / (Duration.between(post.getCreatedAt().atTime(0, 0, 0), LocalDate.now().atTime(0, 0, 0)).toDays()+1);
-                float neededAverage = (post.getFundsNeeded() - post.getTotalFundsCollected()) / (Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays()+1);
+                float neededAverage = (post.getFundsNeeded() - post.getTotalFundsCollected()) / (Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays()+(24-LocalDateTime.now().getHour()/24f));
 
                 if(Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays() == 0) {