From 2521eb9cc88ca214ab033a7f4b9d56b9212f09af Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Wed, 30 Jul 2025 13:35:03 +0530
Subject: [PATCH] Updated year field in pdf

---
 .../net/gepafin/tendermanagement/dao/ApplicationDao.java  | 6 +++---
 .../java/net/gepafin/tendermanagement/dao/FormDao.java    | 5 +++++
 .../java/net/gepafin/tendermanagement/dao/PdfDao.java     | 8 +++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 10a36fbd..f9570895 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -1670,12 +1670,12 @@ public class ApplicationDao {
 //        }
     }
 
-    public void calculationProcessForFormula(ApplicationFormEntity applicationFormEntity, List<ContentResponseBean> contentResponseBeans, ApplicationFormFieldRequestBean applicationFormFieldRequestBean,FieldValidator fieldValidator) {
+    public void calculationProcessForFormula(ApplicationFormEntity applicationFormEntity, List<ContentResponseBean> contentResponseBeans,String fromFieldId,String formFieldValue,FieldValidator fieldValidator) {
         List<String> formulaValue = new ArrayList<>();
         String formulaValueOpt=null;
         String label=null;
         for (ContentResponseBean contentResponseBean:contentResponseBeans){
-            if(contentResponseBean.getId().equals(applicationFormFieldRequestBean.getFieldId())){
+            if(contentResponseBean.getId().equals(fromFieldId)){
                 for (SettingResponseBean settingResponseBean:contentResponseBean.getSettings()){
                     if (settingResponseBean.getName().equals("label")){
                         label= String.valueOf(settingResponseBean.getValue());
@@ -1689,7 +1689,7 @@ public class ApplicationDao {
             }
         }
         Map<String, String> mappedFormulaValue = new HashMap<>();
-        Object fieldValue = applicationFormFieldRequestBean.getFieldValue();
+        Object fieldValue = formFieldValue;
         if (formulaValueOpt != null && fieldValue==null) {
             fieldValue=0;
         }
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
index 47859a3b..8ce395d0 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
@@ -76,6 +76,9 @@ public class FormDao {
     @Autowired
     private HttpServletRequest request;
 
+    @Autowired
+    private ApplicationDao applicationDao;
+
     public FormEntity saveFormEntity(FormEntity formEntity){
         formEntity=formRepository.save(formEntity);
         return formEntity;
@@ -419,6 +422,8 @@ public class FormDao {
                     .maxLength(value, fieldValidatorBean.getMaxLength(), fieldLabel,fieldValidatorBean.getMax(),contentResponseBean)  // Only applies if maxLength is not null
                     .matchesPattern(value, fieldValidatorBean.getPattern(), fieldLabel) // Only applies if pattern is present
                     .validateCustom(value, fieldValidatorBean.getCustom(), fieldLabel,contentResponseBean);  // Add the custom validation here
+
+//            applicationDao.calculationProcessForFormula(applicationFormEntity,formResponseBean.getContent(),fieldId,value,validator);
             if (fieldValidatorBean.getCustom() != null && fieldValidatorBean.getCustom().equals(GepafinConstant.IS_PIVA)) {
                 Long hubId = applicationEntity.getHubId();
                 String error = validateVatNumber(value, fieldLabel,hubId);
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
index 6dc54807..afde01ab 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
@@ -392,10 +392,12 @@ public class PdfDao {
                         if (Boolean.TRUE.equals(formulaEnabledMap.get(key)) && Boolean.TRUE.equals(GepafinConstant.NUMERIC.equalsIgnoreCase(fieldTypeMap.get(key)))) {
                             calculateValue(key, fieldValue, formulaTypeMap, columnSums);
                         }
-                        if(Boolean.TRUE.equals(Utils.isNumeric(fieldValue))){
-                            fieldValue=Utils.convertToItalianFormat(fieldValue);
+                        String fieldLabel = stateFieldMap.getOrDefault(key, "");
+                        if(Boolean.FALSE.equals(fieldLabel.equalsIgnoreCase("Anno"))) {
+                            if (Boolean.TRUE.equals(Utils.isNumeric(fieldValue))) {
+                                fieldValue = Utils.convertToItalianFormat(fieldValue);
+                            }
                         }
-
                         PdfPCell dataCell = PdfUtils.htmlToPdfPCell(fieldValue != null ? fieldValue : "", textFont);
                         dataCell.setBackgroundColor(new BaseColor(239, 243, 248)); // Light blue for the cell
                         dataCell.setMinimumHeight(30f);