diff --git a/pom.xml b/pom.xml index c74cc29a..5efbe6ea 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.iemr.admin - adminapi - v3.1.0 + admin-api + 3.6.0 war Admin-API Admin Page @@ -279,7 +279,7 @@ - adminapi-v3.0.0 + ${project.artifactId}-${project.version} org.owasp diff --git a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeSignatureController.java b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeSignatureController.java index 79f7f724..deb1bbae 100644 --- a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeSignatureController.java +++ b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeSignatureController.java @@ -42,6 +42,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import com.google.gson.JsonObject; import com.iemr.admin.data.employeemaster.EmployeeSignature; import com.iemr.admin.service.employeemaster.EmployeeSignatureServiceImpl; import com.iemr.admin.utils.response.OutputResponse; @@ -125,7 +126,15 @@ public String existFile(@PathVariable("userID") Long userID) throws Exception { try { Boolean userSignID = employeeSignatureServiceImpl.existSignature(userID); - response.setResponse(userSignID.toString()); + Boolean signatureActive = employeeSignatureServiceImpl.isSignatureActive(userID); + + // Create JSON response with both fields + JsonObject responseData = new JsonObject(); + responseData.addProperty("response", userSignID.toString()); + responseData.addProperty("signStatus", signatureActive.toString()); + + // Set the response (existing setResponse method will handle it) + response.setResponse(responseData.toString()); } catch (Exception e) { logger.error("Unexpected error:", e); diff --git a/src/main/java/com/iemr/admin/repo/employeemaster/EmployeeSignatureRepo.java b/src/main/java/com/iemr/admin/repo/employeemaster/EmployeeSignatureRepo.java index 06a89f14..6463ff53 100644 --- a/src/main/java/com/iemr/admin/repo/employeemaster/EmployeeSignatureRepo.java +++ b/src/main/java/com/iemr/admin/repo/employeemaster/EmployeeSignatureRepo.java @@ -39,6 +39,6 @@ public interface EmployeeSignatureRepo extends CrudRepository0; + return employeeSignatureRepo.countByUserIDAndSignatureNotNull(userID) > 0; + } + + public Boolean isSignatureActive(Long userID) { + return employeeSignatureRepo.countByUserIDAndSignatureNotNullAndDeletedFalse(userID) > 0; } @Override