Changeset 6fa3d09

Timestamp:

01/05/22 21:51:57 (2 years ago)

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

a64f926

Parents:

b8dc761

Message:

part 3

Location:

src/main

Files:

• java/it/finki/charitable/controller/DonationPostController.java (modified) (4 diffs)
• java/it/finki/charitable/controller/UserProfileController.java (modified) (3 diffs)
• java/it/finki/charitable/util/AutomaticEvents.java (modified) (2 diffs)
• resources/templates/album.html (modified) (1 diff)
• resources/templates/login.html (modified) (1 diff)
• resources/templates/post.html (modified) (1 diff)

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

@@ -16 +16 @@
 import java.time.Duration;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -67 +68 @@
             return "upload";
         }
+        if (dateDue.isBefore(LocalDate.now()))
+        {
+            model.addAttribute("error", true);
+            return "upload";
+        }
 
         DonationPost post = new DonationPost();
@@ -269 +275 @@
         post.setTotalFundsCollected(post.getTotalFundsCollected() + donatedAmount);
 
-        if(post.getRiskFactor() != 101) {
+        if(post.getRiskFactor() != 101 && post.getRiskFactor() != 102) {
             post.setRiskFactor(getRisk(post));
         }
@@ -317 +323 @@
 
     private Integer getRisk(DonationPost post) {
-        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);
-
-        System.out.println(dailyAverage + " " + neededAverage);
-        int risk = (int) (dailyAverage / neededAverage * 100);
-
-        if(risk > 100) {
-            risk = 100;
-        }
-
-        if(Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays() == 0) {
-            risk = 0;
-        }
-
+        int risk;
         if(post.getFundsNeeded() <= post.getTotalFundsCollected()) {
-            risk = 101;
-        }
-
+            risk = 102;
+        }
+        else
+        {
+            if (LocalDate.now().isAfter(post.getDateDue()))
+            {
+                risk=0;
+            }
+            else
+            {
+                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);
+
+                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);
+                    risk = (int) (hourlyAverage/neededhourlyAverage*100);
+                    if (risk>100)
+                    {
+                        risk=100;
+                    }
+
+                }
+                else
+                {
+                    System.out.println(dailyAverage + " " + neededAverage);
+                    risk = (int) (dailyAverage / neededAverage * 100);
+
+                    if(risk > 100) {
+                        risk = 100;
+                    }
+                }
+            }
+        }
         return risk;
     }

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

@@ -14 +14 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -116 +119 @@
             post.getFundsCollected().add(funds);
             post.setTotalFundsCollected(post.getTotalFundsCollected() + amount);
+            post.setRiskFactor(getRisk(post));
             donationPostService.save(post);
         }
@@ -130 +134 @@
         return null;
     }
+    private Integer getRisk(DonationPost post) {
+        int risk;
+        if(post.getFundsNeeded() <= post.getTotalFundsCollected()) {
+            risk = 102;
+        }
+        else
+        {
+            if (LocalDate.now().isAfter(post.getDateDue()))
+            {
+                risk=0;
+            }
+            else
+            {
+                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);
+
+                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);
+                    risk = (int) (hourlyAverage/neededhourlyAverage*100);
+                    if (risk>100)
+                    {
+                        risk=100;
+                    }
+
+                }
+                else
+                {
+                    System.out.println(dailyAverage + " " + neededAverage);
+                    risk = (int) (dailyAverage / neededAverage * 100);
+
+                    if(risk > 100) {
+                        risk = 100;
+                    }
+                }
+            }
+        }
+        return risk;
+    }
 }
+

src/main/java/it/finki/charitable/util/AutomaticEvents.java

@@ -12 +12 @@
 import java.time.Duration;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -60 +61 @@
 
         donationPosts.forEach(post -> {
-            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);
+            int risk;
+            if(post.getFundsNeeded() <= post.getTotalFundsCollected()) {
+                risk = 102;
+            }
+            else
+            {
+                if (LocalDate.now().isAfter(post.getDateDue()))
+                {
+                    risk=0;
+                }
+                else
+                {
+                    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);
 
-            System.out.println(dailyAverage + " " + neededAverage);
-            int risk = (int) (dailyAverage / neededAverage * 100);
+                    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);
+                        risk = (int) (hourlyAverage/neededhourlyAverage*100);
+                        if (risk>100)
+                        {
+                            risk=100;
+                        }
+                    }
+                    else
+                    {
+                    System.out.println(dailyAverage + " " + neededAverage);
+                    risk = (int) (dailyAverage / neededAverage * 100);
 
-            if(risk > 100) {
-                risk = 100;
+                    if(risk > 100) {
+                        risk = 100;
+                    }
+                    }
             }
-
-            if(Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays() == 0) {
-                risk = 0;
             }
-
-            if(post.getFundsNeeded() <= post.getTotalFundsCollected()) {
-                risk = 101;
-            }
-
             post.setRiskFactor(risk);
             donationPostService.save(post);

src/main/resources/templates/album.html

@@ -55 +55 @@
                             <h4 th:text="${post.title}" style="height: 60px"></h4>
                             <p class="card-text text-truncate" style="height: 45px" th:text="${post.description}"></p>
-                            <span th:if="${post.riskFactor < 101}" class="" style="color: black; margin-left: 62%;">Chance: <small th:text="${post.riskFactor}"></small></span>
-                            <span th:unless="${post.riskFactor < 101}" style="color: black; margin-left: 62%;">Chance: unavailable</span>
+                            <span th:if="${post.riskFactor == 100}" class="" style="color: black; margin-left: 62%;">Chance: <small th:text="${post.riskFactor+'+'}"></small></span>
+                            <span th:if="${post.riskFactor < 100}" class="" style="color: black; margin-left: 62%;">Chance: <small th:text="${post.riskFactor}"></small></span>
+                            <span th:if="${post.riskFactor == 101}" style="color: black; margin-left: 46%;">Chance: too early to calculate</span>
+                            <span th:if="${post.riskFactor == 102}" style="color: black; margin-left: 61%;">Donation completed!</span>
                             <div class="d-flex justify-content-between align-items-center">
                                 <div class="btn-group">

src/main/resources/templates/login.html

@@ -27 +27 @@
         <button class="w-100 btn btn-lg btn-primary" type="submit">Sign in</button>
     </form>
-    <a th:href="@{/oauth2/authorization/google}" class="btn btn-primary">Continue with google</a>
-    <a th:href="@{/oauth2/authorization/facebook}" class="btn btn-primary">Continue with facebook</a>
+    <a th:href="@{/oauth2/authorization/google}" class="btn btn-warning" style="width:200px; margin-top:20px;">Continue with Google</a>
+    <a th:href="@{/oauth2/authorization/facebook}" class="btn btn-info"style="width:200px; margin-top:20px;">Continue with Facebook</a>
     <p th:if="${param.error != null}" class="text-danger">Incorrect username or password</p>
     <p th:if="${successValidation}" class="text-success">Account validated</p>

src/main/resources/templates/post.html

@@ -53 +53 @@
             <h5>Date due:</h5>
             <p th:text="${post.dateDue}"></p>
+            <h5>Chance:</h5>
+            <p th:if="${post.riskFactor<100}" th:text="${post.riskFactor}"></p>
+            <p th:if="${post.riskFactor==100}" th:text="${post.riskFactor+'+'}"></p>
+            <p th:if="${post.riskFactor==101}">too early to calculate</p>
+            <p th:if="${post.riskFactor==102}">Donation completed!</p>
             <h5>Bank account:</h5>
             <p th:text="${post.bankAccount}"></p>