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

w

main
Manuel Tauber 2024-05-28 21:50:45 +02:00
parent c4750ac38b
commit 1867d02d39
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java
View File

@ -43,7 +43,8 @@ public class GlobalExceptionHandler {
*/ */
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
public ResponseEntity<ErrorResponse> handleGenericException(Exception e, HttpServletRequest request) { public ResponseEntity<ErrorResponse> handleGenericException(Exception e, HttpServletRequest request) {
var userMessage = "Backend internal server error"; var userMessage = "Backend internal server error"+e.getMessage()+e.getCause();
e.printStackTrace();
return entityResponse(userMessage, e.getMessage(), e, HttpStatus.INTERNAL_SERVER_ERROR); return entityResponse(userMessage, e.getMessage(), e, HttpStatus.INTERNAL_SERVER_ERROR);
} }
@ -56,7 +57,8 @@ public class GlobalExceptionHandler {
*/ */
@ExceptionHandler(BackendError.class) @ExceptionHandler(BackendError.class)
public ResponseEntity<ErrorResponse> handleBackendErrorException(BackendError e, HttpServletRequest request) { public ResponseEntity<ErrorResponse> handleBackendErrorException(BackendError e, HttpServletRequest request) {
var errorMessage = "Backend internal server error: " + e.getMessage(); var errorMessage = "Backend internal server error: " + e.getMessage()+e.getCause();
e.printStackTrace();
return entityResponse(errorMessage, errorMessage, e, e.getHttpStatus()); return entityResponse(errorMessage, errorMessage, e, e.getHttpStatus());
} }

1
backend/src/main/java/com/nttdata/calender/presets/Presets.java
View File

@ -92,6 +92,7 @@ public class Presets {
formUserPref, null, 0, 0); formUserPref, null, 0, 0);
// INIT ALL PRESETS // INIT ALL PRESETS
getAll(); getAll();
response.setPresets(this.presets); response.setPresets(this.presets);
response.setSelectedPreset(preference.get(0).get(prefQuery.getFieldId("GUID")).toString()); response.setSelectedPreset(preference.get(0).get(prefQuery.getFieldId("GUID")).toString());

4
frontend/src/app/ntt-gantt/ntt-gantt.component.ts
View File

@ -690,11 +690,11 @@ export class NttGanttComponent implements OnInit {
initLanguge(initial: boolean = false) { initLanguge(initial: boolean = false) {
if (this.languageService.language == 'DE') { if (this.languageService.language == 'DE') {
this.scalars = ['Woche', 'Monat', 'Jahr']; this.scalars = ['Monat', 'Jahr'];
this.selectedScalar = 'Monat'; this.selectedScalar = 'Monat';
} }
else { else {
this.scalars = ['Week', 'Month', 'Year']; this.scalars = ['Month', 'Year'];
this.selectedScalar = 'Month'; this.selectedScalar = 'Month';
} }