NapoleonDynamite/munera-vaadin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: change service name

Browse source
This commit is contained in:
filippo-ferrari 2024-09-09 18:10:17 +02:00
parent 02a4e944a2
commit f15b35295d
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/application/munera/services/ServiceView.java → src/main/java/com/application/munera/services/ViewsService.java
View file

@ -9,11 +9,11 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@Service
public class ServiceView {
public class ViewsService {
private final ExpenseService expenseService;
public ServiceView(ExpenseService expenseService) {
public ViewsService(ExpenseService expenseService) {
this.expenseService = expenseService;
}

8
src/main/java/com/application/munera/views/expenses/ExpensesView.java
View file

@ -59,7 +59,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
private final CategoryService categoryService;
private final PersonService personService;
private final EventService eventService;
private final ServiceView serviceView;
private final ViewsService viewsService;
private final UserService userService;
private TextField name;
private TextField cost;
@ -75,12 +75,12 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
private ComboBox<Event> event;
@Autowired
public ExpensesView(ExpenseService expenseService, CategoryService categoryService, PersonService personService, EventService eventService, ServiceView serviceView, UserService userService) {
public ExpensesView(ExpenseService expenseService, CategoryService categoryService, PersonService personService, EventService eventService, ViewsService viewsService, UserService userService) {
this.expenseService = expenseService;
this.categoryService = categoryService;
this.personService = personService;
this.eventService = eventService;
this.serviceView = serviceView;
this.viewsService = viewsService;
this.userService = userService;
addClassNames("expenses-view");
@ -100,7 +100,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
grid.addColumn(Expense::getPeriodUnit).setHeader("Period Unit").setSortable(true);
grid.addColumn(Expense::getDate).setHeader("Date").setSortable(true).setSortProperty("date");
// grid.addColumn(expenseEvent -> expenseEvent.getEvent().getName()).setHeader("Event").setSortable(true);
grid.addColumn(new ComponentRenderer<>(this.serviceView::createExpenseBadge)).setHeader("Status").setSortable(true);
grid.addColumn(new ComponentRenderer<>(this.viewsService::createExpenseBadge)).setHeader("Status").setSortable(true);
grid.getColumns().forEach(col -> col.setAutoWidth(true));
grid.setItems(this.expenseService.findAllOrderByDateDescending());

12
src/main/java/com/application/munera/views/people/PeopleView.java
View file

@ -4,7 +4,7 @@ import com.application.munera.data.Expense;
import com.application.munera.data.Person;
import com.application.munera.services.ExpenseService;
import com.application.munera.services.PersonService;
import com.application.munera.services.ServiceView;
import com.application.munera.services.ViewsService;
import com.application.munera.views.MainLayout;
import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.button.Button;
@ -56,15 +56,15 @@ public class PeopleView extends Div implements BeforeEnterObserver {
private Person person;
private final PersonService personService;
private final ExpenseService expenseService;
private final ServiceView serviceView;
private final ViewsService viewsService;
private TextField firstName;
private TextField lastName;
private EmailField email;
public PeopleView(PersonService personService, ExpenseService expenseService, ServiceView serviceView) {
public PeopleView(PersonService personService, ExpenseService expenseService, ViewsService viewsService) {
this.personService = personService;
this.expenseService = expenseService;
this.serviceView = serviceView;
this.viewsService = viewsService;
addClassNames("expenses-view");
// Create UI
@ -79,8 +79,8 @@ public class PeopleView extends Div implements BeforeEnterObserver {
grid.addHierarchyColumn(this::getNodeName).setHeader("Name");
grid.addColumn(this::getNodeCost).setHeader("Total Expenses Value").setSortable(true);
grid.addColumn(new ComponentRenderer<>(persona -> {
if (persona instanceof Person) return this.serviceView.createPersonBadge(personService.calculateNetBalance((Person) persona));
else return this.serviceView.createExpenseBadge(((Expense) persona));
if (persona instanceof Person) return this.viewsService.createPersonBadge(personService.calculateNetBalance((Person) persona));
else return this.viewsService.createExpenseBadge(((Expense) persona));
})).setHeader("Balance Status");
grid.addColumn(new ComponentRenderer<>(persona -> {