fix codeql detected missing override

codeforamerica · Oct 17, 2023 · 11ec4de · 11ec4de
1 parent 4a5d462
commit 11ec4de
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 25 deletions.
diff --git a/src/main/java/org/ladocuploader/app/inputs/LaDigitalAssister.java b/src/main/java/org/ladocuploader/app/inputs/LaDigitalAssister.java
@@ -167,5 +167,7 @@ public class LaDigitalAssister extends FlowInputs {
 
   private String moneyOnHand;
 
+  private String annualHouseholdIncome;
+
 }
 
diff --git a/src/main/java/org/ladocuploader/app/submission/conditions/JobPaidByTheHour.java b/src/main/java/org/ladocuploader/app/submission/conditions/JobPaidByTheHour.java
@@ -4,6 +4,7 @@
 
 @Component
 public class JobPaidByTheHour extends AbstractSubflowCondition {
+    @Override
     public Boolean run(Submission submission, String uuid) {
         var item = currentIncomeSubflowItem(submission, uuid);
 

diff --git a/src/main/java/org/ladocuploader/app/utils/IncomeCalculator.java b/src/main/java/org/ladocuploader/app/utils/IncomeCalculator.java
@@ -13,6 +13,8 @@ public IncomeCalculator(Submission submission) {
   }
 
   public Double totalFutureEarnedIncome() {
+    // TODO: check for annualIncome key and use that if it is entered?
+//    if submission.getInputData().
     var jobs = (List<Map<String, Object>>) submission.getInputData().getOrDefault("income", new ArrayList<Map<String, Object>>());
     var total = jobs.stream()
       .map(IncomeCalculator::futureIncomeForJob)

diff --git a/src/main/resources/flows-config.yaml b/src/main/resources/flows-config.yaml
@@ -242,6 +242,8 @@ flow:
     subflow: income
     nextScreens:
      - name: householdEmployerName
+  householdIncomeDeleteConfirmation:
+    nextScreens: null
   householdAnnualIncome:
     nextScreens:
       - name: householdIncomeList

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
@@ -731,3 +731,8 @@ income-list.thats-you=(that's you!)
 income-list.delete-job=delete job
 income-list.edit-job=edit job
 income-list.add-job=+ Add a job
+
+income-delete-confirmation.header=Are you sure you want to delete {0} from {1}''s jobs?
+income-delete-confirmation.no=No, keep it
+income-delete-confirmation.title=Delete household member income
+income-delete-confirmation.yes=Yes, delete it
diff --git a/src/main/resources/templates/laDigitalAssister/householdIncomeDeleteConfirmation.html b/src/main/resources/templates/laDigitalAssister/householdIncomeDeleteConfirmation.html
@@ -1,30 +1,48 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}">
-<head th:replace="fragments/head :: head(title='Scaffold')"></head>
-<body>
-<div class="page-wrapper">
-  <div th:replace="fragments/toolbar :: toolbar"></div>
-  <section class="slab">
-    <div class="grid">
-      <div th:replace="fragments/goBack :: goBackLink"></div>
-      <main id="content" role="main" class="form-card spacing-above-35">
-        <!--        <th:block-->
-        <!--            th:replace="'fragments/cardHeader' :: cardHeader(header=#{}, subtext=#{})"/>-->
-        <th:block th:replace="'fragments/form' :: form(action=${formAction}, content=~{::formContent})">
-          <th:block th:ref="formContent">
+<th:block th:with="
+  title=#{income-delete-confirmation.header(${session.entryToDelete.getOrDefault('employerName', '')}, ${session.entryToDelete.getOrDefault('householdMemberJobAdd', '')})}
+">
+  <!DOCTYPE html>
+  <html th:lang="${#locale.language}">
+  <head th:replace="~{fragments/head :: head(title=${title})}"></head>
+  <body>
+  <div class="page-wrapper">
+    <div th:replace="~{fragments/toolbar :: toolbar}"></div>
+    <section class="slab">
+      <div class="grid">
+        <div th:replace="~{fragments/goBack :: goBackLink}"></div>
+        <main id="content" role="main" class="form-card spacing-above-35">
+          <th:block th:if="${noEntryToDelete != null}">
+            <th:block
+                th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{delete-confirmation-back-redirect.header})}"/>
+            <b>hello</b>
+            <div class="form-card__footer" th:with="subflowIsEmpty=${subflowIsEmpty != null}">
+              <a class="button button--primary"
+                 th:href="${subflowIsEmpty ? entryScreen : reviewScreen}"
+                 th:text="#{delete-confirmation-back-redirect.button}"></a>
+            </div>
+          </th:block>
+          <th:block th:if="${noEntryToDelete == null}">
             <div class="form-card__content">
-
+              <th:block th:replace="~{'fragments/icons' :: 'deleteDocument'}"></th:block>
+              <h1 class="h2"
+                  th:text="${title}"></h1>
             </div>
             <div class="form-card__footer">
-              <th:block th:replace="~{fragments/continueButton :: continue}" />
-
+              <a class="button button--primary" th:href="'/flow/' + ${flow} + '/incomeReview'"
+                 th:text="#{income-delete-confirmation.no}"></a>
+              <form method="post"
+                    th:action="'/flow/' + ${flow} + '/' + ${subflow} + '/' + ${param.uuid} + '/delete'">
+                <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
+                  classes='button button--danger',
+                  text=#{income-delete-confirmation.yes})}"/>
+              </form>
             </div>
           </th:block>
-        </th:block>
-      </main>
-    </div>
-  </section>
-</div>
-<th:block th:replace="fragments/footer :: footer" />
-</body>
-</html>
+        </main>
+      </div>
+    </section>
+  </div>
+  <th:block th:replace="~{fragments/footer :: footer}"/>
+  </body>
+  </html>
+</th:block>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -167,5 +167,7 @@ public class LaDigitalAssister extends FlowInputs {

		private String moneyOnHand;

		private String annualHouseholdIncome;

		}