Skip to content

Release 3.5.0 #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
5Amogh merged 3 commits into from
Dec 3, 2025
Merged

Release 3.5.0 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41162a4
Update pom.xml
5Amogh Sep 25, 2025
27241e1
Cherry-pick the commits related to 3.5.0 form 3.6.0 (#106)
snehar-nd Sep 26, 2025
c6ded08
Merge branch 'release-3.6.0' into release-3.5.0
5Amogh Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.iemr.admin</groupId>
<artifactId>admin-api</artifactId>
<version>3.6.1</version>
<version>3.6.0</version>
<packaging>war</packaging>
<name>Admin-API</name>
<description>Admin Page</description>
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/com/iemr/admin/service/employeemaster/EmployeeSignatureServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import com.iemr.admin.data.employeemaster.EmployeeSignature;
import com.iemr.admin.repo.employeemaster.EmployeeSignatureRepo;
import org.json.JSONObject;

Check warning on line 30 in src/main/java/com/iemr/admin/service/employeemaster/EmployeeSignatureServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this duplicated import. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Admin-API&issues=AZrjlizNCvkZJnu3xx93&open=AZrjlizNCvkZJnu3xx93&pullRequest=111

@Service
public class EmployeeSignatureServiceImpl implements EmployeeSignatureService {
Expand Down Expand Up @@ -68,10 +69,6 @@
return employeeSignatureRepo.countByUserIDAndSignatureNotNull(userID) > 0;
}

public Boolean isSignatureActive(Long userID) {
return employeeSignatureRepo.countByUserIDAndSignatureNotNullAndDeletedFalse(userID) > 0;
}

@Override
public EmployeeSignature updateUserSignatureStatus(String activateUser) {
JSONObject obj = new JSONObject(activateUser);
Expand Down
Loading