Calculation delete and restore to interface works

History accessibility improvements
Tab icon added

src/main/java/com/prospero/simulator/calculation/CalculationController.java

@@ -52,11 +52,11 @@ public ResponseEntity<?> createCalculation(@RequestBody Calculation calculation)
     }
 
 
-//    @PutMapping("/update/{id}")
-//    public void updateCalculation(@PathVariable Integer id) {
-//        Calculation calculation = calculationService.getCalculation(id);
-//        calculation.setName("Updated name");
-//        calculationService.updateCalculation(id, calculation);
-//    }
+    @PutMapping("/update/{id}")
+    public ResponseEntity<?> updateCalculation(@PathVariable Integer id, @RequestBody Calculation calculation) {
+        // Logic to save the calculation
+        Calculation savedCalculation = calculationService.updateCalculation(id, calculation);
+        return ResponseEntity.ok(savedCalculation);
+    }
 
 }

src/main/java/com/prospero/simulator/calculation/CalculationService.java

@@ -41,12 +41,18 @@ public Calculation saveCalculation(Calculation calculation) {
         return calculation;
     }
 
-//    public void updateCalculation(Integer id, Calculation calculation) {
-//        Calculation calculationToUpdate = calculationRepository.findById(id).orElseThrow();
-//        calculationToUpdate.setName(calculation.getName());
-//        calculationToUpdate.setInitialAmount(calculation.getInitialAmount());
-//        calculationToUpdate.setContributionAmount(calculation.getContributionAmount());
-//        calculationToUpdate.setContributionFrequency(calculation.getContributionFrequency());
-//        calculationRepository.save(calculationToUpdate);
-//    }
+    public Calculation updateCalculation(Integer id, Calculation calculation) {
+        Calculation calculationToUpdate = calculationRepository.findById(id).orElseThrow();
+        calculationToUpdate.setName(calculation.getName());
+        calculationToUpdate.setContributionAmount(calculation.getContributionAmount());
+        calculationToUpdate.setContributionFrequency(calculation.getContributionFrequency());
+        calculationToUpdate.setCapitalizationFrequency(calculation.getCapitalizationFrequency());
+        calculationToUpdate.setInterestRate(calculation.getInterestRate());
+        calculationToUpdate.setCreatedAt(calculation.getCreatedAt());
+        calculationToUpdate.setIncomeTaxRate(calculation.getIncomeTaxRate());
+        calculationToUpdate.setInflationRate(calculation.getInflationRate());
+        calculationToUpdate.setInitialDeposit(calculation.getInitialDeposit());
+        calculationRepository.save(calculationToUpdate);
+        return calculationToUpdate;
+    }
 }

src/main/resources/i18n/messages.properties

@@ -128,9 +128,10 @@ simulator.tax=Tax
 simulator.maxValueReached=Maximum value reached
 simulator.enterCalculationName=Enter calculation name
 simulator.alreadyExists=Already exists
-simulator.Delete=Delete
+simulator.delete=Delete
 simulator.calculationNameRequired=Calculation name is required
 simulator.inflation=Inflation
+history.delete=Delete
 
 # History
 history.title=History

src/main/resources/static/assets/css/simulator.css

@@ -39,7 +39,7 @@ label {
 }
 
 #sub-container-history {
-    width: 85%;
+    width: 100%;
     margin: auto;
 }
 
@@ -50,10 +50,6 @@ label {
     margin-top: 1.5em;
 }
 
-#btn-export-csv {
-    /*float: right;*/
-}
-
 
 /*////////// Responsiveness /////////////////*/
 /* Laptop */
@@ -108,13 +104,13 @@ label {
         margin: auto;
     }
 
-    #btn-export-csv {
-        margin-bottom: 2em;
-    }
-
     .container-export {
         width: 100%;
     }
+
+    .history-additional-info-tablet {
+        display: none;
+    }
 }
 
 /* Smartphones in landscape mode */
@@ -138,13 +134,13 @@ label {
         margin: auto;
     }
 
-    #btn-export-csv {
-        margin-bottom: 2em;
-    }
-
     .container-export {
         width: 100%;
     }
+
+    .history-additional-info-tablet {
+        display: none;
+    }
 }
 
 /* Smartphones in portrait mode */
@@ -182,7 +178,15 @@ label {
         width: 100%;
     }
 
-    .history-additional-info {
+    .history-additional-info-smartphone {
+        display: none;
+    }
+
+    .history-additional-info-tablet {
+        display: none;
+    }
+
+    .button-history-delete {
         display: none;
     }
 }