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

#4-Registrar-empleado #15

Merged
alex merged 3 commits from #4-Registrar-empleado into main 2024-09-06 00:59:20 +00:00
Conversation 0 Commits 3 Files Changed 2 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b88b680e4e - Show all commits

6
src/main/java/com/primefactorsolutions/views/EmployeeView.java
View File

@ -27,7 +27,7 @@ import java.util.UUID;
@PermitAll
@Scope("prototype")
@PageTitle("Employee")
@Route(value = "/employees/:action?/:employeeId?", layout = MainLayout.class)
@Route(value = "/employees/:employeeId?/:action?", layout = MainLayout.class)
public class EmployeeView extends BeanValidationForm<Employee> implements HasUrlParameter<String> {
private static final String SAVE_BUTTON_TEXT = "Save";
@ -163,9 +163,9 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
}
@Override
public void setParameter(final BeforeEvent beforeEvent, final String s) {
public void setParameter(final BeforeEvent beforeEvent, final String action) {
RouteParameters params = beforeEvent.getRouteParameters();
String action = params.get("action").orElse("new");
String s = params.get("employeeId").orElse(null);
if ("new".equals(action)) {
setEntityWithEnabledSave(new Employee());

4
src/main/java/com/primefactorsolutions/views/EmployeesListView.java
View File

@ -68,11 +68,11 @@ public class EmployeesListView extends Main {
}
private void navigateToEditView(final Employee employee) {
getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, "edit/" + employee.getId().toString()));
getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, employee.getId().toString() + "/edit"));
}
private void navigateToEmployeeView(final Employee employee) {
getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, "view/" + employee.getId().toString()));
getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, employee.getId().toString() + "/view"));
}
private void navigateToAddEmployeeView() {