Resolved conflicts
This commit is contained in:
@@ -5,6 +5,11 @@ import net.gepafin.tendermanagement.dao.DashboardDao;
|
||||
import net.gepafin.tendermanagement.entities.CompanyEntity;
|
||||
import net.gepafin.tendermanagement.entities.UserEntity;
|
||||
import net.gepafin.tendermanagement.model.response.*;
|
||||
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;
|
||||
import net.gepafin.tendermanagement.util.Validator;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -46,5 +51,10 @@ public class DashboardServiceImpl implements DashboardService {
|
||||
public PreInstructorWidgetResponseBean getDashboardWidgetForPreInstructor(HttpServletRequest request) {
|
||||
UserEntity userEntity=validator.validateUser(request);
|
||||
return dashboardDao.getDashboardWidgetForPreInstructor(userEntity);
|
||||
|
||||
@Override
|
||||
public AssignedApplicationWidgetResponseBean getApplicationDetailsForEvaluation(HttpServletRequest request) {
|
||||
UserEntity userEntity = validator.validateUser(request);
|
||||
return dashboardDao.getApplicationDetailsForEvaluation(userEntity);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user