PFS/pfs-intra
4
0
Fork 0
Code Issues 32 Pull Requests 2 Actions Packages Projects 2 Releases Wiki Activity

Compare commits

base: PFS:6d9a2f65e5b67d6d3f361ceaff47d09b29eb2f3b
Branches Tags
PFS:main
PFS:En-desarrollo
PFS:Vacaciones
PFS:mejorar-detalles
PFS:registro-horas
PFS:hoursworked
PFS:actividadHoursWorked
PFS:Listado-General-Vacaciones
PFS:Perfil-Empleado-Administrativo-Documentacion
PFS:#17-Perfil-Personal-Administrativo
PFS:#4-Registrar-empleado
PFS:Rama-Ricardo
..
compare: PFS:45987ccad989c939f004bb15a6bb88d1c5fb14dd
Branches Tags
PFS:En-desarrollo
PFS:Vacaciones
PFS:mejorar-detalles
PFS:main
PFS:registro-horas
PFS:hoursworked
PFS:actividadHoursWorked
PFS:Listado-General-Vacaciones
PFS:Perfil-Empleado-Administrativo-Documentacion
PFS:#17-Perfil-Personal-Administrativo
PFS:#4-Registrar-empleado
PFS:Rama-Ricardo

No commits in common. "6d9a2f65e5b67d6d3f361ceaff47d09b29eb2f3b" and "45987ccad989c939f004bb15a6bb88d1c5fb14dd" have entirely different histories.
6d9a2f65e5 ... 45987ccad9

5 changed files with 36 additions and 211 deletions
Show Stats Expand all files Collapse all files

1
src/main/java/com/primefactorsolutions/model/Document.java
View File

@ -19,5 +19,4 @@ public class Document extends BaseEntity {
@Lob
@Column(columnDefinition = "BLOB")
private byte[] fileData;
private String creator;
}

1
src/main/java/com/primefactorsolutions/model/DocumentType.java
View File

@ -1,7 +1,6 @@
package com.primefactorsolutions.model;
public enum DocumentType {
All,
ID_CARD,
PAY_STUB,
PAY_SLIPS,

26
src/main/java/com/primefactorsolutions/service/DocumentService.java
View File

@ -1,8 +1,6 @@
package com.primefactorsolutions.service;
import com.primefactorsolutions.model.Document;
import com.primefactorsolutions.model.DocumentType;
import com.primefactorsolutions.model.Employee;
import com.primefactorsolutions.repositories.DocumentRepository;
import lombok.AllArgsConstructor;
import org.apache.commons.beanutils.BeanComparator;
@ -12,7 +10,6 @@ import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.Optional;
import java.util.stream.Collectors;
@Service
@AllArgsConstructor
@ -23,10 +20,6 @@ public class DocumentService {
documentRepository.save(newDocument);
}
public void deleteDocument(final UUID id) {
documentRepository.deleteById(id);
}
public List<Document> getAllDocuments() {
return documentRepository.findAll();
}
@ -56,23 +49,4 @@ public class DocumentService {
int end = Math.min(start + pageSize, employees.size());
return employees.subList(start, end);
}
public List<Document> findDocumentBy(final DocumentType documentType,
final Employee employee,
final int start,
final int pageSize) {
List<Document> documents = documentRepository.findAll();
if (documentType != null) {
documents = documents.stream()
.filter(doc -> doc.getDocumentType().equals(documentType))
.collect(Collectors.toList());
}
if (employee != null) {
documents = documents.stream()
.filter(doc -> doc.getEmployee().equals(employee))
.collect(Collectors.toList());
}
int end = Math.min(start + pageSize, documents.size());
return documents.subList(start, end);
}
}

121
src/main/java/com/primefactorsolutions/views/DocumentView.java
View File

