Resolved conflicts

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -404,5 +404,8 @@ public class GepafinConstant {
     public static final String EVALUATION_V2_STEP_2 = "EVALUATION_V2_STEP_2";
 
     public static final String EITHER_APPLICATION_ID_OR_ASSIGNED_APPLICATION_ID_MUST_BE_PROVIDED = "either.applicationId.or.assignedApplicationId.must.be.provided";
+    public static final String ASSIGNED_APPLICATION_STATUS_UPDATED_SUCCESSFULLY = "assigned.application.status.updated.successfully";
+
+    public static final String REQUIRED_REQUESTED_AMOUNT_MSG = "validation.required.requested.amount";
 }
 

src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java

@@ -592,7 +592,7 @@ public class ApplicationAmendmentRequestDao {
         return response;
     }
 
-    public List<ApplicationAmendmentRequestResponse> getAllApplicationAmendmentRequest(HttpServletRequest request, Long userId) {
+    public List<GetAllAmendmentResponseBean> getAllApplicationAmendmentRequest(HttpServletRequest request, Long userId) {
         if (validator.checkIsPreInstructor() && userId == null) {
             throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.USER_ID_NOT_NULL_MSG));
         }
@@ -604,7 +604,7 @@ public class ApplicationAmendmentRequestDao {
                 applicationAmendmentRequestRepository.findAll(spec);
 
         return applicationAmendmentRequestEntities.stream()
-                .map(entity -> convertEntityToResponse(entity, false))
+                .map(this::initializeGetAllBasicResponse)
                 .collect(Collectors.toList());
     }
 
