From 2caa878c07399d38829f83a53f38e4921347b3c7 Mon Sep 17 00:00:00 2001 From: ricardo051199 Date: Tue, 24 Sep 2024 12:30:03 -0400 Subject: [PATCH] =?UTF-8?q?#30=20Perfil=20de=20Usuario=20Administrativo=20?= =?UTF-8?q?-=20A=C3=B1adir=20NUEVO=20Documento?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/EmployeeService.java | 4 + .../views/DocumentsView.java | 201 ++++++++---------- .../views/MainLayout.java | 8 +- 3 files changed, 95 insertions(+), 118 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/service/EmployeeService.java b/src/main/java/com/primefactorsolutions/service/EmployeeService.java index c30f9b8..45f3cd2 100644 --- a/src/main/java/com/primefactorsolutions/service/EmployeeService.java +++ b/src/main/java/com/primefactorsolutions/service/EmployeeService.java @@ -87,4 +87,8 @@ public class EmployeeService { ldapTemplate.modifyAttributes(buildDn(employee), new ModificationItem[] {item}); } + + public List findAllEmployees() { + return employeeRepository.findAll(); + } } \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/DocumentsView.java b/src/main/java/com/primefactorsolutions/views/DocumentsView.java index 545472c..37b11b5 100644 --- a/src/main/java/com/primefactorsolutions/views/DocumentsView.java +++ b/src/main/java/com/primefactorsolutions/views/DocumentsView.java @@ -2,18 +2,16 @@ package com.primefactorsolutions.views; import com.primefactorsolutions.model.Document; import com.primefactorsolutions.model.DocumentType; +import com.primefactorsolutions.model.Employee; import com.primefactorsolutions.service.DocumentService; -import com.vaadin.flow.component.Component; +import com.primefactorsolutions.service.EmployeeService; import com.vaadin.flow.component.button.Button; -import com.vaadin.flow.component.dialog.Dialog; -import com.vaadin.flow.component.html.Div; +import com.vaadin.flow.component.combobox.ComboBox; import com.vaadin.flow.component.html.H2; -import com.vaadin.flow.component.html.IFrame; import com.vaadin.flow.component.html.Main; import com.vaadin.flow.component.notification.Notification; -import com.vaadin.flow.component.orderedlayout.FlexComponent; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; -import com.vaadin.flow.component.orderedlayout.VerticalLayout; +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.PageTitle; @@ -23,152 +21,129 @@ import jakarta.annotation.security.PermitAll; import org.springframework.context.annotation.Scope; import java.io.IOException; -import java.util.Base64; +import java.util.List; @SpringComponent @PermitAll @Scope("prototype") @PageTitle("Documents") -@Route(value = "/documents/me", layout = MainLayout.class) -public abstract class DocumentsView extends Main { - private final DocumentService documentService; +@Route(value = "/documents", layout = MainLayout.class) +public class DocumentsView extends Main { + + private final TextField fileName = new TextField("Document Name"); + private final ComboBox documentType = new ComboBox<>("Document Type"); + private final ComboBox employeeComboBox = new ComboBox<>("Employee"); private final MemoryBuffer buffer = new MemoryBuffer(); - private String lastUploadedFileName = null; + private final Upload uploadButton = new Upload(buffer); + private final DocumentService documentService; + private final EmployeeService employeeService; + private boolean fileUploaded = false; - public DocumentsView(final DocumentService documentService) { + public DocumentsView(final DocumentService documentService, final EmployeeService employeeService) { this.documentService = documentService; - initializeLayout(); + this.employeeService = employeeService; + initializeView(); + addComponents(); } - protected abstract void initializeLayout(); - - protected HorizontalLayout createRow( - final String title1, - final DocumentType type1, - final String title2, - final DocumentType type2) { - - HorizontalLayout row = new HorizontalLayout(); - row.add( - createDocumentSection(title1, type1), - createDocumentSection(title2, type2) - ); - return row; + private void initializeView() { + setFileNameProperties(); + setDocumentTypeProperties(); + setEmployeeComboBoxProperties(); + setUploadButtonProperties(); } - protected HorizontalLayout createRow(final String title1, final DocumentType type1) { - HorizontalLayout row = new HorizontalLayout(); - row.add(createDocumentSection(title1, type1)); - return row; + private void setFileNameProperties() { + fileName.setWidthFull(); } - private Div createDocumentSection(final String title, final DocumentType documentType) { - Div section = new Div(); - section.add(new H2(title)); - - Upload upload = createUploadComponent(); - Button viewButton = createViewButton(documentType); - Button saveButton = createSaveButton(viewButton, documentType); - - section.add(createLayout(upload), - createLayout(viewButton, new Button("Edit"), saveButton), - createAdditionalButtons()); - return section; + private void setDocumentTypeProperties() { + documentType.setItems(DocumentType.values()); + documentType.setWidthFull(); } - private Upload createUploadComponent() { - Upload upload = new Upload(buffer); - upload.setMaxFiles(1); - upload.setAcceptedFileTypes(".pdf"); - upload.addSucceededListener(event -> handleUploadSuccess(event.getFileName())); - return upload; + private void setEmployeeComboBoxProperties() { + List employees = employeeService.findAllEmployees(); + employeeComboBox.setItems(employees); + employeeComboBox.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName()); + employeeComboBox.setWidthFull(); } - private Button createViewButton(final DocumentType documentType) { - Button viewButton = new Button("View"); - viewButton.setEnabled(documentExists(documentType)); - viewButton.addClickListener(event -> viewDocument(documentType)); - return viewButton; + private void setUploadButtonProperties() { + uploadButton.setMaxFiles(1); + uploadButton.setAcceptedFileTypes(".pdf"); + uploadButton.addSucceededListener(event -> handleUploadSuccess()); } - private Button createSaveButton(final Button viewButton, final DocumentType documentType) { + private void addComponents() { + H2 title = new H2("Edit Documents"); + Button saveButton = createSaveButton(); + Button closeButton = createCloseButton(); + HorizontalLayout buttonLayout = new HorizontalLayout(saveButton, closeButton); + + add(title, fileName, documentType, employeeComboBox, uploadButton, buttonLayout); + } + + private Button createSaveButton() { Button saveButton = new Button("Save"); - saveButton.addClickListener(event -> saveFile(documentType, viewButton)); + saveButton.addClickListener(event -> saveDocument()); return saveButton; } - private void handleUploadSuccess(final String fileName) { - lastUploadedFileName = fileName; - Notification.show("File uploaded successfully"); + private Button createCloseButton() { + Button closeButton = new Button("Close"); + closeButton.addClickListener(event -> closeForm()); + return closeButton; } - private HorizontalLayout createLayout(final Component... components) { - if (components.length != 1 && components.length != 3) { - throw new IllegalArgumentException("This method only accepts 1 or 3 components."); - } - HorizontalLayout layout = new HorizontalLayout(components); - layout.setJustifyContentMode(FlexComponent.JustifyContentMode.CENTER); - return layout; + private void handleUploadSuccess() { + fileUploaded = true; + Notification.show("File uploaded successfully."); } - private HorizontalLayout createAdditionalButtons() { - return createLayout(new Button("Print"), new Button("Download"), new Button("Delete")); - } - - private void saveFile(final DocumentType documentType, final Button viewButton) { - if (lastUploadedFileName == null) { - Notification.show("Please upload a file first."); - return; - } - try { - byte[] content = buffer.getInputStream().readAllBytes(); - documentService.saveDocument(new Document(lastUploadedFileName, documentType, content)); + private void saveDocument() { + if (isFormValid()) { + Document document = createDocument(); + documentService.saveDocument(document); Notification.show("File saved successfully."); - viewButton.setEnabled(true); - } catch (IOException e) { - Notification.show("Error saving file: " + e.getMessage()); + clearForm(); + } else { + Notification.show("Save failed: Please complete all fields and upload a file."); } } - private boolean documentExists(final DocumentType documentType) { - return documentService.getAllDocuments().stream() - .anyMatch(doc -> doc.getDocumentType() == documentType); + private boolean isFormValid() { + return !fileName.isEmpty() + && documentType.getValue() != null + && employeeComboBox.getValue() != null + && fileUploaded; } - private void viewDocument(final DocumentType documentType) { - documentService.getAllDocuments().stream() - .filter(doc -> doc.getDocumentType() == documentType) - .findFirst() - .ifPresentOrElse(this::showPdfDialog, () -> Notification.show("Document not found.")); + private Document createDocument() { + Document document = new Document(); + document.setFileName(fileName.getValue()); + document.setDocumentType(documentType.getValue()); + document.setFileData(readFileData()); + return document; } - private void showPdfDialog(final Document document) { - Dialog dialog = createDialog(document.getFileData()); - dialog.open(); + private byte[] readFileData() { + try { + return buffer.getInputStream().readAllBytes(); + } catch (IOException e) { + Notification.show("Error reading file data."); + return new byte[0]; + } } - private Dialog createDialog(final byte[] fileData) { - Dialog dialog = new Dialog(); - dialog.setModal(true); - dialog.setCloseOnEsc(true); - dialog.setCloseOnOutsideClick(true); - - IFrame pdfFrame = new IFrame(); - pdfFrame.setSrc(createPdfResource(fileData)); - pdfFrame.setWidth("800px"); - pdfFrame.setHeight("600px"); - - Button closeButton = new Button("Close", event -> dialog.close()); - VerticalLayout layout = new VerticalLayout(pdfFrame, closeButton); - layout.setAlignItems(FlexComponent.Alignment.CENTER); - - dialog.add(layout); - return dialog; + private void clearForm() { + fileName.clear(); + documentType.clear(); + employeeComboBox.clear(); + fileUploaded = false; } - private String createPdfResource(final byte[] fileData) { - return "data:application/pdf;base64," + Base64.getEncoder().encodeToString(fileData); + private void closeForm() { + clearForm(); } - } - diff --git a/src/main/java/com/primefactorsolutions/views/MainLayout.java b/src/main/java/com/primefactorsolutions/views/MainLayout.java index b5bbcf6..36aaa54 100644 --- a/src/main/java/com/primefactorsolutions/views/MainLayout.java +++ b/src/main/java/com/primefactorsolutions/views/MainLayout.java @@ -18,9 +18,7 @@ import com.vaadin.flow.theme.lumo.LumoUtility; import org.springframework.security.core.userdetails.UserDetails; import org.vaadin.lineawesome.LineAwesomeIcon; -/** - * The main view is a top-level placeholder for other views. - */ + public class MainLayout extends AppLayout { private final transient AuthenticationContext authContext; @@ -81,8 +79,8 @@ public class MainLayout extends AppLayout { SideNavItem admin = new SideNavItem("Admin", MainView.class, LineAwesomeIcon.SUPERSCRIPT_SOLID.create()); - admin.addItem(new SideNavItem("Employees", EmployeeView.class, - LineAwesomeIcon.USER_EDIT_SOLID.create())); +// admin.addItem(new SideNavItem("Employees", EmployeeView.class, +// LineAwesomeIcon.USER_EDIT_SOLID.create())); admin.addItem(new SideNavItem("Documents", DocumentsView.class, LineAwesomeIcon.FILE_ALT_SOLID.create()));