Add document source to report.

US-CBP · May 27, 2020 · dbb0154 · dbb0154
1 parent a18088c
commit dbb0154
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/constant/EventReportConstants.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/constant/EventReportConstants.java
@@ -33,7 +33,8 @@ public class EventReportConstants {
 	final public static String DOC_TABLE_COLUMN_LABEL_TYPE = "Type";
 	final public static String DOC_TABLE_COLUMN_LABEL_ISS_CTRY= "Issue Country";
 	final public static String DOC_TABLE_COLUMN_LABEL_EXP_DATE= "Exp. Date";
-
+	final public static String DOC_TABLE_COLUMN_LABEL_SOURCE= "Source";
+
 
 	/*EVENT HIT INFORMATION COLUMN HEADER TEXT */
 

diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/EventReportPdfServiceImpl.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/EventReportPdfServiceImpl.java
@@ -385,10 +385,11 @@ public void createPdfPassengerDetailSection(PDDocument document, PDPage passenge
 	public void createDocumentsSection(PDDocument document, PDPage passengerDetailPage,
 			PaxDetailPdfDocRequest paxDetailPdfDocRequest) throws Exception {
 
-		final float DOCUMENT_COLUMN_1 = 25;
-		final float DOCUMENT_COLUMN_2 = 25;
-		final float DOCUMENT_COLUMN_3 = 25;
-		final float DOCUMENT_COLUMN_4 = 25;
+		final float DOCUMENT_COLUMN_1 = 20;
+		final float DOCUMENT_COLUMN_2 = 20;
+		final float DOCUMENT_COLUMN_3 = 20;
+		final float DOCUMENT_COLUMN_4 = 20;
+		final float DOCUMENT_COLUMN_5 = 20;
 
 		List<DocumentVo> documentList = paxDetailPdfDocRequest.getPassengerVo().getDocuments();
 
@@ -400,6 +401,7 @@ public void createDocumentsSection(PDDocument document, PDPage passengerDetailPa
 		this.createHorizontalColumnLabelCell(documentHeaderRow, DOCUMENT_COLUMN_2, DOC_TABLE_COLUMN_LABEL_TYPE);
 		this.createHorizontalColumnLabelCell(documentHeaderRow, DOCUMENT_COLUMN_3, DOC_TABLE_COLUMN_LABEL_ISS_CTRY);
 		this.createHorizontalColumnLabelCell(documentHeaderRow, DOCUMENT_COLUMN_4, DOC_TABLE_COLUMN_LABEL_EXP_DATE);
+		this.createHorizontalColumnLabelCell(documentHeaderRow, DOCUMENT_COLUMN_5, DOC_TABLE_COLUMN_LABEL_SOURCE);
 
 		// Document data
 		Row<PDPage> documentDataRow;
@@ -412,9 +414,9 @@ public void createDocumentsSection(PDDocument document, PDPage passengerDetailPa
 				this.createFirstColoredCell(documentDataRow, DOCUMENT_COLUMN_1, documentVo.getDocumentNumber(), i);
 				this.createColoredCell(documentDataRow, DOCUMENT_COLUMN_2, documentVo.getDocumentType(), i);
 				this.createColoredCell(documentDataRow, DOCUMENT_COLUMN_3, documentVo.getIssuanceCountry(), i);
-				this.createLastColoredCell(documentDataRow, DOCUMENT_COLUMN_4,
-						reportDateFormatter(documentVo.getExpirationDate()), i);
-
+				this.createColoredCell(documentDataRow, DOCUMENT_COLUMN_4, reportDateFormatter(documentVo.getExpirationDate()), i);
+				this.createLastColoredCell(documentDataRow, DOCUMENT_COLUMN_5,
+						documentVo.getMessageType(), i);
 			}
 		}