Resolved conflicts

src/main/java/net/gepafin/tendermanagement/enums/AssignedApplicationEnum.java

@@ -5,6 +5,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum AssignedApplicationEnum {
     OPEN ("OPEN"),
     SOCCORSO("SOCCORSO"),
+
+    AWAITING("AWAITING"),
+    
     CLOSE("CLOSE");
 
 

src/main/java/net/gepafin/tendermanagement/enums/EvaluationVersionEnum.java

@@ -0,0 +1,40 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public enum EvaluationVersionEnum {
+    V1("V1"),
+    V2("V2");
+    private String value;
+
+    EvaluationVersionEnum(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+
+    @JsonCreator
+    public static EvaluationVersionEnum fromValue(String value) {
+        for (EvaluationVersionEnum b : EvaluationVersionEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+    public static List<String> getStatusValues() {
+        return Arrays.stream(EvaluationVersionEnum.values())
+                .map(EvaluationVersionEnum::getValue)
+                .collect(Collectors.toList());
+    }
+}
+
+

src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java

@@ -13,6 +13,11 @@ public enum UserActionContextEnum {
     GET_CALL("GET_CALL"),
     DOWNLOAD_CALL_DOCUMENT("DOWNLOAD_CALL_DOCUMENT"),
 
+
+    /** Evaluation V2 call action context  **/
+    EVALUATION_V2_CREATE_UPDATE_CALL_STEP_2("EVALUATION_V2_CREATE_UPDATE_CALL_STEP_2"),
+
+
     /** user action context  **/
     CREATE_USER("CREATE_USER"),
     USER_LOGIN("USER_LOGIN"),
@@ -30,6 +35,7 @@ public enum UserActionContextEnum {
     /** application action context **/
     GET_APPLICATION("GET_APPLICATION"),
     CREATE_UPDATE_APPLICATION_FORM("CREATE_UPDATE_APPLICATION_FORM"),
+    GET_APPLICATION_EVALUATION_VERSION("GET_APPLICATION_EVALUATION_VERSION"),
     CREATE_APPLICATION("CREATE_APPLICATION"),
     DELETE_APPLICATION("DELETE_APPLICATION"),
     GET_ALL_APPLICATION("GET_ALL_APPLICATION"),
@@ -92,6 +98,8 @@ public enum UserActionContextEnum {
     CREATE_UPDATE_APPLICATION_EVALUATION("CREATE_UPDATE_APPLICATION_EVALUATION"),
     GET_APPLICATION_EVALUATION("GET_APPLICATION_EVALUATION"),
     DELETE_APPLICATION_EVALUATION("DELETE_APPLICATION_EVALUATION"),
+    CREATE_UPDATE_APPLICATION_EVALUATION_FORM("CREATE_UPDATE_APPLICATION_EVALUATION_FORM"),
+    GET_APPLICATION_EVALUATION_FORM("GET_APPLICATION_EVALUATION_FORM"),
 
     /** Beneficiary Preferred Call action context  **/
     CREATE_BENEFICIARY_PREFERRED_CALL("CREATE_BENEFICIARY_PREFERRED_CALL"),
@@ -104,6 +112,7 @@ public enum UserActionContextEnum {
     DELETE_ASSIGNED_APPLICATION("DELETE_ASSIGNED_APPLICATION"),
     GET_ASSIGNED_APPLICATION("GET_ASSIGNED_APPLICATION"),
     UPDATE_ASSIGNED_APPLICATION_DETAILS("UPDATE_ASSIGNED_APPLICATION_DETAILS"),
+    UPDATE_ASSIGNED_APPLICATION_STATUS("UPDATE_ASSIGNED_APPLICATION_STATUS"),
     
     /** Assigned form field context  **/
     CREATE_FORM_FIELD("CREATE_FORM_FIELD"),
@@ -137,6 +146,10 @@ public enum UserActionContextEnum {
     GET_DASHBOARD_WIDGET_FOR_SUPER_ADMIN("GET_DASHBOARD_WIDGET_FOR_SUPER_ADMIN"),
     GET_DASHBOARD_WIDGET_FOR_BENEFICIARY("GET_DASHBOARD_WIDGET_FOR_BENEFICIARY"),
     GET_APPLICATION_DETAILS("GET_APPLICATION_DETAILS"),
+    GET_AMENDMENT_DETAILS("GET_AMENDMENT_DETAILS"),
+    GET_DASHBOARD_WIDGET_FOR_PRE_INSTRUCTOR("GET_DASHBOARD_WIDGET_FOR_PRE_INSTRUCTOR"),
+    GET_APPLICATION_DETAILS_FOR_EVALUATION("GET_APPLICATION_DETAILS_FOR_EVALUATION"),
+    GET_STATISTICS_PAGE_FOR_BENEFICIARY("GET_STATISTICS_PAGE_FOR_BENEFICIARY"),
 
     /** Evaluation criteria action context **/
     GET_EVALUATION_CRITERIA("GET_EVALUATION_CRITERIA"),
@@ -171,6 +184,13 @@ public enum UserActionContextEnum {
     GET_ALL_APPLICATION_BY_PAGINATION("GET_ALL_APPLICATION_BY_PAGINATION"),
 
 
+    /** Evaluation form action context **/
+    GET_EVALUATION_FORM("GET_EVALUATION_FORM"),
+    CREATE_EVALUATION_FORM("CREATE_EVALUATION_FORM"),
+    UPDATE_EVALUATION_FORM("UPDATE_EVALUATION_FORM"),
+    DELETE_EVALUATION_FORM("DELETE_EVALUATION_FORM"),
+
+
     GET_USER_ACTION("GET_USER_ACTION"),
     GET_ACTION_CONTEXT_LABELS("GET_ACTION_CONTEXT_LABELS"),
     GET_ALL_ASSIGNED_APPLICATION_BY_PAGINATION("GET_ALL_ASSIGNED_APPLICATION_BY_PAGINATION"),