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 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 13c81de48c - Show all commits

5
src/main/java/com/primefactorsolutions/model/BaseEntity.java
View File

@ -10,6 +10,7 @@ public abstract class BaseEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.UUID) @GeneratedValue(strategy = GenerationType.UUID)
private UUID id; private UUID id;
@Enumerated(EnumType.STRING)
private Employee.Status status; private Employee.Status status;
private String fileName; private String fileName;
@Lob @Lob
@ -64,11 +65,11 @@ public abstract class BaseEntity {
return documentType; return documentType;
} }
public void setStatus(Employee.Status status) { public void setStatusEmployee(Employee.Status status) {
this.status = status; this.status = status;
} }
public Employee.Status getStatus() { public Employee.Status getStatusEmployee() {
return status; return status;
} }
} }

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

@ -199,7 +199,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
private void saveEmployee() { private void saveEmployee() {
if (validateForm()) { if (validateForm()) {
Employee employee = getEntity(); Employee employee = getEntity();
employee.setStatus(status.getValue()); employee.setStatusEmployee(status.getValue());
employeeService.createOrUpdate(employee); employeeService.createOrUpdate(employee);
Notification.show(NOTIFICATION_SAVE_SUCCESS); Notification.show(NOTIFICATION_SAVE_SUCCESS);
getUI().ifPresent(ui -> ui.navigate(EmployeesListView.class)); getUI().ifPresent(ui -> ui.navigate(EmployeesListView.class));
@ -233,7 +233,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
if ("edit".equals(action) && !s.isEmpty()) { if ("edit".equals(action) && !s.isEmpty()) {
saveButton.setVisible(true); saveButton.setVisible(true);
editButton.setVisible(false); editButton.setVisible(false);
status.setValue(employee.getStatus()); status.setValue(employee.getStatusEmployee());
setFieldsEditable(); setFieldsEditable();
} else if ("view".equals(action) && !s.isEmpty()) { } else if ("view".equals(action) && !s.isEmpty()) {
setFieldsReadOnly(); setFieldsReadOnly();