From e74abc704ee0ce33b1c02232efe526d7d19019ff Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Thu, 5 Mar 2026 12:01:50 +0530
Subject: [PATCH 01/21] token

---
 .../com/health/controller/HomeController.java | 59 +++++++++++++++---
 .../com/health/model/TrainingResource.java    | 62 +++++++++++++++++++
 .../TrainingResourceRepository.java           | 11 ++++
 .../service/TrainingResourceService.java      | 11 ++++
 .../impl/TrainingReourceServiceImpl.java      | 31 ++++++++++
 .../com/health/utility/ServiceUtility.java    | 13 ++++
 6 files changed, 179 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index 3ee7205a..3d66ec95 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -5365,6 +5365,22 @@ private List<WeekTitleVideo> getEnglishTrainingMouduleFirst(List<WeekTitleVideo>
      * Assign Tutorial on Week And Package End
      ********************/
 
+    private String generateUniqueTokenForTrainingResource() {
+
+        final int MAX_ATTEMPTS = 10;
+
+        for (int attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
+
+            String token = ServiceUtility.generateToken();
+
+            if (!trainingResourceService.existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(token, token, token, token)) {
+                return token;
+            }
+        }
+
+        throw new IllegalStateException("Token not generated after " + MAX_ATTEMPTS + " attempts");
+    }
+
     @GetMapping("/addTrainingResource")
     public String addTrainingResourceGet(HttpServletRequest req, Principal principal, Model model) {
         User usr = getUser(principal);
@@ -5480,10 +5496,11 @@ public String addTrainingResourcePost(HttpServletRequest req, Model model, Princ
 
                         Path rootPath = Paths.get(CommonData.uploadTrainingResource, String.valueOf(trId), langName);
 
-                        String pdfFolder = Paths.get(rootPath.toString(), "pdf").toString();
-                        String docFolder = Paths.get(rootPath.toString(), "docx_or_odt").toString();
-                        String excelFolder = Paths.get(rootPath.toString(), "excel_or_csv").toString();
-                        String imageFolder = Paths.get(rootPath.toString(), "image").toString();
+                        String token = generateUniqueTokenForTrainingResource();
+                        String pdfFolder = Paths.get(rootPath.toString(), "pdf", token).toString();
+                        String docFolder = Paths.get(rootPath.toString(), "docx_or_odt", token).toString();
+                        String excelFolder = Paths.get(rootPath.toString(), "excel_or_csv", token).toString();
+                        String imageFolder = Paths.get(rootPath.toString(), "image", token).toString();
 
                         Set<String> extentions = new HashSet<>();
                         String document = "";
@@ -5509,6 +5526,7 @@ else if (fileExtention.equals(CommonData.PDF_EXTENSION)) {
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
                             tr.setPdfPath(document);
+                            tr.setPdfToken(token);
                         }
 
                         else if (fileExtention.equals(CommonData.DOC_EXTENSION)) {
@@ -5521,6 +5539,7 @@ else if (fileExtention.equals(CommonData.DOC_EXTENSION)) {
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, docFolder);
                             tr.setDocPath(document);
+                            tr.setDocToken(token);
                         }
 
                         else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)) {
@@ -5533,6 +5552,7 @@ else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)) {
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
                             tr.setExcelPath(document);
+                            tr.setExcelToken(token);
                         }
 
                         else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
@@ -5545,6 +5565,7 @@ else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
                             tr.setImgPath(document);
