Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service
resMap.put("agentPassword", mUser.getAgentPassword());
resMap.put("m_UserLangMappings", new JSONArray(mUser.getM_UserLangMappings().toString()));
resMap.put("designationID", mUser.getDesignationID());
resMap.put("dhistoken",mUser.getDhistoken());
if (mUser.getDesignation() != null) {
resMap.put("designation", new JSONObject(mUser.getDesignation().toString()));
}
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/iemr/common/data/users/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
@Entity
@Table(name = "m_user")
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class User implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand Down Expand Up @@ -208,6 +209,10 @@ public class User implements Serializable {
@Column(name = "failed_attempt")
private Integer failedAttempt;

@Expose
@Column(name = "dhistoken")
private String dhistoken;

/*
* protected User() { }
*/
Expand All @@ -217,7 +222,7 @@ public static User initializeUsers(Long userID, Integer titleID, String firstNam
Timestamp dOJ, Integer qualificationID, String userName, String password, String emailID, Status m_Status,
List<UserServiceRoleMapping> m_UserServiceRoleMapping, String emergencyContactPerson,
String emergencyContactNo, Boolean isSupervisor, Boolean deleted, String createdBy, Timestamp createdDate,
String modifiedBy, Timestamp lastModDate, String newPassword) {
String modifiedBy, Timestamp lastModDate, String newPassword, String dhistoken) {
User user = new User();
user.userID = userID;
user.titleID = titleID;
Expand All @@ -244,6 +249,7 @@ public static User initializeUsers(Long userID, Integer titleID, String firstNam
user.modifiedBy = modifiedBy;
user.lastModDate = lastModDate;
user.newPassword = newPassword;
user.dhistoken = dhistoken;
return user;
}

Expand Down Expand Up @@ -530,6 +536,9 @@ public Integer getDesignationID() {
public Designation getDesignation() {
return designation;
}
public String getDhistoken() {
return dhistoken;
}

/*
* public User(String userName, String password) { this.userName = userName;
Expand Down
Loading