Merge branch 'aiccra-staging' into aiccra-marlo-java-11-version2

CCAFS · Oct 9, 2024 · f50f5a5 · f50f5a5
2 parents 2b00858 + e65b2af
commit f50f5a5
Show file tree

Hide file tree

Showing 9 changed files with 503 additions and 374 deletions.
diff --git a/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/model/CrpProgramOutcome.java b/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/model/CrpProgramOutcome.java
@@ -57,8 +57,10 @@ public class CrpProgramOutcome extends MarloAuditableEntity implements java.io.S
   private Integer year;
   @Expose
   private FileDB file;
-
-
+  @Expose
+  private Integer orderIndex;
+  @Expose
+  private Integer afPhase;
   @Expose
   private BigDecimal value;
 
@@ -160,6 +162,11 @@ public String getAcronym() {
   }
 
 
+  public Integer getAfPhase() {
+    return afPhase;
+  }
+
+
   public String getComposedName() {
     if (this.getCrpProgram() != null && this.getCrpProgram().getAcronym() != null && description != null) {
       return this.getCrpProgram().getAcronym() + " Outcome: " + description;
@@ -168,7 +175,6 @@ public String getComposedName() {
     }
   }
 
-
   public String getComposeID() {
     if (composeID != null) {
       return composeID;
@@ -192,7 +198,6 @@ public Set<CrpOutcomeSubIdo> getCrpOutcomeSubIdos() {
     return this.crpOutcomeSubIdos;
   }
 
-
   public CrpProgram getCrpProgram() {
     return this.crpProgram;
   }
@@ -201,7 +206,6 @@ public Set<CrpProgramOutcomeIndicator> getCrpProgramOutcomeIndicators() {
     return crpProgramOutcomeIndicators;
   }
 
-
   public Set<Deliverable> getDeliverables() {
     return deliverables;
   }
@@ -237,6 +241,9 @@ public List<CrpMilestone> getMilestones() {
     return milestones;
   }
 
+  public Integer getOrderIndex() {
+    return orderIndex;
+  }
 
   public String getPAcronym() {
     return this.getCrpProgram().getAcronym();
@@ -274,16 +281,18 @@ public void setAcronym(String acronym) {
     this.acronym = acronym;
   }
 
+  public void setAfPhase(Integer afPhase) {
+    this.afPhase = afPhase;
+  }
+
   public void setComposeID(String composeID) {
     this.composeID = composeID;
   }
 
-
   public void setCrpClusterKeyOutputOutcomes(Set<CrpClusterKeyOutputOutcome> crpClusterKeyOutputOutcomes) {
     this.crpClusterKeyOutputOutcomes = crpClusterKeyOutputOutcomes;
   }
 
-
   public void setCrpMilestones(Set<CrpMilestone> crpMilestones) {
     this.crpMilestones = crpMilestones;
   }
@@ -328,6 +337,10 @@ public void setMilestones(List<CrpMilestone> milestones) {
     this.milestones = milestones;
   }
 
+  public void setOrderIndex(Integer orderIndex) {
+    this.orderIndex = orderIndex;
+  }
+
   public void setPhase(Phase phase) {
     this.phase = phase;
   }

diff --git a/marlo-data/src/main/resources/xmls/CrpProgramOutcomes.hbm.xml b/marlo-data/src/main/resources/xmls/CrpProgramOutcomes.hbm.xml
@@ -53,6 +53,12 @@
 		<property name="year" type="java.lang.Integer">
 			<column name="year" not-null="false" />
 		</property>
+		<property name="orderIndex" type="java.lang.Integer">
+            <column name="order_index" not-null="false" />
+        </property>
+        <property name="afPhase" type="java.lang.Integer">
+            <column name="af_phase" not-null="false" />
+        </property>
 		<property name="value" type="java.math.BigDecimal">
 			<column name="value" precision="20" not-null="false" />
 		</property>