+                            tr.setImgToken(token);
                         }
 
                         if (fileExtention.equals(CommonData.ZIP_EXTENSION)) {
@@ -5562,6 +5583,7 @@ else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
                                         tr.setPdfPath(document);
+                                        tr.setPdfToken(token);
                                     }
 
                                     else if (ext.equals(CommonData.DOC_EXTENSION)) {
@@ -5574,6 +5596,7 @@ else if (ext.equals(CommonData.DOC_EXTENSION)) {
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, docFolder);
                                         tr.setDocPath(document);
+                                        tr.setDocToken(token);
                                     }
 
                                     else if (ext.equals(CommonData.EXCEL_EXTENSION)) {
@@ -5586,6 +5609,7 @@ else if (ext.equals(CommonData.EXCEL_EXTENSION)) {
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
                                         tr.setExcelPath(document);
+                                        tr.setExcelToken(token);
                                     }
 
                                     else if (ext.equals(CommonData.IMAGE_EXTENSION)) {
@@ -5598,6 +5622,7 @@ else if (ext.equals(CommonData.IMAGE_EXTENSION)) {
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
                                         tr.setImgPath(document);
+                                        tr.setImgToken(token);
                                     }
 
                                     else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
@@ -5900,11 +5925,13 @@ public String updateTrainingResourcePost(HttpServletRequest req, Model model, Pr
         }
 
         boolean fileMatch = false;
+        String token = "";
 
         if (fileType.equals("Doc")) {
             originalFileType = CommonData.Doc_OR_ZIP_OF_DOCS;
             if (oldTrainingResource != null) {
                 oldPath = oldTrainingResource.getDocPath();
+                token = oldTrainingResource.getDocToken();
             }
         }
 
@@ -5912,6 +5939,7 @@ else if (fileType.equals("Pdf")) {
             originalFileType = CommonData.PDF_OR_ZIP_OF_PDFS;
             if (oldTrainingResource != null) {
                 oldPath = oldTrainingResource.getPdfPath();
+                token = oldTrainingResource.getPdfToken();
             }
         }
 
@@ -5919,12 +5947,14 @@ else if (fileType.equals("Image")) {
             originalFileType = CommonData.image_OR_ZIP_OF_IMAGES;
             if (oldTrainingResource != null) {
                 oldPath = oldTrainingResource.getImgPath();
+                token = oldTrainingResource.getImgToken();
             }
 
         } else if (fileType.equals("Excel")) {
             originalFileType = CommonData.Excel_OR_ZIP_OF_EXCELS;
             if (oldTrainingResource != null) {
                 oldPath = oldTrainingResource.getExcelPath();
+                token = oldTrainingResource.getExcelToken();
             }
         }
 
@@ -5976,6 +6006,7 @@ else if (fileType.equals("Image")) {
 
             trainingResourceService.save(newTrainingResource);
             trIdInt = newTrainingResource.getTrainingResourceId();
+            token = generateUniqueTokenForTrainingResource();
 
         }
 
@@ -5985,10 +6016,10 @@ else if (fileType.equals("Image")) {
 
             Path rootPath = Paths.get(CommonData.uploadTrainingResource, String.valueOf(trIdInt), langName);
 
-            String pdfFolder = Paths.get(rootPath.toString(), "pdf").toString();
-            String docFolder = Paths.get(rootPath.toString(), "docx_or_odt").toString();
-            String excelFolder = Paths.get(rootPath.toString(), "excel_or_csv").toString();
-            String imageFolder = Paths.get(rootPath.toString(), "image").toString();
+            String pdfFolder = Paths.get(rootPath.toString(), "pdf", token).toString();
+            String docFolder = Paths.get(rootPath.toString(), "docx_or_odt", token).toString();
+            String excelFolder = Paths.get(rootPath.toString(), "excel_or_csv", token).toString();
+            String imageFolder = Paths.get(rootPath.toString(), "image", token).toString();
             boolean fileFlag = false;
 
             if (!file.isEmpty()) {
@@ -6009,6 +6040,7 @@ else if (fileExtention.equals(CommonData.PDF_EXTENSION)
                         && originalFileType.equals(CommonData.PDF_OR_ZIP_OF_PDFS)) {
                     document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
                     newTrainingResource.setPdfPath(document);
+                    newTrainingResource.setPdfToken(token);
                     if (newTrainingData)
                         oldTrainingResource.setPdfPath("");
                     fileMatch = true;
@@ -6018,6 +6050,7 @@ else if (fileExtention.equals(CommonData.DOC_EXTENSION)
                         && originalFileType.equals(CommonData.Doc_OR_ZIP_OF_DOCS)) {
                     document = ServiceUtility.uploadMediaFile(file, env, docFolder);
                     newTrainingResource.setDocPath(document);
+                    newTrainingResource.setDocToken(token);
                     if (newTrainingData)
                         oldTrainingResource.setDocPath("");
                     fileMatch = true;
@@ -6027,6 +6060,7 @@ else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)
                         && originalFileType.equals(CommonData.Excel_OR_ZIP_OF_EXCELS)) {
                     document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
                     newTrainingResource.setExcelPath(document);
+                    newTrainingResource.setExcelToken(token);
                     if (newTrainingData)
                         oldTrainingResource.setExcelPath("");
                     fileMatch = true;
@@ -6036,6 +6070,7 @@ else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)
                         && originalFileType.equals(CommonData.image_OR_ZIP_OF_IMAGES)) {
                     document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
                     newTrainingResource.setImgPath(document);
+                    newTrainingResource.setImgToken(token);
                     if (newTrainingData)
                         oldTrainingResource.setImgPath("");
                     fileMatch = true;
@@ -6050,6 +6085,7 @@ else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)
                                     && originalFileType.equals(CommonData.PDF_OR_ZIP_OF_PDFS)) {
                                 document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
                                 newTrainingResource.setPdfPath(document);
+                                newTrainingResource.setPdfToken(token);
                                 if (newTrainingData) {
                                     oldTrainingResource.setPdfPath("");
                                 }
@@ -6062,6 +6098,7 @@ else if (ext.equals(CommonData.DOC_EXTENSION)
                                     && originalFileType.equals(CommonData.Doc_OR_ZIP_OF_DOCS)) {
                                 document = ServiceUtility.uploadMediaFile(file, env, docFolder);
                                 newTrainingResource.setDocPath(document);
+                                newTrainingResource.setDocToken(token);
                                 if (newTrainingData) {
                                     oldTrainingResource.setDocPath("");
                                 }
@@ -6073,6 +6110,7 @@ else if (ext.equals(CommonData.EXCEL_EXTENSION)
                                     && originalFileType.equals(CommonData.Excel_OR_ZIP_OF_EXCELS)) {
                                 document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
                                 newTrainingResource.setExcelPath(document);
+                                newTrainingResource.setExcelToken(token);
                                 if (newTrainingData) {
                                     oldTrainingResource.setExcelPath("");
                                 }
@@ -6084,6 +6122,7 @@ else if (ext.equals(CommonData.IMAGE_EXTENSION)
                                     && originalFileType.equals(CommonData.image_OR_ZIP_OF_IMAGES)) {
                                 document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
                                 newTrainingResource.setImgPath(document);
+                                newTrainingResource.setImgToken(token);
                                 if (newTrainingData) {
                                     oldTrainingResource.setImgPath("");
                                 }
@@ -6155,6 +6194,7 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
                             document = ServiceUtility.copyFileAndGetRelativePath(sourceFile, docFolder, fileName, env);
 
                             newTrainingResource.setDocPath(document);
+                            newTrainingResource.setDocToken(token);
                             oldTrainingResource.setDocPath("");
 
                         } else if (originalFileType.equals(CommonData.Excel_OR_ZIP_OF_EXCELS)) {
@@ -6163,6 +6203,7 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
                                     env);
 
                             newTrainingResource.setExcelPath(document);
+                            newTrainingResource.setExcelToken(token);
                             oldTrainingResource.setExcelPath("");
 
                         } else if (originalFileType.equals(CommonData.PDF_OR_ZIP_OF_PDFS)) {
@@ -6170,6 +6211,7 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
                             document = ServiceUtility.copyFileAndGetRelativePath(sourceFile, pdfFolder, fileName, env);
 
                             newTrainingResource.setPdfPath(document);
+                            newTrainingResource.setPdfToken(token);
                             oldTrainingResource.setPdfPath("");
 
                         } else if (originalFileType.equals(CommonData.image_OR_ZIP_OF_IMAGES)) {
@@ -6177,6 +6219,7 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
                             document = ServiceUtility.copyFileAndGetRelativePath(sourceFile, imageFolder, fileName,
                                     env);
                             newTrainingResource.setImgPath(document);
+                            newTrainingResource.setImgToken(token);
                             oldTrainingResource.setImgPath("");
 
                         }
diff --git a/src/main/java/com/health/model/TrainingResource.java b/src/main/java/com/health/model/TrainingResource.java
index 33664880..8f14b5f9 100644
--- a/src/main/java/com/health/model/TrainingResource.java
+++ b/src/main/java/com/health/model/TrainingResource.java
@@ -50,6 +50,18 @@ public class TrainingResource implements Serializable {
     @Column(name = "img_path", length = 1000)
     private String imgPath;
 
+    @Column(unique = true, length = 1000)
+    private String pdfToken;
+
+    @Column(unique = true, length = 1000)
+    private String docToken;
+
+    @Column(unique = true, length = 1000)
+    private String imgToken;
+
+    @Column(unique = true, length = 1000)
+    private String excelToken;
+
     @ManyToOne
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
@@ -126,6 +138,38 @@ public void setUser(User user) {
         this.user = user;
     }
 
+    public String getPdfToken() {
+        return pdfToken;
+    }
+
+    public void setPdfToken(String pdfToken) {
+        this.pdfToken = pdfToken;
+    }
+
+    public String getDocToken() {
+        return docToken;
+    }
+
+    public void setDocToken(String docToken) {
+        this.docToken = docToken;
+    }
+
+    public String getImgToken() {
+        return imgToken;
+    }
+
+    public void setImgToken(String imgToken) {
+        this.imgToken = imgToken;
+    }
+
+    public String getExcelToken() {
+        return excelToken;
+    }
+
+    public void setExcelToken(String excelToken) {
+        this.excelToken = excelToken;
+    }
+
     public String getPdfFileNameWithorWitoutZip() {
         if (pdfPath == null || pdfPath.trim().isEmpty()) {
             return "NA";
@@ -166,6 +210,24 @@ public void setDateAdded(Timestamp dateAdded) {
         this.dateAdded = dateAdded;
     }
 
+    public TrainingResource(Timestamp dateAdded, TopicLanMapping topicLanMapping, Category category, String pdfPath,
+            String docPath, String excelPath, String imgPath, String pdfToken, String docToken, String imgToken,
+            String excelToken, User user) {
+        super();
+        this.dateAdded = dateAdded;
+        this.topicLanMapping = topicLanMapping;
+        this.category = category;
+        this.pdfPath = pdfPath;
+        this.docPath = docPath;
+        this.excelPath = excelPath;
+        this.imgPath = imgPath;
+        this.pdfToken = pdfToken;
+        this.docToken = docToken;
+        this.imgToken = imgToken;
+        this.excelToken = excelToken;
+        this.user = user;
+    }
+
     public TrainingResource(Timestamp dateAdded, TopicLanMapping topicLanMapping, String pdfPath, String docPath,
             String excelPath, String imgPath) {
 
diff --git a/src/main/java/com/health/repository/TrainingResourceRepository.java b/src/main/java/com/health/repository/TrainingResourceRepository.java
index ac83a2fd..643f03a2 100644
--- a/src/main/java/com/health/repository/TrainingResourceRepository.java
+++ b/src/main/java/com/health/repository/TrainingResourceRepository.java
@@ -17,4 +17,15 @@ public interface TrainingResourceRepository extends JpaRepository<TrainingResour
 
     List<TrainingResource> findAllByStatusTrue();
 
+    TrainingResource findByPdfToken(String pdfToken);
+
+    TrainingResource findByDocToken(String docToken);
+
+    TrainingResource findByExcelToken(String excelToken);
+
+    TrainingResource findByImgToken(String docToken);
+
+    boolean existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(String pdfToken, String docToken, String excelToken,
+            String imgToken);
+
 }
diff --git a/src/main/java/com/health/service/TrainingResourceService.java b/src/main/java/com/health/service/TrainingResourceService.java
index c82f9b29..4a7f7691 100644
--- a/src/main/java/com/health/service/TrainingResourceService.java
+++ b/src/main/java/com/health/service/TrainingResourceService.java
@@ -21,4 +21,15 @@ public interface TrainingResourceService {
 
     void saveAll(List<TrainingResource> trainingResourceList);
 
+    TrainingResource findByPdfToken(String pdfToken);
+
+    TrainingResource findByDocToken(String docToken);
+
+    TrainingResource findByExcelToken(String excelToken);
+
+    TrainingResource findByImgToken(String imgToken);
+
+    boolean existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(String pdfToken, String docToken, String excelToken,
+            String imgToken);
+
 }
diff --git a/src/main/java/com/health/service/impl/TrainingReourceServiceImpl.java b/src/main/java/com/health/service/impl/TrainingReourceServiceImpl.java
index 5fcf20a1..c2814063 100644
--- a/src/main/java/com/health/service/impl/TrainingReourceServiceImpl.java
+++ b/src/main/java/com/health/service/impl/TrainingReourceServiceImpl.java
@@ -62,4 +62,35 @@ public List<TrainingResource> findAllByStatusTrue() {
         return repo.findAllByStatusTrue();
     }
 
+    @Override
+    public TrainingResource findByPdfToken(String pdfToken) {
+
+        return repo.findByPdfToken(pdfToken);
+    }
+
+    @Override
+    public TrainingResource findByDocToken(String docToken) {
+
+        return repo.findByDocToken(docToken);
+    }
+
+    @Override
+    public TrainingResource findByExcelToken(String excelToken) {
+
+        return repo.findByExcelToken(excelToken);
+    }
+
+    @Override
+    public TrainingResource findByImgToken(String imgToken) {
+
+        return repo.findByImgToken(imgToken);
+    }
+
+    @Override
+    public boolean existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(String pdfToken, String docToken, String excelToken,
+            String imgToken) {
+
+        return repo.existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(pdfToken, docToken, excelToken, imgToken);
+    }
+
 }
diff --git a/src/main/java/com/health/utility/ServiceUtility.java b/src/main/java/com/health/utility/ServiceUtility.java
index 35545363..60101215 100644
--- a/src/main/java/com/health/utility/ServiceUtility.java
+++ b/src/main/java/com/health/utility/ServiceUtility.java
@@ -18,12 +18,14 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.FileTime;
+import java.security.SecureRandom;
 import java.sql.Timestamp;
 import java.text.Normalizer;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -77,6 +79,7 @@
 import com.health.model.TrainingResource;
 import com.health.model.User;
 import com.health.repository.UserRepository;
+import com.health.service.TrainingResourceService;
 import com.health.threadpool.TimeoutOutputStream;
 
 /**
@@ -100,6 +103,9 @@ public class ServiceUtility {
     @Autowired
     private JavaMailSender mailSender;
 
+    @Autowired
+    private TrainingResourceService trainingResourceService;
+
     public static Timestamp getCurrentTime() { // Current Date
 
         Date date = new Date();
@@ -1261,6 +1267,13 @@ public static String copyFileAndGetRelativePath(File sourceFile, String destinat
         return resultantPath;
     }
 
+    public static String generateToken() {
+        byte[] bytes = new byte[8];
+        new SecureRandom().nextBytes(bytes);
+
+        return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes).substring(0, 10);
+    }
+
     public static boolean hasAnyResourceFile(TrainingResource tr) {
         boolean hasData = true;
         if ((tr.getPdfPath() == null || tr.getPdfPath().isEmpty())

From 1a4e023f57a10eda113d0442f36952c8dbc516db Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Thu, 5 Mar 2026 15:15:32 +0530
Subject: [PATCH 02/21] token in shared resources

---
 src/main/java/com/health/HealthNutrition.java |   1 +
 .../com/health/controller/HomeController.java | 101 ++++++++++++++++--
 .../com/health/model/TrainingResource.java    |  10 ++
 .../threadpool/TaskProcessingService.java     |  52 +++++++++
 .../java/com/health/utility/CommonData.java   |   3 +
 .../templates/trainingResources.html          |   8 +-
 6 files changed, 163 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/health/HealthNutrition.java b/src/main/java/com/health/HealthNutrition.java
index 32383c52..21234a26 100644
--- a/src/main/java/com/health/HealthNutrition.java
+++ b/src/main/java/com/health/HealthNutrition.java
@@ -59,6 +59,7 @@ public void run(String... args) throws Exception {
         try {
 
             taskProcessingService.createOutlineFile();
+            taskProcessingService.addTokenInTrainingResource();
             taskProcessingService.addAllBrochureToQueue();
             taskProcessingService.addAllResearchPapertoQueue();
             taskProcessingService.addAllTuttorialsToQueue();
diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index 3d66ec95..d1c0cacc 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -5996,14 +5996,13 @@ else if (fileType.equals("Image")) {
 
         }
 
-        newTrainingResource.setDateAdded(dateAdded);
         newTrainingResource.setTopicLanMapping(topicLan);
         newTrainingResource.setUser(usr);
         newTrainingResource.setCategory(cat);
 
         // To get exact Id of new trainining Resource Data
         if (newTrainingData) {
-
+            newTrainingResource.setDateAdded(dateAdded);
             trainingResourceService.save(newTrainingResource);
             trIdInt = newTrainingResource.getTrainingResourceId();
             token = generateUniqueTokenForTrainingResource();
@@ -6157,14 +6156,18 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
                     FileUtils.deleteDirectory(extractDirPath.toFile());
 
                 }
+                if (newTrainingData) {
+                    newTrainingResource.setDateAdded(dateAdded);
+                }
 
-                newTrainingResource.setDateAdded(dateAdded);
                 newTrainingResource.setTopicLanMapping(topicLan);
                 newTrainingResource.setUser(usr);
                 newTrainingResource.setCategory(cat);
 
                 if (fileMatch) {
-                    newTrainingResource.setDateAdded(dateAdded);
+                    if (newTrainingData) {
+                        newTrainingResource.setDateAdded(dateAdded);
+                    }
                     newTrainingResource.setTopicLanMapping(topicLan);
                     trainingResourceService.save(newTrainingResource);
                     if (newTrainingData) {
@@ -6247,13 +6250,23 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
         return trainingResourceEditGet(originalFileType, oldtrId, req, model, principal);
     }
 
-    private String sharedTrainingResourceTemplate(String topicName, String fileType, String langName, int trId,
+    private String sharedTrainingResourceTemplate(String topicName, String fileType, String langName, String token,
             Principal principal, Model model) {
 
         int intFileType = ServiceUtility.getFileTypeIdByValue(fileType);
         logger.info("FileType:{}", fileType);
         logger.info("intFileType:{}", intFileType);
-        TrainingResource tr = trainingResourceService.findByTrainingResourceId(trId);
+
+        TrainingResource tr = null;
+        if (intFileType == CommonData.DOC) {
+            tr = trainingResourceService.findByDocToken(token);
+        } else if (intFileType == CommonData.EXCEL) {
+            tr = trainingResourceService.findByExcelToken(token);
+        } else if (intFileType == CommonData.PDF) {
+            tr = trainingResourceService.findByPdfToken(token);
+        } else if (intFileType == CommonData.IMAGE) {
+            tr = trainingResourceService.findByImgToken(token);
+        }
 
         boolean isZipFile = false;
         String filePath = "";
@@ -6306,10 +6319,39 @@ public String getShareLinkofTrainingResource(HttpServletRequest req, @PathVariab
             @PathVariable String fileType, @PathVariable String langName, @PathVariable int trId, Principal principal,
             Model model) {
 
+        TrainingResource tr = trainingResourceService.findByTrainingResourceId(trId);
+        if (tr.isAfterImplementationDate()) {
+            return "redirect:/error";
+        } else {
+            int intFileType = ServiceUtility.getFileTypeIdByValue(fileType);
+            logger.info("FileType:{}", fileType);
+            logger.info("intFileType:{}", intFileType);
+
+            String token = "";
+            if (intFileType == CommonData.DOC) {
+                token = tr.getDocToken();
+            } else if (intFileType == CommonData.EXCEL) {
+                token = tr.getExcelToken();
+            } else if (intFileType == CommonData.PDF) {
+                token = tr.getPdfToken();
+            } else if (intFileType == CommonData.IMAGE) {
+                token = tr.getImgToken();
+            }
+
+            return getShareLinkofTrainingResourceByToken(req, topicName, fileType, langName, token, principal, model);
+        }
+
+    }
+
+    @GetMapping("/shared-Training-Resource/{topicName}/{fileType}/{langName}")
+    public String getShareLinkofTrainingResourceByToken(HttpServletRequest req, @PathVariable String topicName,
+            @PathVariable String fileType, @PathVariable String langName, @RequestParam String token,
+            Principal principal, Model model) {
+
         User usr = getUser(principal);
         logger.info("{} {} {}", usr.getUsername(), req.getMethod(), req.getRequestURI());
 
-        String res = sharedTrainingResourceTemplate(topicName, fileType, langName, trId, principal, model);
+        String res = sharedTrainingResourceTemplate(topicName, fileType, langName, token, principal, model);
         if (fileType.equals("Image") || fileType.equals("Pdf")) {
             return res;
         } else {
@@ -6323,10 +6365,40 @@ public String getShareLinkofTrainingResourceDoc_Excel(HttpServletRequest req, @P
             @PathVariable String fileType, @PathVariable String langName, @PathVariable int trId, Principal principal,
             Model model) {
 
+        TrainingResource tr = trainingResourceService.findByTrainingResourceId(trId);
+        if (tr.isAfterImplementationDate()) {
+            return "redirect:/error";
+        } else {
+            int intFileType = ServiceUtility.getFileTypeIdByValue(fileType);
+            logger.info("FileType:{}", fileType);
+            logger.info("intFileType:{}", intFileType);
+
+            String token = "";
+            if (intFileType == CommonData.DOC) {
+                token = tr.getDocToken();
+            } else if (intFileType == CommonData.EXCEL) {
+                token = tr.getExcelToken();
+            } else if (intFileType == CommonData.PDF) {
+                token = tr.getPdfToken();
+            } else if (intFileType == CommonData.IMAGE) {
+                token = tr.getImgToken();
+            }
+
+            return getShareLinkofTrainingResourceDoc_ExcelByToken(req, topicName, fileType, langName, token, principal,
+                    model);
+        }
+
+    }
+
+    @GetMapping("/shared-training-resource-file/{topicName}/{fileType}/{langName}")
+    public String getShareLinkofTrainingResourceDoc_ExcelByToken(HttpServletRequest req, @PathVariable String topicName,
+            @PathVariable String fileType, @PathVariable String langName, @RequestParam String token,
+            Principal principal, Model model) {
+
         User usr = getUser(principal);
         logger.info("{} {} {}", usr.getUsername(), req.getMethod(), req.getRequestURI());
 
-        String res = sharedTrainingResourceTemplate(topicName, fileType, langName, trId, principal, model);
+        String res = sharedTrainingResourceTemplate(topicName, fileType, langName, token, principal, model);
         if (fileType.equals("Doc") || fileType.equals("Excel")) {
             return "sharedTrainingResource";
         } else {
@@ -6416,6 +6488,19 @@ public String viewAndDownloadTrainingResource(HttpServletRequest req,
         TrainingResource tr = trList.get(0);
         int trId = tr.getTrainingResourceId();
         model.addAttribute("trId", trId);
+
+        String token = "";
+        if (fileTypeString.equals("Doc")) {
+            token = tr.getDocToken();
+        } else if (fileTypeString.equals("Excel")) {
+            token = tr.getExcelToken();
+        } else if (fileTypeString.equals("Pdf")) {
+            token = tr.getPdfToken();
+        } else if (fileTypeString.equals("Image")) {
+            token = tr.getImgToken();
+        }
+        model.addAttribute("token", token);
+
         String filePath = ServiceUtility.getTrainingResourceFilePath(tr, inputFileType);
         if (filePath.isEmpty()) {
             getModelTrainingResource(model);
diff --git a/src/main/java/com/health/model/TrainingResource.java b/src/main/java/com/health/model/TrainingResource.java
index 8f14b5f9..1fff2802 100644
--- a/src/main/java/com/health/model/TrainingResource.java
+++ b/src/main/java/com/health/model/TrainingResource.java
@@ -3,6 +3,7 @@
 import java.io.Serializable;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -13,6 +14,8 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import com.health.utility.CommonData;
+
 @Entity
 @Table(name = "training_resource")
 public class TrainingResource implements Serializable {
@@ -210,6 +213,13 @@ public void setDateAdded(Timestamp dateAdded) {
         this.dateAdded = dateAdded;
     }
 
+    public boolean isAfterImplementationDate() {
+
+        LocalDate resourceDate = this.dateAdded.toLocalDateTime().toLocalDate();
+
+        return !resourceDate.isBefore(CommonData.IMPL_DATE_TRAINING_RESOURCE);
+    }
+
     public TrainingResource(Timestamp dateAdded, TopicLanMapping topicLanMapping, Category category, String pdfPath,
             String docPath, String excelPath, String imgPath, String pdfToken, String docToken, String imgToken,
             String excelToken, User user) {
diff --git a/src/main/java/com/health/threadpool/TaskProcessingService.java b/src/main/java/com/health/threadpool/TaskProcessingService.java
index 7034d12e..16065329 100644
--- a/src/main/java/com/health/threadpool/TaskProcessingService.java
+++ b/src/main/java/com/health/threadpool/TaskProcessingService.java
@@ -43,6 +43,7 @@
 import com.health.model.QueueManagement;
 import com.health.model.ResearchPaper;
 import com.health.model.TopicCategoryMapping;
+import com.health.model.TrainingResource;
 import com.health.model.Tutorial;
 import com.health.model.Version;
 import com.health.repository.QueueManagementRepository;
@@ -55,6 +56,7 @@
 import com.health.service.QueueManagementService;
 import com.health.service.ResearchPaperService;
 import com.health.service.TopicCategoryMappingService;
+import com.health.service.TrainingResourceService;
 import com.health.service.TutorialService;
 import com.health.utility.CommonData;
 import com.health.utility.ServiceUtility;
@@ -79,6 +81,9 @@ public class TaskProcessingService {
     @Autowired
     private ThreadPoolTaskExecutor taskExecutor;
 
+    @Autowired
+    private TrainingResourceService trainingResourceService;
+
     @Autowired
     private QueueManagementService queueService;
 
@@ -962,4 +967,51 @@ public void stop() {
         logger.info("stopping QueueProcessor thread");
         taskExecutor.shutdown();
     }
+
+    private String generateUniqueTokenForTrainingResource() {
+
+        final int MAX_ATTEMPTS = 10;
+
+        for (int attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
+
+            String token = ServiceUtility.generateToken();
+
+            if (!trainingResourceService.existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(token, token, token, token)) {
+                return token;
+            }
+        }
+
+        throw new IllegalStateException("Token not generated after " + MAX_ATTEMPTS + " attempts");
+    }
+
+    public void addTokenInTrainingResource() {
+
+        List<TrainingResource> trList = trainingResourceService.findAll();
+
+        for (TrainingResource temp : trList) {
+
+            if ((temp.getPdfToken() == null || temp.getPdfToken().isEmpty())
+                    && (temp.getPdfPath() != null && !temp.getPdfPath().isEmpty())) {
+                temp.setPdfToken(generateUniqueTokenForTrainingResource());
+            }
+
+            if ((temp.getDocToken() == null || temp.getDocToken().isEmpty())
+                    && (temp.getDocPath() != null && !temp.getDocPath().isEmpty())) {
+                temp.setDocToken(generateUniqueTokenForTrainingResource());
+            }
+
+            if ((temp.getExcelToken() == null || temp.getExcelToken().isEmpty())
+                    && (temp.getExcelPath() != null && !temp.getExcelPath().isEmpty())) {
+                temp.setExcelToken(generateUniqueTokenForTrainingResource());
+            }
+
+            if ((temp.getImgToken() == null || temp.getImgToken().isEmpty())
+                    && (temp.getImgPath() != null && !temp.getImgPath().isEmpty())) {
+                temp.setImgToken(generateUniqueTokenForTrainingResource());
+            }
+
+            trainingResourceService.save(temp);
+        }
+    }
+
 }
diff --git a/src/main/java/com/health/utility/CommonData.java b/src/main/java/com/health/utility/CommonData.java
index 33a013fe..7424114a 100644
--- a/src/main/java/com/health/utility/CommonData.java
+++ b/src/main/java/com/health/utility/CommonData.java
@@ -1,5 +1,7 @@
 package com.health.utility;
 
+import java.time.LocalDate;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -312,6 +314,7 @@ public class CommonData {
     public static final String image_OR_ZIP_OF_IMAGES = "imageOrZipOfImages";
     public static final String PDF_OR_ZIP_OF_PDFS = "pdfOrZipOfPdfs";
     public static final String Excel_OR_ZIP_OF_EXCELS = "excelOrZipOfexcels";
+    public static final LocalDate IMPL_DATE_TRAINING_RESOURCE = LocalDate.of(2026, 3, 5);
 
     public static final String DOCUMENT_ID_TUTORIAL_TIMESCRIPT = "Tts";
     public static final String DOCUMENT_ID_TUTORIAL_ORIGINAL_SCRIPT = "Tos";
diff --git a/src/main/resources/templates/trainingResources.html b/src/main/resources/templates/trainingResources.html
index 8685c704..17114dd0 100644
--- a/src/main/resources/templates/trainingResources.html
+++ b/src/main/resources/templates/trainingResources.html
@@ -228,8 +228,8 @@ <h5 class="modal-title">Share File</h5>
                              ? @{${baseUrl} + '/shared-Training-Resource/'
                                  + ${topicName} + '/'
                                  + ${fileTypeString} + '/'
-                                 + ${langName} + '/'
-                                 + ${trId}}
+                                 + ${langName} 
+                                 + '?token=' + ${token}}
                              : ''">
 						</div>
 
@@ -242,8 +242,8 @@ <h5 class="modal-title">Share File</h5>
                                  ? @{${baseUrl} + '/shared-training-resource-file/'
                                      + ${topicName} + '/'
                                      + ${fileTypeString} + '/'
-                                     + ${langName} + '/'
-                                     + ${trId}}
+                                     + ${langName} 
+                                     + '?token=' + ${token}}
                                  : ''">
 							</div>
 

From e11d4044b6f570c92bf0f18cda5187d97fe1f361 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Thu, 5 Mar 2026 16:36:20 +0530
Subject: [PATCH 03/21] token in download

---
 .../com/health/controller/AjaxController.java | 73 ++++++++++++++++++-
 .../com/health/controller/HomeController.java | 14 ++--
 .../templates/sharedTrainingResource.html     |  2 +-
 3 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/health/controller/AjaxController.java b/src/main/java/com/health/controller/AjaxController.java
index 06647767..ed051064 100644
--- a/src/main/java/com/health/controller/AjaxController.java
+++ b/src/main/java/com/health/controller/AjaxController.java
@@ -2133,11 +2133,80 @@ public ResponseEntity<String> deleteTrainingResource(@RequestParam("trainingReso
 
     }
 
+    /*
+     * @GetMapping("/downloadTrainingResource") public ResponseEntity<Resource>
+     * downloadTrainingResourcePost(@RequestParam(name = "filePath") String
+     * filePath) {
+     * 
+     * try {
+     * 
+     * String finalUrl = ServiceUtility.convertFilePathToUrl(filePath);
+     * 
+     * Path path = Paths.get(env.getProperty("spring.applicationexternalPath.name"),
+     * finalUrl);
+     * 
+     * if (!Files.exists(path)) { return
+     * ResponseEntity.status(HttpStatus.SC_NOT_FOUND).build(); }
+     * 
+     * Resource resource = new UrlResource(path.toUri());
+     * 
+     * String contentType = Files.probeContentType(path); if (contentType == null) {
+     * contentType = "application/octet-stream"; }
+     * 
+     * String originalFilename = path.getFileName().toString();
+     * 
+     * String safeFilename = originalFilename.replaceAll("[\\\\/:*?\"<>|]", "_");
+     * 
+     * String encodedFilename = URLEncoder.encode(safeFilename,
+     * "UTF-8").replace("+", "%20");
+     * 
+     * return ResponseEntity.ok().contentType(MediaType.parseMediaType(contentType))
+     * .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" +
+     * encodedFilename) .body(resource);
+     * 
+     * } catch (Exception e) { logger.error("Error in download", e); return
+     * ResponseEntity.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).build(); } }
+     */
+
     @GetMapping("/downloadTrainingResource")
-    public ResponseEntity<Resource> downloadTrainingResourcePost(@RequestParam(name = "filePath") String filePath) {
+    public ResponseEntity<Resource> downloadTrainingResource(@RequestParam(name = "fileType") String fileTypeString,
+            @RequestParam(name = "token") String token) {
 
         try {
 
+            int fileType = ServiceUtility.getFileTypeIdByValue(fileTypeString);
+            TrainingResource tr = null;
+
+            if (fileType == CommonData.DOC) {
+                tr = trainingResourceService.findByDocToken(token);
+            } else if (fileType == CommonData.EXCEL) {
+                tr = trainingResourceService.findByExcelToken(token);
+            } else if (fileType == CommonData.PDF) {
+                tr = trainingResourceService.findByPdfToken(token);
+            } else if (fileType == CommonData.IMAGE) {
+                tr = trainingResourceService.findByImgToken(token);
+            }
+
+            if (tr == null) {
+                return ResponseEntity.status(HttpStatus.SC_NOT_FOUND).build();
+            }
+
+            String filePath = null;
+
+            if (fileType == CommonData.DOC) {
+                filePath = tr.getDocPath();
+            } else if (fileType == CommonData.EXCEL) {
+                filePath = tr.getExcelPath();
+            } else if (fileType == CommonData.PDF) {
+                filePath = tr.getPdfPath();
+            } else if (fileType == CommonData.IMAGE) {
+                filePath = tr.getImgPath();
+            }
+
+            if (filePath == null || filePath.trim().isEmpty()) {
+                return ResponseEntity.status(HttpStatus.SC_NOT_FOUND).build();
+            }
+
             String finalUrl = ServiceUtility.convertFilePathToUrl(filePath);
 
             Path path = Paths.get(env.getProperty("spring.applicationexternalPath.name"), finalUrl);
@@ -2164,7 +2233,7 @@ public ResponseEntity<Resource> downloadTrainingResourcePost(@RequestParam(name
                     .body(resource);
 
         } catch (Exception e) {
-            logger.error("Error in download", e);
+            logger.error("Error while downloading training resource", e);
             return ResponseEntity.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).build();
         }
     }
diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index d1c0cacc..c6f46be3 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -4,8 +4,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -6285,6 +6283,7 @@ private String sharedTrainingResourceTemplate(String topicName, String fileType,
         model.addAttribute("topicName", topic_name);
         model.addAttribute("langName", lang_name);
         model.addAttribute("fileTypeString", fileType);
+        model.addAttribute("token", token);
 
         Path path = Paths.get(env.getProperty("spring.applicationexternalPath.name"), filePath);
         String fileName = path.getFileName().toString();
@@ -6522,9 +6521,14 @@ public String viewAndDownloadTrainingResource(HttpServletRequest req,
                     String normalizedBaseUrl = baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1)
                             : baseUrl;
 
-                    return "redirect:" + normalizedBaseUrl + "/downloadTrainingResource?filePath="
-                            + URLEncoder.encode(finalUrl, "UTF-8");
-                } catch (UnsupportedEncodingException e) {
+                    // return "redirect:" + normalizedBaseUrl +
+                    // "/downloadTrainingResource?filePath="
+                    // + URLEncoder.encode(finalUrl, "UTF-8");
+
+                    return "redirect:" + normalizedBaseUrl + "/downloadTrainingResource?fileType=" + fileTypeString
+                            + "&token=" + token;
+
+                } catch (Exception e) {
                     logger.error("Error in Download Package", e);
                 }
             }
diff --git a/src/main/resources/templates/sharedTrainingResource.html b/src/main/resources/templates/sharedTrainingResource.html
index 690f320c..f78916c8 100644
--- a/src/main/resources/templates/sharedTrainingResource.html
+++ b/src/main/resources/templates/sharedTrainingResource.html
@@ -90,7 +90,7 @@ <h3 class="text-center resource-title mb-4">
                         <a name="trdownload"
                            class="btn btn-outline-primary btn-lg"
                            target="_blank"
-                           th:href="@{/files/{path}(path=${filePath})}"
+                            th:href="@{/downloadTrainingResource(fileType=${fileTypeString}, token=${token})}"
                            th:id="'trdownload_' + ${fileTypeString.toLowerCase()}">
                             <i class="fas fa-file-download mr-2"></i>
                             Download

From 5a768c658d608a9139cec64b7febf4d5396f5915 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Fri, 6 Mar 2026 12:41:52 +0530
Subject: [PATCH 04/21] token-security in share view

---
 .../com/health/config/SecurityConfig.java     |  2 +-
 .../com/health/controller/AjaxController.java | 75 +++++++++++++++++++
 .../com/health/controller/HomeController.java | 55 ++++++++++++--
 .../templates/sharedTrainingResource.html     | 55 ++++++++++++++
 .../templates/trainingResources.html          | 39 ++++++----
 5 files changed, 203 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/health/config/SecurityConfig.java b/src/main/java/com/health/config/SecurityConfig.java
index 89a57846..3ee25ff3 100644
--- a/src/main/java/com/health/config/SecurityConfig.java
+++ b/src/main/java/com/health/config/SecurityConfig.java
@@ -59,7 +59,7 @@ public static BCryptPasswordEncoder passwordEncoder() {
             "/downloadManagerforhst/**", "/downloadHealthTutorials/**", "/Training-Resource/**",
             "/Training-Resources/**", "/loadLanAndFileTypeByTopic/**", "/loadTopicAndFileTypeByLan/**",
             "/loadTopicAndLanByFileType/**", "/downloadTrainingResource/**", "/shared-Training-Resource/**",
-            "/shared-training-resource-file/**", "/check-deployment" };
+            "/shared-training-resource-file/**", "/check-deployment", "/training-resources/view-share/**" };
 
     /**
      * url matcher for SUPERADMIN
diff --git a/src/main/java/com/health/controller/AjaxController.java b/src/main/java/com/health/controller/AjaxController.java
index ed051064..5f03aa6f 100644
--- a/src/main/java/com/health/controller/AjaxController.java
+++ b/src/main/java/com/health/controller/AjaxController.java
@@ -32,6 +32,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.core.env.Environment;
+import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.http.HttpHeaders;
@@ -42,6 +43,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -2238,6 +2240,79 @@ public ResponseEntity<Resource> downloadTrainingResource(@RequestParam(name = "f
         }
     }
 
+    @GetMapping("/training-resources/view-share/{topic}/{lang}/{fileType}/{token}/{page}/{fileName}")
+    public ResponseEntity<Resource> viewOrSharePdfOrImage(@PathVariable String topic, @PathVariable String lang,
+            @PathVariable String fileType, @PathVariable String token, @PathVariable int page,
+            @PathVariable String fileName) {
+
+        try {
+
+            int fileTypeId = ServiceUtility.getFileTypeIdByValue(fileType);
+
+            TrainingResource tr = null;
+            if (fileTypeId == CommonData.PDF) {
+                tr = trainingResourceService.findByPdfToken(token);
+            } else if (fileTypeId == CommonData.IMAGE) {
+                tr = trainingResourceService.findByImgToken(token);
+            }
+
+            if (tr == null) {
+                return ResponseEntity.notFound().build();
+            }
+
+            String filePath = ServiceUtility.getTrainingResourceFilePath(tr, fileTypeId);
+
+            List<String> filePaths = new ArrayList<>();
+            if (filePath.toLowerCase().endsWith(".zip")) {
+                List<String> extracted = ServiceUtility.extractZipIfNeeded(filePath, env);
+                List<String> sorted = ServiceUtility.sortFilePathsNumericOtherwiseLexical(extracted);
+
+                if (fileType.equalsIgnoreCase("Pdf")) {
+                    for (String str : sorted) {
+                        if (!str.endsWith(".png")) {
+                            filePaths.add(str);
+                        }
+                    }
+                } else {
+                    filePaths.addAll(sorted);
+                }
+
+            } else {
+                filePaths.add(ServiceUtility.convertFilePathToUrl(filePath));
+            }
+
+            if (page < 0 || page >= filePaths.size()) {
+                return ResponseEntity.badRequest().build();
+            }
+
+            String finalFilePath = filePaths.get(page);
+            Path path = Paths.get(env.getProperty("spring.applicationexternalPath.name"), finalFilePath);
+
+            if (!Files.exists(path)) {
+                return ResponseEntity.notFound().build();
+            }
+
+            String contentType = Files.probeContentType(path);
+            if (contentType == null) {
+                contentType = "application/octet-stream";
+            }
+
+            String originalFilename = path.getFileName().toString();
+            String safeFilename = originalFilename.replaceAll("[\\\\/:*?\"<>|]", "_");
+            String encodedFilename = URLEncoder.encode(safeFilename, "UTF-8").replace("+", "%20");
+
+            InputStreamResource resource = new InputStreamResource(Files.newInputStream(path));
+
+            return ResponseEntity.ok().contentType(MediaType.parseMediaType(contentType))
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename*=UTF-8''" + encodedFilename)
+                    .body(resource);
+
+        } catch (Exception e) {
+            logger.error("Error viewing shared file", e);
+            return ResponseEntity.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).build();
+        }
+    }
+
     @RequestMapping("/loadTopicByCategoryforTR")
     public @ResponseBody TreeMap<String, Integer> loadTopicByCategoryforTR(@RequestParam(value = "catId") int catId) {
         TreeMap<String, Integer> topicMaps = new TreeMap<>();
diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index c6f46be3..ed0cb2d0 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -4,6 +4,9 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -27,6 +30,7 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -6300,7 +6304,7 @@ private String sharedTrainingResourceTemplate(String topicName, String fileType,
         model.addAttribute("isZipFile", isZipFile);
         String res = ServiceUtility.convertFilePathToUrl(filePath);
 
-        model.addAttribute("filePath", res);
+        // model.addAttribute("filePath", res);
 
         if (res == null || res.trim().isEmpty()) {
 
@@ -6310,7 +6314,17 @@ private String sharedTrainingResourceTemplate(String topicName, String fileType,
             return "sharedTrainingResource";
         }
         res = ServiceUtility.convertFilePathToUrlWithUTFforBrowserRedirect(filePath);
-        return "redirect:/files/" + res;
+        String normalizedBaseUrl = baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl;
+        String encodedFileName = "";
+        try {
+            encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
+        } catch (UnsupportedEncodingException e) {
+
+            logger.error("Exception", e);
+        }
+
+        return "redirect:" + normalizedBaseUrl + "/training-resources/view-share/" + topicName + "/" + langName + "/"
+                + fileType + "/" + token + "/" + 0 + "/" + encodedFileName;
     }
 
     @GetMapping("/shared-Training-Resource/{topicName}/{fileType}/{langName}/{trId}")
@@ -6498,7 +6512,6 @@ public String viewAndDownloadTrainingResource(HttpServletRequest req,
         } else if (fileTypeString.equals("Image")) {
             token = tr.getImgToken();
         }
-        model.addAttribute("token", token);
 
         String filePath = ServiceUtility.getTrainingResourceFilePath(tr, inputFileType);
         if (filePath.isEmpty()) {
@@ -6508,10 +6521,23 @@ public String viewAndDownloadTrainingResource(HttpServletRequest req,
         }
 
         String finalUrl = ServiceUtility.convertFilePathToUrl(filePath);
+        boolean allowed = true;
+
+        if ((fileTypeString.equals("Doc") || fileTypeString.equals("Excel")) && (usr == null || !authorizedUsr)) {
+
+            allowed = false;
+
+        }
+
+        if (allowed) {
+            model.addAttribute("token", token);
+        } else {
+            model.addAttribute("token", "");
+        }
 
         if (action != null && !action.isEmpty() && action.equals("download")) {
             model.addAttribute("action", action);
-            if ((fileTypeString.equals("Doc") || fileTypeString.equals("Excel")) && (usr == null || !authorizedUsr)) {
+            if (!allowed) {
 
                 model.addAttribute("error_msg", "Authentication Error");
 
@@ -6573,7 +6599,22 @@ public String viewAndDownloadTrainingResource(HttpServletRequest req,
                 filePaths.add(ServiceUtility.convertFilePathToUrl(filePath));
 
             }
-            model.addAttribute("filePaths", filePaths);
+            List<String> fileNames = new ArrayList<>();
+            for (String str : filePaths) {
+
+                Path path = Paths.get(env.getProperty("spring.applicationexternalPath.name"), str);
+                String fileName = path.getFileName().toString();
+
+                fileNames.add(fileName);
+
+            }
+            List<Integer> pageIndexes = IntStream.range(0, filePaths.size()).boxed().collect(Collectors.toList());
+
+            if (allowed) {
+                model.addAttribute("pageIndexes", pageIndexes);
+                // model.addAttribute("filePaths", filePaths);
+                model.addAttribute("fileNames", fileNames);
+            }
 
             model.addAttribute("action", action);
         }
@@ -6581,8 +6622,8 @@ public String viewAndDownloadTrainingResource(HttpServletRequest req,
         if (action != null && !action.isEmpty() && action.equals("share")) {
 
             model.addAttribute("action", action);
-
-            model.addAttribute("shareUrl", finalUrl);
+            if (allowed)
+                model.addAttribute("shareUrl", finalUrl);
 
         }
 
diff --git a/src/main/resources/templates/sharedTrainingResource.html b/src/main/resources/templates/sharedTrainingResource.html
index f78916c8..cd1026bb 100644
--- a/src/main/resources/templates/sharedTrainingResource.html
+++ b/src/main/resources/templates/sharedTrainingResource.html
@@ -119,6 +119,61 @@ <h3 class="text-center resource-title mb-4">
 </div>
 
 <!-- Footer -->
+<footer class="footer" style="margin-bottom:0px; margin-top:200px;">
+			<div class="container">
+
+				<div class="row" height="50%">
+					<div class="col text-center justify-content" style=" padding-top:12px; height:50%;">
+						<p> <i class="fas fa-map-marker-alt contact-icon"></i> Spoken Tutorial Project,<br>
+							TCS Lab,Behind CAD Centre,<br>
+							IIT Bombay, Powai,<br>
+							Mumbai - 400076
+						</p>
+					</div>
+
+					<div class="col text-center" style=" padding-top:12px; height:50%;">
+
+						<p><a href="mailto:health@spoken-tutorial.org"><i
+									class="fas fa-envelope contact-icon mr-2"></i><span style="color:white;">
+									health@spoken-tutorial.org</span> </a></p>
+						<p><a href="tel:02225764229"><i class="fas fa-phone-alt contact-icon mr-2"></i><span
+									style="color:white;">022 2576 4229 </span> </a></p>
+
+					</div>
+
+					<div class="col  text-center " style="padding-top:10px; height:50%;">
+						<a href="https://www.iitb.ac.in/" target="_blank"> <img th:src="@{/image/iitb-logo.png}"
+								width="50%" height="50%" alt="IITB"> </img>
+							<p class="text-centre"><span style="color:white;">Developed at IIT-Bombay</span></p>
+						</a>
+
+					</div>
+
+					<div class="col   justify-content " style="padding-top:5px; height:30%; ">
+
+						<p><a href="https://www.youtube.com/channel/UCmyV3lKT1Gs1AfgtV8pp__Q"
+								class="fab fa-youtube fa-1x" style="color: #ed302f;" target="_blank"> <span
+									style="color:white; font-size: 14px;">ST Health YouTube Channel</span></a></p>
+						<p><a href="https://www.youtube.com/user/SpokenTutorialIITB" class="fab fa-youtube fa-1x"
+								style="color: #ed302f;" target="_blank"> <span style="color: white; font-size: 14px;">ST
+									YouTube Channel</span> </a> </p>
+						<p><a href="https://www.facebook.com/SpokenTutorial.org" class="fab fa-facebook-f fa-1x"
+								style="color: #3b5998;" target="_blank"> <span style="color: white; font-size: 14px;">
+									ST Facebook Page</span> </a></p>
+						<p><a href="https://www.linkedin.com/company/spokentutorial?original_referer="
+								class="fab fa-linkedin-in fa-1x" style="color: #0082ca;" target="_blank"> <span
+									style="color:white; font-size: 14px;">ST LinkedIn Page</span> </a> </p>
+
+
+
+					</div>
+
+				</div>
+
+			</div>
+
+		</footer>
+
 <div th:replace="common/trail :: body-bottom-scripts"></div>
 
  <style>
diff --git a/src/main/resources/templates/trainingResources.html b/src/main/resources/templates/trainingResources.html
index 17114dd0..aeb75d8a 100644
--- a/src/main/resources/templates/trainingResources.html
+++ b/src/main/resources/templates/trainingResources.html
@@ -135,7 +135,7 @@
 			}
 
 
-			/* Control viewport height safely */
+			
 			#imageSlider .carousel-inner {
 				min-height: 80vh;
 				background: #fff;
@@ -299,12 +299,14 @@ <h5 class="modal-title" th:replace="common/commonItemsTrainingResource :: model_
 
 					<div class="modal-body">
 						<div th:if="${fileTypeString == 'Pdf'}">
-							<th:block th:each="pdf, stat : ${filePaths}">
-								<span th:text="'Pdf ' + ${stat.count} + ': '"></span>
-								<a th:href="@{'/files/' + ${pdf}}" target="_blank">Click here to view</a>
-								<br />
-							</th:block>
-						</div>
+					    <th:block th:each="stat, iter : ${fileNames}">
+					        <span th:text="'Pdf ' + (${iter.index} + 1) + ': '"></span>
+					        <a th:href="@{/training-resources/view-share/{topic}/{lang}/{fileType}/{token}/{page}/{fileName}(topic=${topicName},lang=${langName},fileType=${fileTypeString},token=${token},page=${iter.index},fileName=${stat})}" target="_blank">
+					            Click here to view
+					        </a>
+					        <br />
+					    </th:block>
+					</div>
 
 
 						<div th:if="${fileTypeString == 'Doc' or fileTypeString == 'Excel'}">
@@ -332,7 +334,7 @@ <h6 class="px-3 pt-3">
 
 
 						<ol class="carousel-indicators">
-							<th:block th:each="img, i : ${filePaths}">
+							<th:block th:each="x, i : ${fileNames}">
 								<li th:data-target="'#imageSlider'" th:data-slide-to="${i.index}"
 									th:classappend="${i.index == 0} ? 'active'">
 								</li>
@@ -341,11 +343,18 @@ <h6 class="px-3 pt-3">
 
 
 						<div class="carousel-inner">
-							<th:block th:each="img, i : ${filePaths}">
+							<th:block th:each="x, i : ${fileNames}">
 								<div class="carousel-item" th:classappend="${i.index == 0} ? ' active'">
-									<img th:src="@{'/files/' + ${img}}"
-     class="carousel-img"
-     alt="Preview Image">
+									
+            <img th:src="@{/training-resources/view-share/{topic}/{lang}/{fileType}/{token}/{page}/{fileName}
+                (topic=${topicName},
+                 lang=${langName},
+                 fileType=${fileTypeString},
+                 token=${token},
+                 page=${i.index},
+                 fileName=${x})}"
+                 class="carousel-img"
+                 alt="Preview Image">
 
 
 								</div>
@@ -396,8 +405,8 @@ <h6 class="px-3 pt-3">
 
 		<script th:if="${action == 'view'
                
-               and filePaths != null
-               and filePaths.size() > 0
+               and fileNames != null
+               and fileNames.size() > 0
                and ((fileTypeString == 'Pdf' or fileTypeString == 'Image')
                     or ((fileTypeString == 'Doc' or fileTypeString == 'Excel') and authorizedUsr))}">
 						$(document).ready(function () {
@@ -455,7 +464,7 @@ <h6 class="px-3 pt-3">
 			});
 		</script>
 		
-		<!-- Global user state -->
+		
 <input type="hidden" id="usrValue" th:value="${usr != null}">
 <input type="hidden" id="authorizedUsrValue" th:value="${authorizedUsr}">
 <input type="hidden" id="fileTypeString" th:value="${fileTypeString}">

From c6521d18a11c394e257050f7c53efe98e61cd5c5 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Fri, 6 Mar 2026 13:20:21 +0530
Subject: [PATCH 05/21] UTF-8

---
 src/main/java/com/health/controller/HomeController.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index ed0cb2d0..c13cc87f 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -6,7 +6,6 @@
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -6317,7 +6316,7 @@ private String sharedTrainingResourceTemplate(String topicName, String fileType,
         String normalizedBaseUrl = baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl;
         String encodedFileName = "";
         try {
-            encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
+            encodedFileName = URLEncoder.encode(fileName, "UTF-8");
         } catch (UnsupportedEncodingException e) {
 
             logger.error("Exception", e);

From 38bd465962c9554603f44900815320b1dbe8e299 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Tue, 20 Jan 2026 13:09:13 +0530
Subject: [PATCH 06/21] state district mapping

---
 src/main/java/com/health/model/District.java  | 11 +++
 src/main/java/com/health/model/State.java     | 11 +++
 .../health/model/StateDistrictMapping.java    | 96 +++++++++++++++++++
 .../StateDistrictMappingRepository.java       | 22 +++++
 .../service/StateDistrictMappingService.java  | 26 +++++
 .../impl/StateDistrictMappingServiceImpl.java | 67 +++++++++++++
 6 files changed, 233 insertions(+)
 create mode 100644 src/main/java/com/health/model/StateDistrictMapping.java
 create mode 100644 src/main/java/com/health/repository/StateDistrictMappingRepository.java
 create mode 100644 src/main/java/com/health/service/StateDistrictMappingService.java
 create mode 100644 src/main/java/com/health/service/impl/StateDistrictMappingServiceImpl.java

diff --git a/src/main/java/com/health/model/District.java b/src/main/java/com/health/model/District.java
index 2d66ad38..c244cdba 100644
--- a/src/main/java/com/health/model/District.java
+++ b/src/main/java/com/health/model/District.java
@@ -56,6 +56,17 @@ public class District implements Comparable<District>, Serializable {
     @OneToMany(mappedBy = "district", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     Set<Event> events = new HashSet<Event>();
 
+    @OneToMany(mappedBy = "district", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private Set<StateDistrictMapping> stateDistrictMappings = new HashSet<StateDistrictMapping>();
+
+    public Set<StateDistrictMapping> getStateDistrictMappings() {
+        return stateDistrictMappings;
+    }
+
+    public void setStateDistrictMappings(Set<StateDistrictMapping> stateDistrictMappings) {
+        this.stateDistrictMappings = stateDistrictMappings;
+    }
+
     public int getId() {
         return id;
     }
diff --git a/src/main/java/com/health/model/State.java b/src/main/java/com/health/model/State.java
index 9f5ac404..4417be5d 100644
--- a/src/main/java/com/health/model/State.java
+++ b/src/main/java/com/health/model/State.java
@@ -47,6 +47,17 @@ public class State implements Comparable<State>, Serializable {
     @OneToMany(mappedBy = "state", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private Set<Event> events = new HashSet<Event>();
 
+    @OneToMany(mappedBy = "state", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private Set<StateDistrictMapping> stateDistrictMappings = new HashSet<StateDistrictMapping>();
+
+    public Set<StateDistrictMapping> getStateDistrictMappings() {
+        return stateDistrictMappings;
+    }
+
+    public void setStateDistrictMappings(Set<StateDistrictMapping> stateDistrictMappings) {
+        this.stateDistrictMappings = stateDistrictMappings;
+    }
+
     public int getId() {
         return id;
     }
diff --git a/src/main/java/com/health/model/StateDistrictMapping.java b/src/main/java/com/health/model/StateDistrictMapping.java
new file mode 100644
index 00000000..53236c62
--- /dev/null
+++ b/src/main/java/com/health/model/StateDistrictMapping.java
@@ -0,0 +1,96 @@
+
+package com.health.model;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Comparator;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "state_district_mapping")
+public class StateDistrictMapping implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "state_dis_id", nullable = false, updatable = false)
+    private int stateDisId;
+
+    @Column(name = "status", nullable = false)
+    private boolean status = true;
+
+    @Column(name = "date_added", nullable = false)
+    private Timestamp dateAdded;
+
+    @ManyToOne
+    @JoinColumn(name = "state_id")
+    private State state;
+
+    @ManyToOne
+    @JoinColumn(name = "district_id")
+    private District district;
+
+    // @OneToMany(mappedBy = "topicLanMapping", cascade = CascadeType.ALL)
+    // private Set<TrainingResource> trainingResources = new
+    // HashSet<TrainingResource>();
+
+    public boolean isStatus() {
+        return status;
+    }
+
+    public void setStatus(boolean status) {
+        this.status = status;
+    }
+
+    public int getStateDisId() {
+        return stateDisId;
+    }
+
+    public void setStateDisId(int stateDisId) {
+        this.stateDisId = stateDisId;
+    }
+
+    public State getState() {
+        return state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
+
+    public District getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(District district) {
+        this.district = district;
+    }
+
+    public Timestamp getDateAdded() {
+        return dateAdded;
+    }
+
+    public void setDateAdded(Timestamp dateAdded) {
+        this.dateAdded = dateAdded;
+    }
+
+    public static Comparator<StateDistrictMapping> SortByStateName = new Comparator<StateDistrictMapping>() {
+
+        @Override
+        public int compare(StateDistrictMapping sd1, StateDistrictMapping sd2) {
+
+            return sd1.getState().getStateName().compareTo(sd2.getState().getStateName());
+
+        }
+    };
+
+}
diff --git a/src/main/java/com/health/repository/StateDistrictMappingRepository.java b/src/main/java/com/health/repository/StateDistrictMappingRepository.java
new file mode 100644
index 00000000..9c333b35
--- /dev/null
+++ b/src/main/java/com/health/repository/StateDistrictMappingRepository.java
@@ -0,0 +1,22 @@
+
+package com.health.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.health.model.District;
+import com.health.model.State;
+import com.health.model.StateDistrictMapping;
+
+public interface StateDistrictMappingRepository extends JpaRepository<StateDistrictMapping, Integer> {
+
+    StateDistrictMapping findByStateDisId(int topicLanId);
+
+    List<StateDistrictMapping> findByDistrict(District district);
+
+    List<StateDistrictMapping> findByState(State state);
+
+    StateDistrictMapping findByStateAndDistrict(State state, District district);
+
+}
diff --git a/src/main/java/com/health/service/StateDistrictMappingService.java b/src/main/java/com/health/service/StateDistrictMappingService.java
new file mode 100644
index 00000000..dd18ee5f
--- /dev/null
+++ b/src/main/java/com/health/service/StateDistrictMappingService.java
@@ -0,0 +1,26 @@
+
+package com.health.service;
+
+import java.util.List;
+
+import com.health.model.District;
+import com.health.model.State;
+import com.health.model.StateDistrictMapping;
+
+public interface StateDistrictMappingService {
+
+    StateDistrictMapping findByStateDistrictId(int stateDisId);
+
+    List<StateDistrictMapping> findByDistrict(District district);
+
+    List<StateDistrictMapping> findByState(State state);
+
+    StateDistrictMapping findByStateAndDistrict(State state, District district);
+
+    List<StateDistrictMapping> findAll();
+
+    void save(StateDistrictMapping stateDistrictMapping);
+
+    void saveAll(List<StateDistrictMapping> stateDistrictMappingList);
+
+}
diff --git a/src/main/java/com/health/service/impl/StateDistrictMappingServiceImpl.java b/src/main/java/com/health/service/impl/StateDistrictMappingServiceImpl.java
new file mode 100644
index 00000000..41a079dc
--- /dev/null
+++ b/src/main/java/com/health/service/impl/StateDistrictMappingServiceImpl.java
@@ -0,0 +1,67 @@
+
+package com.health.service.impl;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.health.model.District;
+import com.health.model.State;
+import com.health.model.StateDistrictMapping;
+import com.health.repository.StateDistrictMappingRepository;
+import com.health.service.StateDistrictMappingService;
+
+@Service
+public class StateDistrictMappingServiceImpl implements StateDistrictMappingService {
+
+    private static final Logger logger = LoggerFactory.getLogger(StateDistrictMappingServiceImpl.class);
+
+    @Autowired
+    private StateDistrictMappingRepository repo;
+
+    @Override
+    public StateDistrictMapping findByStateDistrictId(int stateDisId) {
+
+        return repo.findByStateDisId(stateDisId);
+    }
+
+    @Override
+    public List<StateDistrictMapping> findByDistrict(District district) {
+
+        return repo.findByDistrict(district);
+    }
+
+    @Override
+    public List<StateDistrictMapping> findByState(State state) {
+
+        return repo.findByState(state);
+    }
+
+    @Override
+    public StateDistrictMapping findByStateAndDistrict(State state, District district) {
+
+        return repo.findByStateAndDistrict(state, district);
+    }
+
+    @Override
+    public List<StateDistrictMapping> findAll() {
+
+        return repo.findAll();
+    }
+
+    @Override
+    public void save(StateDistrictMapping stateDistrictMapping) {
+        repo.save(stateDistrictMapping);
+
+    }
+
+    @Override
+    public void saveAll(List<StateDistrictMapping> stateDistrictMappingList) {
+        repo.saveAll(stateDistrictMappingList);
+
+    }
+
+}

From 3aec53262d1dbff2d5618655a11ea1b5eeb77042 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Thu, 22 Jan 2026 11:51:54 +0530
Subject: [PATCH 07/21] Project Report

---
 .../java/com/health/model/ProjectReport.java  | 173 ++++++++++++++++++
 .../health/model/StateDistrictMapping.java    |  29 ++-
 src/main/java/com/health/model/User.java      |  12 ++
 .../repository/ProjectReportRepository.java   |  21 +++
 .../health/service/ProjectReportService.java  |  25 +++
 .../impl/ProjectReportServiceImpl.java        |  67 +++++++
 6 files changed, 324 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/health/model/ProjectReport.java
 create mode 100644 src/main/java/com/health/repository/ProjectReportRepository.java
 create mode 100644 src/main/java/com/health/service/ProjectReportService.java
 create mode 100644 src/main/java/com/health/service/impl/ProjectReportServiceImpl.java

diff --git a/src/main/java/com/health/model/ProjectReport.java b/src/main/java/com/health/model/ProjectReport.java
new file mode 100644
index 00000000..b0f527ac
--- /dev/null
+++ b/src/main/java/com/health/model/ProjectReport.java
@@ -0,0 +1,173 @@
+
+package com.health.model;
+
+import java.io.Serializable;
+import java.nio.file.Paths;
+import java.sql.Timestamp;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "project_report")
+public class ProjectReport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "project_rep_id", nullable = false, updatable = false)
+    private int projectReportId;
+
+    @Column(name = "date_added", nullable = false)
+    private Timestamp dateAdded;
+
+    @Column(name = "status", nullable = false)
+    private boolean status = true;
+
+    @Column(name = "pdf_path", length = 1000)
+    private String pdfPath;
+
+    @Column(name = "doc_path", length = 1000)
+    private String docPath;
+
+    @Column(name = "excel_path", length = 1000)
+    private String excelPath;
+
+    @Column(name = "img_path", length = 1000)
+    private String imgPath;
+
+    @ManyToOne
+    @JoinColumn(name = "state_district_id")
+    private StateDistrictMapping stateDistrictMapping;
+
+    @ManyToOne
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    public int getProjectReportId() {
+        return projectReportId;
+    }
+
+    public void setProjectReportId(int projectReportId) {
+        this.projectReportId = projectReportId;
+    }
+
+    public StateDistrictMapping getStateDistrictMapping() {
+        return stateDistrictMapping;
+    }
+
+    public void setStateDistrictMapping(StateDistrictMapping stateDistrictMapping) {
+        this.stateDistrictMapping = stateDistrictMapping;
+    }
+
+    public boolean isStatus() {
+        return status;
+    }
+
+    public void setStatus(boolean status) {
+        this.status = status;
+    }
+
+    public String getPdfPath() {
+        return pdfPath;
+    }
+
+    public void setPdfPath(String pdfPath) {
+        this.pdfPath = pdfPath;
+    }
+
+    public String getDocPath() {
+        return docPath;
+    }
+
+    public void setDocPath(String docPath) {
+        this.docPath = docPath;
+    }
+
+    public String getExcelPath() {
+        return excelPath;
+    }
+
+    public void setExcelPath(String excelPath) {
+        this.excelPath = excelPath;
+    }
+
+    public String getImgPath() {
+        return imgPath;
+    }
+
+    public void setImgPath(String imgPath) {
+        this.imgPath = imgPath;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getPdfFileNameWithorWitoutZip() {
+        if (pdfPath == null || pdfPath.trim().isEmpty()) {
+            return "NA";
+        }
+        String fileName = Paths.get(pdfPath).getFileName().toString();
+        return fileName;
+    }
+
+    public String getDocFileNameWithorWitoutZip() {
+        if (docPath == null || docPath.trim().isEmpty()) {
+            return "NA";
+        }
+        String fileName = Paths.get(docPath).getFileName().toString();
+        return fileName;
+    }
+
+    public String getExcelFileNameWithorWitoutZip() {
+        if (excelPath == null || excelPath.trim().isEmpty()) {
+            return "NA";
+        }
+        String fileName = Paths.get(excelPath).getFileName().toString();
+        return fileName;
+    }
+
+    public String getImageFileNameWithorWitoutZip() {
+        if (imgPath == null || imgPath.trim().isEmpty()) {
+            return "NA";
+        }
+        String fileName = Paths.get(imgPath).getFileName().toString();
+        return fileName;
+    }
+
+    public Timestamp getDateAdded() {
+        return dateAdded;
+    }
+
+    public void setDateAdded(Timestamp dateAdded) {
+        this.dateAdded = dateAdded;
+    }
+
+    public ProjectReport(Timestamp dateAdded, StateDistrictMapping stateDistrictMapping, String pdfPath, String docPath,
+            String excelPath, String imgPath) {
+
+        this.dateAdded = dateAdded;
+        this.stateDistrictMapping = stateDistrictMapping;
+        this.pdfPath = pdfPath;
+        this.docPath = docPath;
+        this.excelPath = excelPath;
+        this.imgPath = imgPath;
+    }
+
+    public ProjectReport() {
+
+    }
+
+}
diff --git a/src/main/java/com/health/model/StateDistrictMapping.java b/src/main/java/com/health/model/StateDistrictMapping.java
index 53236c62..9d8d28e0 100644
--- a/src/main/java/com/health/model/StateDistrictMapping.java
+++ b/src/main/java/com/health/model/StateDistrictMapping.java
@@ -4,7 +4,10 @@
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -12,6 +15,7 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 @Entity
@@ -39,9 +43,8 @@ public class StateDistrictMapping implements Serializable {
     @JoinColumn(name = "district_id")
     private District district;
 
-    // @OneToMany(mappedBy = "topicLanMapping", cascade = CascadeType.ALL)
-    // private Set<TrainingResource> trainingResources = new
-    // HashSet<TrainingResource>();
+    @OneToMany(mappedBy = "stateDistrictMapping", cascade = CascadeType.ALL)
+    private Set<ProjectReport> projectReports = new HashSet<ProjectReport>();
 
     public boolean isStatus() {
         return status;
@@ -59,6 +62,14 @@ public void setStateDisId(int stateDisId) {
         this.stateDisId = stateDisId;
     }
 
+    public Set<ProjectReport> getProjectReports() {
+        return projectReports;
+    }
+
+    public void setProjectReports(Set<ProjectReport> projectReports) {
+        this.projectReports = projectReports;
+    }
+
     public State getState() {
         return state;
     }
@@ -83,6 +94,18 @@ public void setDateAdded(Timestamp dateAdded) {
         this.dateAdded = dateAdded;
     }
 
+    public StateDistrictMapping(Timestamp dateAdded, State state, District district) {
+
+        this.dateAdded = dateAdded;
+        this.state = state;
+        this.district = district;
+
+    }
+
+    public StateDistrictMapping() {
+
+    }
+
     public static Comparator<StateDistrictMapping> SortByStateName = new Comparator<StateDistrictMapping>() {
 
         @Override
diff --git a/src/main/java/com/health/model/User.java b/src/main/java/com/health/model/User.java
index 64f261c5..e8868e76 100644
--- a/src/main/java/com/health/model/User.java
+++ b/src/main/java/com/health/model/User.java
@@ -183,6 +183,10 @@ public void setOrgRolev(OrganizationRole orgRolev) {
     @JsonIgnore
     private Set<TrainingResource> trainingResources = new HashSet<TrainingResource>();
 
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JsonIgnore
+    private Set<ProjectReport> projectReports = new HashSet<ProjectReport>();
+
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JsonIgnore
     private Set<Topic> topics = new HashSet<Topic>();
@@ -287,6 +291,14 @@ public void setCourseCatTopicMappings(Set<CourseCatTopicMapping> courseCatTopicM
         this.courseCatTopicMappings = courseCatTopicMappings;
     }
 
+    public Set<ProjectReport> getProjectReports() {
+        return projectReports;
+    }
+
+    public void setProjectReports(Set<ProjectReport> projectReports) {
+        this.projectReports = projectReports;
+    }
+
     @Override
     public String getPassword() {
         return password;
diff --git a/src/main/java/com/health/repository/ProjectReportRepository.java b/src/main/java/com/health/repository/ProjectReportRepository.java
new file mode 100644
index 00000000..66da9462
--- /dev/null
+++ b/src/main/java/com/health/repository/ProjectReportRepository.java
@@ -0,0 +1,21 @@
+
+package com.health.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.health.model.ProjectReport;
+import com.health.model.StateDistrictMapping;
+
+public interface ProjectReportRepository extends JpaRepository<ProjectReport, Integer> {
+
+    ProjectReport findByProjectReportId(int projectReportId);
+
+    List<ProjectReport> findByStateDistrictMapping(StateDistrictMapping stateDistrictMapping);
+
+    List<ProjectReport> findByStateDistrictMappingInAndStatusTrue(List<StateDistrictMapping> stateDistrictMappingList);
+
+    List<ProjectReport> findAllByStatusTrue();
+
+}
diff --git a/src/main/java/com/health/service/ProjectReportService.java b/src/main/java/com/health/service/ProjectReportService.java
new file mode 100644
index 00000000..ce4a5ef9
--- /dev/null
+++ b/src/main/java/com/health/service/ProjectReportService.java
@@ -0,0 +1,25 @@
+
+package com.health.service;
+
+import java.util.List;
+
+import com.health.model.ProjectReport;
+import com.health.model.StateDistrictMapping;
+
+public interface ProjectReportService {
+
+    ProjectReport findByProjectReportId(int projectReportId);
+
+    List<ProjectReport> findByStateDistrictMapping(StateDistrictMapping stateDistrictMapping);
+
+    List<ProjectReport> findByStateDistrictMappingInAndStatusTrue(List<StateDistrictMapping> stateDistrictMappingList);
+
+    List<ProjectReport> findAll();
+
+    List<ProjectReport> findAllByStatusTrue();
+
+    void save(ProjectReport projectReport);
+
+    void saveAll(List<ProjectReport> projectReportList);
+
+}
diff --git a/src/main/java/com/health/service/impl/ProjectReportServiceImpl.java b/src/main/java/com/health/service/impl/ProjectReportServiceImpl.java
new file mode 100644
index 00000000..2a55c275
--- /dev/null
+++ b/src/main/java/com/health/service/impl/ProjectReportServiceImpl.java
@@ -0,0 +1,67 @@
+
+package com.health.service.impl;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.health.model.ProjectReport;
+import com.health.model.StateDistrictMapping;
+import com.health.repository.ProjectReportRepository;
+import com.health.service.ProjectReportService;
+
+@Service
+public class ProjectReportServiceImpl implements ProjectReportService {
+
+    private static final Logger logger = LoggerFactory.getLogger(ProjectReportServiceImpl.class);
+
+    @Autowired
+    private ProjectReportRepository repo;
+
+    @Override
+    public ProjectReport findByProjectReportId(int projectReportId) {
+
+        return repo.findByProjectReportId(projectReportId);
+    }
+
+    @Override
+    public List<ProjectReport> findByStateDistrictMapping(StateDistrictMapping stateDistrictMapping) {
+
+        return repo.findByStateDistrictMapping(stateDistrictMapping);
+    }
+
+    @Override
+    public List<ProjectReport> findByStateDistrictMappingInAndStatusTrue(
+            List<StateDistrictMapping> stateDistrictMappingList) {
+
+        return repo.findByStateDistrictMappingInAndStatusTrue(stateDistrictMappingList);
+    }
+
+    @Override
+    public List<ProjectReport> findAll() {
+
+        return repo.findAll();
+    }
+
+    @Override
+    public List<ProjectReport> findAllByStatusTrue() {
+
+        return repo.findAllByStatusTrue();
+    }
+
+    @Override
+    public void save(ProjectReport projectReport) {
+        repo.save(projectReport);
+
+    }
+
+    @Override
+    public void saveAll(List<ProjectReport> projectReportList) {
+        repo.saveAll(projectReportList);
+
+    }
+
+}

From f8166bd7db17e3b0d739f0b4bf01f16ea52207f7 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Tue, 3 Feb 2026 14:20:09 +0530
Subject: [PATCH 08/21] :add Project Report Get and Post resolved merge
 conflict

---
 .../com/health/controller/HomeController.java | 258 ++++++++++++++++++
 .../java/com/health/utility/CommonData.java   |   2 +
 .../com/health/utility/ServiceUtility.java    |  15 +
 3 files changed, 275 insertions(+)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index c13cc87f..ea3dcf8f 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -97,6 +97,7 @@
 import com.health.model.ContributorAssignedTutorial;
 import com.health.model.Course;
 import com.health.model.CourseCatTopicMapping;
+import com.health.model.District;
 import com.health.model.DocumentSearch;
 import com.health.model.Event;
 import com.health.model.FeedbackMasterTrainer;
@@ -111,11 +112,13 @@
 import com.health.model.PackageLanguage;
 import com.health.model.PathofPromoVideo;
 import com.health.model.PostQuestionaire;
+import com.health.model.ProjectReport;
 import com.health.model.PromoVideo;
 import com.health.model.Question;
 import com.health.model.ResearchPaper;
 import com.health.model.SpokenVideo;
 import com.health.model.State;
+import com.health.model.StateDistrictMapping;
 import com.health.model.Testimonial;
 import com.health.model.Topic;
 import com.health.model.TopicCategoryMapping;
@@ -158,11 +161,13 @@
 import com.health.service.PackageLanguageService;
 import com.health.service.PathofPromoVideoService;
 import com.health.service.PostQuestionaireService;
+import com.health.service.ProjectReportService;
 import com.health.service.PromoVideoService;
 import com.health.service.QuestionService;
 import com.health.service.ResearchPaperService;
 import com.health.service.RoleService;
 import com.health.service.SpokenVideoService;
+import com.health.service.StateDistrictMappingService;
 import com.health.service.StateService;
 import com.health.service.TestimonialService;
 import com.health.service.TopicCategoryMappingService;
@@ -265,6 +270,12 @@ public class HomeController {
     @Autowired
     private LanguageService lanService;
 
+    @Autowired
+    private ProjectReportService projectReportService;
+
+    @Autowired
+    private StateDistrictMappingService stateDistrictMappingService;
+
     @Autowired
     private CategoryService catService;
 
@@ -6648,6 +6659,253 @@ public String viewAndDownloadTrainingResource(HttpServletRequest req,
         return "trainingResources";
     }
 
+    /************************ Project Report Start ******************************/
+
+    @GetMapping("/addProjectReport")
+    public String addProjectReportGet(HttpServletRequest req, Principal principal, Model model) {
+        User usr = getUser(principal);
+        logger.info("{} {} {}", usr.getUsername(), req.getMethod(), req.getRequestURI());
+        model.addAttribute("userInfo", usr);
+
+        List<State> states = stateService.findAll();
+        states.sort(Comparator.comparing(State::getStateName));
+        model.addAttribute("states", states);
+
+        List<ProjectReport> projectReportList = new ArrayList<>();
+        List<ProjectReport> tempProjectReportList = projectReportService.findAll();
+        for (ProjectReport temp : tempProjectReportList) {
+            if (ServiceUtility.hasAnyProjectReportFile(temp)) {
+                projectReportList.add(temp);
+            }
+        }
+
+        model.addAttribute("projectReportList", projectReportList);
+
+        return "addProjectReport";
+    }
+
+    @PostMapping("/addProjectReport")
+    public String addProjectReportPost(HttpServletRequest req, Model model, Principal principal,
+            @RequestParam(name = "stateIdPR") int stateId,
+            @RequestParam(name = "districtIdPR") List<Integer> districtIds,
+            @RequestParam(name = "filePR") List<MultipartFile> files) {
+
+        User usr = getUser(principal);
+        logger.info("{} {} {}", usr.getUsername(), req.getMethod(), req.getRequestURI());
+        model.addAttribute("userInfo", usr);
+
+        boolean viewSection = false;
+
+        if (stateId == 0) {
+            model.addAttribute("error_msg", "State should not be null");
+            viewSection = true;
+            model.addAttribute("viewSection", viewSection);
+            return addProjectReportGet(req, principal, model);
+        }
+
+        if (districtIds.isEmpty() || files.isEmpty()) {
+            viewSection = true;
+            model.addAttribute("viewSection", viewSection);
+            model.addAttribute("error_msg", "District and Files should not be null");
+            return addProjectReportGet(req, principal, model);
+        }
+
+        State state = stateService.findById(stateId);
+        String stateName = state.getStateName();
+
+        Timestamp dateAdded = ServiceUtility.getCurrentTime();
+
+        Set<District> addedDistrict = new HashSet<>();
+
+        try {
+
+            for (int i = 0; i < districtIds.size(); i++) {
+                if (i < files.size())
+                    logger.info("File: {}", files.get(i));
+                if (districtIds.get(i) != 0 && !files.get(i).isEmpty()) {
+
+                    District district = districtService.findById(districtIds.get(i));
+
+                    if (district != null) {
+                        String districtName = district.getDistrictName();
+                        StateDistrictMapping stateDistrictMapping = stateDistrictMappingService
+                                .findByStateAndDistrict(state, district);
+
+                        boolean addedDistrictFlag = addedDistrict.add(district);
+
+                        if (stateDistrictMapping == null && addedDistrictFlag) {
+                            stateDistrictMapping = new StateDistrictMapping(dateAdded, state, district);
+
+                            stateDistrictMappingService.save(stateDistrictMapping);
+                            logger.info(" iter:{}  stateDistrictMapping :{}", i, stateDistrictMapping);
+                        }
+
+                        List<ProjectReport> prList = projectReportService
+                                .findByStateDistrictMapping(stateDistrictMapping);
+                        ProjectReport pr = null;
+                        boolean oldPRFlag = false;
+                        String oldPath = "";
+
+                        if (prList.isEmpty()) {
+                            pr = new ProjectReport();
+                            logger.info("iter:{} ProjectReport  :{}", i, pr);
+
+                        } else {
+                            pr = prList.get(0);
+                            oldPRFlag = true;
+                        }
+
+                        pr.setDateAdded(dateAdded);
+                        pr.setStateDistrictMapping(stateDistrictMapping);
+                        pr.setUser(usr);
+
+                        projectReportService.save(pr); // Saved first to get exact Id
+                        int prId = pr.getProjectReportId();
+
+                        Path rootPath = Paths.get(CommonData.uploadProjectReport, String.valueOf(prId), stateName,
+                                districtName);
+
+                        String pdfFolder = Paths.get(rootPath.toString(), "pdf").toString();
+                        String docFolder = Paths.get(rootPath.toString(), "docx_or_odt").toString();
+                        String excelFolder = Paths.get(rootPath.toString(), "excel_or_csv").toString();
+                        String imageFolder = Paths.get(rootPath.toString(), "image").toString();
+
+                        Set<String> extentions = new HashSet<>();
+                        String document = "";
+
+                        MultipartFile file = files.get(i);
+
+                        String fileExtention = ServiceUtility.checkFileExtensions(file);
+
+                        if (fileExtention.equals(CommonData.UNSUPPORTED_EXTENSION)) {
+                            model.addAttribute("error_msg", "Unsupported file Error at District:" + districtName);
+                            viewSection = true;
+                            model.addAttribute("viewSection", viewSection);
+                            return addProjectReportGet(req, principal, model);
+                        }
+
+                        else if (fileExtention.equals(CommonData.PDF_EXTENSION)) {
+                            if (oldPRFlag) {
+                                oldPath = pr.getPdfPath();
+                            }
+                            document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
+                            pr.setPdfPath(document);
+                        }
+
+                        else if (fileExtention.equals(CommonData.DOC_EXTENSION)) {
+                            if (oldPRFlag) {
+                                oldPath = pr.getDocPath();
+                            }
+                            document = ServiceUtility.uploadMediaFile(file, env, docFolder);
+                            pr.setDocPath(document);
+                        }
+
+                        else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)) {
+                            if (oldPRFlag) {
+                                oldPath = pr.getExcelPath();
+                            }
+                            document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
+                            pr.setExcelPath(document);
+                        }
+
+                        else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
+                            if (oldPRFlag) {
+                                oldPath = pr.getImgPath();
+                            }
+                            document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
+                            pr.setImgPath(document);
+                        }
+
+                        if (fileExtention.equals(CommonData.ZIP_EXTENSION)) {
+
+                            extentions = ServiceUtility.checkFileExtentionsInZip(file);
+                            if (extentions.size() == 1) {
+                                for (String ext : extentions) {
+                                    if (ext.equals(CommonData.PDF_EXTENSION)) {
+                                        if (oldPRFlag) {
+                                            oldPath = pr.getPdfPath();
+                                        }
+                                        document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
+                                        pr.setPdfPath(document);
+                                    }
+
+                                    else if (ext.equals(CommonData.DOC_EXTENSION)) {
+                                        if (oldPRFlag) {
+                                            oldPath = pr.getDocPath();
+                                        }
+                                        document = ServiceUtility.uploadMediaFile(file, env, docFolder);
+                                        pr.setDocPath(document);
+                                    }
+
+                                    else if (ext.equals(CommonData.EXCEL_EXTENSION)) {
+                                        if (oldPRFlag) {
+                                            oldPath = pr.getExcelPath();
+                                        }
+                                        document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
+                                        pr.setExcelPath(document);
+                                    }
+
+                                    else if (ext.equals(CommonData.IMAGE_EXTENSION)) {
+                                        if (oldPRFlag) {
+                                            oldPath = pr.getImgPath();
+                                        }
+                                        document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
+                                        pr.setImgPath(document);
+                                    }
+
+                                    else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
+                                        viewSection = true;
+                                        model.addAttribute("viewSection", viewSection);
+                                        model.addAttribute("error_msg",
+                                                "Unsupported file Error at District:" + districtName);
+
+                                        return addProjectReportGet(req, principal, model);
+                                    }
+
+                                }
+                            }
+
+                            else {
+                                model.addAttribute("error_msg",
+                                        "Zip contains different types of files Error at language:" + districtName);
+                                viewSection = true;
+                                model.addAttribute("viewSection", viewSection);
+                                return addProjectReportGet(req, principal, model);
+                            }
+
+                        }
+
+                        if (oldPath != null && oldPath.endsWith(".zip")) {
+
+                            String extractDir = oldPath.replace(".zip", "");
+
+                            Path extractDirPath = Paths.get(env.getProperty("spring.applicationexternalPath.name"),
+                                    extractDir);
+                            FileUtils.deleteDirectory(extractDirPath.toFile());
+
+                        }
+                        pr.setUser(usr);
+                        projectReportService.save(pr);
+
+                    }
+
+                }
+
+            }
+
+        } catch (Exception e) {
+            model.addAttribute("error_msg", "Some errors occurred, please contact the Admin");
+            logger.error("Error:", e);
+            return addProjectReportGet(req, principal, model);
+        }
+
+        model.addAttribute("viewSection", viewSection);
+        model.addAttribute("success_msg", CommonData.RECORD_SAVE_SUCCESS_MSG);
+        return addProjectReportGet(req, principal, model);
+    }
+
+    /************************ Project Report End ********************************/
+
     @GetMapping("/trainingModules")
     public String hstTrainingModules(@RequestParam(name = "week", required = false, defaultValue = "") String weekName,
             @RequestParam(name = "lan", required = false, defaultValue = "") String langName, HttpServletRequest req,
diff --git a/src/main/java/com/health/utility/CommonData.java b/src/main/java/com/health/utility/CommonData.java
index 7424114a..396b9001 100644
--- a/src/main/java/com/health/utility/CommonData.java
+++ b/src/main/java/com/health/utility/CommonData.java
@@ -167,6 +167,8 @@ public class CommonData {
 
     public static String uploadTrainingResource = "Media/Content/TrainingResource/";
 
+    public static String uploadProjectReport = "Media/Content/ProjectReport/";
+
     public static String uploadPromoVideo = "Media/Content/PromoVideo/";
 
     public static String uploadVersion = "Media/Content/Version/";
diff --git a/src/main/java/com/health/utility/ServiceUtility.java b/src/main/java/com/health/utility/ServiceUtility.java
index 60101215..5a0b4866 100644
--- a/src/main/java/com/health/utility/ServiceUtility.java
+++ b/src/main/java/com/health/utility/ServiceUtility.java
@@ -76,6 +76,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.health.model.ProjectReport;
 import com.health.model.TrainingResource;
 import com.health.model.User;
 import com.health.repository.UserRepository;
@@ -1274,6 +1275,20 @@ public static String generateToken() {
         return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes).substring(0, 10);
     }
 
+    public static boolean hasAnyProjectReportFile(ProjectReport pr) {
+        boolean hasData = true;
+        if ((pr.getPdfPath() == null || pr.getPdfPath().isEmpty())
+                && (pr.getDocPath() == null || pr.getDocPath().isEmpty())
+                && (pr.getExcelPath() == null || pr.getExcelPath().isEmpty())
+                && (pr.getImgPath() == null || pr.getImgPath().isEmpty())) {
+
+            hasData = false;
+        }
+
+        return hasData;
+
+    }
+
     public static boolean hasAnyResourceFile(TrainingResource tr) {
         boolean hasData = true;
         if ((tr.getPdfPath() == null || tr.getPdfPath().isEmpty())

From 58609eb3a0c48174bcb65b2e7be7c66cd979222d Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Mon, 9 Mar 2026 12:36:29 +0530
Subject: [PATCH 09/21] resolved conflict

---
 .../com/health/controller/HomeController.java | 76 +++++++++++++++++--
 .../java/com/health/utility/CommonData.java   |  3 +
 2 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index ea3dcf8f..162ec67f 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -6716,6 +6716,8 @@ public String addProjectReportPost(HttpServletRequest req, Model model, Principa
         Timestamp dateAdded = ServiceUtility.getCurrentTime();
 
         Set<District> addedDistrict = new HashSet<>();
+        Map<String, Set<String>> ErrorsforExistingFiles = new LinkedHashMap<>();
+        boolean savedFlag = false;
 
         try {
 
@@ -6728,6 +6730,18 @@ public String addProjectReportPost(HttpServletRequest req, Model model, Principa
 
                     if (district != null) {
                         String districtName = district.getDistrictName();
+                        if (!CommonData.ALL_DISTRICTS.equalsIgnoreCase(districtName)) {
+                            int tempStateId = district.getState().getId();
+                            if (stateId != tempStateId) {
+                                viewSection = true;
+                                model.addAttribute("viewSection", viewSection);
+                                model.addAttribute("error_msg", "District does not belong to the selected state");
+                                return addProjectReportGet(req, principal, model);
+                            }
+                        }
+
+                        Set<String> existingFiles = ErrorsforExistingFiles.computeIfAbsent(districtName,
+                                k -> new LinkedHashSet<>());
                         StateDistrictMapping stateDistrictMapping = stateDistrictMappingService
                                 .findByStateAndDistrict(state, district);
 
@@ -6787,6 +6801,10 @@ public String addProjectReportPost(HttpServletRequest req, Model model, Principa
                         else if (fileExtention.equals(CommonData.PDF_EXTENSION)) {
                             if (oldPRFlag) {
                                 oldPath = pr.getPdfPath();
+                                if (oldPath != null && !oldPath.trim().isEmpty()) {
+                                    existingFiles.add(CommonData.PDF_EXTENSION);
+                                    continue;
+                                }
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
                             pr.setPdfPath(document);
@@ -6795,6 +6813,10 @@ else if (fileExtention.equals(CommonData.PDF_EXTENSION)) {
                         else if (fileExtention.equals(CommonData.DOC_EXTENSION)) {
                             if (oldPRFlag) {
                                 oldPath = pr.getDocPath();
+                                if (oldPath != null && !oldPath.trim().isEmpty()) {
+                                    existingFiles.add(CommonData.DOC_EXTENSION);
+                                    continue;
+                                }
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, docFolder);
                             pr.setDocPath(document);
@@ -6803,6 +6825,10 @@ else if (fileExtention.equals(CommonData.DOC_EXTENSION)) {
                         else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)) {
                             if (oldPRFlag) {
                                 oldPath = pr.getExcelPath();
+                                if (oldPath != null && !oldPath.trim().isEmpty()) {
+                                    existingFiles.add(CommonData.EXCEL_EXTENSION);
+                                    continue;
+                                }
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
                             pr.setExcelPath(document);
@@ -6811,6 +6837,10 @@ else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)) {
                         else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
                             if (oldPRFlag) {
                                 oldPath = pr.getImgPath();
+                                if (oldPath != null && !oldPath.trim().isEmpty()) {
+                                    existingFiles.add(CommonData.IMAGE_EXTENSION);
+                                    continue;
+                                }
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
                             pr.setImgPath(document);
@@ -6824,6 +6854,10 @@ else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
                                     if (ext.equals(CommonData.PDF_EXTENSION)) {
                                         if (oldPRFlag) {
                                             oldPath = pr.getPdfPath();
+                                            if (oldPath != null && !oldPath.trim().isEmpty()) {
+                                                existingFiles.add(CommonData.PDF_EXTENSION);
+                                                continue;
+                                            }
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
                                         pr.setPdfPath(document);
@@ -6832,6 +6866,10 @@ else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
                                     else if (ext.equals(CommonData.DOC_EXTENSION)) {
                                         if (oldPRFlag) {
                                             oldPath = pr.getDocPath();
+                                            if (oldPath != null && !oldPath.trim().isEmpty()) {
+                                                existingFiles.add(CommonData.DOC_EXTENSION);
+                                                continue;
+                                            }
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, docFolder);
                                         pr.setDocPath(document);
@@ -6840,6 +6878,10 @@ else if (ext.equals(CommonData.DOC_EXTENSION)) {
                                     else if (ext.equals(CommonData.EXCEL_EXTENSION)) {
                                         if (oldPRFlag) {
                                             oldPath = pr.getExcelPath();
+                                            if (oldPath != null && !oldPath.trim().isEmpty()) {
+                                                existingFiles.add(CommonData.EXCEL_EXTENSION);
+                                                continue;
+                                            }
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
                                         pr.setExcelPath(document);
@@ -6848,6 +6890,10 @@ else if (ext.equals(CommonData.EXCEL_EXTENSION)) {
                                     else if (ext.equals(CommonData.IMAGE_EXTENSION)) {
                                         if (oldPRFlag) {
                                             oldPath = pr.getImgPath();
+                                            if (oldPath != null && !oldPath.trim().isEmpty()) {
+                                                existingFiles.add(CommonData.IMAGE_EXTENSION);
+                                                continue;
+                                            }
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
                                         pr.setImgPath(document);
@@ -6875,17 +6921,14 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
 
                         }
 
-                        if (oldPath != null && oldPath.endsWith(".zip")) {
-
-                            String extractDir = oldPath.replace(".zip", "");
-
-                            Path extractDirPath = Paths.get(env.getProperty("spring.applicationexternalPath.name"),
-                                    extractDir);
-                            FileUtils.deleteDirectory(extractDirPath.toFile());
+                        if (oldPath != null && !oldPath.trim().isEmpty()) {
 
+                            continue;
                         }
+
                         pr.setUser(usr);
                         projectReportService.save(pr);
+                        savedFlag = true;
 
                     }
 
@@ -6900,7 +6943,24 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
         }
 
         model.addAttribute("viewSection", viewSection);
-        model.addAttribute("success_msg", CommonData.RECORD_SAVE_SUCCESS_MSG);
+        StringBuilder errorMsg = new StringBuilder();
+
+        for (Map.Entry<String, Set<String>> entry : ErrorsforExistingFiles.entrySet()) {
+            if (!entry.getValue().isEmpty()) {
+                errorMsg.append(entry.getKey()).append(": ").append(String.join(", ", entry.getValue())).append("<br>");
+            }
+        }
+
+        if (errorMsg.length() > 0) {
+
+            String finalErrorMessage = "The following files types already exist. To update them, please go to the Edit section.”:<br>"
+                    + errorMsg.toString();
+            model.addAttribute("error_msg", finalErrorMessage);
+        }
+
+        if (savedFlag) {
+            model.addAttribute("success_msg", CommonData.RECORD_SAVE_SUCCESS_MSG);
+        }
         return addProjectReportGet(req, principal, model);
     }
 
diff --git a/src/main/java/com/health/utility/CommonData.java b/src/main/java/com/health/utility/CommonData.java
index 396b9001..9927e659 100644
--- a/src/main/java/com/health/utility/CommonData.java
+++ b/src/main/java/com/health/utility/CommonData.java
@@ -316,8 +316,11 @@ public class CommonData {
     public static final String image_OR_ZIP_OF_IMAGES = "imageOrZipOfImages";
     public static final String PDF_OR_ZIP_OF_PDFS = "pdfOrZipOfPdfs";
     public static final String Excel_OR_ZIP_OF_EXCELS = "excelOrZipOfexcels";
+
     public static final LocalDate IMPL_DATE_TRAINING_RESOURCE = LocalDate.of(2026, 3, 5);
 
+    public static final String ALL_DISTRICTS = "All Districts";
+
     public static final String DOCUMENT_ID_TUTORIAL_TIMESCRIPT = "Tts";
     public static final String DOCUMENT_ID_TUTORIAL_ORIGINAL_SCRIPT = "Tos";
     public static final String DOCUMENT_ID_BROCHURE = "Bro";

From a0596d19747bc94c14c0a1badd638e4cdebb4768 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Tue, 24 Feb 2026 13:03:12 +0530
Subject: [PATCH 10/21] add Project Report template

---
 .../resources/templates/addProjectReport.html | 433 ++++++++++++++++++
 1 file changed, 433 insertions(+)
 create mode 100644 src/main/resources/templates/addProjectReport.html

diff --git a/src/main/resources/templates/addProjectReport.html b/src/main/resources/templates/addProjectReport.html
new file mode 100644
index 00000000..4d33ae18
--- /dev/null
+++ b/src/main/resources/templates/addProjectReport.html
@@ -0,0 +1,433 @@
+
+<!DOCTYPE html>
+<html xmlns:th="https://thymeleaf.org">
+<head th:replace="common/trail :: common-trail (pageTitle='Add Project Report - Admin - Health And Nutrition')"></head>
+<style>
+.nav-add_project_report{
+border-right: 5px solid orange;
+font-size:0.9rem;
+/* text-decoration: underline; */
+}
+.nav-add_project_report a{
+color: #044F7A!important;
+font-weight:bold!important;
+}
+
+
+    
+   
+</style>
+<body>
+	<div th:replace="common/sidebar :: top_header"></div>
+	<div class="container-fluid">
+		<div class="row">
+			<div class="col-md-3 col-lg-2 pr-0">
+				<div th:replace="common/sidebar :: contributor_sidebar"></div>
+			</div>
+			<div class="col-md-9 col-lg-10 p-md-5">
+				<div>
+					<div class="alert alert-success" role="alert"
+						th:if="${success_msg}">
+						<div id="#test" class="">
+							<div>
+								<span th:text="${success_msg}"></span>
+							</div>
+						</div>
+					</div>
+					<div class="alert alert-danger" role="alert" th:if="${error_msg}">
+						<div id="#test" class="">
+							<div>
+								<span th:utext="${error_msg}"></span>
+							</div>
+						</div>
+					</div>
+				</div>
+				<ul class="nav nav-tabs" id="myTab" role="tablist">
+					<li class="nav-item"><a class="nav-link active" id="home-tab"
+						data-toggle="tab" href="#add" role="tab" aria-controls="home"
+						aria-selected="true">Add</a></li>
+					<li class="nav-item"><a th:if="${viewSection !=false}" class="nav-link" id="profile-tab"
+						data-toggle="tab" href="#view" role="tab" aria-controls="profile"
+						aria-selected="false">Training Report View</a></li>
+						
+				
+   
+
+
+				</ul>
+				<div class="tab-content" id="myTabContent">
+					<div class="tab-pane fade show active py-3" id="add"
+						role="tabpanel" aria-labelledby="home-tab">
+						<div class="card">
+							<div class="card-header">
+								<h4>Add Project Report </h4>
+							</div>
+							<div class="card-body">
+								<div class="row">
+									<div class="col-lg-8">
+							
+										<form th:action="@{/addProjectReport}" method="post"
+											enctype="multipart/form-data" id="inputForm">
+											<div id="rawData">
+												
+											</div>
+											
+											    <div class="form-group">
+													<label for="catIdTR"><b>Select State *</b></label> <select id="stateIdPR"
+														class="form-control package_input" name="stateIdPR" required="required">
+
+															<option value='0'>Select State</option>
+														
+															<option th:each="state: ${states}" th:value="${state.getId()}" th:text="${state.getStateName()}">
+														</option>
+								
+													</select>
+
+											</div>
+											 
+											  
+											  <!--div class="form-group">
+													<label for="topicIdTR"><b>Select Topic *</b></label> <select id="topicIdTR"
+														class="form-control package_input" name="topicIdTR" required="required">
+
+															<option value='0'>Select Topic</option>
+														
+								
+													</select>
+
+											</div-->
+							
+							
+
+											
+										 <input type="hidden" id="lengthofDistrict" name="lengthofDistrict"  th:value="${districts.size()}"/>	
+										
+									<div th:each="dis,iter: ${districts}" th:id="${'fileInputDiv' + iter.index}" th:style="${'display: ' + (iter.first ? 'block' : 'none')}" >
+									
+									<div class="container">
+										
+								        <div class="row">
+								            <div class="col-md-5">
+								              
+								               <div class="form-group">
+		               	                 		<label th:if="${iter.index == 0}" th:for="${'districtIdPR' + iter.index}">Select District </label>
+												<select th:id="${'districtIdPR' + iter.index}" class="form-control district-select" name="districtIdPR" th:data-index="${iter.index}">
+			  									<option value="0">Select District</option>
+			  									<option th:each="disitr : ${districts}" th:value="${disitr.getId()}" th:text="${disitr.getDistrictName()}"></option>
+												</select>
+		  									</div>
+								            
+								            </div>
+								            
+								         
+								            
+								            <div class="col-md-7">
+												
+								            <div class="form-group">
+
+												<label th:if="${iter.index == 0}" th:for="${'filePR' + iter.index}">Upload File</label> 
+												<input type="file" class="form-control" th:id="${'filePR' + iter.index}" name="filePR" th:data-index="${iter.index}" accept=".jpeg,.jpg,.png,.pdf,.doc,.docx,.odt,.xlsx,.csv,.zip"  onchange="validate_file_size(this,734003200)"/>
+												<small> (.jpg or .png or .pdf or .docx or .odt or .xlsx or .csv  or .zip Only)</small> 
+												<small>Max file size : 700 MB</small>
+
+											</div>
+												
+								            </div>
+								        </div>
+								    </div>
+									
+									
+
+									
+
+									
+									<br>
+									</div>									  
+											<br>
+																        
+									        
+											
+											<button type="submit" class="btn  btn-success"  style="float:left;  margin-left:15px; margin-right:40px;">Submit</button>
+										</form>
+										
+									
+									</div>
+								</div>
+
+							</div>
+						</div>
+					</div>
+					<div class="tab-pane fade py-3" id="view" role="tabpanel"
+						aria-labelledby="profile-tab">
+						<table class="table table-striped" id="myTable"  data-order='[[ 0, "desc" ]]'>
+						
+							
+							<thead>
+								<tr>
+									<th scope="col">Date Added</th>
+									<th scope="col">State</th>
+									<th scope="col">District</th>
+									<th scope="col">Enable/Disable</th>
+									<th scope="col">Pdf File</th>
+									<th scope="col">Doc File</th>
+									<th scope="col">Excel File</th>
+									<th scope="col">Image File</th>
+									
+									 
+								</tr>
+							</thead>
+							<tbody>
+								<tr th:each="temp : ${projectReportList}">
+								 <td scope="row"><span th:text = "${temp.getDateAdded()}"></span></td>
+								 <td><span th:text = "${temp.getStateDistrictMapping().getState().getStateName()}"></span></td>
+								  <td><span th:text = "${temp.getStateDistrictMapping().getDistrict().getDistrictName()}"></span></td>
+							      <td>
+	  		
+						   			<div th:if="${temp.isStatus()}">
+						   				<a class="disableProjetcReport" th:value="${temp.getProjectReportId()}" title="Click to Disable Project Report "><i class="fas fa-times-circle" th:id="${temp.getProjectReportId()}" style="color:red"></i></a>
+						   			</div>
+						   			<div th:unless="${temp.isStatus()}">
+						   				<a class="enableProjetcReport" th:value="${temp.getProjectReportId()}" title="Click to Enable Project Report"><i class="fas fa-check-circle" th:id="${temp.getProjectReportId()}" style="color:green"></i> </a>
+						   			</div>
+						   		
+						  			</td>
+						  				
+						  			<td>
+									    <div th:id="${'pdf'+ temp.getProjectReportId()}">
+									        <span th:text="${temp.getPdfFileNameWithorWitoutZip()}"></span><br>
+									
+									        <!-- Actions if PDF exists -->
+									        <div th:if="${temp.getPdfFileNameWithorWitoutZip() != 'NA'}" class="mt-2 d-flex gap-2">
+									            <a class="btn btn-sm btn-primary " 
+									               th:href="@{'/projectReportAdminView/pdfOrZipOfPdfs/' + ${temp.getProjectReportId()}}" 
+									               title="View PDF">
+									                <i class="bi bi-eye"></i> View
+									            </a>
+												&ensp;
+									            <a class="btn btn-sm btn-warning me-2" 
+									               th:href="@{'/projectReport/edit/pdfOrZipOfPdfs/' + ${temp.getProjectReportId()}}" 
+									               title="Edit Pdf">
+									                <i class="bi bi-pencil-square"></i> Edit
+									            </a>
+												&ensp;
+									            <button class="btn btn-sm btn-danger deleteProjectReport-btn"
+									                    th:data-projectreportid="${temp.getProjectReportId()}"
+									                    th:data-statename="${temp.getStateDistrictMapping().getState().getStateName()}"
+									                    th:data-districtname="${temp.getStateDistrictMapping().getDistrict().getDistrictName()}"
+									                    th:data-filename="${temp.getPdfFileNameWithorWitoutZip()}"
+									                    th:data-filetype="'pdf'"
+									                    title="Delete Pdf">
+									                <i class="bi bi-trash"></i> Delete
+									            </button>
+									        </div>
+									
+									        <!-- Message if no PDF -->
+									        <div th:if="${temp.getPdfFileNameWithorWitoutZip() == 'NA'}" class="text-muted mt-2">
+									            <i class="bi bi-file-earmark-excel"></i> No Pdf available
+									        </div>
+									    </div>
+									</td>
+
+									
+									<td>
+										
+										<div th:id="${'doc'+ temp.getProjectReportId()}">
+									        <span th:text="${temp.getDocFileNameWithorWitoutZip()}"></span><br>
+									
+									        <!-- Actions if Doc exists -->
+									        <div th:if="${temp.getDocFileNameWithorWitoutZip() != 'NA'}" class="mt-2 d-flex gap-2">
+									            <a class="btn btn-sm btn-primary " 
+									               th:href="@{${'/projectReportAdminView/docOrZipOfDocs/' + temp.getProjectReportId()}}" 
+									               title="View Doc">
+									                <i class="bi bi-eye"></i> View
+									            </a>
+												&ensp;
+									            <a class="btn btn-sm btn-warning me-2" 
+									               th:href="@{'/projectReport/edit/docOrZipOfDocs/' + ${temp.getProjectReportId()}}" 
+									               title="Edit Doc">
+									                <i class="bi bi-pencil-square"></i> Edit
+									            </a>
+												&ensp;
+									            <button class="btn btn-sm btn-danger deleteProjectReport-btn"
+									                    th:data-projectreportid="${temp.getProjectReportId()}"
+									                    th:data-statename="${temp.getStateDistrictMapping().getState().getStateName()}"
+									                    th:data-districtname="${temp.getStateDistrictMapping().getDistrict().getDistrictName()}"
+									                    th:data-filename="${temp.getDocFileNameWithorWitoutZip()}"
+									                    th:data-filetype="'doc'"
+									                    title="Delete Doc">
+									                <i class="bi bi-trash"></i> Delete
+									            </button>
+									        </div>
+									
+									        <!-- Message if no Doc -->
+									        <div th:if="${temp.getDocFileNameWithorWitoutZip() == 'NA'}" class="text-muted mt-2">
+									            <i class="bi bi-file-earmark-excel"></i> No Doc available
+									        </div>
+									    </div>
+						                 
+									</td>
+									
+									<td>
+										
+										<div th:id="${'excel'+ temp.getProjectReportId()}">
+									        <span th:text="${temp.getExcelFileNameWithorWitoutZip()}"></span><br>
+									
+									        <!-- Actions if Excel exists -->
+									        <div th:if="${temp.getExcelFileNameWithorWitoutZip() != 'NA'}" class="mt-2 d-flex gap-2">
+									            <a class="btn btn-sm btn-primary " 
+									               th:href="@{${'/projectReportAdminView/excelOrZipOfexcels/' + temp.getProjectReportId()}}" 
+									               title="View Excel">
+									                <i class="bi bi-eye"></i> View
+									            </a>
+												&ensp;
+									            <a class="btn btn-sm btn-warning me-2" 
+									               th:href="@{'/projectReport/edit/excelOrZipOfexcels/' + ${temp.getProjectReportId()}}" 
+									               title="Edit Excel">
+									                <i class="bi bi-pencil-square"></i> Edit
+									            </a>
+												&ensp;
+									            <button class="btn btn-sm btn-danger deleteProjectReport-btn"
+									                    th:data-projectreportid="${temp.getProjectReportId()}"
+									                    th:data-statename="${temp.getStateDistrictMapping().getState().getStateName()}"
+									                    th:data-districtname="${temp.getStateDistrictMapping().getDistrict().getDistrictName()}"
+									                    th:data-filename="${temp.getExcelFileNameWithorWitoutZip()}"
+									                    th:data-filetype="'excel'"
+									                    title="Delete Excel">
+									                <i class="bi bi-trash"></i> Delete
+									            </button>
+									        </div>
+									
+									        <!-- Message if no Excel-->
+									        <div th:if="${temp.getExcelFileNameWithorWitoutZip() == 'NA'}" class="text-muted mt-2">
+									            <i class="bi bi-file-earmark-excel"></i> No Excel available
+									        </div>
+									    </div>
+						            
+						                 
+									</td>
+									
+									<td>
+										 <div th:id="${'image'+ temp.getProjectReportId()}">
+									        <span th:text="${temp.getImageFileNameWithorWitoutZip()}"></span><br>
+									
+									
+									        <!-- Actions if Image exists -->
+									        <div th:if="${temp.getImageFileNameWithorWitoutZip() != 'NA'}" class="mt-2 d-flex gap-2">
+									            <a class="btn btn-sm btn-primary " 
+									               th:href="@{${'/projectReportAdminView/imageOrZipOfImages/' + temp.getProjectReportId()}}" 
+									               title="View Image">
+									                <i class="bi bi-eye"></i> View
+									            </a>
+												&ensp;
+									            <a class="btn btn-sm btn-warning me-2" 
+									               th:href="@{'/projectReport/edit/imageOrZipOfImages/' + ${temp.getProjectReportId()}}" 
+									               title="Edit Image">
+									                <i class="bi bi-pencil-square"></i> Edit
+									            </a>
+												&ensp;
+									            <button class="btn btn-sm btn-danger deleteProjectReport-btn"
+									                    th:data-projectreportid="${temp.getProjectReportId()}"
+									                    th:data-statename="${temp.getStateDistrictMapping().getState().getStateName()}"
+									                    th:data-districtname="${temp.getStateDistrictMapping().getDistrict().getDistrictName()}"
+									                    th:data-filename="${temp.getImageFileNameWithorWitoutZip()}"
+									                    th:data-filetype="'image'"
+									                    title="Delete Image">
+									                <i class="bi bi-trash"></i> Delete
+									            </button>
+									        </div>
+									
+									        <!-- Message if no Image-->
+									        <div th:if="${temp.getImageFileNameWithorWitoutZip() == 'NA'}" class="text-muted mt-2">
+									            <i class="bi bi-file-earmark-excel"></i> No Image available
+									        </div>
+									    </div>
+						            
+						                
+									</td>
+							
+							   
+							     
+								  
+							    </tr>
+
+							</tbody>
+						</table >
+						</div>
+						
+												
+						
+
+						
+					</div>
+
+
+
+				</div>
+
+			</div>
+
+
+		</div>
+
+	</div>
+	<div th:replace="common/trail :: body-bottom-scripts"></div>
+	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+	<script type="text/javascript">
+$(document).ready( function () {
+	
+    $('#myTable').DataTable();
+    
+     
+    
+   
+} );
+
+var divid = 0;
+
+function addListener(divid) {
+	var disSelect = document.getElementById("districtIdPR" + (divid - 1));
+	if (disSelect === null) {
+		console.log("divid=", divid);
+		return;
+	}
+	disSelect.addEventListener("change", function() {
+	  var selecteddis = disSelect.value;
+	  if (selecteddis !== "") {
+	    addRow(divid);
+	  }
+	});
+	
+}
+
+function addRow(divid) {
+	var fileInputDiv = document.getElementById("fileInputDiv" + divid);
+	if (fileInputDiv == null) {
+		console.log("none", divid);
+		return;
+	}
+    fileInputDiv.style.display = "block";
+    divid += 1;
+    addListener(divid);
+}
+
+function setRequired(divid) {
+	var stateName = document.getElementById("stateIdPR" + divid).value;
+	var dis = document.getElementById("districtIdPR" + divid);
+	var title = document.getElementById("fileId" + divid);
+	
+	title.required = (value != "");
+	return false;
+}
+
+addRow(divid);
+
+
+</script>
+
+	<script th:inline="javascript">
+	
+		var projectPath='[(@{/})]';
+	</script>
+</body>
+
+</html>

From d4da5deef38fb5edd900612802bf8d0e1bcdaa50 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Wed, 25 Feb 2026 09:49:24 +0530
Subject: [PATCH 11/21] state district maping repo method

---
 .../com/health/repository/StateDistrictMappingRepository.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/health/repository/StateDistrictMappingRepository.java b/src/main/java/com/health/repository/StateDistrictMappingRepository.java
index 9c333b35..4813039a 100644
--- a/src/main/java/com/health/repository/StateDistrictMappingRepository.java
+++ b/src/main/java/com/health/repository/StateDistrictMappingRepository.java
@@ -11,7 +11,7 @@
 
 public interface StateDistrictMappingRepository extends JpaRepository<StateDistrictMapping, Integer> {
 
-    StateDistrictMapping findByStateDisId(int topicLanId);
+    StateDistrictMapping findByStateDisId(int stateDisId);
 
     List<StateDistrictMapping> findByDistrict(District district);
 

From a88863f220b2a944354c8f18f8e7303b430f3505 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Wed, 25 Feb 2026 10:14:39 +0530
Subject: [PATCH 12/21]  all districts

---
 src/main/java/com/health/controller/HomeController.java     | 4 ++++
 src/main/java/com/health/repository/DistrictRepository.java | 3 +++
 src/main/java/com/health/service/DistrictService.java       | 3 +++
 .../java/com/health/service/impl/DistrictServiceImpl.java   | 6 ++++++
 src/main/resources/templates/addProjectReport.html          | 2 +-
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index 162ec67f..9d62f715 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -6671,6 +6671,10 @@ public String addProjectReportGet(HttpServletRequest req, Principal principal, M
         states.sort(Comparator.comparing(State::getStateName));
         model.addAttribute("states", states);
 
+        Optional<District> allDis = districtService.findByDistrictNameIgnoreCase(CommonData.ALL_DISTRICTS);
+
+        allDis.ifPresent(dis -> model.addAttribute("allDisId", dis.getId()));
+
         List<ProjectReport> projectReportList = new ArrayList<>();
         List<ProjectReport> tempProjectReportList = projectReportService.findAll();
         for (ProjectReport temp : tempProjectReportList) {
diff --git a/src/main/java/com/health/repository/DistrictRepository.java b/src/main/java/com/health/repository/DistrictRepository.java
index d804173c..554e0139 100644
--- a/src/main/java/com/health/repository/DistrictRepository.java
+++ b/src/main/java/com/health/repository/DistrictRepository.java
@@ -1,6 +1,7 @@
 package com.health.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.repository.CrudRepository;
 
@@ -41,4 +42,6 @@ public interface DistrictRepository extends CrudRepository<District, Integer> {
      */
     List<District> findAllBystate(State state);
 
+    Optional<District> findByDistrictNameIgnoreCase(String districtName);
+
 }
diff --git a/src/main/java/com/health/service/DistrictService.java b/src/main/java/com/health/service/DistrictService.java
index 911b696c..9e46cb9c 100644
--- a/src/main/java/com/health/service/DistrictService.java
+++ b/src/main/java/com/health/service/DistrictService.java
@@ -1,6 +1,7 @@
 package com.health.service;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.health.model.District;
 import com.health.model.State;
@@ -45,4 +46,6 @@ public interface DistrictService {
      */
     List<District> findAllByState(State state);
 
+    Optional<District> findByDistrictNameIgnoreCase(String districtName);
+
 }
diff --git a/src/main/java/com/health/service/impl/DistrictServiceImpl.java b/src/main/java/com/health/service/impl/DistrictServiceImpl.java
index 7e45986f..5a7777fd 100644
--- a/src/main/java/com/health/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/com/health/service/impl/DistrictServiceImpl.java
@@ -77,4 +77,10 @@ public List<District> findAllByState(State state) {
         return local;
     }
 
+    @Override
+    public Optional<District> findByDistrictNameIgnoreCase(String districtName) {
+
+        return distRepo.findByDistrictNameIgnoreCase(districtName);
+    }
+
 }
diff --git a/src/main/resources/templates/addProjectReport.html b/src/main/resources/templates/addProjectReport.html
index 4d33ae18..314fb9c3 100644
--- a/src/main/resources/templates/addProjectReport.html
+++ b/src/main/resources/templates/addProjectReport.html
@@ -99,7 +99,7 @@ <h4>Add Project Report </h4>
 							
 							
 
-											
+										 <input type="hidden" id="allDistrict" name="allDistrict"  th:value="${allDisId}"/>	
 										 <input type="hidden" id="lengthofDistrict" name="lengthofDistrict"  th:value="${districts.size()}"/>	
 										
 									<div th:each="dis,iter: ${districts}" th:id="${'fileInputDiv' + iter.index}" th:style="${'display: ' + (iter.first ? 'block' : 'none')}" >

From 516c1fabf6f839dcddd3987ef5d45b467d396dc2 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Wed, 25 Feb 2026 14:29:22 +0530
Subject: [PATCH 13/21] addProject ajax controller, state and district

---
 .../com/health/config/SecurityConfig.java     |  5 ++
 .../com/health/controller/AjaxController.java | 32 +++++++++++++
 .../com/health/controller/HomeController.java |  6 ++-
 src/main/java/com/health/model/City.java      |  2 +-
 src/main/java/com/health/model/District.java  |  4 +-
 src/main/java/com/health/model/State.java     | 10 ++--
 .../health/repository/DistrictRepository.java |  8 +++-
 .../health/repository/StateRepository.java    |  6 +++
 .../service/impl/DistrictServiceImpl.java     | 13 ++---
 .../health/service/impl/StateServiceImpl.java |  8 ++--
 src/main/resources/static/js/ajaxSupport.js   | 48 +++++++++++++++++++
 .../resources/templates/addProjectReport.html | 23 +++------
 .../resources/templates/common/sidebar.html   | 15 ++++++
 13 files changed, 139 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/health/config/SecurityConfig.java b/src/main/java/com/health/config/SecurityConfig.java
index 3ee25ff3..c724d703 100644
--- a/src/main/java/com/health/config/SecurityConfig.java
+++ b/src/main/java/com/health/config/SecurityConfig.java
@@ -74,6 +74,9 @@ public static BCryptPasswordEncoder passwordEncoder() {
             "/enableDisableCourseCatTopic", "/delete-category-topic-from-course", "/createCourse",
             "/courseName/edit/**", "/updateCourseName",
 
+            "/addProjectReport", "/projectReportAdminView/**", "/projectReport/edit/**", "/enableDisableProjectReport",
+            "/delete-projectReport",
+
 //			"/unpublishTutorial/**"
 
     };
@@ -102,6 +105,8 @@ public static BCryptPasswordEncoder passwordEncoder() {
             "/delete-category-topic-from-course", "/createCourse", "/courseName/edit/**", "/updateCourseName",
             "/addTrainingResource", "/trainingReource/view/**", "/trainingReourceAdminView/**",
             "/trainingReource/edit/**", "/enableDisableTrainingResource", "/delete-trainingResource",
+            "/addProjectReport", "/projectReportAdminView/**", "/projectReport/edit/**", "/enableDisableProjectReport",
+            "/delete-projectReport",
 
     };
 
diff --git a/src/main/java/com/health/controller/AjaxController.java b/src/main/java/com/health/controller/AjaxController.java
index 5f03aa6f..dffdefb6 100644
--- a/src/main/java/com/health/controller/AjaxController.java
+++ b/src/main/java/com/health/controller/AjaxController.java
@@ -2336,6 +2336,38 @@ public ResponseEntity<Resource> viewOrSharePdfOrImage(@PathVariable String topic
      * Training Resource End
      *************************************************************/
 
+    /**********************************
+     * Projet Report Start
+     *************************/
+
+    @RequestMapping("/loadDistrictByStateforPR")
+    public @ResponseBody TreeMap<String, Integer> loadDistrictByStateforPR(@RequestParam(value = "stateId") int stateId,
+            @RequestParam(value = "allDisId") int allDisId) {
+        TreeMap<String, Integer> districtMaps = new TreeMap<>();
+
+        if (allDisId != 0) {
+            District allDistrict = disService.findById(allDisId);
+            if (allDistrict != null)
+                districtMaps.put(allDistrict.getDistrictName(), allDistrict.getId());
+
+        }
+
+        State state = stateService.findById(stateId);
+        if (state != null) {
+            List<District> disList = disService.findAllByState(state);
+            for (District temp : disList) {
+
+                districtMaps.put(temp.getDistrictName(), temp.getId());
+
+            }
+
+        }
+
+        return districtMaps;
+    }
+
+    /********************************** Projet Report End *************************/
+
     @RequestMapping("/loadTopicByCategoryInAssignContri")
     public @ResponseBody HashMap<Integer, String> getTopicByCategoryAssignContri(@RequestParam(value = "id") int id) {
 
diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index 9d62f715..fc6bca7e 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -6673,7 +6673,9 @@ public String addProjectReportGet(HttpServletRequest req, Principal principal, M
 
         Optional<District> allDis = districtService.findByDistrictNameIgnoreCase(CommonData.ALL_DISTRICTS);
 
-        allDis.ifPresent(dis -> model.addAttribute("allDisId", dis.getId()));
+        int allDisId = allDis.map(District::getId).orElse(0);
+
+        model.addAttribute("allDisId", allDisId);
 
         List<ProjectReport> projectReportList = new ArrayList<>();
         List<ProjectReport> tempProjectReportList = projectReportService.findAll();
@@ -6727,7 +6729,7 @@ public String addProjectReportPost(HttpServletRequest req, Model model, Principa
 
             for (int i = 0; i < districtIds.size(); i++) {
                 if (i < files.size())
-                    logger.info("File: {}", files.get(i));
+                    logger.info("File: {}", files.get(i).getOriginalFilename());
                 if (districtIds.get(i) != 0 && !files.get(i).isEmpty()) {
 
                     District district = districtService.findById(districtIds.get(i));
diff --git a/src/main/java/com/health/model/City.java b/src/main/java/com/health/model/City.java
index 9a697fe3..f3efbd5f 100644
--- a/src/main/java/com/health/model/City.java
+++ b/src/main/java/com/health/model/City.java
@@ -46,7 +46,7 @@ public class City implements Comparable<City>, Serializable {
     @JoinColumn(name = "district_id")
     private District district;
 
-    @OneToMany(mappedBy = "city", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "city", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private Set<Event> events = new HashSet<Event>();
 
     public int getId() {
diff --git a/src/main/java/com/health/model/District.java b/src/main/java/com/health/model/District.java
index c244cdba..a9a03bbb 100644
--- a/src/main/java/com/health/model/District.java
+++ b/src/main/java/com/health/model/District.java
@@ -50,10 +50,10 @@ public class District implements Comparable<District>, Serializable {
     @JoinColumn(name = "state_id")
     private State state;
 
-    @OneToMany(mappedBy = "district", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "district", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     Set<City> cities = new HashSet<City>();
 
-    @OneToMany(mappedBy = "district", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "district", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     Set<Event> events = new HashSet<Event>();
 
     @OneToMany(mappedBy = "district", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/src/main/java/com/health/model/State.java b/src/main/java/com/health/model/State.java
index 4417be5d..83eedac2 100644
--- a/src/main/java/com/health/model/State.java
+++ b/src/main/java/com/health/model/State.java
@@ -41,10 +41,10 @@ public class State implements Comparable<State>, Serializable {
      */
     private Timestamp dateAdded;
 
-    @OneToMany(mappedBy = "state", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    private Set<District> Districts = new HashSet<District>();
+    @OneToMany(mappedBy = "state", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private Set<District> districts = new HashSet<District>();
 
-    @OneToMany(mappedBy = "state", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "state", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private Set<Event> events = new HashSet<Event>();
 
     @OneToMany(mappedBy = "state", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@@ -83,11 +83,11 @@ public void setDateAdded(Timestamp dateAdded) {
     }
 
     public Set<District> getDistricts() {
-        return Districts;
+        return districts;
     }
 
     public void setDistricts(Set<District> districts) {
-        Districts = districts;
+        this.districts = districts;
     }
 
     @Override
diff --git a/src/main/java/com/health/repository/DistrictRepository.java b/src/main/java/com/health/repository/DistrictRepository.java
index 554e0139..509e11c6 100644
--- a/src/main/java/com/health/repository/DistrictRepository.java
+++ b/src/main/java/com/health/repository/DistrictRepository.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 import com.health.model.District;
@@ -40,8 +41,13 @@ public interface DistrictRepository extends CrudRepository<District, Integer> {
      * @param state state object
      * @return list of District object
      */
-    List<District> findAllBystate(State state);
+    List<District> findAllByState(State state);
 
     Optional<District> findByDistrictNameIgnoreCase(String districtName);
 
+    @Query("SELECT d FROM District d ORDER BY d.districtName")
+    List<District> findAllOrderByName();
+
+    List<District> findAllByStateOrderByDistrictNameAsc(State state);
+
 }
diff --git a/src/main/java/com/health/repository/StateRepository.java b/src/main/java/com/health/repository/StateRepository.java
index 8cc3d62a..3daef706 100644
--- a/src/main/java/com/health/repository/StateRepository.java
+++ b/src/main/java/com/health/repository/StateRepository.java
@@ -1,5 +1,8 @@
 package com.health.repository;
 
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 import com.health.model.State;
@@ -22,4 +25,7 @@ public interface StateRepository extends CrudRepository<State, Integer> {
      */
     State findBystateName(String name);
 
+    @Query("SELECT s FROM State s ORDER BY s.stateName")
+    List<State> findAllOrderByName();
+
 }
diff --git a/src/main/java/com/health/service/impl/DistrictServiceImpl.java b/src/main/java/com/health/service/impl/DistrictServiceImpl.java
index 5a7777fd..0195b302 100644
--- a/src/main/java/com/health/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/com/health/service/impl/DistrictServiceImpl.java
@@ -1,6 +1,5 @@
 package com.health.service.impl;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -60,10 +59,8 @@ public District findById(int id) {
      */
     @Override
     public List<District> findAll() {
-        // TODO Auto-generated method stub
-        List<District> local = (List<District>) distRepo.findAll();
-        Collections.sort(local);
-        return local;
+
+        return distRepo.findAllOrderByName();
     }
 
     /**
@@ -71,10 +68,8 @@ public List<District> findAll() {
      */
     @Override
     public List<District> findAllByState(State state) {
-        // TODO Auto-generated method stub
-        List<District> local = distRepo.findAllBystate(state);
-        Collections.sort(local);
-        return local;
+
+        return distRepo.findAllByStateOrderByDistrictNameAsc(state);
     }
 
     @Override
diff --git a/src/main/java/com/health/service/impl/StateServiceImpl.java b/src/main/java/com/health/service/impl/StateServiceImpl.java
index ad6523cd..fed25c24 100644
--- a/src/main/java/com/health/service/impl/StateServiceImpl.java
+++ b/src/main/java/com/health/service/impl/StateServiceImpl.java
@@ -1,6 +1,5 @@
 package com.health.service.impl;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -60,10 +59,9 @@ public State findById(int id) {
      */
     @Override
     public List<State> findAll() {
-        // TODO Auto-generated method stub
-        List<State> local = (List<State>) stateRepo.findAll();
-        Collections.sort(local);
-        return local;
+
+        return stateRepo.findAllOrderByName();
+
     }
 
     /**
diff --git a/src/main/resources/static/js/ajaxSupport.js b/src/main/resources/static/js/ajaxSupport.js
index 6679e6e0..cc79d734 100644
--- a/src/main/resources/static/js/ajaxSupport.js
+++ b/src/main/resources/static/js/ajaxSupport.js
@@ -3356,6 +3356,54 @@ $(document).ready(function () {
 
 
 /******************************** Training Resource End ****************************************/
+
+
+/******************************** Project Report Start *****************************/
+
+ $("#stateIdPR").change(function() {
+
+						var stateId = $(this).find(":selected").val();
+						var allDisId = $("#allDistrict").val();
+						
+
+						$.ajax({
+							type : "GET",
+							url : projectPath+"loadDistrictByStateforPR",
+							data : {
+								"stateId" : stateId,
+								"allDisId" : allDisId,
+								
+								
+							},
+							contentType : "application/json",
+							success : function(result) {
+
+								var html = '';
+								html += '<option value="0">Select District</option>';
+								var len = result.length;
+	  	  			            $.each(result , function( key, value ) {
+		  	  			        html += '<option value=' + value + '>'
+		  			               + key
+		  			               + '</option>';
+		  	  			        })
+	  	  			            
+								$(".district-select-pr").prop('disabled',false);
+								$('.district-select-pr').html(html);
+
+							},
+
+							error : function(err) {
+								console.log("not working. ERROR: "+ JSON.stringify(err));
+
+							}
+
+						});
+
+					});
+
+
+
+/******************************** Project Report End *******************************/
 			
 			
 /***************** changes made by om prakash *********************************************/
diff --git a/src/main/resources/templates/addProjectReport.html b/src/main/resources/templates/addProjectReport.html
index 314fb9c3..8fbfd476 100644
--- a/src/main/resources/templates/addProjectReport.html
+++ b/src/main/resources/templates/addProjectReport.html
@@ -48,7 +48,7 @@
 						aria-selected="true">Add</a></li>
 					<li class="nav-item"><a th:if="${viewSection !=false}" class="nav-link" id="profile-tab"
 						data-toggle="tab" href="#view" role="tab" aria-controls="profile"
-						aria-selected="false">Training Report View</a></li>
+						aria-selected="false">Project Report View</a></li>
 						
 				
    
@@ -73,7 +73,7 @@ <h4>Add Project Report </h4>
 											</div>
 											
 											    <div class="form-group">
-													<label for="catIdTR"><b>Select State *</b></label> <select id="stateIdPR"
+													<label for="stateIdPR"><b>Select State *</b></label> <select id="stateIdPR"
 														class="form-control package_input" name="stateIdPR" required="required">
 
 															<option value='0'>Select State</option>
@@ -86,23 +86,14 @@ <h4>Add Project Report </h4>
 											</div>
 											 
 											  
-											  <!--div class="form-group">
-													<label for="topicIdTR"><b>Select Topic *</b></label> <select id="topicIdTR"
-														class="form-control package_input" name="topicIdTR" required="required">
-
-															<option value='0'>Select Topic</option>
-														
-								
-													</select>
-
-											</div-->
+											 
 							
 							
 
 										 <input type="hidden" id="allDistrict" name="allDistrict"  th:value="${allDisId}"/>	
-										 <input type="hidden" id="lengthofDistrict" name="lengthofDistrict"  th:value="${districts.size()}"/>	
+										 	
 										
-									<div th:each="dis,iter: ${districts}" th:id="${'fileInputDiv' + iter.index}" th:style="${'display: ' + (iter.first ? 'block' : 'none')}" >
+									<div th:each="dis,iter: ${#numbers.sequence(0,9)}" th:id="${'fileInputDiv' + iter.index}" th:style="${'display: ' + (iter.first ? 'block' : 'none')}" >
 									
 									<div class="container">
 										
@@ -111,9 +102,9 @@ <h4>Add Project Report </h4>
 								              
 								               <div class="form-group">
 		               	                 		<label th:if="${iter.index == 0}" th:for="${'districtIdPR' + iter.index}">Select District </label>
-												<select th:id="${'districtIdPR' + iter.index}" class="form-control district-select" name="districtIdPR" th:data-index="${iter.index}">
+												<select th:id="${'districtIdPR' + iter.index}" class="form-control district-select-pr" name="districtIdPR" th:data-index="${iter.index}">
 			  									<option value="0">Select District</option>
-			  									<option th:each="disitr : ${districts}" th:value="${disitr.getId()}" th:text="${disitr.getDistrictName()}"></option>
+			  									
 												</select>
 		  									</div>
 								            
diff --git a/src/main/resources/templates/common/sidebar.html b/src/main/resources/templates/common/sidebar.html
index c3afe394..8c562d4d 100644
--- a/src/main/resources/templates/common/sidebar.html
+++ b/src/main/resources/templates/common/sidebar.html
@@ -312,6 +312,14 @@
             </a>
           </li>
           
+          <li class="nav-item border-lt nav-add_project_report">
+            <a class="nav-link" th:href="@{/addProjectReport}">
+              <span data-feather="bar-chart-2"></span>
+             Add Project Report
+
+            </a>
+          </li>
+          
           <li class="nav-item ">
             <span class="nav-link" >
               <i class="far fa-newspaper sidebar-icon"></i>
@@ -535,6 +543,13 @@
             </a>
           </li>
           
+           <li class="nav-item border-lt nav-add_project_report">
+            <a class="nav-link" th:href="@{/addProjectReport}">
+              <span data-feather="bar-chart-2"></span>
+             Add Project Report
+
+            </a>
+          </li>
           
         </ul>
          <ul class="nav flex-column" sec:authorize="hasAnyAuthority('DOMAIN_REVIEWER')">

From 39e057ba4550c698f811018cd58fc7a63f9087db Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Thu, 26 Feb 2026 10:43:23 +0530
Subject: [PATCH 14/21] enable and disable project Report

---
 .../com/health/controller/AjaxController.java | 30 ++++++++
 src/main/resources/static/js/ajaxSupport.js   | 71 +++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/src/main/java/com/health/controller/AjaxController.java b/src/main/java/com/health/controller/AjaxController.java
index dffdefb6..752b1504 100644
--- a/src/main/java/com/health/controller/AjaxController.java
+++ b/src/main/java/com/health/controller/AjaxController.java
@@ -74,6 +74,7 @@
 import com.health.model.PackageContainer;
 import com.health.model.PackageLanguage;
 import com.health.model.PathofPromoVideo;
+import com.health.model.ProjectReport;
 import com.health.model.PromoVideo;
 import com.health.model.ResearchPaper;
 import com.health.model.State;
@@ -112,6 +113,7 @@
 import com.health.service.PackageContainerService;
 import com.health.service.PackageLanguageService;
 import com.health.service.PathofPromoVideoService;
+import com.health.service.ProjectReportService;
 import com.health.service.PromoVideoService;
 import com.health.service.ResearchPaperService;
 import com.health.service.RoleService;
@@ -295,6 +297,9 @@ public class AjaxController {
     @Autowired
     private EventService eventService;
 
+    @Autowired
+    private ProjectReportService projectReportService;
+
     @Value("${downloadLimit}")
     private int downloadLimit;
 
@@ -2366,6 +2371,31 @@ public ResponseEntity<Resource> viewOrSharePdfOrImage(@PathVariable String topic
         return districtMaps;
     }
 
+    @GetMapping("/enableDisableProjectReport")
+    public @ResponseBody boolean enableDisableProjectReport(int projectReportId) {
+        ProjectReport pr = projectReportService.findByProjectReportId(projectReportId);
+
+        try {
+            if (pr.isStatus()) {
+                pr.setStatus(false);
+                projectReportService.save(pr);
+                return true;
+
+            } else {
+                pr.setStatus(true);
+                projectReportService.save(pr);
+                return true;
+
+            }
+
+        } catch (Exception e) {
+
+            logger.error("Error in Enable Disbale Project Report: {}", pr, e);
+            return false;
+        }
+
+    }
+
     /********************************** Projet Report End *************************/
 
     @RequestMapping("/loadTopicByCategoryInAssignContri")
diff --git a/src/main/resources/static/js/ajaxSupport.js b/src/main/resources/static/js/ajaxSupport.js
index cc79d734..84cd5db7 100644
--- a/src/main/resources/static/js/ajaxSupport.js
+++ b/src/main/resources/static/js/ajaxSupport.js
@@ -3401,7 +3401,78 @@ $(document).ready(function () {
 
 					});
 
+$('.enableProjetcReport').click(function() {
+				
+				var test_id=$(this).attr('value');
+				
+				
+				$('#Success').css({"display": "none"});
+				$('#Failure').css({"display": "none"});
+			
+				$.ajax({
+					type : "GET",
+					url : projectPath+"enableDisableProjectReport",
+					data : {
+						"projectReportId" : test_id
+					},
+					contentType : "application/json",
+					success : function(data) {
+						if(data){
+			   				$('#'+test_id).addClass('fas fa-times-circle');
+			   				$('#'+test_id).removeClass('fas fa-check-circle');
+			   				$('#'+test_id).css({"color": "red"});
+			   				$('#Success').css({"display": "block"});
+			   	
+			   			}else{
+			   				$('#Failure').css({"display": "block"});
+			   			}
+					},
+
+					error : function(err) {
+						console.log("not working. ERROR: "+ JSON.stringify(err));
+					}
+
+				});
 
+			});
+			
+			
+			$('.disableProjetcReport').click(function() {
+				
+				var test_id=$(this).attr('value');
+				
+				$('#Success').css({"display": "none"});
+				$('#Failure').css({"display": "none"});
+			
+				$.ajax({
+					type : "GET",
+					url : projectPath+"enableDisableProjectReport",
+					data : {
+						"projectReportId" : test_id
+					},
+					contentType : "application/json",
+					success : function(data) {
+						if(data){
+			   				
+			   				$('#'+test_id).addClass('fas fa-check-circle');
+			   				$('#'+test_id).removeClass('fas fa-times-circle');
+			   				$('#'+test_id).css({"color": "green"});
+			   				$('#Success').css({"display": "block"});
+			   				
+			   	
+			   			}else{
+			   				$('#Failure').css({"display": "block"});
+			   			}
+					},
+
+					error : function(err) {
+						console.log("not working. ERROR: "+ JSON.stringify(err));
+					}
+
+				});
+
+			});
+			
 
 /******************************** Project Report End *******************************/
 			

From ddee06999d2e13b32fdc49c645c396c15fc1b5d9 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Mon, 9 Mar 2026 12:41:37 +0530
Subject: [PATCH 15/21] resloved merge conflict

---
 .../com/health/config/SecurityConfig.java     | 65 +++++++++----------
 .../resources/templates/common/sidebar.html   | 13 ++--
 2 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/health/config/SecurityConfig.java b/src/main/java/com/health/config/SecurityConfig.java
index c724d703..766adc62 100644
--- a/src/main/java/com/health/config/SecurityConfig.java
+++ b/src/main/java/com/health/config/SecurityConfig.java
@@ -46,20 +46,21 @@ public static BCryptPasswordEncoder passwordEncoder() {
             "/tutorial_view/**", "/getConsultantDetails/**", "/reset/**", "/resetPassword/**", "/getCatAndLan/**",
             "/getTopicOnCatAndLan/**", "/getRolesOnCatLanUser/**", "/getTutorial/**", "/statistics", "/statistics/**",
             "/tutCountOnCat/**", "/tutCountOnLan/**", "/cdContentInfo/**", "/getContributorByTutLanUser/**",
-            "/showConsultant/**", "/showLanguages/**", "/unpublishTutorial/**", "/loadTopicByCategory/**",
-            "/loadLanguageByCategoryTopic/**", "/loadTopicAndLanguageByCategory/**",
-            "/loadCategoryAndLanguageByTopic/**", "/loadCategoryAndTopicByLanguage/**", "/tutorialsSearch/**",
-            "/tutorialsSearch1/**", "/checkTutorial/**", "/Slide/**", "/TimeScript/**", "/OriginalScript/**",
-            "/Brochure-English/**", "/Brochure/**", "/ResearchPaper/**", "/downloads",
-            "/loadLanguageByCategoryResource", "/autosuggest/**", "/loadLanguageAndTopicByCategoryResource",
-            "/loadTutorialCountByTopicAndLanguage", "/loadTutorialCountByTopics", "/downloadResources", "/citations",
-            "/api/scriptPublished/**", "/loadLanguageByPackage/**", "/promoVideoView/**", "/trainingModules/**",
-            "/downloadTrainingModules", "/loadMessageByPackageAndLan/**", "/loadLanguageByWeek/**",
-            "/loadWeekByLanguage/**", "/trainingTutorials/**", "/hstTrainingModuleView/**", "/downloadManager/**",
-            "/downloadManagerforhst/**", "/downloadHealthTutorials/**", "/Training-Resource/**",
-            "/Training-Resources/**", "/loadLanAndFileTypeByTopic/**", "/loadTopicAndFileTypeByLan/**",
-            "/loadTopicAndLanByFileType/**", "/downloadTrainingResource/**", "/shared-Training-Resource/**",
-            "/shared-training-resource-file/**", "/check-deployment", "/training-resources/view-share/**" };
+
+            "/showConsultant/**", "/showLanguages/**", "/loadTopicByCategory/**", "/loadLanguageByCategoryTopic/**",
+            "/loadTopicAndLanguageByCategory/**", "/loadCategoryAndLanguageByTopic/**",
+            "/loadCategoryAndTopicByLanguage/**", "/tutorialsSearch/**", "/tutorialsSearch1/**", "/checkTutorial/**",
+            "/Slide/**", "/TimeScript/**", "/OriginalScript/**", "/Brochure-English/**", "/Brochure/**",
+            "/ResearchPaper/**", "/downloads", "/loadLanguageByCategoryResource", "/autosuggest/**",
+            "/loadLanguageAndTopicByCategoryResource", "/loadTutorialCountByTopicAndLanguage",
+            "/loadTutorialCountByTopics", "/downloadResources", "/citations", "/api/scriptPublished/**",
+            "/loadLanguageByPackage/**", "/promoVideoView/**", "/trainingModules/**", "/downloadTrainingModules",
+            "/loadMessageByPackageAndLan/**", "/loadLanguageByWeek/**", "/loadWeekByLanguage/**",
+            "/trainingTutorials/**", "/hstTrainingModuleView/**", "/downloadManager/**", "/downloadManagerforhst/**",
+            "/downloadHealthTutorials/**", "/Training-Resource/**", "/Training-Resources/**",
+            "/loadLanAndFileTypeByTopic/**", "/loadTopicAndFileTypeByLan/**", "/loadTopicAndLanByFileType/**",
+            "/downloadTrainingResource/**", "/shared-Training-Resource/**", "/shared-training-resource-file/**",
+            "/check-deployment", "/training-resources/view-share/**" };
 
     /**
      * url matcher for SUPERADMIN
@@ -67,17 +68,10 @@ public static BCryptPasswordEncoder passwordEncoder() {
     public static final String[] SUPERUSER_URL = { "/addCategory/**", "/updateCategory/**", "/category/edit/**",
             "/addOrganizationRole/**", "/organization_role/edit/**", "/update_organization_role/**", "/addLanguage/**",
             "/language/edit/**", "/updateLanguage/**", "/addRole/**", "/addTopic/**", "/topic/edit/**",
-            "/updateTopic/**", "/uploadQuestion/**", "/question/edit/**", "/updateQuestion/**", "/addBrochure/**",
-            "/addCarousel/**", "/approveRole/**", "/assignTutorialToContributor/**", "/assignContributor/edit/**",
-            "/enableRoleById/**", "/deleteMasterRole/**", "/viewTrainee/**", "/details/**", "/tutorialStatus/**",
-            "/users/**", "/unpublishTopic/**", "/clearAllCaches/**", "/addConsultant/**",
-            "/enableDisableCourseCatTopic", "/delete-category-topic-from-course", "/createCourse",
-            "/courseName/edit/**", "/updateCourseName",
-
-            "/addProjectReport", "/projectReportAdminView/**", "/projectReport/edit/**", "/enableDisableProjectReport",
-            "/delete-projectReport",
-
-//			"/unpublishTutorial/**"
+            "/updateTopic/**", "/uploadQuestion/**", "/question/edit/**", "/updateQuestion/**", "/approveRole/**",
+            "/assignTutorialToContributor/**", "/assignContributor/edit/**", "/enableRoleById/**",
+            "/deleteMasterRole/**", "/viewTrainee/**", "/details/**", "/tutorialStatus/**", "/users/**",
+            "/unpublishTopic/**", "/clearAllCaches/**",
 
     };
 
@@ -98,15 +92,6 @@ public static BCryptPasswordEncoder passwordEncoder() {
     public static final String[] CONTRIBUTOR_URL = { "/uploadTutorial/**", "/addOutline/**", "/addKeyword**",
             "/addPreRequisticWhenNotRequired/**", "/addPreRequistic/**", "/addVideo/**", "/addSlide/**",
             "/addScript/**", "/listTutorialForContributorReview/**", "/Contributor/review/**", "/uploadTimescript/**",
-            "/addLiveTutorial", "/updateLiveTutorial", "/addSpokenVideo", "/spokenVideo/edit/**", "/addVideoResource",
-            "/createPackage", "/packageName/edit/**", "/updatePackageName", "/weekTitleVideo/editTitle/**",
-
-            "/updateTitle", "/weekTitleVideo/editWeek/**", "/updateWeek", "/enableDisableCourseCatTopic",
-            "/delete-category-topic-from-course", "/createCourse", "/courseName/edit/**", "/updateCourseName",
-            "/addTrainingResource", "/trainingReource/view/**", "/trainingReourceAdminView/**",
-            "/trainingReource/edit/**", "/enableDisableTrainingResource", "/delete-trainingResource",
-            "/addProjectReport", "/projectReportAdminView/**", "/projectReport/edit/**", "/enableDisableProjectReport",
-            "/delete-projectReport",
 
     };
 
@@ -171,7 +156,17 @@ protected void configure(HttpSecurity http) throws Exception {
                         "/enableDisableBrouchure/**", "/enableDisableConsultant/**", "/enableDisableTestimonial/**",
                         "/addCitation/**", "/citation/edit/**", "/enableDisableCourseCatTopic",
                         "/delete-category-topic-from-course", "/createCourse", "/courseName/edit/**",
-                        "/updateCourseName", "/addTrainingResource")
+                        "/enableDisablePromoVideo", "/enableDisablePacakgeLanguage", "/enableDisableResearchPaper",
+                        "/enableDisableEvent", "/enableDisableCarousel", "/updateCourseName", "/addTrainingResource",
+                        "/updateCitation", "/updateConsultant", "/updateSpokenVideo", "/updateTrainingResource",
+                        "/updateEvent", "/updatePromoVideo", "/updateBrochure", "/updateResearchPaper",
+                        "/updateCarousel", "/updateTestimonial", "/addLiveTutorial", "/updateLiveTutorial",
+                        "/addSpokenVideo", "/spokenVideo/edit/**", "/addVideoResource", "/trainingReource/view/**",
+                        "/trainingReourceAdminView/**", "/trainingReource/edit/**", "/enableDisableTrainingResource",
+                        "/delete-trainingResource", "/addProjectReport", "/projectReportAdminView/**",
+                        "/projectReport/edit/**", "/enableDisableProjectReport", "/delete-projectReport"
+
+                )
 
                 .hasAnyAuthority("SUPER_USER", "CONTRIBUTOR").antMatchers(PUBLIC_MATCHERS).permitAll().anyRequest()
                 .authenticated().and().exceptionHandling().accessDeniedPage("/access-denied");
diff --git a/src/main/resources/templates/common/sidebar.html b/src/main/resources/templates/common/sidebar.html
index 8c562d4d..91269d4a 100644
--- a/src/main/resources/templates/common/sidebar.html
+++ b/src/main/resources/templates/common/sidebar.html
@@ -448,12 +448,13 @@
             </a>
           </li>
           
-           <li class="nav-item border-lt nav-live_tutorial">
+           <!--li class="nav-item border-lt nav-live_tutorial">
             <a class="nav-link" th:href="@{/addLiveTutorial}">
               <span data-feather="bar-chart-2"></span>
               Live Tutorial
             </a>
-          </li>
+          </li-->
+          
            <li class="nav-item border-lt nav-brochure">
             <a class="nav-link" th:href="@{/addBrochure}">
               <span data-feather="bar-chart-2"></span>
@@ -506,12 +507,12 @@
             </a>
           </li>
           
-           <li class="nav-item border-lt nav-spokenVideo">
+           <!--li class="nav-item border-lt nav-spokenVideo">
             <a class="nav-link" th:href="@{/addSpokenVideo}">
               <span data-feather="bar-chart-2"></span>
               Spoken Video
             </a>
-          </li>
+          </li-->
           
            <li class="nav-item border-lt nav-video_resource">
             <a class="nav-link" th:href="@{/addVideoResource}">
@@ -631,12 +632,12 @@
             </a>
           </li>
           
-           <li class="nav-item border-lt nav-spokenVideo">
+           <!--li class="nav-item border-lt nav-spokenVideo">
             <a class="nav-link" th:href="@{/addSpokenVideo}">
               <span data-feather="bar-chart-2"></span>
               Spoken Video
             </a>
-          </li>
+          </li-->
           
            <li class="nav-item border-lt nav-video_resource">
             <a class="nav-link" th:href="@{/addVideoResource}">

From 1db23ea393e81bacf32f60c183260460a384aa6c Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Fri, 27 Feb 2026 10:29:42 +0530
Subject: [PATCH 16/21] delete Project Report Ajax and urls

---
 .../com/health/config/SecurityConfig.java     | 28 ++++++-----
 .../com/health/controller/AjaxController.java | 48 +++++++++++++++++++
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/health/config/SecurityConfig.java b/src/main/java/com/health/config/SecurityConfig.java
index 766adc62..7322c8d4 100644
--- a/src/main/java/com/health/config/SecurityConfig.java
+++ b/src/main/java/com/health/config/SecurityConfig.java
@@ -150,21 +150,23 @@ protected void configure(HttpSecurity http) throws Exception {
                 .antMatchers("/addBrochure/**", "/addCarousel/**", "/addConsultant/**", "/addEvent/**",
                         "/addTestimonial/**", "/addPromoVideo/**", "/addResearchPaper/**", "/brochure/edit/**",
                         "/promoVideo/edit/**", "/carousel/edit/**", "/event/edit/**", "/testimonial/edit/**",
-                        "/createPackage", "/packageName/edit/**", "/updatePackageName", "/weekTitleVideo/editTitle/**",
+                        "/createPackage/**", "/packageName/edit/**", "/updatePackageName/**",
+                        "/weekTitleVideo/editTitle/**",
 
-                        "/updateTitle", "/weekTitleVideo/editWeek/**", "/updateWeek", "/researchPaper/edit/**",
+                        "/updateTitle/**", "/weekTitleVideo/editWeek/**", "/updateWeek/**", "/researchPaper/edit/**",
                         "/enableDisableBrouchure/**", "/enableDisableConsultant/**", "/enableDisableTestimonial/**",
-                        "/addCitation/**", "/citation/edit/**", "/enableDisableCourseCatTopic",
-                        "/delete-category-topic-from-course", "/createCourse", "/courseName/edit/**",
-                        "/enableDisablePromoVideo", "/enableDisablePacakgeLanguage", "/enableDisableResearchPaper",
-                        "/enableDisableEvent", "/enableDisableCarousel", "/updateCourseName", "/addTrainingResource",
-                        "/updateCitation", "/updateConsultant", "/updateSpokenVideo", "/updateTrainingResource",
-                        "/updateEvent", "/updatePromoVideo", "/updateBrochure", "/updateResearchPaper",
-                        "/updateCarousel", "/updateTestimonial", "/addLiveTutorial", "/updateLiveTutorial",
-                        "/addSpokenVideo", "/spokenVideo/edit/**", "/addVideoResource", "/trainingReource/view/**",
-                        "/trainingReourceAdminView/**", "/trainingReource/edit/**", "/enableDisableTrainingResource",
-                        "/delete-trainingResource", "/addProjectReport", "/projectReportAdminView/**",
-                        "/projectReport/edit/**", "/enableDisableProjectReport", "/delete-projectReport"
+                        "/addCitation/**", "/citation/edit/**", "/enableDisableCourseCatTopic/**",
+                        "/delete-category-topic-from-course/**", "/createCourse/**", "/courseName/edit/**",
+                        "/enableDisablePromoVideo/**", "/enableDisablePacakgeLanguage/**",
+                        "/enableDisableResearchPaper/**", "/enableDisableEvent/**", "/enableDisableCarousel/**",
+                        "/updateCourseName/**", "/addTrainingResource/**", "/updateCitation/**", "/updateConsultant/**",
+                        "/updateSpokenVideo/**", "/updateTrainingResource/**", "/updateEvent/**",
+                        "/updatePromoVideo/**", "/updateBrochure/**", "/updateResearchPaper/**", "/updateCarousel/**",
+                        "/updateTestimonial/**", "/addLiveTutorial/**", "/updateLiveTutorial/**", "/addSpokenVideo/**",
+                        "/spokenVideo/edit/**", "/addVideoResource/**", "/trainingReource/view/**",
+                        "/trainingReourceAdminView/**", "/trainingReource/edit/**", "/enableDisableTrainingResource/**",
+                        "/delete-trainingResource/**", "/addProjectReport/**", "/projectReportAdminView/**",
+                        "/projectReport/edit/**", "/enableDisableProjectReport/**", "/delete-projectReport/**"
 
                 )
 
diff --git a/src/main/java/com/health/controller/AjaxController.java b/src/main/java/com/health/controller/AjaxController.java
index 752b1504..6ea4db11 100644
--- a/src/main/java/com/health/controller/AjaxController.java
+++ b/src/main/java/com/health/controller/AjaxController.java
@@ -2396,6 +2396,54 @@ public ResponseEntity<Resource> viewOrSharePdfOrImage(@PathVariable String topic
 
     }
 
+    @RequestMapping("/delete-projectReport")
+    public ResponseEntity<String> deleteProjectReport(@RequestParam("projectReportId") int projectReportId,
+            @RequestParam("fileType") String fileType) {
+
+        try {
+            ProjectReport pr = projectReportService.findByProjectReportId(projectReportId);
+            String filePath = "";
+            if (pr != null) {
+                switch (fileType.toLowerCase()) {
+                case "image":
+                    filePath = pr.getImgPath();
+                    pr.setImgPath("");
+                    break;
+                case "pdf":
+                    filePath = pr.getPdfPath();
+                    pr.setPdfPath("");
+                    break;
+                case "doc":
+                    filePath = pr.getDocPath();
+                    pr.setDocPath("");
+                    break;
+                case "excel":
+                    filePath = pr.getExcelPath();
+                    pr.setExcelPath("");
+                    break;
+                default:
+                    return ResponseEntity.badRequest().body("Unsupported file type: " + fileType);
+                }
+
+                if (!filePath.isEmpty() && filePath.endsWith(".zip")) {
+                    String extractDir = filePath.replace(".zip", "");
+
+                    Path extractDirPath = Paths.get(env.getProperty("spring.applicationexternalPath.name"), extractDir);
+                    FileUtils.deleteDirectory(extractDirPath.toFile());
+                }
+
+                projectReportService.save(pr);
+                return ResponseEntity.ok("Deleted successfully");
+            } else {
+                return ResponseEntity.status(HttpStatus.SC_NOT_FOUND).body("Project Report not found");
+            }
+
+        } catch (Exception e) {
+            logger.error("Error in deleting project report", e);
+            return ResponseEntity.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).body("Error in deleting!");
+        }
+    }
+
     /********************************** Projet Report End *************************/
 
     @RequestMapping("/loadTopicByCategoryInAssignContri")

From dc96cd97c0eb5caf9391b0bb0f4af4b5f1ece2c6 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Fri, 27 Feb 2026 13:18:01 +0530
Subject: [PATCH 17/21] project report deletion , statedir and  distrct dir

---
 .../com/health/controller/HomeController.java |  7 ++-
 src/main/resources/static/js/ajaxSupport.js   | 49 +++++++++++++++++++
 .../resources/templates/common/sidebar.html   |  8 +--
 3 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index fc6bca7e..fa047873 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -6718,6 +6718,7 @@ public String addProjectReportPost(HttpServletRequest req, Model model, Principa
 
         State state = stateService.findById(stateId);
         String stateName = state.getStateName();
+        String state_dir = stateName.replace(" ", "_");
 
         Timestamp dateAdded = ServiceUtility.getCurrentTime();
 
@@ -6782,8 +6783,10 @@ public String addProjectReportPost(HttpServletRequest req, Model model, Principa
                         projectReportService.save(pr); // Saved first to get exact Id
                         int prId = pr.getProjectReportId();
 
-                        Path rootPath = Paths.get(CommonData.uploadProjectReport, String.valueOf(prId), stateName,
-                                districtName);
+                        String district_dir = districtName.replace(" ", "_");
+
+                        Path rootPath = Paths.get(CommonData.uploadProjectReport, String.valueOf(prId), state_dir,
+                                district_dir);
 
                         String pdfFolder = Paths.get(rootPath.toString(), "pdf").toString();
                         String docFolder = Paths.get(rootPath.toString(), "docx_or_odt").toString();
diff --git a/src/main/resources/static/js/ajaxSupport.js b/src/main/resources/static/js/ajaxSupport.js
index 84cd5db7..16e9cf51 100644
--- a/src/main/resources/static/js/ajaxSupport.js
+++ b/src/main/resources/static/js/ajaxSupport.js
@@ -3473,6 +3473,55 @@ $('.enableProjetcReport').click(function() {
 
 			});
 			
+			
+			
+	$(".deleteProjectReport-btn").click(function(){
+    var row = $(this).closest("tr");
+    var projectReportId = $(this).data("projectreportid"); 
+    var stateName = $(this).data("statename");
+    var districtName = $(this).data("districtname");
+    var fileName = $(this).data("filename");
+    var fileType = $(this).data("filetype");
+    
+
+    Swal.fire({
+        title: "Are you sure?",
+        html: "<b>Do you want to delete this Project Report?</b><br><br>" +
+              "<b>State:</b> " + stateName + "<br>" +
+              "<b>District:</b> " + districtName + "<br>" +
+              "<b>file Type:</b> " + fileType + "<br>" +
+              "<b>file Name:</b> " + fileName,
+             
+        icon: "warning",
+        showCancelButton: true,
+        confirmButtonText: "Yes",
+        cancelButtonText: "No",
+        dangerMode: true
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.ajax({
+                url: "/delete-projectReport/",
+                data: {
+                   
+                   
+                    "projectReportId": projectReportId,
+                    "fileType": fileType
+                },
+                type: "DELETE",
+                success: function(result) {
+                    Swal.fire("Deleted!", "Deleted successfully!", "success");
+                   $("#" + fileType + projectReportId).text("Deleted");
+                },
+                error: function(err) {
+                    Swal.fire("Error!", "Error in deleting!", "error");
+                }
+            });
+        }
+    });
+});
+    
+
+			
 
 /******************************** Project Report End *******************************/
 			
diff --git a/src/main/resources/templates/common/sidebar.html b/src/main/resources/templates/common/sidebar.html
index 91269d4a..d97788a4 100644
--- a/src/main/resources/templates/common/sidebar.html
+++ b/src/main/resources/templates/common/sidebar.html
@@ -307,7 +307,7 @@
             <li class="nav-item border-lt nav-add_training_resource">
             <a class="nav-link" th:href="@{/addTrainingResource}">
               <span data-feather="bar-chart-2"></span>
-             Add Training Resource
+              Training Resource
 
             </a>
           </li>
@@ -315,7 +315,7 @@
           <li class="nav-item border-lt nav-add_project_report">
             <a class="nav-link" th:href="@{/addProjectReport}">
               <span data-feather="bar-chart-2"></span>
-             Add Project Report
+              Project Report
 
             </a>
           </li>
@@ -539,7 +539,7 @@
            <li class="nav-item border-lt nav-add_training_resource">
             <a class="nav-link" th:href="@{/addTrainingResource}">
               <span data-feather="bar-chart-2"></span>
-             Add Training Resource
+             Training Resource
 
             </a>
           </li>
@@ -547,7 +547,7 @@
            <li class="nav-item border-lt nav-add_project_report">
             <a class="nav-link" th:href="@{/addProjectReport}">
               <span data-feather="bar-chart-2"></span>
-             Add Project Report
+              Project Report
 
             </a>
           </li>

From 6ead9e2f9714bbf7d1fc6ce3cc54f4d27707c6e4 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:19:17 +0530
Subject: [PATCH 18/21] project report edit

---
 .../com/health/controller/HomeController.java | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index fa047873..329cf6e3 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -6973,6 +6973,73 @@ else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
         return addProjectReportGet(req, principal, model);
     }
 
+    @GetMapping("/projectReport/edit/{fileType}/{id}")
+    public String projectReportEditGet(@PathVariable String fileType, @PathVariable int id, HttpServletRequest req,
+            Model model, Principal principal) {
+
+        User usr = getUser(principal);
+        logger.info("{} {} {}", usr.getUsername(), req.getMethod(), req.getRequestURI());
+        model.addAttribute("userInfo", usr);
+
+        ProjectReport pr = projectReportService.findByProjectReportId(id);
+
+        if (pr == null) {
+
+            return "redirect:/addProjectReport";
+        }
+        State state = pr.getStateDistrictMapping().getState();
+        District district = pr.getStateDistrictMapping().getDistrict();
+        List<State> states = stateService.findAll();
+
+        List<ProjectReport> projectReportList = new ArrayList<>();
+        List<ProjectReport> tempProjectReportList = projectReportService.findAll();
+        for (ProjectReport temp : tempProjectReportList) {
+            if (ServiceUtility.hasAnyProjectReportFile(temp)) {
+                projectReportList.add(temp);
+            }
+        }
+        model.addAttribute("states", states);
+        model.addAttribute("projectReportList", projectReportList);
+        model.addAttribute("ProjectReport", pr);
+        model.addAttribute("state", state);
+        model.addAttribute("district", district);
+
+        model.addAttribute("id", id);
+        String filePath = "";
+
+        if (fileType.equals(CommonData.Doc_OR_ZIP_OF_DOCS)) {
+            filePath = pr.getDocPath();
+            model.addAttribute("fileType", "Doc");
+
+        }
+
+        else if (fileType.equals(CommonData.PDF_OR_ZIP_OF_PDFS)) {
+            filePath = pr.getPdfPath();
+            model.addAttribute("fileType", "Pdf");
+        }
+
+        else if (fileType.equals(CommonData.image_OR_ZIP_OF_IMAGES)) {
+            filePath = pr.getImgPath();
+            model.addAttribute("fileType", "Image");
+        }
+
+        else if (fileType.equals(CommonData.Excel_OR_ZIP_OF_EXCELS)) {
+            filePath = pr.getExcelPath();
+            model.addAttribute("fileType", "Excel");
+        }
+
+        if (filePath.toLowerCase().endsWith(".zip")) {
+            model.addAttribute("zipFile", filePath);
+        }
+
+        else {
+            model.addAttribute("nonZipFile", filePath);
+
+        }
+
+        return "updateProjectReport";
+    }
+
     /************************ Project Report End ********************************/
 
     @GetMapping("/trainingModules")

From a605103a24f1e6c7d55bc5a0734067a2e2697f0b Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Mon, 9 Mar 2026 12:58:22 +0530
Subject: [PATCH 19/21] token

---
 .../com/health/controller/HomeController.java | 16 +++++
 .../java/com/health/model/ProjectReport.java  | 61 +++++++++++++++++++
 .../repository/ProjectReportRepository.java   | 11 ++++
 .../health/service/ProjectReportService.java  | 11 ++++
 .../impl/ProjectReportServiceImpl.java        | 31 ++++++++++
 5 files changed, 130 insertions(+)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index 329cf6e3..2f84e262 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -6661,6 +6661,22 @@ public String viewAndDownloadTrainingResource(HttpServletRequest req,
 
     /************************ Project Report Start ******************************/
 
+    private String generateUniqueTokenForProjectReport() {
+
+        final int MAX_ATTEMPTS = 10;
+
+        for (int attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
+
+            String token = ServiceUtility.generateToken();
+
+            if (!projectReportService.existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(token, token, token, token)) {
+                return token;
+            }
+        }
+
+        throw new IllegalStateException("Token not generated after " + MAX_ATTEMPTS + " attempts");
+    }
+
     @GetMapping("/addProjectReport")
     public String addProjectReportGet(HttpServletRequest req, Principal principal, Model model) {
         User usr = getUser(principal);
diff --git a/src/main/java/com/health/model/ProjectReport.java b/src/main/java/com/health/model/ProjectReport.java
index b0f527ac..07f0f5d5 100644
--- a/src/main/java/com/health/model/ProjectReport.java
+++ b/src/main/java/com/health/model/ProjectReport.java
@@ -43,6 +43,18 @@ public class ProjectReport implements Serializable {
     @Column(name = "img_path", length = 1000)
     private String imgPath;
 
+    @Column(unique = true, length = 1000)
+    private String pdfToken;
+
+    @Column(unique = true, length = 1000)
+    private String docToken;
+
+    @Column(unique = true, length = 1000)
+    private String imgToken;
+
+    @Column(unique = true, length = 1000)
+    private String excelToken;
+
     @ManyToOne
     @JoinColumn(name = "state_district_id")
     private StateDistrictMapping stateDistrictMapping;
@@ -55,6 +67,38 @@ public int getProjectReportId() {
         return projectReportId;
     }
 
+    public String getPdfToken() {
+        return pdfToken;
+    }
+
+    public void setPdfToken(String pdfToken) {
+        this.pdfToken = pdfToken;
+    }
+
+    public String getDocToken() {
+        return docToken;
+    }
+
+    public void setDocToken(String docToken) {
+        this.docToken = docToken;
+    }
+
+    public String getImgToken() {
+        return imgToken;
+    }
+
+    public void setImgToken(String imgToken) {
+        this.imgToken = imgToken;
+    }
+
+    public String getExcelToken() {
+        return excelToken;
+    }
+
+    public void setExcelToken(String excelToken) {
+        this.excelToken = excelToken;
+    }
+
     public void setProjectReportId(int projectReportId) {
         this.projectReportId = projectReportId;
     }
@@ -155,6 +199,23 @@ public void setDateAdded(Timestamp dateAdded) {
         this.dateAdded = dateAdded;
     }
 
+    public ProjectReport(Timestamp dateAdded, String pdfPath, String docPath, String excelPath, String imgPath,
+            String pdfToken, String docToken, String imgToken, String excelToken,
+            StateDistrictMapping stateDistrictMapping, User user) {
+        super();
+        this.dateAdded = dateAdded;
+        this.pdfPath = pdfPath;
+        this.docPath = docPath;
+        this.excelPath = excelPath;
+        this.imgPath = imgPath;
+        this.pdfToken = pdfToken;
+        this.docToken = docToken;
+        this.imgToken = imgToken;
+        this.excelToken = excelToken;
+        this.stateDistrictMapping = stateDistrictMapping;
+        this.user = user;
+    }
+
     public ProjectReport(Timestamp dateAdded, StateDistrictMapping stateDistrictMapping, String pdfPath, String docPath,
             String excelPath, String imgPath) {
 
diff --git a/src/main/java/com/health/repository/ProjectReportRepository.java b/src/main/java/com/health/repository/ProjectReportRepository.java
index 66da9462..bb13c8cd 100644
--- a/src/main/java/com/health/repository/ProjectReportRepository.java
+++ b/src/main/java/com/health/repository/ProjectReportRepository.java
@@ -18,4 +18,15 @@ public interface ProjectReportRepository extends JpaRepository<ProjectReport, In
 
     List<ProjectReport> findAllByStatusTrue();
 
+    ProjectReport findByPdfToken(String pdfToken);
+
+    ProjectReport findByDocToken(String docToken);
+
+    ProjectReport findByExcelToken(String excelToken);
+
+    ProjectReport findByImgToken(String docToken);
+
+    boolean existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(String pdfToken, String docToken, String excelToken,
+            String imgToken);
+
 }
diff --git a/src/main/java/com/health/service/ProjectReportService.java b/src/main/java/com/health/service/ProjectReportService.java
index ce4a5ef9..ca4acd87 100644
--- a/src/main/java/com/health/service/ProjectReportService.java
+++ b/src/main/java/com/health/service/ProjectReportService.java
@@ -22,4 +22,15 @@ public interface ProjectReportService {
 
     void saveAll(List<ProjectReport> projectReportList);
 
+    ProjectReport findByPdfToken(String pdfToken);
+
+    ProjectReport findByDocToken(String docToken);
+
+    ProjectReport findByExcelToken(String excelToken);
+
+    ProjectReport findByImgToken(String imgToken);
+
+    boolean existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(String pdfToken, String docToken, String excelToken,
+            String imgToken);
+
 }
diff --git a/src/main/java/com/health/service/impl/ProjectReportServiceImpl.java b/src/main/java/com/health/service/impl/ProjectReportServiceImpl.java
index 2a55c275..6ace7143 100644
--- a/src/main/java/com/health/service/impl/ProjectReportServiceImpl.java
+++ b/src/main/java/com/health/service/impl/ProjectReportServiceImpl.java
@@ -64,4 +64,35 @@ public void saveAll(List<ProjectReport> projectReportList) {
 
     }
 
+    @Override
+    public ProjectReport findByPdfToken(String pdfToken) {
+
+        return repo.findByPdfToken(pdfToken);
+    }
+
+    @Override
+    public ProjectReport findByDocToken(String docToken) {
+
+        return repo.findByDocToken(docToken);
+    }
+
+    @Override
+    public ProjectReport findByExcelToken(String excelToken) {
+
+        return repo.findByExcelToken(excelToken);
+    }
+
+    @Override
+    public ProjectReport findByImgToken(String imgToken) {
+
+        return repo.findByImgToken(imgToken);
+    }
+
+    @Override
+    public boolean existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(String pdfToken, String docToken, String excelToken,
+            String imgToken) {
+
+        return repo.existsByPdfTokenOrDocTokenOrExcelTokenOrImgToken(pdfToken, docToken, excelToken, imgToken);
+    }
+
 }

From de64ca4bb197812e2ae2d50d9e1cba2d856df04b Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Wed, 11 Mar 2026 13:08:54 +0530
Subject: [PATCH 20/21] update Project Report Post

---
 .../com/health/controller/HomeController.java | 366 ++++++++++++++++++
 1 file changed, 366 insertions(+)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index 2f84e262..751c606b 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -7056,6 +7056,372 @@ else if (fileType.equals(CommonData.Excel_OR_ZIP_OF_EXCELS)) {
         return "updateProjectReport";
     }
 
+    @PostMapping("/updateProjectReport")
+    public String updateProjectReportPost(HttpServletRequest req, Model model, Principal principal,
+            @RequestParam("file") MultipartFile file) {
+
+        User usr = getUser(principal);
+        logger.info("{} {} {}", usr.getUsername(), req.getMethod(), req.getRequestURI());
+
+        model.addAttribute("userInfo", usr);
+
+        String prId = req.getParameter("prId");
+        String stateId = req.getParameter("stateId");
+        String districtId = req.getParameter("districtId");
+        String fileType = req.getParameter("fileType");
+        int prIdInt = Integer.parseInt(prId);
+        int stateIdInt = Integer.parseInt(stateId);
+        int districtIdInt = Integer.parseInt(districtId);
+        int oldprId = prIdInt;
+
+        ProjectReport oldProjectReport = projectReportService.findByProjectReportId(prIdInt);
+        String originalFileType = "";
+        String oldPath = "";
+
+        boolean fileMatch = false;
+        String token = "";
+
+        if (oldProjectReport == null) {
+            model.addAttribute("error_msg", "Project Report doesn't exist");
+            return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+        }
+
+        if (fileType.equals("Doc")) {
+            originalFileType = CommonData.Doc_OR_ZIP_OF_DOCS;
+            if (oldProjectReport != null) {
+                oldPath = oldProjectReport.getDocPath();
+                token = oldProjectReport.getDocToken();
+            }
+        }
+
+        else if (fileType.equals("Pdf")) {
+            originalFileType = CommonData.PDF_OR_ZIP_OF_PDFS;
+            if (oldProjectReport != null) {
+                oldPath = oldProjectReport.getPdfPath();
+                token = oldProjectReport.getPdfToken();
+            }
+        }
+
+        else if (fileType.equals("Image")) {
+            originalFileType = CommonData.image_OR_ZIP_OF_IMAGES;
+            if (oldProjectReport != null) {
+                oldPath = oldProjectReport.getImgPath();
+                token = oldProjectReport.getImgToken();
+            }
+
+        } else if (fileType.equals("Excel")) {
+            originalFileType = CommonData.Excel_OR_ZIP_OF_EXCELS;
+            if (oldProjectReport != null) {
+                oldPath = oldProjectReport.getExcelPath();
+                token = oldProjectReport.getExcelToken();
+            }
+        }
+
+        State state = stateService.findById(stateIdInt);
+        District district = districtService.findById(districtIdInt);
+        if (state == null || district == null) {
+            model.addAttribute("error_msg", "state or distrct missing");
+            return projectReportEditGet(fileType, oldprId, req, model, principal);
+        }
+        String districtName = district.getDistrictName();
+        if (!CommonData.ALL_DISTRICTS.equalsIgnoreCase(districtName)) {
+            int tempStateId = district.getState().getId();
+            if (stateIdInt != tempStateId) {
+                model.addAttribute("error_msg", "District doesn't belong to selected state");
+                return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+            }
+        }
+
+        StateDistrictMapping stateDistrict = stateDistrictMappingService.findByStateAndDistrict(state, district);
+        Timestamp dateAdded = ServiceUtility.getCurrentTime();
+
+        if (oldPath == null || oldPath.isEmpty()) {
+            model.addAttribute("error_msg",
+                    "The data has already moved to another Project Report. Please check the View section to edit.");
+            return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+        }
+
+        ProjectReport newProjectReport;
+        boolean newProjectData = true;
+
+        if (stateDistrict != null) {
+            List<ProjectReport> prList = projectReportService.findByStateDistrictMapping(stateDistrict);
+
+            if (prList.isEmpty()) {
+                newProjectReport = new ProjectReport();
+                logger.info("new Project Report Data");
+
+            } else if (!prList.contains(oldProjectReport)) {
+                newProjectReport = prList.get(0);
+                logger.info("new Project Report Data from prList");
+            } else {
+                newProjectData = false;
+                newProjectReport = oldProjectReport;
+                logger.info("old Project Report data");
+            }
+        } else {
+
+            stateDistrict = new StateDistrictMapping(dateAdded, state, district);
+
+            stateDistrictMappingService.save(stateDistrict);
+            newProjectReport = new ProjectReport();
+
+        }
+
+        newProjectReport.setStateDistrictMapping(stateDistrict);
+        newProjectReport.setUser(usr);
+
+        // To get exact Id of new project Report Data
+        if (newProjectData) {
+            newProjectReport.setDateAdded(dateAdded);
+            projectReportService.save(newProjectReport);
+            prIdInt = newProjectReport.getProjectReportId();
+            token = generateUniqueTokenForProjectReport();
+
+        }
+
+        try {
+
+            String district_dir = districtName.replace(" ", "_");
+            String stateName = state.getStateName();
+            String state_dir = stateName.replace(" ", "_");
+
+            Path rootPath = Paths.get(CommonData.uploadProjectReport, String.valueOf(prId), state_dir, district_dir);
+
+            String pdfFolder = Paths.get(rootPath.toString(), "pdf", token).toString();
+            String docFolder = Paths.get(rootPath.toString(), "docx_or_odt", token).toString();
+            String excelFolder = Paths.get(rootPath.toString(), "excel_or_csv", token).toString();
+            String imageFolder = Paths.get(rootPath.toString(), "image", token).toString();
+            boolean fileFlag = false;
+
+            if (!file.isEmpty()) {
+                fileFlag = true;
+
+                Set<String> extentions = new HashSet<>();
+                String document = "";
+
+                String fileExtention = ServiceUtility.checkFileExtensions(file);
+
+                if (fileExtention.equals(CommonData.UNSUPPORTED_EXTENSION)) {
+                    model.addAttribute("error_msg", "Unsupported file");
+
+                    return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+                }
+
+                else if (fileExtention.equals(CommonData.PDF_EXTENSION)
+                        && originalFileType.equals(CommonData.PDF_OR_ZIP_OF_PDFS)) {
+                    document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
+                    newProjectReport.setPdfPath(document);
+                    newProjectReport.setPdfToken(token);
+                    if (newProjectData)
+                        oldProjectReport.setPdfPath("");
+                    fileMatch = true;
+                }
+
+                else if (fileExtention.equals(CommonData.DOC_EXTENSION)
+                        && originalFileType.equals(CommonData.Doc_OR_ZIP_OF_DOCS)) {
+                    document = ServiceUtility.uploadMediaFile(file, env, docFolder);
+                    newProjectReport.setDocPath(document);
+                    newProjectReport.setDocToken(token);
+                    if (newProjectData)
+                        oldProjectReport.setDocPath("");
+                    fileMatch = true;
+                }
+
+                else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)
+                        && originalFileType.equals(CommonData.Excel_OR_ZIP_OF_EXCELS)) {
+                    document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
+                    newProjectReport.setExcelPath(document);
+                    newProjectReport.setExcelToken(token);
+                    if (newProjectData)
+                        oldProjectReport.setExcelPath("");
+                    fileMatch = true;
+                }
+
+                else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)
+                        && originalFileType.equals(CommonData.image_OR_ZIP_OF_IMAGES)) {
+                    document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
+                    newProjectReport.setImgPath(document);
+                    newProjectReport.setImgToken(token);
+                    if (newProjectData)
+                        oldProjectReport.setImgPath("");
+                    fileMatch = true;
+                }
+
+                if (fileExtention.equals(CommonData.ZIP_EXTENSION)) {
+
+                    extentions = ServiceUtility.checkFileExtentionsInZip(file);
+                    if (extentions.size() == 1) {
+                        for (String ext : extentions) {
+                            if (ext.equals(CommonData.PDF_EXTENSION)
+                                    && originalFileType.equals(CommonData.PDF_OR_ZIP_OF_PDFS)) {
+                                document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
+                                newProjectReport.setPdfPath(document);
+                                newProjectReport.setPdfToken(token);
+                                if (newProjectData) {
+                                    oldProjectReport.setPdfPath("");
+                                }
+
+                                fileMatch = true;
+
+                            }
+
+                            else if (ext.equals(CommonData.DOC_EXTENSION)
+                                    && originalFileType.equals(CommonData.Doc_OR_ZIP_OF_DOCS)) {
+                                document = ServiceUtility.uploadMediaFile(file, env, docFolder);
+                                newProjectReport.setDocPath(document);
+                                newProjectReport.setDocToken(token);
+                                if (newProjectData) {
+                                    oldProjectReport.setDocPath("");
+                                }
+
+                                fileMatch = true;
+                            }
+
+                            else if (ext.equals(CommonData.EXCEL_EXTENSION)
+                                    && originalFileType.equals(CommonData.Excel_OR_ZIP_OF_EXCELS)) {
+                                document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
+                                newProjectReport.setExcelPath(document);
+                                newProjectReport.setExcelToken(token);
+                                if (newProjectData) {
+                                    oldProjectReport.setExcelPath("");
+                                }
+
+                                fileMatch = true;
+                            }
+
+                            else if (ext.equals(CommonData.IMAGE_EXTENSION)
+                                    && originalFileType.equals(CommonData.image_OR_ZIP_OF_IMAGES)) {
+                                document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
+                                newProjectReport.setImgPath(document);
+                                newProjectReport.setImgToken(token);
+                                if (newProjectData) {
+                                    oldProjectReport.setImgPath("");
+                                }
+
+                                fileMatch = true;
+
+                            }
+
+                            else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {
+
+                                model.addAttribute("error_msg", "Unsupported file Error ");
+
+                                return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+                            }
+
+                        }
+                    }
+
+                    else {
+                        model.addAttribute("error_msg", "Zip contains different types of files Error");
+
+                        return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+                    }
+
+                }
+
+                if (oldPath != null && oldPath.endsWith(".zip")) {
+
+                    String extractDir = oldPath.replace(".zip", "");
+
+                    Path extractDirPath = Paths.get(env.getProperty("spring.applicationexternalPath.name"), extractDir);
+                    FileUtils.deleteDirectory(extractDirPath.toFile());
+
+                }
+                if (newProjectData) {
+                    newProjectReport.setDateAdded(dateAdded);
+                }
+
+                newProjectReport.setStateDistrictMapping(stateDistrict);
+                newProjectReport.setUser(usr);
+
+                if (fileMatch) {
+                    if (newProjectData) {
+                        newProjectReport.setDateAdded(dateAdded);
+                    }
+                    newProjectReport.setStateDistrictMapping(stateDistrict);
+                    projectReportService.save(newProjectReport);
+                    if (newProjectData) {
+                        logger.info("1st old data save is called");
+                        oldProjectReport.setUser(usr);
+                        projectReportService.save(oldProjectReport);
+                    }
+                } else {
+                    model.addAttribute("error_msg", "Please upload a file of the same type. E.g., DOC for DOC type.");
+                    return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+                }
+            }
+
+            // File Empty
+            else {
+                if (newProjectData && !fileFlag && oldPath != null && !oldPath.isEmpty()) {
+
+                    Path sourcePath = Paths.get(env.getProperty("spring.applicationexternalPath.name"), oldPath);
+                    File sourceFile = sourcePath.toFile();
+                    String fileName = sourcePath.getFileName().toString();
+
+                    String document = "";
+
+                    if (sourceFile.exists()) {
+                        if (originalFileType.equals(CommonData.Doc_OR_ZIP_OF_DOCS)) {
+
+                            document = ServiceUtility.copyFileAndGetRelativePath(sourceFile, docFolder, fileName, env);
+
+                            newProjectReport.setDocPath(document);
+                            newProjectReport.setDocToken(token);
+                            oldProjectReport.setDocPath("");
+
+                        } else if (originalFileType.equals(CommonData.Excel_OR_ZIP_OF_EXCELS)) {
+
+                            document = ServiceUtility.copyFileAndGetRelativePath(sourceFile, excelFolder, fileName,
+                                    env);
+
+                            newProjectReport.setExcelPath(document);
+                            newProjectReport.setExcelToken(token);
+                            oldProjectReport.setExcelPath("");
+
+                        } else if (originalFileType.equals(CommonData.PDF_OR_ZIP_OF_PDFS)) {
+
+                            document = ServiceUtility.copyFileAndGetRelativePath(sourceFile, pdfFolder, fileName, env);
+
+                            newProjectReport.setPdfPath(document);
+                            newProjectReport.setPdfToken(token);
+                            oldProjectReport.setPdfPath("");
+
+                        } else if (originalFileType.equals(CommonData.image_OR_ZIP_OF_IMAGES)) {
+
+                            document = ServiceUtility.copyFileAndGetRelativePath(sourceFile, imageFolder, fileName,
+                                    env);
+                            newProjectReport.setImgPath(document);
+                            newProjectReport.setImgToken(token);
+                            oldProjectReport.setImgPath("");
+
+                        }
+
+                        newProjectReport.setDateAdded(dateAdded);
+                        newProjectReport.setUser(usr);
+
+                        projectReportService.save(newProjectReport);
+                        logger.info("2nd old data save is called");
+                        projectReportService.save(oldProjectReport);
+                    }
+
+                }
+            }
+
+        } catch (Exception e) {
+            logger.error("Exception while updating Project Report: {} {} {}", state, district, file, e);
+            model.addAttribute("error_msg", CommonData.RECORD_ERROR);
+
+            return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+        }
+
+        model.addAttribute("success_msg", CommonData.RECORD_UPDATE_SUCCESS_MSG);
+
+        return projectReportEditGet(originalFileType, oldprId, req, model, principal);
+    }
+
     /************************ Project Report End ********************************/
 
     @GetMapping("/trainingModules")

From 65922b40a041fe0fbe7a80791faa5a2ab5398eb0 Mon Sep 17 00:00:00 2001
From: Alok Kumar <59380269+AlokSP@users.noreply.github.com>
Date: Wed, 11 Mar 2026 13:27:15 +0530
Subject: [PATCH 21/21] token in add Project Report

---
 .../com/health/controller/HomeController.java  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/health/controller/HomeController.java b/src/main/java/com/health/controller/HomeController.java
index 751c606b..d4863f0b 100644
--- a/src/main/java/com/health/controller/HomeController.java
+++ b/src/main/java/com/health/controller/HomeController.java
@@ -6804,10 +6804,12 @@ public String addProjectReportPost(HttpServletRequest req, Model model, Principa
                         Path rootPath = Paths.get(CommonData.uploadProjectReport, String.valueOf(prId), state_dir,
                                 district_dir);
 
-                        String pdfFolder = Paths.get(rootPath.toString(), "pdf").toString();
-                        String docFolder = Paths.get(rootPath.toString(), "docx_or_odt").toString();
-                        String excelFolder = Paths.get(rootPath.toString(), "excel_or_csv").toString();
-                        String imageFolder = Paths.get(rootPath.toString(), "image").toString();
+                        String token = generateUniqueTokenForProjectReport();
+
+                        String pdfFolder = Paths.get(rootPath.toString(), "pdf", token).toString();
+                        String docFolder = Paths.get(rootPath.toString(), "docx_or_odt", token).toString();
+                        String excelFolder = Paths.get(rootPath.toString(), "excel_or_csv", token).toString();
+                        String imageFolder = Paths.get(rootPath.toString(), "image", token).toString();
 
                         Set<String> extentions = new HashSet<>();
                         String document = "";
@@ -6833,6 +6835,7 @@ else if (fileExtention.equals(CommonData.PDF_EXTENSION)) {
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
                             pr.setPdfPath(document);
+                            pr.setPdfToken(token);
                         }
 
                         else if (fileExtention.equals(CommonData.DOC_EXTENSION)) {
@@ -6845,6 +6848,7 @@ else if (fileExtention.equals(CommonData.DOC_EXTENSION)) {
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, docFolder);
                             pr.setDocPath(document);
+                            pr.setDocToken(token);
                         }
 
                         else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)) {
@@ -6857,6 +6861,7 @@ else if (fileExtention.equals(CommonData.EXCEL_EXTENSION)) {
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
                             pr.setExcelPath(document);
+                            pr.setExcelToken(token);
                         }
 
                         else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
@@ -6869,6 +6874,7 @@ else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
                             }
                             document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
                             pr.setImgPath(document);
+                            pr.setImgToken(token);
                         }
 
                         if (fileExtention.equals(CommonData.ZIP_EXTENSION)) {
@@ -6886,6 +6892,7 @@ else if (fileExtention.equals(CommonData.IMAGE_EXTENSION)) {
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, pdfFolder);
                                         pr.setPdfPath(document);
+                                        pr.setPdfToken(token);
                                     }
 
                                     else if (ext.equals(CommonData.DOC_EXTENSION)) {
@@ -6898,6 +6905,7 @@ else if (ext.equals(CommonData.DOC_EXTENSION)) {
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, docFolder);
                                         pr.setDocPath(document);
+                                        pr.setDocToken(token);
                                     }
 
                                     else if (ext.equals(CommonData.EXCEL_EXTENSION)) {
@@ -6910,6 +6918,7 @@ else if (ext.equals(CommonData.EXCEL_EXTENSION)) {
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, excelFolder);
                                         pr.setExcelPath(document);
+                                        pr.setExcelToken(token);
                                     }
 
                                     else if (ext.equals(CommonData.IMAGE_EXTENSION)) {
@@ -6922,6 +6931,7 @@ else if (ext.equals(CommonData.IMAGE_EXTENSION)) {
                                         }
                                         document = ServiceUtility.uploadMediaFile(file, env, imageFolder);
                                         pr.setImgPath(document);
+                                        pr.setImgToken(token);
                                     }
 
                                     else if (ext.equals(CommonData.UNSUPPORTED_EXTENSION)) {