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

En-desarrollo #27

Merged
alex merged 39 commits from En-desarrollo into main 2024-10-07 18:23:34 +00:00
Conversation 0 Commits 39 Files Changed 11 +95 -118
3 changed files with 95 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2caa878c07 - Show all commits

4
src/main/java/com/primefactorsolutions/service/EmployeeService.java
View File

@ -87,4 +87,8 @@ public class EmployeeService {
ldapTemplate.modifyAttributes(buildDn(employee), new ModificationItem[] {item}); ldapTemplate.modifyAttributes(buildDn(employee), new ModificationItem[] {item});
} }
public List<Employee> findAllEmployees() {
return employeeRepository.findAll();
}
} }

211
src/main/java/com/primefactorsolutions/views/DocumentsView.java
View File

@ -2,18 +2,16 @@ package com.primefactorsolutions.views;
import com.primefactorsolutions.model.Document; import com.primefactorsolutions.model.Document;
import com.primefactorsolutions.model.DocumentType; import com.primefactorsolutions.model.DocumentType;
import com.primefactorsolutions.model.Employee;
import com.primefactorsolutions.service.DocumentService; 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.button.Button;
import com.vaadin.flow.component.dialog.Dialog; import com.vaadin.flow.component.combobox.ComboBox;
import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.component.html.H2; 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.html.Main;
import com.vaadin.flow.component.notification.Notification; 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.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.Upload;
import com.vaadin.flow.component.upload.receivers.MemoryBuffer; import com.vaadin.flow.component.upload.receivers.MemoryBuffer;
import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.PageTitle;
@ -23,152 +21,129 @@ import jakarta.annotation.security.PermitAll;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import java.io.IOException; import java.io.IOException;
import java.util.Base64; import java.util.List;
@SpringComponent @SpringComponent
@PermitAll @PermitAll
@Scope("prototype") @Scope("prototype")
@PageTitle("Documents") @PageTitle("Documents")
@Route(value = "/documents/me", layout = MainLayout.class) @Route(value = "/documents", layout = MainLayout.class)
public abstract class DocumentsView extends Main { public class DocumentsView extends Main {
private final DocumentService documentService;
private final TextField fileName = new TextField("Document Name");
private final ComboBox<DocumentType> documentType = new ComboBox<>("Document Type");
private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Employee");
private final MemoryBuffer buffer = new MemoryBuffer(); 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; this.documentService = documentService;
initializeLayout(); this.employeeService = employeeService;
initializeView();
addComponents();
} }
protected abstract void initializeLayout(); private void initializeView() {
setFileNameProperties();
protected HorizontalLayout createRow( setDocumentTypeProperties();
final String title1, setEmployeeComboBoxProperties();
final DocumentType type1, setUploadButtonProperties();
final String title2,
final DocumentType type2) {
HorizontalLayout row = new HorizontalLayout();
row.add(
createDocumentSection(title1, type1),
createDocumentSection(title2, type2)
);
return row;
} }
protected HorizontalLayout createRow(final String title1, final DocumentType type1) { private void setFileNameProperties() {
HorizontalLayout row = new HorizontalLayout(); fileName.setWidthFull();
row.add(createDocumentSection(title1, type1));
return row;
} }
private Div createDocumentSection(final String title, final DocumentType documentType) { private void setDocumentTypeProperties() {
Div section = new Div(); documentType.setItems(DocumentType.values());
section.add(new H2(title)); documentType.setWidthFull();
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 Upload createUploadComponent() { private void setEmployeeComboBoxProperties() {
Upload upload = new Upload(buffer); List<Employee> employees = employeeService.findAllEmployees();
upload.setMaxFiles(1); employeeComboBox.setItems(employees);
upload.setAcceptedFileTypes(".pdf"); employeeComboBox.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName());
upload.addSucceededListener(event -> handleUploadSuccess(event.getFileName())); employeeComboBox.setWidthFull();
return upload;
} }
private Button createViewButton(final DocumentType documentType) { private void setUploadButtonProperties() {
Button viewButton = new Button("View"); uploadButton.setMaxFiles(1);
viewButton.setEnabled(documentExists(documentType)); uploadButton.setAcceptedFileTypes(".pdf");
viewButton.addClickListener(event -> viewDocument(documentType)); uploadButton.addSucceededListener(event -> handleUploadSuccess());
return viewButton;
} }
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"); Button saveButton = new Button("Save");
saveButton.addClickListener(event -> saveFile(documentType, viewButton)); saveButton.addClickListener(event -> saveDocument());
return saveButton; return saveButton;
} }
private void handleUploadSuccess(final String fileName) { private Button createCloseButton() {
lastUploadedFileName = fileName; Button closeButton = new Button("Close");
Notification.show("File uploaded successfully"); closeButton.addClickListener(event -> closeForm());
return closeButton;
} }
private HorizontalLayout createLayout(final Component... components) { private void handleUploadSuccess() {
if (components.length != 1 && components.length != 3) { fileUploaded = true;
throw new IllegalArgumentException("This method only accepts 1 or 3 components."); Notification.show("File uploaded successfully.");
}
HorizontalLayout layout = new HorizontalLayout(components);
layout.setJustifyContentMode(FlexComponent.JustifyContentMode.CENTER);
return layout;
} }
private HorizontalLayout createAdditionalButtons() { private void saveDocument() {
return createLayout(new Button("Print"), new Button("Download"), new Button("Delete")); if (isFormValid()) {
} Document document = createDocument();
documentService.saveDocument(document);
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));
Notification.show("File saved successfully."); Notification.show("File saved successfully.");
viewButton.setEnabled(true); clearForm();
} else {
Notification.show("Save failed: Please complete all fields and upload a file.");
}
}
private boolean isFormValid() {
return !fileName.isEmpty()
&& documentType.getValue() != null
&& employeeComboBox.getValue() != null
&& 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();
} catch (IOException e) { } catch (IOException e) {
Notification.show("Error saving file: " + e.getMessage()); Notification.show("Error reading file data.");
return new byte[0];
} }
} }
private boolean documentExists(final DocumentType documentType) { private void clearForm() {
return documentService.getAllDocuments().stream() fileName.clear();
.anyMatch(doc -> doc.getDocumentType() == documentType); documentType.clear();
employeeComboBox.clear();
fileUploaded = false;
} }
private void viewDocument(final DocumentType documentType) { private void closeForm() {
documentService.getAllDocuments().stream() clearForm();
.filter(doc -> doc.getDocumentType() == documentType)
.findFirst()
.ifPresentOrElse(this::showPdfDialog, () -> Notification.show("Document not found."));
} }
private void showPdfDialog(final Document document) {
Dialog dialog = createDialog(document.getFileData());
dialog.open();
} }
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 String createPdfResource(final byte[] fileData) {
return "data:application/pdf;base64," + Base64.getEncoder().encodeToString(fileData);
}
}

