Skip to content

Commit b5f0670

Browse files
SauravBizbRollySauravBizbRolly
authored
Merge pull request #337 from PSMRI/feature/hide_feilds_state_wise
implement state wise hide un hide form fields
2 parents 984d533 + 5190737 commit b5f0670

7 files changed

Lines changed: 503 additions & 83 deletions

File tree

‎src/main/java/com/iemr/common/controller/dynamicForm/DynamicFormController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ public ResponseEntity<ApiResponse<?>> deleteField(@PathVariable Long fieldId) {
8484
}
8585

8686
@GetMapping(value = "form/{formId}/fields")
87-
public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String formId, @RequestParam(name = "lang", defaultValue = "en") String lang) {
87+
public ResponseEntity<ApiResponse<?>> getStructuredForm(@PathVariable String formId, @RequestParam(name = "lang", defaultValue = "en") String lang,@RequestHeader(value = "JwtToken") String token) {
8888
try {
89-
Object result = formMasterService.getStructuredFormByFormId(formId,lang);
89+
Object result = formMasterService.getStructuredFormByFormId(formId,lang,token);
9090
return ResponseEntity.status(HttpStatus.OK)
9191
.body(ApiResponse.success("Form structure fetched successfully", HttpStatus.OK.value(), result));
9292
} catch (Exception e) {

‎src/main/java/com/iemr/common/data/dynamic_from/FormField.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ public class FormField {
5353
@Column(name = "sequence")
5454
private Integer sequence;
5555

56+
@Column(name = "is_editable")
57+
private Boolean isEditable;
58+
59+
@Column(name = "state_code")
60+
private Integer stateCode;
61+
5662
@Column(name = "created_at")
5763
private LocalDateTime createdAt = LocalDateTime.now();
5864

‎src/main/java/com/iemr/common/data/users/UserServiceRole.java‎

Lines changed: 368 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,368 @@
1+
package com.iemr.common.data.users;
2+
3+
import jakarta.persistence.*;
4+
import java.util.Objects;
5+
6+
@Entity
7+
@Table(name = "v_userservicerolemapping", schema = "db_iemr")
8+
public class UserServiceRole {
9+
private Integer userId;
10+
private int usrMappingId;
11+
private String name;
12+
private String userName;
13+
private Short serviceId;
14+
private String serviceName;
15+
private Boolean isNational;
16+
private Integer stateId;
17+
private String stateName;
18+
private Integer workingDistrictId;
19+
private String workingDistrictName;
20+
private Integer workingLocationId;
21+
private Short serviceProviderId;
22+
private String locationName;
23+
private String workingLocationAddress;
24+
private Integer roleId;
25+
private String roleName;
26+
private Integer providerServiceMapId;
27+
private String agentId;
28+
private Short psmStatusId;
29+
private String psmStatus;
30+
private Boolean userServciceRoleDeleted;
31+
private Boolean userDeleted;
32+
private Boolean serviceProviderDeleted;
33+
private Boolean roleDeleted;
34+
private Boolean providerServiceMappingDeleted;
35+
private Boolean isInbound;
36+
private Boolean isOutbound;
37+
private Integer blockid;
38+
private String blockname;
39+
private String villageid;
40+
private String villagename;
41+
42+
@Basic
43+
@Column(name = "UserID")
44+
public Integer getUserId() {
45+
return userId;
46+
}
47+
48+
public void setUserId(Integer userId) {
49+
this.userId = userId;
50+
}
51+
52+
@Basic
53+
@Column(name = "USRMappingID")
54+
@Id
55+
@GeneratedValue(strategy = GenerationType.IDENTITY)
56+
public int getUsrMappingId() {
57+
return usrMappingId;
58+
}
59+
60+
public void setUsrMappingId(int usrMappingId) {
61+
this.usrMappingId = usrMappingId;
62+
}
63+
64+
@Basic
65+
@Column(name = "Name")
66+
public String getName() {
67+
return name;
68+
}
69+
70+
public void setName(String name) {
71+
this.name = name;
72+
}
73+
74+
@Basic
75+
@Column(name = "UserName")
76+
public String getUserName() {
77+
return userName;
78+
}
79+
80+
public void setUserName(String userName) {
81+
this.userName = userName;
82+
}
83+
84+
@Basic
85+
@Column(name = "ServiceID")
86+
public Short getServiceId() {
87+
return serviceId;
88+
}
89+
90+
public void setServiceId(Short serviceId) {
91+
this.serviceId = serviceId;
92+
}
93+
94+
@Basic
95+
@Column(name = "ServiceName")
96+
public String getServiceName() {
97+
return serviceName;
98+
}
99+
100+
public void setServiceName(String serviceName) {
101+
this.serviceName = serviceName;
102+
}
103+
104+
@Basic
105+
@Column(name = "IsNational")
106+
public Boolean getNational() {
107+
return isNational;
108+
}
109+
110+
public void setNational(Boolean national) {
111+
isNational = national;
112+
}
113+
114+
@Basic
115+
@Column(name = "StateID")
116+
public Integer getStateId() {
117+
return stateId;
118+
}
119+
120+
public void setStateId(Integer stateId) {
121+
this.stateId = stateId;
122+
}
123+
124+
@Basic
125+
@Column(name = "StateName")
126+
public String getStateName() {
127+
return stateName;
128+
}
129+
130+
public void setStateName(String stateName) {
131+
this.stateName = stateName;
132+
}
133+
134+
@Basic
135+
@Column(name = "WorkingDistrictID")
136+
public Integer getWorkingDistrictId() {
137+
return workingDistrictId;
138+
}
139+
140+
public void setWorkingDistrictId(Integer workingDistrictId) {
141+
this.workingDistrictId = workingDistrictId;
142+
}
143+
144+
@Basic
145+
@Column(name = "WorkingDistrictName")
146+
public String getWorkingDistrictName() {
147+
return workingDistrictName;
148+
}
149+
150+
public void setWorkingDistrictName(String workingDistrictName) {
151+
this.workingDistrictName = workingDistrictName;
152+
}
153+
154+
@Basic
155+
@Column(name = "WorkingLocationID")
156+
public Integer getWorkingLocationId() {
157+
return workingLocationId;
158+
}
159+
160+
public void setWorkingLocationId(Integer workingLocationId) {
161+
this.workingLocationId = workingLocationId;
162+
}
163+
164+
@Basic
165+
@Column(name = "ServiceProviderID")
166+
public Short getServiceProviderId() {
167+
return serviceProviderId;
168+
}
169+
170+
public void setServiceProviderId(Short serviceProviderId) {
171+
this.serviceProviderId = serviceProviderId;
172+
}
173+
174+
@Basic
175+
@Column(name = "LocationName")
176+
public String getLocationName() {
177+
return locationName;
178+
}
179+
180+
public void setLocationName(String locationName) {
181+
this.locationName = locationName;
182+
}
183+
184+
@Basic
185+
@Column(name = "WorkingLocationAddress")
186+
public String getWorkingLocationAddress() {
187+
return workingLocationAddress;
188+
}
189+
190+
public void setWorkingLocationAddress(String workingLocationAddress) {
191+
this.workingLocationAddress = workingLocationAddress;
192+
}
193+
194+
@Basic
195+
@Column(name = "RoleID")
196+
public Integer getRoleId() {
197+
return roleId;
198+
}
199+
200+
public void setRoleId(Integer roleId) {
201+
this.roleId = roleId;
202+
}
203+
204+
@Basic
205+
@Column(name = "RoleName")
206+
public String getRoleName() {
207+
return roleName;
208+
}
209+
210+
public void setRoleName(String roleName) {
211+
this.roleName = roleName;
212+
}
213+
214+
@Basic
215+
@Column(name = "ProviderServiceMapID")
216+
public Integer getProviderServiceMapId() {
217+
return providerServiceMapId;
218+
}
219+
220+
public void setProviderServiceMapId(Integer providerServiceMapId) {
221+
this.providerServiceMapId = providerServiceMapId;
222+
}
223+
224+
@Basic
225+
@Column(name = "AgentID")
226+
public String getAgentId() {
227+
return agentId;
228+
}
229+
230+
public void setAgentId(String agentId) {
231+
this.agentId = agentId;
232+
}
233+
234+
@Basic
235+
@Column(name = "PSMStatusID")
236+
public Short getPsmStatusId() {
237+
return psmStatusId;
238+
}
239+
240+
public void setPsmStatusId(Short psmStatusId) {
241+
this.psmStatusId = psmStatusId;
242+
}
243+
244+
@Basic
245+
@Column(name = "PSMStatus")
246+
public String getPsmStatus() {
247+
return psmStatus;
248+
}
249+
250+
public void setPsmStatus(String psmStatus) {
251+
this.psmStatus = psmStatus;
252+
}
253+
254+
@Basic
255+
@Column(name = "UserServciceRoleDeleted")
256+
public Boolean getUserServciceRoleDeleted() {
257+
return userServciceRoleDeleted;
258+
}
259+
260+
public void setUserServciceRoleDeleted(Boolean userServciceRoleDeleted) {
261+
this.userServciceRoleDeleted = userServciceRoleDeleted;
262+
}
263+
264+
@Basic
265+
@Column(name = "UserDeleted")
266+
public Boolean getUserDeleted() {
267+
return userDeleted;
268+
}
269+
270+
public void setUserDeleted(Boolean userDeleted) {
271+
this.userDeleted = userDeleted;
272+
}
273+
274+
@Basic
275+
@Column(name = "ServiceProviderDeleted")
276+
public Boolean getServiceProviderDeleted() {
277+
return serviceProviderDeleted;
278+
}
279+
280+
public void setServiceProviderDeleted(Boolean serviceProviderDeleted) {
281+
this.serviceProviderDeleted = serviceProviderDeleted;
282+
}
283+
284+
@Basic
285+
@Column(name = "RoleDeleted")
286+
public Boolean getRoleDeleted() {
287+
return roleDeleted;
288+
}
289+
290+
public void setRoleDeleted(Boolean roleDeleted) {
291+
this.roleDeleted = roleDeleted;
292+
}
293+
294+
@Basic
295+
@Column(name = "ProviderServiceMappingDeleted")
296+
public Boolean getProviderServiceMappingDeleted() {
297+
return providerServiceMappingDeleted;
298+
}
299+
300+
public void setProviderServiceMappingDeleted(Boolean providerServiceMappingDeleted) {
301+
this.providerServiceMappingDeleted = providerServiceMappingDeleted;
302+
}
303+
304+
@Basic
305+
@Column(name = "isInbound")
306+
public Boolean getInbound() {
307+
return isInbound;
308+
}
309+
310+
public void setInbound(Boolean inbound) {
311+
isInbound = inbound;
312+
}
313+
314+
@Basic
315+
@Column(name = "isOutbound")
316+
public Boolean getOutbound() {
317+
return isOutbound;
318+
}
319+
320+
public void setOutbound(Boolean outbound) {
321+
isOutbound = outbound;
322+
}
323+
324+
@Basic
325+
@Column(name = "blockid")
326+
public Integer getBlockid() {
327+
return blockid;
328+
}
329+
330+
public void setBlockid(Integer blockid) {
331+
this.blockid = blockid;
332+
}
333+
334+
@Basic
335+
@Column(name = "blockname")
336+
public String getBlockname() {
337+
return blockname;
338+
}
339+
340+
public void setBlockname(String blockname) {
341+
this.blockname = blockname;
342+
}
343+
344+
@Basic
345+
@Column(name = "villageid")
346+
public String getVillageid() {
347+
return villageid;
348+
}
349+
350+
public void setVillageid(String villageid) {
351+
this.villageid = villageid;
352+
}
353+
354+
@Basic
355+
@Column(name = "villagename")
356+
public String getVillagename() {
357+
return villagename;
358+
}
359+
360+
public void setVillagename(String villagename) {
361+
this.villagename = villagename;
362+
}
363+
364+
@Override
365+
public int hashCode() {
366+
return Objects.hash(userId, usrMappingId, name, userName, serviceId, serviceName, isNational, stateId, stateName, workingDistrictId, workingDistrictName, workingLocationId, serviceProviderId, locationName, workingLocationAddress, roleId, roleName, providerServiceMapId, agentId, psmStatusId, psmStatus, userServciceRoleDeleted, userDeleted, serviceProviderDeleted, roleDeleted, providerServiceMappingDeleted, isInbound, isOutbound, blockid, blockname, villageid, villagename);
367+
}
368+
}

0 commit comments

Comments
 (0)