Skip to content
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

AMM-1137 | Modify feedback register API- Add param "BeneficiaryConsent" #141

Merged
merged 6 commits into from
Dec 10, 2024
Merged

AMM-1137 | Modify feedback register API- Add param "BeneficiaryConsent" #141

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7a9518
adding changes related to encryption and decryption
Oct 16, 2024
e1b5318
making final field static
Oct 16, 2024
eddabe3
making enclosing method static
Oct 16, 2024
6e626bb
adding beneficiaryConsent param to createFeedback API
Dec 10, 2024
6cf8550
Merge pull request #6 from PSMRI/develop
srishtigrp78 Dec 10, 2024
2303d60
Update src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java
srishtigrp78 Dec 10, 2024
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
21 changes: 18 additions & 3 deletions src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ public class FeedbackDetails {

@Transient
private String instituteName = "";

@Column(name = "BeneficiaryConsent")
@Expose
private Boolean beneficiaryConsent;

@Column(name = "DesignationID")
@Expose
Expand Down Expand Up @@ -304,7 +308,7 @@ public FeedbackDetails() {
public FeedbackDetails(Long feedbackID, Long institutionID,String instiName, Integer designationID, Integer severityID,
Integer feedbackTypeID, Integer feedbackStatusID, String feedback, Long beneficiaryRegID, Integer serviceID,
Integer userID, String sMSPhoneNo, Timestamp serviceAvailDate, Boolean deleted, String createdBy,
Timestamp createdDate, String modifiedBy, Timestamp lastModDate, String feedbackAgainst) {
Timestamp createdDate, String modifiedBy, Timestamp lastModDate, String feedbackAgainst, Boolean beneficiaryConsent) {
super();
this.feedbackID = feedbackID;
this.institutionID = institutionID;
Expand All @@ -325,7 +329,8 @@ public FeedbackDetails(Long feedbackID, Long institutionID,String instiName, Int
this.modifiedBy = modifiedBy;
this.lastModDate = lastModDate;
this.feedbackAgainst = feedbackAgainst;
}
this.beneficiaryConsent = beneficiaryConsent;
}

public FeedbackDetails(Long feedbackID, Integer severityID, Integer feedbackTypeID, Integer feedbackStatusID,
String feedback, String createdBy, String feedbackAgainst) {
Expand Down Expand Up @@ -466,6 +471,15 @@ public Boolean getDeleted() {
public void setDeleted(Boolean deleted) {
this.deleted = deleted;
}
public Boolean getBeneficiaryConsent() {
return beneficiaryConsent;
}

public void setBeneficiaryConsent(Boolean beneficiaryConsent) {
this.beneficiaryConsent = beneficiaryConsent;
}



public String getCreatedBy() {
return createdBy;
Expand Down Expand Up @@ -555,7 +569,7 @@ public static FeedbackDetails initializeFeedbackDetailsWithAllFeilds(Long feedba
Integer stateID, States state, Integer districtID, Districts district, Integer blockID,
DistrictBlock districtBlock, Integer districtBranchID, DistrictBranchMapping districtBranchMapping,
Integer instituteTypeID, InstituteType instituteType, Integer feedbackNatureID,
FeedbackNatureDetail feedbackNatureDetail, String feedbackAgainst) {
FeedbackNatureDetail feedbackNatureDetail, String feedbackAgainst, Boolean beneficiaryConsent) {
FeedbackDetails feedbackDetails = new FeedbackDetails();
feedbackDetails.feedbackID = feedbackID;
feedbackDetails.mUser = mUser;
Expand Down Expand Up @@ -624,6 +638,7 @@ public static FeedbackDetails initializeFeedbackDetailsWithAllFeilds(Long feedba
feedbackDetails.feedbackNatureID = feedbackNatureID;
feedbackDetails.feedbackNatureDetail = feedbackNatureDetail;
feedbackDetails.feedbackAgainst = feedbackAgainst;
feedbackDetails.beneficiaryConsent = beneficiaryConsent;
return feedbackDetails;
}

Expand Down
Loading