En-desarrollo #27

Merged
alex merged 39 commits from En-desarrollo into main 2024-10-07 18:23:34 +00:00
Showing only changes of commit dccc3ea09d - Show all commits

View File

@ -8,7 +8,6 @@ import com.primefactorsolutions.service.EmployeeService;
import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.combobox.ComboBox; 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.notification.Notification;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.component.textfield.TextField;
@ -40,7 +39,6 @@ import java.io.InputStream;
@PageTitle("Document") @PageTitle("Document")
@Route(value = "/documents/:documentId?/:action?", layout = MainLayout.class) @Route(value = "/documents/:documentId?/:action?", layout = MainLayout.class)
public class DocumentView extends BeanValidationForm<Document> implements HasUrlParameter<String> { public class DocumentView extends BeanValidationForm<Document> implements HasUrlParameter<String> {
private final H2 title = new H2("Edit Documents");
private final TextField fileName = new TextField("Document Name"); private final TextField fileName = new TextField("Document Name");
private final ComboBox<DocumentType> documentType = new ComboBox<>("Document Type"); private final ComboBox<DocumentType> documentType = new ComboBox<>("Document Type");
private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Employee"); private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Employee");
@ -53,6 +51,7 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
private Button saveButton; private Button saveButton;
private Button viewDocumentButton; private Button viewDocumentButton;
public DocumentView(final DocumentService documentService, public DocumentView(final DocumentService documentService,
final EmployeeService employeeService, final EmployeeService employeeService,
final AuthenticationContext authContext) { final AuthenticationContext authContext) {
@ -131,8 +130,7 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
ui.getPage().open(registration.getResourceUri().toString()); ui.getPage().open(registration.getResourceUri().toString());
}); });
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); Notification.show("Error reading file.");
Notification.show("Error al leer el archivo.");
} }
} }
@ -198,30 +196,36 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
fileUploaded = true; fileUploaded = true;
} }
private void handleUploadSuccess() { private void updateSaveButtonState() {
fileUploaded = true; boolean isModified = !fileName.getValue().equals(getEntity().getFileName())
Notification.show("File uploaded successfully."); || documentType.getValue() != getEntity().getDocumentType()
viewDocumentButton.setEnabled(true); || employeeComboBox.getValue() != getEntity().getEmployee()
} || fileUploaded;
saveButton.setEnabled(isModified);
private void handleFileRemoval() {
fileUploaded = false;
Notification.show("File removed.");
viewDocumentButton.setEnabled(false);
uploadButton.setReceiver(new MemoryBuffer());
} }
private void configureComponents() { private void configureComponents() {
setFileNameProperties(); setFileNameProperties();
setDocumentTypeProperties(); setDocumentTypeProperties();
setEmployeeComboBoxProperties(); setEmployeeComboBoxProperties();
fileName.addValueChangeListener(e -> updateSaveButtonState());
documentType.addValueChangeListener(e -> updateSaveButtonState());
employeeComboBox.addValueChangeListener(e -> updateSaveButtonState());
uploadButton.addSucceededListener(e -> updateSaveButtonState());
uploadButton.getElement().addEventListener("file-remove", event -> updateSaveButtonState());
} }
private void configureUploadButton() { private void configureUploadButton() {
uploadButton.setMaxFiles(1); uploadButton.setMaxFiles(1);
uploadButton.setAcceptedFileTypes(".pdf"); uploadButton.setAcceptedFileTypes(".pdf");
uploadButton.addSucceededListener(event -> handleUploadSuccess()); uploadButton.addSucceededListener(event -> {
uploadButton.getElement().addEventListener("file-remove", event -> handleFileRemoval()); fileUploaded = true;
updateSaveButtonState();
});
uploadButton.getElement().addEventListener("file-remove", event -> {
fileUploaded = false;
updateSaveButtonState();
});
} }
private void configureViewOrEditAction(final String action, final String documentIdString) { private void configureViewOrEditAction(final String action, final String documentIdString) {
@ -245,6 +249,7 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
if ("new".equals(action)) { if ("new".equals(action)) {
setEntityWithEnabledSave(new Document()); setEntityWithEnabledSave(new Document());
} else { } else {
assert documentIdString != null;
UUID documentId = UUID.fromString(documentIdString); UUID documentId = UUID.fromString(documentIdString);
Document document = documentService.getDocument(documentId); Document document = documentService.getDocument(documentId);
setEntity(document); setEntity(document);
@ -259,6 +264,6 @@ public class DocumentView extends BeanValidationForm<Document> implements HasUrl
HorizontalLayout buttonLayout = new HorizontalLayout(); HorizontalLayout buttonLayout = new HorizontalLayout();
buttonLayout.add(uploadButton, createViewDocumentButton()); buttonLayout.add(uploadButton, createViewDocumentButton());
buttonLayout.setSpacing(true); buttonLayout.setSpacing(true);
return List.of(title, fileName, documentType, employeeComboBox, buttonLayout, createCloseButton()); return List.of(fileName, documentType, employeeComboBox, buttonLayout, createCloseButton());
} }
} }