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

plantimes

main
Said Gedik 2024-02-28 15:40:50 +01:00
parent 687df00bb2
commit bfd6f04c63
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/com/nttdata/calender/changes/query/Filter.java
View File

@ -22,6 +22,7 @@ public class Filter {
this.queryChange = new Query.QueryBuilder("ASF:WI_TAS_Paket") this.queryChange = new Query.QueryBuilder("ASF:WI_TAS_Paket")
.addFieldId("ChangeNr", 1000000182) .addFieldId("ChangeNr", 1000000182)
.addFieldId("SupportGroup", 1000000015) .addFieldId("SupportGroup", 1000000015)
.addFieldId("ManagerGroup", 1000003229)
.addFieldId("State", 7) .addFieldId("State", 7)
.addFieldId("ResourceName", 1000000000) .addFieldId("ResourceName", 1000000000)
.addFieldId("D1", 1000000349) .addFieldId("D1", 1000000349)
@ -131,6 +132,8 @@ public class Filter {
}else if(column.equals("SupportGroup")){ }else if(column.equals("SupportGroup")){
String supportGroupColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId("SupportGroup")); String supportGroupColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId("SupportGroup"));
String coordGroupColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId("ManagerGroup")); String coordGroupColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId("ManagerGroup"));
System.out.println(coordGroupColumn);
for (int j = 0; j < criterias.length; j++) { for (int j = 0; j < criterias.length; j++) {
var criteria = criterias[j]; var criteria = criterias[j];
if (j > 0) { if (j > 0) {

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

@ -41,6 +41,7 @@ public class PlanTimes {
* @throws ValidationError if there is a validation error * @throws ValidationError if there is a validation error
*/ */
public void setPlanTimes(PlanTimesRequest req) throws ARException, ValidationError { public void setPlanTimes(PlanTimesRequest req) throws ARException, ValidationError {
try {
var dateConverter = new DateConverter(); var dateConverter = new DateConverter();
var startDate = dateConverter.convertDateTime(req.getRenderStartDate()); var startDate = dateConverter.convertDateTime(req.getRenderStartDate());
var endDate = dateConverter.convertDateTime(req.getRenderEndDate()); var endDate = dateConverter.convertDateTime(req.getRenderEndDate());
@ -60,6 +61,8 @@ public class PlanTimes {
LocalDate startOfWeek = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); LocalDate startOfWeek = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
calendarWeek.setWeek(year + "w" + formattedStartWeek); calendarWeek.setWeek(year + "w" + formattedStartWeek);
calendarWeek.setPlanTime(0); calendarWeek.setPlanTime(0);
calendarWeek.setStartDate(startOfWeek.format(formatter)); calendarWeek.setStartDate(startOfWeek.format(formatter));
@ -87,8 +90,13 @@ public class PlanTimes {
planTimePerWeek += plantime; planTimePerWeek += plantime;
} }
} }
System.out.println(planTimePerWeek);
week.setPlanTime((int) Math.ceil(planTimePerWeek)); week.setPlanTime((int) Math.ceil(planTimePerWeek));
} }
} catch (Exception e) {
e.printStackTrace();
}
} }
/** /**