diff --git a/.vscode/settings.json b/.vscode/settings.json index c5f3f6b..e0f15db 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "automatic" } \ No newline at end of file diff --git a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java index 88eb66b..19220e9 100644 --- a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java +++ b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java @@ -55,24 +55,24 @@ public class SupportGroup { System.out.println(api.isAdministrator()); - if (!api.isAdministrator()) { - this.supportGroups = api - .queryFieldsById("\'1000000172\' == 5000 OR \'1000000172\' == 6000", querySupportGroups.getFieldIds(), - querySupportGroups.getFormName(), null, 0, 0) - .stream() - .map(entry -> new SupportGroupGetResponse( - entry.get(querySupportGroups.getFieldId("SupportGroup")).toString(), - entry.get(querySupportGroups.getFieldId("SupportGroupId")).toString())) - .distinct() - .collect(Collectors.toCollection(ArrayList::new)); + // if (!api.isAdministrator()) { + // this.supportGroups = api + // .queryFieldsById("\'1000000172\' == 5000 OR \'1000000172\' == 6000", querySupportGroups.getFieldIds(), + // querySupportGroups.getFormName(), null, 0, 0) + // .stream() + // .map(entry -> new SupportGroupGetResponse( + // entry.get(querySupportGroups.getFieldId("SupportGroup")).toString(), + // entry.get(querySupportGroups.getFieldId("SupportGroupId")).toString())) + // .distinct() + // .collect(Collectors.toCollection(ArrayList::new)); - // nur zum testen - var test = api - .queryFieldsById("\'1000000172\' == 5000 OR \'1000000172\' == 6000", querySupportGroups.getFieldIds(), - querySupportGroups.getFormName(), null, 0, 0); - for (var t : test) System.out.println(t); + // // nur zum testen + // var test = api + // .queryFieldsById("\'1000000172\' == 5000 OR \'1000000172\' == 6000", querySupportGroups.getFieldIds(), + // querySupportGroups.getFormName(), null, 0, 0); + // for (var t : test) System.out.println(t); - } else { + // } else { this.supportGroups = api .queryFieldsById("\'4\' != \"_\"", querySupportGroups.getFieldIds(), querySupportGroups.getFormName(), null, 0, 0) @@ -82,7 +82,7 @@ public class SupportGroup { entry.get(querySupportGroups.getFieldId("SupportGroupId")).toString())) .distinct() .collect(Collectors.toCollection(ArrayList::new)); - } + // } if (this.supportGroups.isEmpty()) { diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index cadbdab..2ace95f 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -401,6 +401,8 @@ export class DataService { response.forEach(supportGroup => { res.push(supportGroup) }); + console.log("\n###################") + console.log(response); resolve(res); }) })