Resolved Conflicts.

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

@@ -6,6 +6,7 @@ public enum DocOtherSourceTypeEnum {
     TEMPLATE("TEMPLATE"),
     DELETED_USER_DELEGATION("DELETED_USER_DELEGATION"),
     DELETED_APPLICATION("DELETED_APPLICATION"),
+    DELETED_EVALUATION("DELETED_EVALUATION"),
     DELETED_CALL("DELETED_CALL"),
     DELETED_AMENDMENT("DELETED_AMENDMENT");
 

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

@@ -4,7 +4,7 @@ public enum DocumentSourceTypeEnum {
     CALL("CALL"),
 
     APPLICATION("APPLICATION"),
-
+    EVALUATION("EVALUATION"),
     AMENDMENT("AMENDMENT");
 
     private String value;

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

@@ -0,0 +1,24 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum ProtocolTypeEnum {
+    INPUT("INPUT"),
+    OUTPUT("OUTPUT");
+
+    private String value;
+
+    ProtocolTypeEnum(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+}

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

@@ -7,7 +7,8 @@ public enum RoleStatusEnum {
 	ROLE_BENEFICIARY("ROLE_BENEFICIARY"),
 	ROLE_SUPER_ADMIN("ROLE_SUPER_ADMIN"),
 	ROLE_PRE_INSTRUCTOR("ROLE_PRE_INSTRUCTOR"),
-	ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR");
+	ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR"),
+    ROLE_INSTRUCTOR_MANAGER("ROLE_INSTRUCTOR_MANAGER");
 
     private String value;
 

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

@@ -118,6 +118,10 @@ public enum UserActionContextEnum {
     UPDATE_DOCUMENT("UPDATE_DOCUEMENT"),
     UPDATE_IMAGES("UPDATE_IMAGES"),
     GET_DOCUMENT("GET_DOCUMENT"),
+    UPLOAD_AMENDMENT_DOCUMENT("UPLOAD_AMENDMENT_DOCUMENT"),
+    UPLOAD_AMENDMENT_IMAGES("UPLOAD_AMENDMENT_IMAGES"),
+    UPLOAD_EVALUATION_DOCUMENT("UPLOAD_EVALUATION_DOCUMENT"),
+    UPLOAD_EVALUATION_IMAGES("UPLOAD_EVALUATION_IMAGES"),
     
     /** Assigned flow context  **/
     CREATE_UPDATE_FLOW("CREATE_UPDATE_FLOW"),
@@ -136,6 +140,7 @@ public enum UserActionContextEnum {
     UPDATE_EVALUATION_CRITERIA("UPDATE_EVALUATION_CRITERIA"),
     DELETE_EVALUATION_CRITERIA("DELETE_EVALUATION_CRITERIA"),
     CREATE_EVALUATION_CRITERIA("CREATE_EVALUATION_CRITERIA"),
+    UPLOAD_EVALUATION_DOC("UPLOAD_EVALUATION_DOC"),
 
     /** communication action context **/
     ADD_COMMENT_TO_AMENDMENT_REQUEST("ADD_COMMENT_TO_AMENDMENT_REQUEST"),