Changeset a64f926

Timestamp:

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

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Parents:

6fa3d09

Message:

project complete

Location:

src/main/java/it/finki/charitable

Files:

• controller/DonationPostController.java (modified) (4 diffs)
• controller/UserProfileController.java (modified) (1 diff)
• services/EmailService.java (modified) (1 diff)

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) {

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

@@ -148 +148 @@
             {
                 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) {
                     float hour=(float) LocalDateTime.now().getHour();
                     float mins=(float) LocalDateTime.now().getMinute();
-                    hour=hour+(mins/(float)60);
-                    float hourlyAverage=(dailyAverage/(float)24);
-                    float neededhourlyAverage=(post.getFundsNeeded() - post.getTotalFundsCollected())/((float)24-hour);
+                    hour=hour+(mins/60f);
+                    float hourlyAverage=(dailyAverage/24f);
+                    float neededhourlyAverage=(post.getFundsNeeded() - post.getTotalFundsCollected())/(24f-hour);
                     risk = (int) (hourlyAverage/neededhourlyAverage*100);
                     if (risk>100)

src/main/java/it/finki/charitable/services/EmailService.java

@@ -65 +65 @@
         try {
             javaMailSender.send(message);
-
         } catch (Exception e) {
             emailMessageService.save(new EmailMessage(message.getTo()[0], message.getSubject(), message.getText()));