Merge pull request #1354 from nehaniua/Dev-2.0

pdf box version
upyog · Sep 13, 2024 · db1a9f6 · db1a9f6
2 parents 8c80454 + 71981aa
commit db1a9f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/RoadReserve.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/RoadReserve.java
@@ -77,33 +77,33 @@ public Plan process(Plan pl) {
     	 List<Road> roadReserves = pl.getRoadReserves();
 
     	 ScrutinyDetail scrutinyDetail8 = new ScrutinyDetail();
-			scrutinyDetail8.addColumnHeading(1, RULE_NO);
+			//scrutinyDetail8.addColumnHeading(1, RULE_NO);
 			scrutinyDetail8.addColumnHeading(2, DESCRIPTION);
 			//scrutinyDetail8.addColumnHeading(3, FLOOR_NO);
-			scrutinyDetail8.addColumnHeading(3, Room);
-			scrutinyDetail8.addColumnHeading(4, REQUIRED);
+			//scrutinyDetail8.addColumnHeading(3, Room);
+			//scrutinyDetail8.addColumnHeading(4, REQUIRED);
 			scrutinyDetail8.addColumnHeading(5, PROVIDED);
 			scrutinyDetail8.addColumnHeading(6, STATUS);
 			scrutinyDetail8.setKey("Common_" + "Road Reserve ");
-        System.out.println("ii" + pl.getRoadReserveFront() +  pl.getRoadReserveFront());
+        System.out.println("ii" + pl.getRoadReserveFront() +  pl.getRoadReserveRear());
 
-     	setReportOutputDetails(pl, "", "Road Width Front And Rear", "", "" ,
-				"" + pl.getRoadReserveFront() + " & " +  pl.getRoadReserveRear(), Result.Accepted.getResultVal(), scrutinyDetail8);
+     	setReportOutputDetails(pl, "Road Width Front And Rear",
+				"" + pl.getRoadReserveFront() + " & " +  pl.getRoadReserveRear(), "", scrutinyDetail8);
 		//LOG.info("Room Height Validation True: (Expected/Actual) " + "" + "/" + "");
         // setReportOutputDetails(pl, "Road Width Rear", "" + pl.getRoadReserveRear(), scrutinyDetail);
 
 
         return pl;
     }
-    private void setReportOutputDetails(Plan pl, String ruleNo, String ruleDesc,   String room, String expected,
+    private void setReportOutputDetails(Plan pl, String ruleDesc,  
 			String actual, String status, ScrutinyDetail scrutinyDetail) {
 		Map<String, String> details = new HashMap<>();
-		details.put(RULE_NO, ruleNo);
+	//	details.put(RULE_NO, ruleNo);
 		details.put(DESCRIPTION, ruleDesc);
 		//details.put(FLOOR_NO, ruleDesc);
 
-		details.put(Room, room);
-		details.put(REQUIRED, expected);
+//		details.put(Room, room);
+//		details.put(REQUIRED, expected);
 		details.put(PROVIDED, actual);
 		details.put(STATUS, status);
 		scrutinyDetail.getDetail().add(details);

diff --git a/edcr/service/egov/pom.xml b/edcr/service/egov/pom.xml
@@ -178,7 +178,7 @@
 		<javaxt.core.version>1.7.8</javaxt.core.version>
 		<recaptcha.version>0.0.8</recaptcha.version>
 		<jcaptcha.version>2.0-alpha-1</jcaptcha.version>
-		<pdfbox.version>2.0.4</pdfbox.version>
+		<pdfbox.version>2.0.28</pdfbox.version>
 		<itextpdf.version>5.0.6</itextpdf.version>
 
 		<!-- Plugin dependency versions -->