Skip to content

Commit

Permalink
GRAD2-2905
Browse files Browse the repository at this point in the history
P3 - GRAD System - XML In Progress Course selection issue
Fix merge issues
  • Loading branch information
arybakov-cgi committed Sep 19, 2024
1 parent 132fb20 commit 25b9d82
Showing 1 changed file with 0 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ public ResponseEntity<AlgorithmResponse> graduateStudentNew(@PathVariable String
@Operation(summary = "Get Report data from graduation by student pen", description = "Get Report data from graduation by student pen", tags = { "Graduation Data" })
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
public ResponseEntity<ReportData> reportDataByPen(@PathVariable @NotNull String pen, @RequestParam(required = false) String type) {
LOGGER.debug("Report Data By Student Pen: {}", pen);
return response.GET(gradService.prepareReportData(pen, type));
}

Expand All @@ -85,7 +84,6 @@ public ResponseEntity<ReportData> reportDataByPen(@PathVariable @NotNull String
public ResponseEntity<byte[]> reportTranscriptByPen(@PathVariable @NotNull String pen,
@RequestParam(required = false) String interim,
@RequestParam(required = false) String preview) {
LOGGER.debug("Report Data By Student Pen");
byte[] resultBinary = gradService.prepareTranscriptReport(pen, interim, preview);
if(resultBinary == null || resultBinary.length == 0) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
Expand All @@ -101,7 +99,6 @@ public ResponseEntity<byte[]> reportTranscriptByPen(@PathVariable @NotNull Strin
public ResponseEntity<byte[]> reportTranscriptPdfByPen(@PathVariable @NotNull String pen,
@RequestParam(required = false) String interim,
@RequestParam(required = false) String preview) {
LOGGER.debug("Report Data By Student Pen");
byte[] resultBinary = gradService.prepareTranscriptReport(pen, interim, preview);
return handleBinaryResponse(resultBinary, String.format("%sTranscript%sReport.pdf", pen, interim), MediaType.APPLICATION_PDF);
}
Expand Down

0 comments on commit 25b9d82

Please sign in to comment.