diff --git a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java index 6b7c5a7..6275787 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -95,6 +95,23 @@ public class KalenderRestController { return state.get(); } + + /** + * Handles GET request to retrieve all the states and their actual and possible + * states and results a JSON array. + * + * @return JSON Array of states with actualState, possibleStates, stateNameEN, + * stateNameDE + * @throws JsonProcessingException if an exception occurs during JSON processing + */ + @CrossOrigin("*") + @GetMapping("/api/getUser") + @ResponseBody + public String getUserId() { + String jsonString = "{\"userId\": \""+this.javaAPI.getUser()+"\"}"; + return jsonString; + } + /** * Handles GET request to retrieve all support groups. * @@ -304,6 +321,8 @@ public class KalenderRestController { return implementer.get(request); } + + // Preset HANDLERS @CrossOrigin("*") @PostMapping("/api/savePreset") @ResponseBody diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index e9e1c6d..cb2e820 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -132,6 +132,22 @@ export class DataService { return this.contracts.find((contract)=> {return contract.id == contractId;}).name; } + /** + * The function fetchStates fetches an array from the possible statuses per state + * @returns promise for the fetched Status Array + */ + public async getUser(){ + const promise = new Promise(resolve=>{ + let res : any; + this.http.get('http://localhost:8080/api/getUser') + .subscribe((response: any)=>{ + res = response; + resolve(res); + }) + }) + return promise; + } + /** * The function initPresets fetches an array of all presets * @returns promise for the fetched presets array diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 43920ed..898f6ad 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -51,6 +51,10 @@ + +