Merge pull request #237 from bcgov/develop/alex-GRAD2-2387

GRAD2-2387
bcgov · Dec 4, 2023 · eb2d4ab · eb2d4ab
2 parents 74a5d56 + 9151356
commit eb2d4ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/distribution/process/CreateBlankCredentialProcess.java b/api/src/main/java/ca/bc/gov/educ/api/distribution/process/CreateBlankCredentialProcess.java
@@ -87,6 +87,7 @@ private int processYed4Transcript(DistributionPrintRequest obj, int currentSlipC
 				int failedToAdd = 0;
 				for (BlankCredentialDistribution bcd : bcdList) {
 					ReportData data = prepareBlankTranscriptData(bcd,mincode);
+					data.setSchool(packSlipReq.getData().getPackingSlip().getSchool());
 					ReportOptions options = new ReportOptions();
 					options.setReportFile("Transcript");
 					options.setReportName("Transcript.pdf");
@@ -161,6 +162,7 @@ private void mergeCertificates(ReportRequest packSlipReq, CertificatePrintReques
 			int failedToAdd = 0;
 			for (BlankCredentialDistribution bcd : bcdList) {
 				ReportData data = prepareBlankCertData(bcd);
+				data.setSchool(packSlipReq.getData().getPackingSlip().getSchool());
 				ReportOptions options = new ReportOptions();
 				options.setReportFile("certificate");
 				options.setReportName("Certificate.pdf");

diff --git a/api/src/main/java/ca/bc/gov/educ/api/distribution/service/ReportService.java b/api/src/main/java/ca/bc/gov/educ/api/distribution/service/ReportService.java
@@ -69,6 +69,10 @@ public ReportRequest preparePackingSlipData(StudentSearchRequest searchRequest,
 		schObj.setName(schoolDetails.getSchoolName());
 		schObj.setSchlno(schoolDetails.getSchlNo());
 		schObj.setMincode(schoolDetails.getDistNo()+schoolDetails.getSchlNo());
+		schObj.setSignatureCode(schoolDetails.getDistNo());
+		schObj.setSchoolCategoryCode(schoolDetails.getSchoolCategoryCode());
+		schObj.setTypeIndicator("");
+		schObj.setTypeBanner("");
 		String userName = searchRequest == null ? "" : searchRequest.getUser();
 		return  createReportRequest(batchId,schObj, userName);
 	}