diff --git a/src/main/java/com/ecep/contract/manager/ds/project/controller/EvaluationFileTableCell.java b/src/main/java/com/ecep/contract/manager/ds/project/controller/EvaluationFileTableCell.java deleted file mode 100644 index 176cfd8..0000000 --- a/src/main/java/com/ecep/contract/manager/ds/project/controller/EvaluationFileTableCell.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.ecep.contract.manager.ds.project.controller; - -import com.ecep.contract.manager.SpringApp; -import com.ecep.contract.manager.ds.customer.model.CompanyCustomerEvaluationFormFile; -import com.ecep.contract.manager.ds.customer.model.CompanyCustomerFile; -import com.ecep.contract.manager.ds.customer.service.CompanyCustomerFileService; -import com.ecep.contract.manager.ds.project.vo.ProjectBidViewModel; -import javafx.scene.control.TableCell; -import org.hibernate.Hibernate; -import org.springframework.util.StringUtils; - -import java.io.File; - -class EvaluationFileTableCell extends TableCell { - private CompanyCustomerFileService fileService; - - public CompanyCustomerFileService getFileService() { - if (fileService == null) { - fileService = SpringApp.getBean(CompanyCustomerFileService.class); - } - return fileService; - } - - @Override - protected void updateItem(CompanyCustomerEvaluationFormFile item, boolean empty) { - super.updateItem(item, empty); - if (empty || item == null) { - setText(""); - return; - } - if (!Hibernate.isInitialized(item)) { - item = getFileService().findCustomerEvaluationFormFileById(item.getId()); - } - CompanyCustomerFile customerFile = item.getCustomerFile(); - String path = customerFile.getFilePath(); - if (StringUtils.hasText(path)) { - File file = new File(path); - setText(file.getName()); - } - } -} diff --git a/src/main/java/com/ecep/contract/manager/ui/table/cell/EmployeeRoleTableCell.java b/src/main/java/com/ecep/contract/manager/ui/table/cell/EmployeeRoleTableCell.java new file mode 100644 index 0000000..d3728c1 --- /dev/null +++ b/src/main/java/com/ecep/contract/manager/ui/table/cell/EmployeeRoleTableCell.java @@ -0,0 +1,20 @@ +package com.ecep.contract.manager.ui.table.cell; + +import com.ecep.contract.manager.ds.company.model.Company; +import com.ecep.contract.manager.ds.company.service.CompanyService; +import lombok.NoArgsConstructor; + +import static com.ecep.contract.manager.SpringApp.getBean; + +@NoArgsConstructor +public class CompanyTableCell extends AsyncUpdateTableCell { + + public CompanyTableCell(CompanyService companyService) { + setService(companyService); + } + + @Override + protected CompanyService getServiceBean() { + return getBean(CompanyService.class); + } +}