@@ -1178,6 +1178,37 @@ public class ApplicationAmendmentRequestDao {
         return applicationEvaluation;
 
 
+    }
+
+    private GetAllAmendmentResponseBean initializeGetAllBasicResponse(ApplicationAmendmentRequestEntity entity) {
+        GetAllAmendmentResponseBean response = new GetAllAmendmentResponseBean();
+        ApplicationEntity applicationEntity = entity.getApplicationEvaluationEntity().getAssignedApplicationsEntity().getApplication();
+        response.setId(entity.getId());
+        response.setApplicationId(entity.getApplicationId());
+        response.setApplicationEvaluationId(entity.getApplicationEvaluationEntity().getId());
+        response.setNote(entity.getNote());
+        response.setStatus(ApplicationAmendmentRequestEnum.valueOf(entity.getStatus()));
+        response.setResponseDays(entity.getResponseDays());
+        response.setInternalNote(entity.getInternalNote());
+
+        LocalDateTime startDate = entity.getStartDate();
+        response.setStartDate(startDate);
+        response.setExpirationDate(entity.getEndDate());
+        response.setEvaluationEndDate(entity.getApplicationEvaluationEntity().getEndDate());
+        response.setIsSendEmail(entity.getIsEmail());
+        response.setIsSendNotification(entity.getIsNotification());
+
+        ApplicationEntity application = applicationService.validateApplication(entity.getApplicationId());
+        response.setCallEmail(application.getCall().getEmail());
+        response.setCallName(application.getCall().getName());
+
+        UserEntity userEntity = userService.validateUser(application.getUserId());
+        response.setBeneficiaryName(buildBeneficiaryName(userEntity));
+        CompanyEntity company = companyService.validateCompany(application.getCompanyId());
+        response.setCompanyName(company.getCompanyName());
+        Long protocolNumber = entity.getProtocol() != null ? entity.getProtocol().getProtocolNumber() : null;
+        response.setProtocolNumber(protocolNumber);
+        return response;
     }
 	private void softDeleteDocument(Long documentId) {
 		documentService.deleteFile(documentId);

src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java

@@ -4,19 +4,13 @@ import jakarta.persistence.criteria.Predicate;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
-import net.gepafin.tendermanagement.entities.ApplicationEntity;
+import net.gepafin.tendermanagement.entities.*;
-import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
+import net.gepafin.tendermanagement.enums.*;
-import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
-import net.gepafin.tendermanagement.entities.CompanyEntity;
-import net.gepafin.tendermanagement.entities.UserEntity;
-import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
-import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
-import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
-import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
+import net.gepafin.tendermanagement.model.response.ApplicationResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
 import net.gepafin.tendermanagement.repositories.ApplicationRepository;
@@ -37,6 +31,7 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -120,6 +115,7 @@ public class AssignedApplicationsDao {
 		setIfUpdated(assignedApplication::getAssignedBy, assignedApplication::setAssignedBy, assignedByUser.getId());
 		setIfUpdated(assignedApplication::getUserId, assignedApplication::setUserId, userId);
 		assignedApplication.setAssignedAt(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
+        assignedApplication.setStatus(AssignedApplicationEnum.AWAITING.getValue());
 		Optional<ApplicationEvaluationEntity> entityOptional = applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(assignedApplication.getId());
 		if(entityOptional.isPresent()) { 
 			ApplicationEvaluationEntity oldApplicationEvaluationEntity = Utils.getClonedEntityForData(entityOptional.get());
@@ -141,10 +137,7 @@ public class AssignedApplicationsDao {
         assignApplication.setApplication(application);
         assignApplication.setAssignedBy(assignedByUser.getId());
         assignApplication.setUserId(userId);
-        assignApplication.setStatus(AssignedApplicationEnum.OPEN.getValue());
+        assignApplication.setStatus(AssignedApplicationEnum.AWAITING.getValue());
-        if (assignedApplicationsRequest.getStatus() != null) {
-            assignApplication.setStatus(assignedApplicationsRequest.getStatus().getValue());
-        }
         assignApplication.setNote(assignedApplicationsRequest.getNote());
         assignApplication.setIsDeleted(false);
         assignApplication.setAssignedAt(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
@@ -226,7 +219,7 @@ public class AssignedApplicationsDao {
         log.info("Assigned Application deleted with ID: {}", id);
     }
 
-        public List<AssignedApplicationsResponse> getAllAssignedApplications(HttpServletRequest request, Long userId) {
+        public List<AssignedApplicationsResponse> getAllAssignedApplications(HttpServletRequest request, Long userId,List<AssignedApplicationEnum> statusList) {
         	UserEntity user = validator.validateUser(request);
         	if(validator.checkIsPreInstructor() && userId == null) {
         		throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.USER_ID_NOT_NULL_MSG));
@@ -234,18 +227,24 @@ public class AssignedApplicationsDao {
         	if(userId != null) {        		
         		validator.validatePreInstructor(request, userId);
         	}
-            Specification<AssignedApplicationsEntity> spec = search(user.getHub().getId() ,userId);
+            Specification<AssignedApplicationsEntity> spec = search(user.getHub().getId() ,userId,statusList);
             List<AssignedApplicationsEntity> assignedApplicationsEntityList = assignedApplicationsRepository.findAll(spec);
             return assignedApplicationsEntityList.stream()
                     .map(entity -> convertEntityToResponse(entity))
                     .collect(Collectors.toList());
         }
-        private Specification<AssignedApplicationsEntity> search(Long hubId, Long userId) {
+        private Specification<AssignedApplicationsEntity> search(Long hubId, Long userId,List<AssignedApplicationEnum> statusList) {
             return (root, query, builder) -> {
                 Predicate predicate = builder.isFalse(root.get("isDeleted"));
                 if (userId != null) {
                     predicate = builder.and(predicate, builder.equal(root.get("userId"), userId));
                 }
+                if  (statusList != null && !statusList.isEmpty()) {
+                    List<String> statusNames = statusList.stream()
+                            .map(Enum::name)
+                            .collect(Collectors.toList());
+                    predicate = builder.and(predicate, root.get("status").in(statusNames));
+                }
                 query.orderBy(
                         builder.desc(builder.isNotNull(root.get(GepafinConstant.ASSIGNED_AT))),
                         builder.desc(root.get(GepafinConstant.ASSIGNED_AT))
@@ -287,5 +286,14 @@ public class AssignedApplicationsDao {
         log.info("Assigned application fetched successfully: {}", response);
         return response;
     }
+    public AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {
 
+        AssignedApplicationsEntity assignedApplication = validateAssignedApplication(assignedApplicationId);
+        validator.validatePreInstructor(request, assignedApplication.getUserId());
+
+        AssignedApplicationsEntity oldAssignedApplicationEntity = Utils.getClonedEntityForData(assignedApplication);
+        assignedApplication.setStatus(status.getValue());
+        AssignedApplicationsEntity updatedAssignment = saveAssignedApplication(assignedApplication, oldAssignedApplicationEntity, VersionActionTypeEnum.UPDATE);
+        return convertEntityToResponse(updatedAssignment);
+    }
 }

src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java

@@ -6,31 +6,23 @@ import net.gepafin.tendermanagement.entities.UserActionEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.entities.UserWithCompanyEntity;
 import net.gepafin.tendermanagement.entities.*;
-import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
+import net.gepafin.tendermanagement.enums.*;
-import net.gepafin.tendermanagement.enums.CallStatusEnum;
-import net.gepafin.tendermanagement.enums.RoleStatusEnum;
-import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.repositories.*;
 import net.gepafin.tendermanagement.service.CompanyService;
 import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
+
-import java.util.List;
-import java.util.List;
 import java.util.stream.Collectors;
 
 @Component
@@ -57,8 +49,6 @@ public class DashboardDao {
 	@Autowired
 	private ApplicationEvaluationRepository applicationEvaluationRepository;
 
-	@Autowired
-	private UserActionsRepository userActionsRepository;
 	@Autowired
 	private ApplicationAmendmentRequestRepository applicationAmendmentRequestRepository;
 
@@ -258,14 +248,15 @@ public class DashboardDao {
 
 		if (Boolean.FALSE.equals(applicationIds.isEmpty())) {
 			BigDecimal averageTime = applicationEvaluationRepository.findAverageEvaluationTimeByApplicationIds(applicationIds);
-			responseBean.setEvaluationAverageTime(averageTime != null ? averageTime : BigDecimal.ZERO);
+			responseBean.setEvaluationAverageTime(averageTime != null ? averageTime.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO);
 		}
 		LocalDate twoDaysLater = LocalDate.now().plusDays(2);
-
+		List<String> statusList =Arrays.asList( ApplicationEvaluationStatusTypeEnum.OPEN.getValue(), ApplicationEvaluationStatusTypeEnum.SOCCORSO.getValue());
 		Long dueApplications = applicationEvaluationRepository.countDueApplicationsBetween(
 				applicationIds,
 				LocalDate.now(),
-				twoDaysLater
+				twoDaysLater,
+				statusList
 		);
 
 		if (dueApplications != null) {
@@ -362,5 +353,57 @@ public class DashboardDao {
 		}
 	}
 
+	public AssignedApplicationWidgetResponseBean getApplicationDetailsForEvaluation(UserEntity userEntity) {
+	   Long userId = userEntity.getId();
+	   Long hubId = userEntity.getHub().getId();
+
+		Object[] results;
+		List<Long> applicationIds;
+		if (validator.checkIsPreInstructor()) {
+			results = assignedApplicationsRepository.countAssignedApplicationsWithStatus(userId, hubId);
+			applicationIds = assignedApplicationsRepository.findApplicationIdsByUserIdAndHubIdAndIsDeletedFalse(userId,hubId);
+		} else {
+			results = assignedApplicationsRepository.countAssignedApplicationsForHub(hubId);
+			applicationIds = assignedApplicationsRepository.findApplicationIdsByHubId(hubId);
+		}
+		AssignedApplicationWidgetResponseBean response = convertToResponse(results);
+		calculateEvaluationAvgTimeForAssignedApplication(response, applicationIds);
+		return response;
+	}
+
+	private void calculateEvaluationAvgTimeForAssignedApplication(AssignedApplicationWidgetResponseBean response, List<Long> applicationIds) {
+		if (applicationIds == null || applicationIds.isEmpty()) {
+			response.setAverageEvaluationDays(BigDecimal.ZERO);
+			response.setNumberOfApplicationExpiringIn48Hours(0L);
+			return;
+		}
+
+		BigDecimal averageTime = applicationEvaluationRepository.findAverageEvaluationTimeByApplicationIds(applicationIds);
+		response.setAverageEvaluationDays(averageTime != null ? averageTime.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO);
+
+		LocalDate today = LocalDate.now();
+		LocalDate twoDaysLater = today.plusDays(2);
+		List<String> statusList =Arrays.asList( ApplicationEvaluationStatusTypeEnum.OPEN.getValue(), ApplicationEvaluationStatusTypeEnum.SOCCORSO.getValue());
+		Long dueApplications = applicationEvaluationRepository.countDueApplicationsBetween(
+				applicationIds, today, twoDaysLater,statusList
+		);
+		response.setNumberOfApplicationExpiringIn48Hours(dueApplications != null ? dueApplications : 0L);
+	}
+
+	private AssignedApplicationWidgetResponseBean convertToResponse(Object[] results) {
+		AssignedApplicationWidgetResponseBean response = new AssignedApplicationWidgetResponseBean();
+
+		Object[] data = (Object[]) results[0];
+
+		response.setNumberOfAssignedApplication(data[0] instanceof Number ? ((Number) data[0]).longValue() : 0L);
+		response.setNumberOfApplicationInAmendmentState(data[1] instanceof Number ? ((Number) data[1]).longValue() : 0L);
+		response.setNumberOfApplicationInOpenState(data[2] instanceof Number ? ((Number) data[2]).longValue() : 0L);
+		response.setNumberOfApplicationInCloseState(data[3] instanceof Number ? ((Number) data[3]).longValue() : 0L);
+
+		return response;
+	}
+
+
+
 
 }

src/main/java/net/gepafin/tendermanagement/dao/NotificationDao.java

@@ -208,6 +208,20 @@ public class NotificationDao {
         }
     }
 
+    public void sendNotificationToInstructorManager(Map<String, String> placeHolders, ApplicationEvaluationEntity applicationEvaluationEntity, NotificationTypeEnum notificationTypeEnum) {
+
+        List<UserEntity> userEntities=userRepository.findByRoleEntity_RoleTypeAndHubId(RoleStatusEnum.ROLE_INSTRUCTOR_MANAGER.getValue(),applicationEvaluationEntity.getAssignedApplicationsEntity().getApplication().getHubId());
+        for (UserEntity user:userEntities) {
+            Long instructorId=user.getId();
+            ApplicationEntity application = applicationService.validateApplication(applicationEvaluationEntity.getApplicationId());
+            if (instructorId != null) {
+                NotificationReq notificationreq = createNotificationReq(notificationTypeEnum.getValue(), placeHolders, instructorId, application.getUserWithCompany(),
+                        null);
+                sendNotification(notificationreq);
+            }
+        }
+    }
+
     public List<Long> getAllCompanyIdsForUser(Long userId) {
 
         return userWithCompanyRepository.findActiveCompanyIdsByUserId(userId);

src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java

@@ -340,7 +340,8 @@ public class PdfDao {
                 for (String key : orderedKeys) {
                     if (stateFieldMap.containsKey(key)) {  // Only add data cell if key is in stateFieldMap
                         Object value = row.getOrDefault(key, ""); // Fetch value or use empty string if key not present
-                      String fieldValue= (String) value;
+//                      String fieldValue= (String) value;
+                        String fieldValue = value != null ? value.toString() : "";
                       if(Boolean.TRUE.equals(Utils.isItalianFormattedAmount(fieldValue))  ){
                             fieldValue= String.valueOf(Utils.convertToItalianFormat(fieldValue));
                         }

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/UserActionContextEnum.java

@@ -111,6 +111,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"),
@@ -145,6 +146,7 @@ public enum UserActionContextEnum {
     GET_DASHBOARD_WIDGET_FOR_BENEFICIARY("GET_DASHBOARD_WIDGET_FOR_BENEFICIARY"),
     GET_APPLICATION_DETAILS("GET_APPLICATION_DETAILS"),
     GET_AMENDMENT_DETAILS("GET_AMENDMENT_DETAILS"),
+    GET_APPLICATION_DETAILS_FOR_EVALUATION("GET_APPLICATION_DETAILS_FOR_EVALUATION"),
 
     /** Evaluation criteria action context **/
     GET_EVALUATION_CRITERIA("GET_EVALUATION_CRITERIA"),

src/main/java/net/gepafin/tendermanagement/model/request/AssignedApplicationsRequest.java

@@ -6,5 +6,4 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 @Data
 public class AssignedApplicationsRequest {
     private String note;
-    private AssignedApplicationEnum status;
 }

src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationWidgetResponseBean.java

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AssignedApplicationWidgetResponseBean {
+    private Long numberOfAssignedApplication;
+    private Long numberOfApplicationInAmendmentState;
+    private Long numberOfApplicationInCloseState;
+    private Long numberOfApplicationInOpenState;
+    private Long numberOfApplicationExpiringIn48Hours;
+    private BigDecimal averageEvaluationDays;
+}

src/main/java/net/gepafin/tendermanagement/model/response/GetAllAmendmentResponseBean.java

@@ -0,0 +1,30 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class GetAllAmendmentResponseBean {
+    private Long id;
+    private String callEmail;
+    private String note;
+    private Long responseDays;
+    private LocalDateTime startDate;
+    private Boolean isSendNotification;
+    private Boolean isSendEmail;
+    private Long protocolNumber;
+    private String callName;
+    private String beneficiaryName;
+    private String companyName;
+    private String amendmentNotes;
+    private Long applicationId;
+    private Long applicationEvaluationId;
+    private LocalDateTime evaluationEndDate;
+    private LocalDateTime expirationDate;
+    private String internalNote;
+    private ApplicationAmendmentRequestEnum status;
+}
+

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java

@@ -59,7 +59,7 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
 
     @Query("SELECT a FROM ApplicationAmendmentRequestEntity a " +
             "WHERE a.isDeleted = false " +
-            "AND a.status <> 'CLOSE' " +
+            "AND a.status NOT IN('CLOSE','EXPIRED') " +
             "AND a.endDate < :currentTime")
     List<ApplicationAmendmentRequestEntity> findAmendmentsDueForExpiration(LocalDateTime currentTime);
     
@@ -72,7 +72,7 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
     	       "AND NOT EXISTS ( " +
     	       "    SELECT 1 FROM ApplicationAmendmentRequestEntity activeAmendment" +
     	       "    WHERE activeAmendment.applicationEvaluationEntity.id = a.applicationEvaluationEntity.id " +
-    	       "    AND activeAmendment.status <> 'CLOSE' " +
+    	       "    AND activeAmendment.status  NOT IN('CLOSE','EXPIRED') " +
     	       "    AND activeAmendment.isDeleted = false) ")
 	Set<ApplicationEvaluationEntity> findEvaluationsWithoutActiveAmendmentsByIds(@Param("applicationEvaluationIds") Set<Long> applicationEvaluationIds);
 

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java

@@ -32,7 +32,7 @@ public interface ApplicationEvaluationRepository extends JpaRepository<Applicati
             "WHERE aar.id = :evaluationId AND aar.isDeleted = false)")
     ApplicationEntity findApplicationByEvaluationId(Long evaluationId);
 
-    @Query("SELECT a FROM ApplicationEvaluationEntity a WHERE a.isDeleted = false AND a.endDate < :currentDate")
+    @Query("SELECT a FROM ApplicationEvaluationEntity a WHERE a.isDeleted = false  AND a.status = 'OPEN' AND a.endDate < :currentDate")
     List<ApplicationEvaluationEntity> findAllByIsDeletedFalseAndEndDateBefore(@Param("currentDate") LocalDateTime currentDate);
 
     @Query("SELECT a FROM ApplicationEvaluationEntity a " +
@@ -55,11 +55,13 @@ public interface ApplicationEvaluationRepository extends JpaRepository<Applicati
     WHERE e.applicationId IN :applicationIds
       AND FUNCTION('DATE', e.endDate) BETWEEN :startDate AND :endDate
       AND e.isDeleted = false
+      AND e.status IN :statusList
 """)
     Long countDueApplicationsBetween(
             @Param("applicationIds") List<Long> applicationIds,
             @Param("startDate") LocalDate startDate,
-            @Param("endDate") LocalDate endDate
+            @Param("endDate") LocalDate endDate,
+            @Param("statusList") List<String> statusList
     );
 
     @Query("SELECT ae FROM ApplicationEvaluationEntity ae " +

src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java

@@ -25,4 +25,46 @@ public interface AssignedApplicationsRepository extends JpaRepository<AssignedAp
 
     @Query("SELECT aa.application.id FROM AssignedApplicationsEntity aa WHERE aa.isDeleted = false AND aa.userId = :userId")
     List<Long> findApplicationIdsByUserIdAndIsDeletedFalse(@Param("userId") Long userId);
+    
+    @Query("""
+    SELECT
+        COALESCE(COUNT(a.id), 0) AS totalAssigned,
+        COALESCE(SUM(CASE WHEN a.status = 'SOCCORSO' THEN 1 ELSE 0 END), 0) AS amendmentCount,
+        COALESCE(SUM(CASE WHEN a.status = 'OPEN' THEN 1 ELSE 0 END), 0) AS openCount,
+        COALESCE(SUM(CASE WHEN a.status = 'CLOSE' THEN 1 ELSE 0 END), 0) AS closeCount
+    FROM AssignedApplicationsEntity a
+    JOIN a.application app
+    WHERE a.isDeleted = false
+    AND a.userId = :userId
+    AND app.isDeleted = false
+    AND app.hubId = :hubId
+""")
+    Object[] countAssignedApplicationsWithStatus(
+           @Param("userId") Long userId,
+           @Param("hubId") Long hubId
+   );
+
+    @Query("""
+    SELECT
+        COALESCE(COUNT(a.id), 0) AS totalAssigned,
+        COALESCE(SUM(CASE WHEN a.status = 'SOCCORSO' THEN 1 ELSE 0 END), 0) AS amendmentCount,
+        COALESCE(SUM(CASE WHEN a.status = 'OPEN' THEN 1 ELSE 0 END), 0) AS openCount,
+        COALESCE(SUM(CASE WHEN a.status = 'CLOSE' THEN 1 ELSE 0 END), 0) AS closeCount
+    FROM AssignedApplicationsEntity a
+    JOIN a.application app
+    WHERE a.isDeleted = false
+    AND app.isDeleted = false
+      AND app.hubId = :hubId
+""")
+    Object[] countAssignedApplicationsForHub(@Param("hubId") Long hubId);
+
+    @Query("SELECT aa.application.id FROM AssignedApplicationsEntity aa " +
+            "WHERE aa.userId = :userId AND aa.application.hubId = :hubId AND aa.isDeleted = false")
+    List<Long> findApplicationIdsByUserIdAndHubIdAndIsDeletedFalse(@Param("userId") Long userId, @Param("hubId") Long hubId);
+
+    @Query("SELECT aa.application.id FROM AssignedApplicationsEntity aa " +
+            "WHERE aa.application.hubId = :hubId AND aa.isDeleted = false")
+    List<Long> findApplicationIdsByHubId(@Param("hubId") Long hubId);
+
+
 }

src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java

@@ -90,7 +90,7 @@ public class ApplicationEvaluationScheduler {
 					Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_EXPIRED);
 					notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.EVALUATION_EXPIRED);
 					notificationDao.sendNotificationToInstructor(placeHolders,evaluation,NotificationTypeEnum.EVALUATION_EXPIRED);
-
+					notificationDao.sendNotificationToInstructorManager(placeHolders,evaluation,NotificationTypeEnum.EVALUATION_EXPIRED);
 
 					// Logging version history for the update operation
 					loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest)

src/main/java/net/gepafin/tendermanagement/service/ApplicationAmendmentRequestService.java

@@ -8,6 +8,7 @@ import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
 import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean;
 import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse;
+import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean;
 
 import java.util.List;
 
@@ -16,7 +17,7 @@ public interface ApplicationAmendmentRequestService {
     public ApplicationAmendmentRequestResponse createApplicationAmendmentRequest(HttpServletRequest request, Long applicationEvaluationId , ApplicationAmendmentRequest applicationAmendmentRequest);
     void deleteApplicationAmendmentRequest(HttpServletRequest request, Long id);
     ApplicationAmendmentRequestResponse getApplicationAmendmentRequestById(HttpServletRequest request,Long id);
-    List<ApplicationAmendmentRequestResponse> getAllApplicationAmendmentRequest(HttpServletRequest request,Long userId);
+    List<GetAllAmendmentResponseBean> getAllApplicationAmendmentRequest(HttpServletRequest request, Long userId);
     ApplicationAmendmentRequestResponse updateApplicationAmendment(HttpServletRequest request, Long id, ApplicationAmendmentRequestBean applicationAmendmentRequestBean);
     ApplicationAmendmentRequestEntity validateApplicationAmendmentRequest(Long applicationAmendmentId);
     List<ApplicationAmendmentRequestResponse> getAllAmendmentRequestByBeneficiaryId(HttpServletRequest request,Long beneficiaryId);

src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java

@@ -2,6 +2,8 @@ package net.gepafin.tendermanagement.service;
 
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
@@ -15,8 +17,9 @@ public interface AssignedApplicationsService {
 
     void deleteApplication(HttpServletRequest request, Long id);
 
-    List<AssignedApplicationsResponse> getAllAssignedApplications(HttpServletRequest request, Long userId);
+    List<AssignedApplicationsResponse> getAllAssignedApplications(HttpServletRequest request, Long userId,List<AssignedApplicationEnum> statusList);
     AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, UpdateAssignedApplicationRequest assignedApplicationsRequest);
     AssignedApplicationsResponse getAssignedApplicationById(HttpServletRequest request, Long id);
     AssignedApplicationsEntity validateAssignedApplication(Long assignedApplicationId);
+    AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status);
 }

src/main/java/net/gepafin/tendermanagement/service/DashboardService.java

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.service;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.model.response.AmendmentWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.AssignedApplicationWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
 
@@ -13,4 +14,6 @@ public interface DashboardService {
     public BeneficiaryWidgetResponseBean getDashboardWidgetForBeneficiary(HttpServletRequest request, Long companyId);
     public ApplicationWidgetResponseBean getApplicationDetails(HttpServletRequest request);
     public AmendmentWidgetResponseBean getAmendmentDetails(HttpServletRequest request);
+    public AssignedApplicationWidgetResponseBean getApplicationDetailsForEvaluation(HttpServletRequest request);
+
 }

src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java

@@ -12,6 +12,7 @@ import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
 import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean;
 import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse;
+import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean;
 import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository;
 import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
 import net.gepafin.tendermanagement.service.ApplicationAmendmentRequestService;
@@ -83,8 +84,7 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm
     }
 
     @Override
-    public List<ApplicationAmendmentRequestResponse> getAllApplicationAmendmentRequest(HttpServletRequest request,Long userId) {
+    public List<GetAllAmendmentResponseBean> getAllApplicationAmendmentRequest(HttpServletRequest request, Long userId) {
-        UserEntity user = validator.validatePreInstructor(request, userId);
         return applicationAmendmentRequestDao.getAllApplicationAmendmentRequest(request,userId);
     }
 

src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java

@@ -4,6 +4,8 @@ import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.dao.AssignedApplicationsDao;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
@@ -40,8 +42,8 @@ public class AssignedApplicationsServiceImpl implements AssignedApplicationsServ
 
     @Override
     @Transactional(readOnly = true)
-    public List<AssignedApplicationsResponse> getAllAssignedApplications(HttpServletRequest request, Long userId) {
+    public List<AssignedApplicationsResponse> getAllAssignedApplications(HttpServletRequest request, Long userId,List<AssignedApplicationEnum> statusList) {
-        return assignedApplicationsDao.getAllAssignedApplications(request, userId);
+        return assignedApplicationsDao.getAllAssignedApplications(request, userId,statusList);
     }
 
     @Override
@@ -60,5 +62,8 @@ public class AssignedApplicationsServiceImpl implements AssignedApplicationsServ
     public AssignedApplicationsEntity validateAssignedApplication(Long assignedApplicationId) {
         return assignedApplicationsDao.validateAssignedApplication(assignedApplicationId);
     }
-
+    @Override
+    public AssignedApplicationsResponse updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {
+        return   assignedApplicationsDao.updateAssignedApplicationStatus(request, assignedApplicationId, status);
+    }
 }

src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java

@@ -7,10 +7,7 @@ import java.util.List;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
-import net.gepafin.tendermanagement.model.response.CallResponse;
+import net.gepafin.tendermanagement.model.response.*;
-import net.gepafin.tendermanagement.model.response.EvaluationFormResponseBean;
-import net.gepafin.tendermanagement.model.response.FlowResponseBean;
-import net.gepafin.tendermanagement.model.response.FormResponseBean;
 import net.gepafin.tendermanagement.util.FieldValidator;
 import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
@@ -54,13 +51,41 @@ public class CallValidatorServiceImpl {
 			data = data.addError(Translator.toLocale(GepafinConstant.INVALID_DATE_MSG));
 		}
 
-		if (response.getEvaluationVersion() == EvaluationVersionEnum.V1 &&(flowResponse == null || ((flowResponse.getFlowData() == null || flowResponse.getFlowData().isEmpty()))
+		if (flowResponse == null || ((flowResponse.getFlowData() == null || flowResponse.getFlowData().isEmpty()))
-				&& (flowResponse.getFlowEdges() == null || flowResponse.getFlowEdges().isEmpty()))) {
+				&& (flowResponse.getFlowEdges() == null || flowResponse.getFlowEdges().isEmpty())) {
 			data.addError(Translator.toLocale(GepafinConstant.FLOW_NOT_FOUND));
 		}
-		if (response.getEvaluationVersion() == EvaluationVersionEnum.V1 &&(formResponses == null || formResponses.isEmpty()) ){
+		if (formResponses == null || formResponses.isEmpty()) {
 			data.addError(Translator.toLocale(GepafinConstant.FORM_NOT_FOUND));
 		}
+		boolean isAmountRequestedValid = false;
+		if (formResponses != null && !formResponses.isEmpty()) {
+			outerloop:
+			for (FormResponseBean formResponse : formResponses) {
+
+				if (formResponse.getContent() != null && !formResponse.getContent().isEmpty()) {
+					for (ContentResponseBean content : formResponse.getContent()) {
+						if ("numberinput".equals(content.getName()) && content.getSettings() != null) {
+							for (SettingResponseBean setting : content.getSettings()) {
+								if ("isRequestedAmount".equals(setting.getName())) {
+									Object value = setting.getValue();
+									if (Boolean.TRUE.equals(value)) {
+										isAmountRequestedValid = true;
+										break outerloop;
+									} else if (value == null) {
+										data.addError(Translator.toLocale(GepafinConstant.REQUIRED_REQUESTED_AMOUNT_MSG));
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (!isAmountRequestedValid) {
+			data.addError(Translator.toLocale(GepafinConstant.REQUIRED_REQUESTED_AMOUNT_MSG));
+		}
 		data.validate();
 	}
 }

src/main/java/net/gepafin/tendermanagement/service/impl/DashboardServiceImpl.java

@@ -6,6 +6,7 @@ import net.gepafin.tendermanagement.entities.CompanyEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.model.response.AmendmentWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.AssignedApplicationWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
 import net.gepafin.tendermanagement.service.DashboardService;
@@ -45,4 +46,10 @@ public class DashboardServiceImpl implements DashboardService {
         UserEntity userEntity=validator.validateUser(request);
         return   dashboardDao.getAmendmentDetails(userEntity);
     }
+
+    @Override
+    public AssignedApplicationWidgetResponseBean getApplicationDetailsForEvaluation(HttpServletRequest request) {
+        UserEntity userEntity = validator.validateUser(request);
+        return   dashboardDao.getApplicationDetailsForEvaluation(userEntity);
+    }
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationAmendmentRequestApi.java

@@ -14,10 +14,12 @@ import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBea
 import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse;
 import net.gepafin.tendermanagement.model.response.ApplicationResponse;
+import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -85,9 +87,10 @@ public interface ApplicationAmendmentRequestApi {
                             @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
-    @GetMapping(value = "/user/{id}", produces = "application/json")
+    @GetMapping(value = "/user", produces = "application/json")
-    ResponseEntity<Response<List<ApplicationAmendmentRequestResponse>>> getAllApplicationAmendmentRequest(HttpServletRequest request,
+    @PreAuthorize("hasRole('ROLE_SUPER_ADMIN') || hasRole('ROLE_INSTRUCTOR_MANAGER')|| hasRole('ROLE_PRE_INSTRUCTOR')")
-                                                                                                          @Parameter(description = "The User ID", required = false) @PathVariable(value = "id",required = false) Long userId);
+    ResponseEntity<Response<List<GetAllAmendmentResponseBean>>> getAllApplicationAmendmentRequest(HttpServletRequest request,
+                                                                                                  @Parameter(description = "The User ID", required = false) @RequestParam(value = "userId",required = false) Long userId);
 
     @Operation(summary = "Api to update application amendment",
             responses = {

src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java

@@ -75,7 +75,7 @@ public interface ApplicationEvaluationApi {
                                                                                             @Parameter(description = "The evaluation id", required = true) @PathVariable(value = "id", required = true) Long id,
                                                                                             @Parameter(description = "The evaluation form ID", required = true) @RequestParam("evaluationFormId") Long evaluationFormId);
 
-    @Operation(summary = "Api to get an application evaluation form",
+    @Operation(summary = "Api to get an application evaluation form (Evaluation V2)",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {

src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java

@@ -6,8 +6,11 @@ import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
+import net.gepafin.tendermanagement.model.response.ApplicationResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
@@ -66,7 +69,8 @@ public interface AssignedApplicationsApi {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
     @GetMapping(value = "", produces = "application/json")
     ResponseEntity<Response<List<AssignedApplicationsResponse>>> getAllAssignedApplications(HttpServletRequest request,
-    		@Parameter(description = "The User ID", required = false) @RequestParam(value = "userId",required = false) Long userId);
+    		@Parameter(description = "The User ID", required = false) @RequestParam(value = "userId",required = false) Long userId,
+            @Parameter(description = "Assigned application statuses" ,required = false) @RequestParam(value = "statuses",required = false) List<AssignedApplicationEnum> statusList);
 
     @Operation(summary = "Api to update assigned application",
             responses = {
@@ -97,6 +101,19 @@ public interface AssignedApplicationsApi {
     ResponseEntity<Response<AssignedApplicationsResponse>> getAssignedApplicationById(HttpServletRequest request,
     		@Parameter(description = "The assigned application id", required = true) @PathVariable(value = "id", required = true) Long id);
 
+    @Operation(summary = "Api to update assigned application status",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @PutMapping(value = "/{id}/status", produces = { "application/json" })
+    ResponseEntity<Response<AssignedApplicationsResponse>> updateAssignedApplicationStatus(HttpServletRequest request,
+                                                                          @Parameter(description = "The assigned application id", required = true) @PathVariable("id") Long id,
+                                                                          @Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) AssignedApplicationEnum status);
 
 
 

src/main/java/net/gepafin/tendermanagement/web/rest/api/DashboardApi.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.model.response.AmendmentWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.AssignedApplicationWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
@@ -75,4 +76,19 @@ public interface DashboardApi {
             produces = { "application/json" })
     @PreAuthorize("hasRole('ROLE_SUPER_ADMIN') || hasRole('ROLE_INSTRUCTOR_MANAGER')|| hasRole('ROLE_PRE_INSTRUCTOR')")
     ResponseEntity<Response<AmendmentWidgetResponseBean>> getAmendmentDetails(HttpServletRequest request);
+
+    @Operation(summary = "Api to get Application details for Evaluation",
+	 responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+							@GetMapping(value = "/evaluation",
+            produces = { "application/json" })
+    @PreAuthorize("hasRole('ROLE_SUPER_ADMIN') || hasRole('ROLE_INSTRUCTOR_MANAGER')|| hasRole('ROLE_PRE_INSTRUCTOR')")
+    ResponseEntity<Response<AssignedApplicationWidgetResponseBean>> getApplicationDetailsForEvaluation(HttpServletRequest request);
+    
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationAmendmentRequestController.java

@@ -12,6 +12,7 @@ import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBea
 import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse;
+import net.gepafin.tendermanagement.model.response.GetAllAmendmentResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.service.ApplicationAmendmentRequestService;
 import net.gepafin.tendermanagement.util.LoggingUtil;
@@ -85,14 +86,14 @@ public class ApplicationAmendmentRequestController implements ApplicationAmendme
     }
 
     @Override
-    public ResponseEntity<Response<List<ApplicationAmendmentRequestResponse>>> getAllApplicationAmendmentRequest(HttpServletRequest request,Long userId) {
+    public ResponseEntity<Response<List<GetAllAmendmentResponseBean>>> getAllApplicationAmendmentRequest(HttpServletRequest request, Long userId) {
         log.info("Get All Applications Amendment Request");
 
         /** This code is responsible for creating user action logs for the "get all application amendment by preInstructor user id" operation. **/
         loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW)
                 .actionContext(UserActionContextEnum.GET_ALL_AMENDMENT_BY_PREINSTRUCTOR_USER_ID).build());
 
-        List<ApplicationAmendmentRequestResponse> applicationAmendmentRequestResponses = applicationAmendmentRequestService.getAllApplicationAmendmentRequest(request,userId);
+        List<GetAllAmendmentResponseBean> applicationAmendmentRequestResponses = applicationAmendmentRequestService.getAllApplicationAmendmentRequest(request,userId);
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new Response<>(applicationAmendmentRequestResponses, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_APPLICATION_AMENDMENT_SUCCESS_MSG)));
     }

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java

@@ -4,11 +4,14 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.log4j.Log4j2;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
 import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
+import net.gepafin.tendermanagement.model.response.ApplicationResponse;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.service.AssignedApplicationsService;
@@ -56,12 +59,12 @@ public class AssignedApplicationsController implements AssignedApplicationsApi {
     }
 
     @Override
-    public ResponseEntity<Response<List<AssignedApplicationsResponse>>> getAllAssignedApplications(HttpServletRequest request, Long userId) {
+    public ResponseEntity<Response<List<AssignedApplicationsResponse>>> getAllAssignedApplications(HttpServletRequest request, Long userId,List<AssignedApplicationEnum> statusList) {
         log.info("Get All Assigned Applications");
         /** This code is responsible for creating user action logs for the "get Assigned Applications" operation. **/
         loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW)
                 .actionContext(UserActionContextEnum.GET_ASSIGNED_APPLICATION).build());
-        List<AssignedApplicationsResponse> applications = assignedApplicationsService.getAllAssignedApplications(request, userId);
+        List<AssignedApplicationsResponse> applications = assignedApplicationsService.getAllAssignedApplications(request, userId,statusList);
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new Response<>(applications, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_ASSIGNED_APPLICATION_SUCCESS_MSG)));
     }
@@ -89,6 +92,18 @@ public class AssignedApplicationsController implements AssignedApplicationsApi {
                 .body(new Response<>(application, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_ASSIGNED_APPLICATION_SUCCESS_MSG)));
     }
 
+    @Override
+    public ResponseEntity<Response<AssignedApplicationsResponse>> updateAssignedApplicationStatus(HttpServletRequest request, Long assignedApplicationId, AssignedApplicationEnum status) {
+
+        /** This code is responsible for creating user action logs for the "update assigned application status" operation. **/
+        loggingUtil.logUserAction(
+                UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE).actionContext(UserActionContextEnum.UPDATE_ASSIGNED_APPLICATION_STATUS).build());
+
+        AssignedApplicationsResponse applicationResponse = assignedApplicationsService.updateAssignedApplicationStatus(request, assignedApplicationId, status);
+
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(new Response<>(applicationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_STATUS_UPDATED_SUCCESSFULLY)));
+    }
 
 }
 

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DashboardApiController.java

@@ -8,6 +8,7 @@ import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
 import net.gepafin.tendermanagement.model.response.AmendmentWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.AssignedApplicationWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
@@ -71,4 +72,17 @@ public class DashboardApiController implements DashboardApi {
         return ResponseEntity.status(HttpStatus.CREATED)
                 .body(new Response<>(widgetResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY)));
     }
+
+    @Override
+    public ResponseEntity<Response<AssignedApplicationWidgetResponseBean>> getApplicationDetailsForEvaluation(HttpServletRequest request) {
+
+        /** This code is responsible for creating user action logs for the "Get Application Details for Evaluation" operation. **/
+        loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW).actionContext(UserActionContextEnum.GET_APPLICATION_DETAILS_FOR_EVALUATION).build());
+
+        AssignedApplicationWidgetResponseBean widgetResponseBean= dashboardService.getApplicationDetailsForEvaluation(request);
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new Response<>(widgetResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY)));
+    }
+
+
 }

src/main/resources/message_en.properties

@@ -364,4 +364,8 @@ evaluation.form.fetched.successfully=Evaluation form fetched successfully.
 evaluation.form.not.found=Evaluation form not found.
 
 either.applicationId.or.assignedApplicationId.must.be.provided=Either applicationId or assignedApplicationId must be provided.
+assigned.application.status.updated.successfully=Assigned application status updated successfully.
+
+validation.required.requested.amount=The Requested Amount configuration should be mandatory.
+
 

src/main/resources/message_it.properties

@@ -353,5 +353,11 @@ evaluation.form.deleted.successfully=Modulo di valutazione eliminato con success
 evaluation.form.fetched.successfully=Modulo di valutazione recuperato con successo.
 evaluation.form.not.found=Modulo di valutazione non trovato.
 
-either.applicationId.or.assignedApplicationId.must.be.provided = "È necessario fornire applicationId o assegnatoApplicationId."
+either.applicationId.or.assignedApplicationId.must.be.provided = "<EFBFBD> necessario fornire applicationId o assegnatoApplicationId."
+
+assigned.application.status.updated.successfully=Stato dell'applicazione assegnata aggiornato con successo.
+
+validation.required.requested.amount=La configurazione dell'importo richiesto <20> obbligatoria.
+
+