diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java index de697243..36dca7d6 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java @@ -10,6 +10,7 @@ import net.gepafin.tendermanagement.model.response.Widget1; import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean; import net.gepafin.tendermanagement.repositories.ApplicationRepository; import net.gepafin.tendermanagement.repositories.CallRepository; +import net.gepafin.tendermanagement.repositories.CompanyRepository; import net.gepafin.tendermanagement.repositories.UserRepository; import net.gepafin.tendermanagement.util.FieldValidator; import org.springframework.beans.factory.annotation.Autowired; @@ -30,11 +31,14 @@ public class DashboardDao { @Autowired private ApplicationRepository applicationRepository; + @Autowired + private CompanyRepository companyRepository; + public SuperAdminWidgetResponseBean getDashboardWidget() { SuperAdminWidgetResponseBean widgetResponseBean = new SuperAdminWidgetResponseBean(); widgetResponseBean.setWidget1(createWidget1()); List widgetBars = callRepository.findApplicationsPerCall(); - widgetResponseBean.setWidgetBars(widgetBars); +// widgetResponseBean.setWidgetBars(widgetBars); return widgetResponseBean; } @@ -42,17 +46,31 @@ public class DashboardDao { Widget1 widget1 = new Widget1(); Long activeCalls = callRepository.countByStatus(CallStatusEnum.PUBLISH.getValue()); if (Boolean.FALSE.equals(FieldValidator.isNullOrZero(activeCalls))) { - widget1.setActiveCalls(activeCalls); + widget1.setNumberOfActiveCalls(activeCalls); } Long activeUsers = userRepository.countByStatusAndRoleEntity_RoleType(UserStatusEnum.ACTIVE.getValue(), RoleStatusEnum.ROLE_BENEFICIARY.getValue()); if (Boolean.FALSE.equals(FieldValidator.isNullOrZero(activeUsers))) { - widget1.setResgisteredUsers(activeUsers); + widget1.setNumberOfResgisteredUsers(activeUsers); } BigDecimal totalActiveFinancing = callRepository.findTotalAmountOfPublishedCalls(); widget1.setTotalActiveFinancing(totalActiveFinancing); - Long preInvestigationQuestions = callRepository.countByStatus(CallStatusEnum.DRAFT.getValue()); - if (Boolean.FALSE.equals(FieldValidator.isNullOrZero(preInvestigationQuestions))) { - widget1.setPreInvestigationQuestions(preInvestigationQuestions); +// Long preInvestigationQuestions = callRepository.countByStatus(CallStatusEnum.DRAFT.getValue()); +// if (Boolean.FALSE.equals(FieldValidator.isNullOrZero(preInvestigationQuestions))) { +// widget1.setPreInvestigationQuestions(preInvestigationQuestions); +// } + Long submittedApplications=applicationRepository.countSubmittedApplications(); + if(Boolean.FALSE.equals(FieldValidator.isNullOrZero(submittedApplications))) + { + widget1.setNumberOfSubmittedApplications(submittedApplications); + } + Long draftApplications=applicationRepository.countSubmittedApplications(); + if(Boolean.FALSE.equals(FieldValidator.isNullOrZero(draftApplications))) + { + widget1.setNumberOfDraftApplications(draftApplications); + } + Long numberOfCompany=companyRepository.countTotalCompanies(); + if (Boolean.FALSE.equals(FieldValidator.isNullOrZero(numberOfCompany))) { + widget1.setNumberOfCompany(numberOfCompany); } return widget1; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/Widget1.java b/src/main/java/net/gepafin/tendermanagement/model/response/Widget1.java index 4a8e6d0f..52d83a04 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/Widget1.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/Widget1.java @@ -7,11 +7,17 @@ import java.math.BigDecimal; @Data public class Widget1 { - private Long activeCalls; + private Long numberOfActiveCalls; - private Long resgisteredUsers; + private Long numberOfResgisteredUsers; - private Long preInvestigationQuestions; +// private Long preInvestigationQuestions; + + private Long numberOfSubmittedApplications; + + private Long numberOfDraftApplications; + + private Long numberOfCompany; private BigDecimal totalActiveFinancing; diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java index 0a5b5f78..4f181e1a 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java @@ -33,4 +33,12 @@ public interface ApplicationRepository extends JpaRepository { Boolean existsByVatNumber(String vatNumber); CompanyEntity findByVatNumber(String vatNumber); + @Query("SELECT COUNT(c) FROM CompanyEntity c") + long countTotalCompanies(); + + }