taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plantimes finished

main
Said Gedik 2023-06-15 14:19:31 +02:00
parent 2a512abf8c
commit facfc1e360
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java
View File

@ -45,7 +45,7 @@ public class PlanTimes {
calendarWeek.setPlanTime(0);
calendarWeek.setStartDate(startDate.format(formatter));
LocalDate endOfWeek = startDate.with(TemporalAdjusters.next(DayOfWeek.SUNDAY));
LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
if (endOfWeek.isAfter(endDate))
endOfWeek = endDate;
calendarWeek.setEndDate(endOfWeek.format(formatter));
@ -60,7 +60,6 @@ public class PlanTimes {
queryChanges.getFieldIds(), formName, null, 0, 0);
for (var week : calenderWeeks) {
System.out.println(week.getStartDate() + " -> " + week.getEndDate());
double planTimePerWeek = 0.0;
for (var change : changesInDateRange) {
LocalDate d2 = timestampToDate(change.get(queryChanges.getFieldId("D2")).toString());
@ -68,27 +67,14 @@ public class PlanTimes {
LocalDate dateEnd = LocalDate.parse(week.getEndDate(), formatter);
if (d2.isAfter(dateStart) && (d2.isEqual(dateEnd) || d2.isBefore(dateEnd))) {
var minutes = change.get(queryChanges.getFieldId("PlanTimeMinutes")).toString();
var hours = change.get(queryChanges.getFieldId("PlanTimeHours")).toString();
double plantime = convertPlanTime(hours, minutes);
System.out.println(change.get(queryChanges.getFieldId("ChangeNr")).toString() + " - "
+ d2 + " | " + minutes + ":" + hours + " (" + plantime + ")");
planTimePerWeek += plantime;
}
}
week.setPlanTime((int) Math.ceil(planTimePerWeek));
System.out.println("Total Plantime : " + (int) Math.ceil(planTimePerWeek) + "\n");
}
System.out.println("Calendar Weeks:\n");
for (var v : calenderWeeks)
System.out.println(v.getWeek() + " - " + v.getPlanTime() + " - " + v.getStartDate() + " - " + v.getEndDate());
}
public double convertPlanTime(String hours, String minutes) throws ARException {