@ -10,23 +10,16 @@ import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.combobox.ComboBox;
import com.vaadin.flow.component.html.H2;
import com.vaadin.flow.component.notification.Notification;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.component.upload.Upload;
import com.vaadin.flow.component.upload.receivers.MemoryBuffer;
import com.vaadin.flow.router.*;
import com.vaadin.flow.spring.annotation.SpringComponent;
import elemental.json.Json;
import elemental.json.JsonArray;
import elemental.json.JsonObject;
import jakarta.annotation.security.PermitAll;
import org.springframework.context.annotation.Scope;
import org.springframework.security.core.userdetails.UserDetails;
import org.vaadin.firitin.form.BeanValidationForm;
import com.vaadin.flow.spring.security.AuthenticationContext;
import java.io.IOException;
import java.util.Base64;
import java.util.List;
import java.util.UUID;
@ -45,31 +38,20 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
private final Upload uploadButton = new Upload(buffer);
private final DocumentService documentService;
private final EmployeeService employeeService;
private final AuthenticationContext authContext;
private boolean fileUploaded = false;
private Button saveButton;
private Button viewDocumentButton;
public DocumentView(final DocumentService documentService,
final EmployeeService employeeService,
final AuthenticationContext authContext) {
public DocumentView(final DocumentService documentService, final EmployeeService employeeService) {
super(Document.class);
this.documentService = documentService;
this.employeeService = employeeService;
this.authContext = authContext;
initializeView();
}
private void initializeView() {
configureComponents();
configureUploadButton();
}
private void configureComponents() {
setFileNameProperties();
setDocumentTypeProperties();
setEmployeeComboBoxProperties();
setUploadButtonProperties();
}
private void setFileNameProperties() {
@ -88,14 +70,14 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
employeeComboBox.setWidthFull();
}
private void configureUploadButton() {
private void setUploadButtonProperties() {
uploadButton.setMaxFiles(1);
uploadButton.setAcceptedFileTypes(".pdf");
uploadButton.addSucceededListener(event -> handleUploadSuccess());
}
protected Button createSaveButton() {
saveButton = new Button("Save");
Button saveButton = new Button("Save");
saveButton.addClickListener(event -> saveDocument());
return saveButton;
}
@ -106,35 +88,6 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
return closeButton;
}
protected Button createViewDocumentButton() {
viewDocumentButton = new Button("View Document");
viewDocumentButton.setEnabled(false);
viewDocumentButton.addClickListener(event -> viewDocument());
return viewDocumentButton;
}
private void viewDocument() {
Document document = getEntity();
if (document.getFileData() != null && document.getFileData().length > 0) {
String base64Data = Base64.getEncoder().encodeToString(document.getFileData());
String jsCode = createJsCodeForDocument(base64Data);
getElement().executeJs(jsCode);
} else {
Notification.show("No file data available to view.");
}
}
private String createJsCodeForDocument(final String base64Data) {
return "var byteCharacters = atob('" + base64Data + "');"
+ "var byteNumbers = new Array(byteCharacters.length);"
+ "for (var i = 0; i < byteCharacters.length; i++) {"
+ " byteNumbers[i] = byteCharacters.charCodeAt(i);"
+ "}"
+ "var byteArray = new Uint8Array(byteNumbers);"
+ "var blob = new Blob([byteArray], { type: 'application/pdf' });"
+ "var url = URL.createObjectURL(blob);"
+ "window.open(url, '_blank');";
}
private void closeForm() {
navigateToDocumentsListView();
@ -147,18 +100,12 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
private void handleUploadSuccess() {
fileUploaded = true;
Notification.show("File uploaded successfully.");
viewDocumentButton.setEnabled(true);
}
private void saveDocument() {
if (isFormValid()) {
Document document = getEntity();
document.setFileName(fileName.getValue());
document.setDocumentType(documentType.getValue());
Document document = createDocument();
document.setEmployee(employeeComboBox.getValue());
document.setFileData(readFileData());
setDocumentCreator(document);
documentService.saveDocument(document);
Notification.show("File saved successfully.");
clearForm();
@ -167,12 +114,6 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
}
}
private void setDocumentCreator(final Document document) {
authContext.getAuthenticatedUser(UserDetails.class).ifPresent(user -> {
document.setCreator(user.getUsername());
});
}
private boolean isFormValid() {
return !fileName.isEmpty()
&& documentType.getValue() != null
@ -180,6 +121,14 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
&& fileUploaded;
}
private Document createDocument() {
Document document = new Document();
document.setFileName(fileName.getValue());
document.setDocumentType(documentType.getValue());
document.setFileData(readFileData());
return document;
}
private byte[] readFileData() {
try {
return buffer.getInputStream().readAllBytes();
@ -194,59 +143,25 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
documentType.clear();
employeeComboBox.clear();
fileUploaded = false;
uploadButton.getElement().setPropertyJson("files", Json.createArray());
viewDocumentButton.setEnabled(false);
}
private void setFieldsReadOnly(final boolean option) {
fileName.setReadOnly(option);
documentType.setReadOnly(option);
employeeComboBox.setReadOnly(option);
}
private void preLoadFile(final Document document) {
JsonArray jsonArray = Json.createArray();
JsonObject jsonObject = Json.createObject();
jsonObject.put("name", document.getFileName());
jsonObject.put("progress", 100);
jsonObject.put("complete", true);
jsonArray.set(0, jsonObject);
uploadButton.getElement().setPropertyJson("files", jsonArray);
}
@Override
public void setParameter(final BeforeEvent beforeEvent, final String action) {
final RouteParameters params = beforeEvent.getRouteParameters();
final String documentIdString = params.get("documentId").orElse(null);
final String s = params.get("documentId").orElse(null);
if ("new".equals(action)) {
setEntityWithEnabledSave(new Document());
} else {
UUID documentId = UUID.fromString(documentIdString);
Document document = documentService.getDocument(documentId);
setEntity(document);
employeeComboBox.setValue(document.getEmployee());
preLoadFile(document);
configureViewOrEditAction(action, documentIdString);
}
}
private void configureViewOrEditAction(final String action, final String documentIdString) {
if ("edit".equals(action) && !documentIdString.isEmpty()) {
setFieldsReadOnly(false);
preLoadFile(getEntity());
} else if ("view".equals(action) && !documentIdString.isEmpty()) {
setFieldsReadOnly(true);
saveButton.setEnabled(false);
viewDocumentButton.setEnabled(true);
UUID documentId = UUID.fromString(s);
var document = documentService.getDocument(documentId);
setEntityWithEnabledSave(document);
}
}
@Override
protected List<Component> getFormComponents() {
HorizontalLayout buttonLayout = new HorizontalLayout();
buttonLayout.add(uploadButton, createViewDocumentButton());
buttonLayout.setSpacing(true);
return List.of(title, fileName, documentType, employeeComboBox, buttonLayout, createCloseButton());
return List.of(title, fileName, documentType, employeeComboBox, uploadButton, createCloseButton());
}
}

94
src/main/java/com/primefactorsolutions/views/DocumentsListView.java
View File

@ -5,7 +5,6 @@ import com.primefactorsolutions.model.DocumentType;
import com.primefactorsolutions.model.Employee;
import com.primefactorsolutions.service.DocumentService;
import com.primefactorsolutions.service.EmployeeService;
import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.combobox.ComboBox;
import com.vaadin.flow.component.grid.GridSortOrder;
@ -14,14 +13,11 @@ import com.vaadin.flow.component.html.Span;
import com.vaadin.flow.data.provider.SortDirection;
import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.server.StreamRegistration;
import com.vaadin.flow.server.StreamResource;
import com.vaadin.flow.spring.annotation.SpringComponent;
import jakarta.annotation.security.PermitAll;
import org.springframework.context.annotation.Scope;
import org.vaadin.firitin.components.grid.PagingGrid;
import java.io.ByteArrayInputStream;
import java.util.List;
@ -35,14 +31,12 @@ public class DocumentsListView extends Main {
private final DocumentService documentService;
private final EmployeeService employeeService;
private final PagingGrid<Document> documentGrid = new PagingGrid<>(Document.class);
private ComboBox<Employee> employeeFilter;
private ComboBox<DocumentType> documentTypeFilter;
public DocumentsListView(final DocumentService documentService, final EmployeeService employeeService) {
this.documentService = documentService;
this.employeeService = employeeService;
initializeView();
updateDocumentGrid(null, null);
updateDocumentGrid();
}
private void initializeView() {
@ -54,9 +48,11 @@ public class DocumentsListView extends Main {
}
private void configureDocumentGrid() {
documentGrid.setColumns("fileName", "documentType", "creator");
documentGrid.setColumns("fileName", "documentType");
documentGrid.addComponentColumn(this::createEmployeeSpan).setHeader("Employee");
addActionColumns();
addDocumentActionColumn("View", this::navigateToDocumentView);
addDocumentActionColumn("Edit", this::navigateToEditDocumentView);
addDocumentActionColumn("Download", this::navigateToDownloadDocumentView);
configurePagination();
}
@ -66,11 +62,6 @@ public class DocumentsListView extends Main {
return new Span(employeeName);
}
private void addActionColumns() {
addDocumentActionColumn("View", this::navigateToDocumentView);
addDocumentActionColumn("Edit", this::navigateToEditDocumentView);
addDocumentActionColumn("Download", this::downloadDocument);
}
private void addDocumentActionColumn(final String label, final DocumentActionHandler handler) {
documentGrid.addComponentColumn(document -> createActionButton(label, () -> handler.handle(document)));
@ -83,38 +74,21 @@ public class DocumentsListView extends Main {
}
private ComboBox<DocumentType> createDocumentTypeFilter() {
documentTypeFilter = new ComboBox<>("Document Type");
ComboBox<DocumentType> documentTypeFilter = new ComboBox<>("Document Type");
documentTypeFilter.setItems(DocumentType.values());
documentTypeFilter.setValue(DocumentType.values()[0]);
documentTypeFilter.addValueChangeListener(event -> {
updateDocumentGrid(event.getValue(), employeeFilter.getValue());
});
documentTypeFilter.addValueChangeListener(event -> updateDocumentGrid());
return documentTypeFilter;
}
private ComboBox<Employee> createEmployeeFilter() {
employeeFilter = new ComboBox<>("Employee");
ComboBox<Employee> employeeFilter = new ComboBox<>("Employee");
List<Employee> employees = employeeService.findAllEmployees();
employees.addFirst(createAllEmployeesOption());
employeeFilter.setItems(employees);
employeeFilter.setItemLabelGenerator(this::getEmployeeLabel);
employeeFilter.setValue(employees.getFirst());
employeeFilter.addValueChangeListener(event -> {
updateDocumentGrid(documentTypeFilter.getValue(), event.getValue());
});
employeeFilter.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName());
employeeFilter.addValueChangeListener(event -> updateDocumentGrid());
return employeeFilter;
}
private Employee createAllEmployeesOption() {
Employee allEmployeesOption = new Employee();
allEmployeesOption.setFirstName("All");
return allEmployeesOption;
}
private String getEmployeeLabel(final Employee employee) {
return employee.getFirstName().equals("All") ? "All" : employee.getFirstName() + " " + employee.getLastName();
}
private void navigateToEditDocumentView(final Document document) {
navigateToDocumentView(document, "edit");
}
@ -127,6 +101,10 @@ public class DocumentsListView extends Main {
getUI().ifPresent(ui -> ui.navigate(DocumentView.class, document.getId().toString() + "/" + action));
}
private void navigateToDownloadDocumentView(final Document document) {
// No operation
}
private void navigateToAddDocumentView() {
getUI().ifPresent(ui -> ui.navigate(DocumentView.class, "new"));
}
@ -136,30 +114,8 @@ public class DocumentsListView extends Main {
documentGrid.setPageSize(5);
}
private void updateDocumentGrid(final DocumentType documentType, final Employee employee) {
DocumentType finalDocumentType = isValidDocumentType(documentType) ? documentType : null;
Employee finalEmployee = isValidEmployee(employee) ? employee : null;
documentGrid.setPagingDataProvider((page, pageSize) ->
(finalDocumentType == null && finalEmployee == null)
? fetchDocuments((int) page, pageSize)
: fetchFilteredDocuments((int) page, pageSize, finalDocumentType, finalEmployee)
);
documentGrid.getDataProvider().refreshAll();
}
private boolean isValidDocumentType(final DocumentType documentType) {
return documentType != null && !"All".equals(documentType.name());
}
private boolean isValidEmployee(final Employee employee) {
return employee != null && !"All".equals(employee.getFirstName());
}
private List<Document> fetchFilteredDocuments(final int page,
final int pageSize,
final DocumentType documentType,
final Employee employee) {
return documentService.findDocumentBy(documentType, employee, page, pageSize);
private void updateDocumentGrid() {
documentGrid.setPagingDataProvider((page, pageSize) -> fetchDocuments((int) page, pageSize));
}
private List<Document> fetchDocuments(final int page, final int size) {
@ -180,24 +136,6 @@ public class DocumentsListView extends Main {
sortOrder.getDirection() == SortDirection.ASCENDING);
}
private void downloadDocument(final Document document) {
StreamResource resource = createDocumentStreamResource(document);
getUI().ifPresent(ui -> openDocumentStream(resource, ui));
}
private StreamResource createDocumentStreamResource(final Document document) {
StreamResource resource = new StreamResource(document.getFileName(),
() -> new ByteArrayInputStream(document.getFileData()));
resource.setContentType("application/pdf");
resource.setHeader("Content-Disposition", "attachment; filename=\"" + document.getFileName() + ".pdf\"");
return resource;
}
private void openDocumentStream(final StreamResource resource, final UI ui) {
StreamRegistration registration = ui.getSession().getResourceRegistry().registerResource(resource);
ui.getPage().open(registration.getResourceUri().toString());
}
@FunctionalInterface
private interface DocumentActionHandler {
void handle(Document document);