mirrors/swt23w23
1
0
Fork 0
mirror of https://github.com/st-tu-dresden-praktikum/swt23w23 synced 2024-07-19 21:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix days in calendar and display of events per calendar day

Browse source
This commit is contained in:
Theo Reichert 2023-11-22 06:00:43 +01:00 committed by Simon Bruder
parent b836a38942
commit e83b6380be
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/catering/order/OrderController.java
View file

@ -13,6 +13,7 @@ import org.salespointframework.useraccount.web.LoggedIn;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.query.Procedure; import org.springframework.data.jpa.repository.query.Procedure;
import org.springframework.data.util.Streamable;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@ -211,12 +212,24 @@ public class OrderController {
datesOfMonth.add(x); datesOfMonth.add(x);
} }
// add each order overlapping with the calender to the days it overlaps with /*
for (CustomOrder order : this.orderManagement.findBy(Interval.from(startDateTime).to(endDateTime))) { * FIXME: Do not load all orders into java,
* instead query orderManagement better to only return orders overlapping with interval [startDate,endDate]
* by using "query creation" of the jpa
* e.g. this.orderManagement.findByFinishDateIsNotBeforeAndStartDateIsNotAfter(LocalDateTime startDateTime, LocalDateTime endDateTime)
*/
Streamable<CustomOrder> x = this.orderManagement.findAll(Pageable.unpaged()).filter(e ->
!e.getFinish().toLocalDate().isBefore(startDate) && // end is not before today
!e.getStart().toLocalDate().isAfter(endDate)
);
// add each order overlapping with the calendar to the days it overlaps with
for (CustomOrder order : x) {
int start_index_inclusive = Math.max((int) startDate.until(order.getStart().toLocalDate(), ChronoUnit.DAYS),0); int start_index_inclusive = Math.max((int) startDate.until(order.getStart().toLocalDate(), ChronoUnit.DAYS),0);
int end_index_exclusive = Math.min((int) startDate.until(order.getFinish().toLocalDate(), ChronoUnit.DAYS), 27) + 1; int end_index_exclusive = Math.min((int) startDate.until(order.getFinish().toLocalDate(), ChronoUnit.DAYS), 27) + 1;
String order_id = Objects.requireNonNull(order.getId()).toString(); String order_id = Objects.requireNonNull(order.getId()).toString();
for (int i = start_index_inclusive; i < end_index_exclusive; i++) { for (int i = start_index_inclusive; i < end_index_exclusive; i++) {
// FIXME: exchange order ids for a short name or a color
datesOfMonth.get(i).add(order_id); datesOfMonth.get(i).add(order_id);
} }
} }
@ -228,13 +241,15 @@ public class OrderController {
dayNames.add(date.getDayOfWeek().toString()); dayNames.add(date.getDayOfWeek().toString());
} }
// FIXME: Get rid of the following paragraph of code by change of order_calender.html
// put data of datesOfMonth inside current structure used in order_calender.html
ArrayList<ArrayList<ArrayList<String>>> weeksOfMonth = new ArrayList<ArrayList<ArrayList<String>>>(); ArrayList<ArrayList<ArrayList<String>>> weeksOfMonth = new ArrayList<ArrayList<ArrayList<String>>>();
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
weeksOfMonth.add(new ArrayList<ArrayList<String>>(7)); weeksOfMonth.add(new ArrayList<ArrayList<String>>(7));
for (int j = 0; j < 7; j++) { for (int j = 0; j < 7; j++) {
weeksOfMonth.get(i).add(new ArrayList<String>()); weeksOfMonth.get(i).add(new ArrayList<String>());
weeksOfMonth.get(i).get(j).addAll(datesOfMonth.get( weeksOfMonth.get(i).get(j).addAll(datesOfMonth.get(
(i==0) ? j : (j==0) ? i : i*j i*7+j
) )
); );
} }