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

#10-Registro-Informacion-Profesional #38

Merged
alex merged 13 commits from #10-Registro-Informacion-Profesional into main 2024-10-08 18:00:45 +00:00
Conversation 0 Commits 13 Files Changed 6 +21 -7
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6316230a2a - Show all commits

6
src/main/java/com/primefactorsolutions/model/Employee.java
View File

@ -25,6 +25,7 @@
private String age;
private String residenceAddress;
private String localAddress;
private String phoneNumber;
private String personalEmail;
private String position;
@ -34,7 +35,6 @@
private String emergencyCPhone;
private String emergencyCEmail;
private String numberOfChildren;
private String departmentAndProvinceResidence;
private String ci;
private String issuedIn;
@ -66,8 +66,8 @@
private LocalDate dateOfExit;
private String contractType;
private Integer seniority;
private Double salary;
private String seniority;
private String salary;
private String bankName;
private String accountNumber;

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

@ -173,6 +173,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
int birthYear = birthday.getValue().getYear();
int ages = currentYear - birthYear;
age.setValue(String.valueOf(ages));
System.out.println(age);
}
}
@ -285,6 +286,8 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
if (validateForm()) {
Employee employee = getEntity();
employee.setStatus(status.getValue());
employee.setAge(age.getValue());
employeeService.createOrUpdate(employee);
Notification.show(NOTIFICATION_SAVE_SUCCESS);
getUI().ifPresent(ui -> ui.navigate(EmployeesListView.class));

19
src/main/resources/reports/ficha.html
View File

@ -28,6 +28,7 @@
</head>
<body>
<div style="clear:both;"></div>
<h2>FICHA DE CONTRATACIÓN</h2>
<h3>Información General</h3>
<table>
<tr>
@ -55,10 +56,14 @@
<td>${maritalStatus!""}</td>
<td>Nro. CI:</td>
<td>${ci!""}</td>
<td>Expedido en:</td>
<td>${issuedIn!""}</td>
</tr>
<tr>
<td>Nro. Hijos:</td>
<td>${numberOfChildren!""}</td>
</tr>
<tr>
<td>Nro. Celular:</td>
<td>${phoneNumber!""}</td>
</tr>
@ -66,13 +71,11 @@
<td>Email:</td>
<td>${personalEmail!""}</td>
</tr>
</table>
<h3>Información de Contratación</h3>
<table>
<tr>
<td>Código de Empleado:</td>
<td>${cod!""}</td>
</tr>
<tr>
<td>Cargo:</td>
<td>${position!""}</td>
</tr>
@ -80,9 +83,15 @@
<td>Equipo:</td>
<td>${team!""}</td>
</tr>
</table>
<h3>Información de Contratación</h3>
<table>
<tr>
<td>Fecha de Ingreso:</td>
<td>${dateOfEntry!""}</td>
</tr>
<tr>
<td>Tipo de Contrato:</td>
<td>${contractType!""}</td>
</tr>
@ -97,6 +106,8 @@
<tr>
<td>Banco:</td>
<td>${bankName!""}</td>
</tr>
<tr>
<td>Nro. Cuenta:</td>
<td>${accountNumber!""}</td>
</tr>