8
src/main/java/com/primefactorsolutions/views/MainLayout.java
View File

@ -18,9 +18,7 @@ import com.vaadin.flow.theme.lumo.LumoUtility;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.vaadin.lineawesome.LineAwesomeIcon; import org.vaadin.lineawesome.LineAwesomeIcon;
/**
* The main view is a top-level placeholder for other views.
*/
public class MainLayout extends AppLayout { public class MainLayout extends AppLayout {
private final transient AuthenticationContext authContext; private final transient AuthenticationContext authContext;
@ -81,8 +79,8 @@ public class MainLayout extends AppLayout {
SideNavItem admin = new SideNavItem("Admin", MainView.class, SideNavItem admin = new SideNavItem("Admin", MainView.class,
LineAwesomeIcon.SUPERSCRIPT_SOLID.create()); LineAwesomeIcon.SUPERSCRIPT_SOLID.create());
admin.addItem(new SideNavItem("Employees", EmployeeView.class, // admin.addItem(new SideNavItem("Employees", EmployeeView.class,
LineAwesomeIcon.USER_EDIT_SOLID.create())); // LineAwesomeIcon.USER_EDIT_SOLID.create()));
admin.addItem(new SideNavItem("Documents", DocumentsView.class, admin.addItem(new SideNavItem("Documents", DocumentsView.class,
LineAwesomeIcon.FILE_ALT_SOLID.create())); LineAwesomeIcon.FILE_ALT_SOLID.create()));