Merge pull request #2496 from CCAFS/aiccra-dev-responsive

Changes based on bad pull request update
CCAFS · Feb 26, 2024 · fa135e8 · fa135e8
2 parents bcf4592 + 33dee55
commit fa135e8
Show file tree

Hide file tree

Showing 86 changed files with 540 additions and 7,227 deletions.
diff --git a/marlo-data/src/main/java/org/cgiar/ccafs/marlo/config/APConstants.java b/marlo-data/src/main/java/org/cgiar/ccafs/marlo/config/APConstants.java
@@ -155,7 +155,6 @@ public final class APConstants {
   public static final String HIGHLIGHT_COMMENTS_ACTIVE = "highlight_comments_active";
   public static final String TIP_SECTION_ACTIVE = "tip_section_active";
 
-  public static final String SHFRM_CONTRIBUTION_ACTIVE = "shfrm_contribution_active";
 
   public static final String IS_EXPECTED_DELIVERABLE_REPORT_All_YEARS_VISIBLE =
     "is_expected_deliverable_report_all_years_visible";
@@ -176,8 +175,6 @@ public final class APConstants {
   public static final String DELIVERABLE_FILE_LOCALLY_HOSTED_STR = "Locally";
 
   public static final String DELIVERABLE_ID = "deliverableId";
-  public static final String PRIORITY_ACTION_ID = "priorityActionId";
-  public static final String SUB_ACTION_ID = "subActionId";
   public static final int DELIVERABLE_QUALITY_ANSWER_NO = 3;
   public static final int DELIVERABLE_QUALITY_ANSWER_YES = 2;
   public static final int DELIVERABLE_QUALITY_ANSWER_YES_BUT_NO = 1;

diff --git a/...-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/DeliverableShfrmPriorityActionDAO.java b/...-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/DeliverableShfrmPriorityActionDAO.java
diff --git a/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/DeliverableShfrmSubActionDAO.java b/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/DeliverableShfrmSubActionDAO.java
diff --git a/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/ShfrmPriorityActionDAO.java b/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/ShfrmPriorityActionDAO.java
diff --git a/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/ShfrmSubActionDAO.java b/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/ShfrmSubActionDAO.java
diff --git a/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/SoilIndicatorDAO.java b/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/SoilIndicatorDAO.java