From 79d47a66b0085906634e78f2ecc3191a993f8cf1 Mon Sep 17 00:00:00 2001 From: Usama Khan Date: Tue, 4 Mar 2025 22:02:24 -0800 Subject: [PATCH] fixed comments --- .../controller/JobCardController.java | 2 +- .../service/JobCardService.java | 18 +++--- .../PDFResponseEntityInputStreamResource.java | 8 +-- .../util/TemporaryDocument.java | 63 ------------------- .../templates/job-card-view-pdf.html | 4 -- 5 files changed, 10 insertions(+), 85 deletions(-) delete mode 100644 src/main/java/com/utopiaindustries/util/TemporaryDocument.java diff --git a/src/main/java/com/utopiaindustries/controller/JobCardController.java b/src/main/java/com/utopiaindustries/controller/JobCardController.java index 4d11cd9..67ceb59 100644 --- a/src/main/java/com/utopiaindustries/controller/JobCardController.java +++ b/src/main/java/com/utopiaindustries/controller/JobCardController.java @@ -177,7 +177,7 @@ public class JobCardController { } @GetMapping( value = "/pdf/{id}", produces = MediaType.APPLICATION_PDF_VALUE ) - public ResponseEntity showGinReceivingPDF(@PathVariable long id, Model model ) throws Exception { + public ResponseEntity generateJobCardPdf(@PathVariable long id, Model model ) throws Exception { return jobCardService.getJobCardReceivingPdf(id,model); } diff --git a/src/main/java/com/utopiaindustries/service/JobCardService.java b/src/main/java/com/utopiaindustries/service/JobCardService.java index 2fa94ea..b3e1966 100644 --- a/src/main/java/com/utopiaindustries/service/JobCardService.java +++ b/src/main/java/com/utopiaindustries/service/JobCardService.java @@ -311,30 +311,28 @@ public class JobCardService { public Map totalFinishItem(List itemIds, long jobCardId ){ return finishedItemDAO.findTotalFinishedItems( itemIds, jobCardId ); } + /** * Print Job card * * **/ public ResponseEntity getJobCardReceivingPdf(long id, Model model ) throws Exception { - - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd,yyyy h:m a"); - List jobCardItems = this.findJobCardItemByJobCardId(id); + List jobCardItems = findJobCardItemByJobCardId(id); List jobCardItemIds = jobCardItems.stream() .map(JobCardItem::getItemId) .collect(Collectors.toList()); + List itemIds = jobCardItems.stream() .map(JobCardItem::getId) .collect(Collectors.toList()); + model.addAttribute( "baseUrl", URLUtils.getCurrentBaseUrl() ); - model.addAttribute( "card", this.findByID(id)); + model.addAttribute( "card", findByID(id)); model.addAttribute("jobCardItems", jobCardItems); - model.addAttribute("cutPiece",this.findCutPieceByJobCardItemIds(itemIds)); - model.addAttribute("totalFinishItem",this.totalFinishItem(jobCardItemIds, id)); - model.addAttribute("totalStitchingItem",this.totalStitchingItem(jobCardItemIds, id)); - - + model.addAttribute("cutPiece", findCutPieceByJobCardItemIds(itemIds)); + model.addAttribute("totalFinishItem", totalFinishItem(jobCardItemIds, id)); + model.addAttribute("totalStitchingItem", totalStitchingItem(jobCardItemIds, id)); // html str String htmlStr = htmlBuilder.buildHTML( "job-card-view-pdf", model ); - // return pdf return pdfGenerator.generatePdf( htmlStr, "Job-Card", "inline" ); } diff --git a/src/main/java/com/utopiaindustries/util/PDFResponseEntityInputStreamResource.java b/src/main/java/com/utopiaindustries/util/PDFResponseEntityInputStreamResource.java index a7f682d..204e12d 100644 --- a/src/main/java/com/utopiaindustries/util/PDFResponseEntityInputStreamResource.java +++ b/src/main/java/com/utopiaindustries/util/PDFResponseEntityInputStreamResource.java @@ -107,10 +107,4 @@ public class PDFResponseEntityInputStreamResource { public ResponseEntity generateInvoicePdf( String htmlStr, String filename, String method, long height, long width ) throws IOException { return this.createPDFResponseEntityInvoiceInputStreamResource( htmlStr, filename, method, height, width ); } -} - - - - - - +} \ No newline at end of file diff --git a/src/main/java/com/utopiaindustries/util/TemporaryDocument.java b/src/main/java/com/utopiaindustries/util/TemporaryDocument.java deleted file mode 100644 index 4d6d49f..0000000 --- a/src/main/java/com/utopiaindustries/util/TemporaryDocument.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.utopiaindustries.util; - -public class TemporaryDocument { - private long id; - private long typeId; - private String parentDocumentType; - private long parentDocumentId; - private String photoBlob; - - public TemporaryDocument() { - } - - public long getId() { - return id; - } - - public void setId( long id ) { - this.id = id; - } - - public long getTypeId() { - return typeId; - } - - public void setTypeId( long typeId ) { - this.typeId = typeId; - } - - public String getParentDocumentType() { - return parentDocumentType; - } - - public void setParentDocumentType( String parentDocumentType ) { - this.parentDocumentType = parentDocumentType; - } - - public long getParentDocumentId() { - return parentDocumentId; - } - - public void setParentDocumentId( long parentDocumentId ) { - this.parentDocumentId = parentDocumentId; - } - - public String getPhotoBlob() { - return photoBlob; - } - - public void setPhotoBlob( String photoBlob ) { - this.photoBlob = photoBlob; - } - - @Override - public String toString() { - return "TemporaryDocument{" + - "id=" + id + - ", typeId=" + typeId + - ", parentDocumentType='" + parentDocumentType + '\'' + - ", parentDocumentId=" + parentDocumentId + - ", photoBlob='" + photoBlob + '\'' + - '}'; - } -} diff --git a/src/main/resources/templates/job-card-view-pdf.html b/src/main/resources/templates/job-card-view-pdf.html index b25fffb..06bb654 100644 --- a/src/main/resources/templates/job-card-view-pdf.html +++ b/src/main/resources/templates/job-card-view-pdf.html @@ -87,7 +87,6 @@ -
ITEMS
@@ -102,7 +101,6 @@ - @@ -125,11 +123,9 @@
- - \ No newline at end of file