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

En-desarrollo #65

Merged
alex merged 29 commits from En-desarrollo into main 2024-11-09 12:15:26 +00:00
Conversation 0 Commits 29 Files Changed 15 +17 -12
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eb6183df19 - Show all commits

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

@ -18,7 +18,7 @@ public class TimeOffRequestService {
timeOffRequestRepository.save(newTimeOffRequest);
}
public void saveAll(List<TimeOffRequest> requests) {
public void saveAll(final List<TimeOffRequest> requests) {
timeOffRequestRepository.saveAll(requests);
}
@ -35,7 +35,7 @@ public class TimeOffRequestService {
return timeOffRequest.orElse(null);
}
public List<TimeOffRequest> findRequestsByState(TimeOffRequestStatus state) {
public List<TimeOffRequest> findRequestsByState(final TimeOffRequestStatus state) {
return timeOffRequestRepository.findByState(state);
}

2
src/main/java/com/primefactorsolutions/views/MainView.java
View File

@ -19,7 +19,7 @@ public class MainView extends Main {
private final TimeOffRequestService requestService;
public MainView(TimeOffRequestService requestService) {
public MainView(final TimeOffRequestService requestService) {
this.requestService = requestService;
add(new Text("Welcome"));
updateRequestStatuses();

13
src/main/java/com/primefactorsolutions/views/PendingRequestsListView.java
View File

@ -84,7 +84,7 @@ public class PendingRequestsListView extends Main {
return new HorizontalLayout(approveButton, rejectButton, closeButton);
}
private Button createActionButton(String caption, TimeOffRequestStatus status) {
private Button createActionButton(final String caption, final TimeOffRequestStatus status) {
return new Button(caption, event -> {
if (selectedRequestId != null) {
TimeOffRequest request = requestService.findTimeOffRequest(selectedRequestId);
@ -112,7 +112,8 @@ public class PendingRequestsListView extends Main {
final Employee employee,
final Team team,
final TimeOffRequestType category) {
List<TimeOffRequest> filteredPendingRequests = requestService.findRequestsByState(TimeOffRequestStatus.PENDIENTE);
List<TimeOffRequest> filteredPendingRequests
= requestService.findRequestsByState(TimeOffRequestStatus.PENDIENTE);
if (employee != null && !"TODOS".equals(employee.getFirstName())) {
filteredPendingRequests = filteredPendingRequests.stream()
@ -122,7 +123,8 @@ public class PendingRequestsListView extends Main {
if (team != null && !"TODOS".equals(team.getName())) {
filteredPendingRequests = filteredPendingRequests.stream()
.filter(emp -> emp.getEmployee().getTeam() != null && emp.getEmployee().getTeam().getId().equals(team.getId()))
.filter(emp -> emp.getEmployee().getTeam() != null
&& emp.getEmployee().getTeam().getId().equals(team.getId()))
.collect(Collectors.toList());
}
@ -142,7 +144,8 @@ public class PendingRequestsListView extends Main {
}
private String getEmployeeFullNameLabel(final Employee employee) {
return "TODOS".equals(employee.getFirstName()) ? "TODOS" : employee.getFirstName() + " " + employee.getLastName();
return "TODOS".equals(employee.getFirstName())
? "TODOS" : employee.getFirstName() + " " + employee.getLastName();
}
private String getTeamName(final TimeOffRequest request) {
@ -154,7 +157,7 @@ public class PendingRequestsListView extends Main {
return "TODOS".equals(team.getName()) ? "TODOS" : team.getName();
}
private String getCategory(TimeOffRequest request){
private String getCategory(final TimeOffRequest request) {
return String.valueOf(request.getCategory());
}

1
src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java
View File

@ -21,7 +21,6 @@ import com.vaadin.flow.spring.annotation.SpringComponent;
import jakarta.annotation.security.PermitAll;
import org.springframework.context.annotation.Scope;
import java.time.LocalDate;
import java.util.Collections;
import java.util.List;
import java.util.UUID;

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

@ -136,7 +136,8 @@ public class RequestRegisterView extends VerticalLayout {
List<TimeOffRequestType> availableCategories = allCategories.stream()
.filter(category -> isCategoryAvailable(employeeRequests, category))
.filter(category -> isCategoryAllowedByGender(category, employee.getGender()))
.filter(category -> category != TimeOffRequestType.VACACION_GESTION_ANTERIOR && category != TimeOffRequestType.TODOS)
.filter(category -> category != TimeOffRequestType.VACACION_GESTION_ANTERIOR
&& category != TimeOffRequestType.TODOS)
.toList();
categoryComboBox.setItems(availableCategories);
@ -235,7 +236,8 @@ public class RequestRegisterView extends VerticalLayout {
endDate = null;
UUID employeeId = employee.getId();
List<TimeOffRequest> previousRequests = requestService.findByEmployeeAndCategory(employeeId, vacation.getCategory());
List<TimeOffRequest> previousRequests
= requestService.findByEmployeeAndCategory(employeeId, vacation.getCategory());
int startYear = calculateStartYear(previousRequests);

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

@ -141,7 +141,8 @@ public class RequestsListView extends Main {
}
private String getEmployeeFullName(final Employee employee) {
return "TODOS".equals(employee.getFirstName()) ? "TODOS" : employee.getFirstName() + " " + employee.getLastName();
return "TODOS".equals(employee.getFirstName())
? "TODOS" : employee.getFirstName() + " " + employee.getLastName();
}
private String getTeamName(final Employee employee) {