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

t

main
Manuel Tauber 2024-03-05 13:46:09 +01:00
parent fbd207b31a
commit 4fe306089a
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/settings.json vendored
View File

@ -1,3 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
"java.configuration.updateBuildConfiguration": "automatic"
}

34
backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java
View File

@ -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()) {

2
frontend/src/app/data.service.ts
View File

@ -401,6 +401,8 @@ export class DataService {
response.forEach(supportGroup => {
res.push(supportGroup)
});
console.log("\n###################")
console.log(response);
resolve(res);
})
})