Skip to content

Commit cddf114

Browse files
authored
Merge pull request #819 from egovernments/observation_3835
Observation fixes for apk
2 parents 042d890 + f25dd94 commit cddf114

File tree

7 files changed

+5056
-2890
lines changed

7 files changed

+5056
-2890
lines changed

apps/health_campaign_field_worker_app/lib/sampleJsonConfigs/complaints.dart

Lines changed: 68 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ final dynamic sampleComplaintFlows = {
1717
"type": "tertiary",
1818
"suffixIcon": "Search",
1919
"popupConfig": {
20+
"onOpenAction": [
21+
{
22+
"actionType": "CLEAR_STATE",
23+
"properties": {
24+
"name": "pgrService",
25+
"filterKeys": ["serviceRequestId", "mobileNumber"],
26+
"widgetKeys": ["complaintNumber", "mobileNumber"],
27+
"triggerSearch": true
28+
}
29+
}
30+
],
2031
"body": [
2132
{
2233
"type": "template",
@@ -130,7 +141,27 @@ final dynamic sampleComplaintFlows = {
130141
"icon": "FilterAlt",
131142
"size": "medium",
132143
"type": "tertiary",
144+
"suffixIcon": "FilterAlt",
133145
"popupConfig": {
146+
"onOpenAction": [
147+
{
148+
"actionType": "CLEAR_STATE",
149+
"properties": {
150+
"name": "pgrService",
151+
"filterKeys": [
152+
"name",
153+
"serviceCode",
154+
"localityBoundaryCode"
155+
],
156+
"widgetKeys": [
157+
"assignTo",
158+
"complaintType",
159+
"locality"
160+
],
161+
"triggerSearch": true
162+
}
163+
}
164+
],
134165
"body": [
135166
{
136167
"data": [
@@ -271,6 +302,7 @@ final dynamic sampleComplaintFlows = {
271302
"icon": "SortSvg",
272303
"size": "medium",
273304
"type": "tertiary",
305+
"suffixIcon": "SortSvg",
274306
"popupConfig": {
275307
"body": [
276308
{
@@ -356,8 +388,7 @@ final dynamic sampleComplaintFlows = {
356388
},
357389
"mainAxisSize": "min",
358390
"mainAxisAlignment": "start"
359-
},
360-
"suffixIcon": "SortSvg"
391+
}
361392
}
362393
],
363394
"properties": {
@@ -385,7 +416,7 @@ final dynamic sampleComplaintFlows = {
385416
},
386417
{
387418
"key": "COMPLAINT_INBOX_COMPLAINT_DATE",
388-
"value": "{{fn:formatDate(item.PgrServiceModel.auditDetails.createdTime, dateTime, 'date', dd MMM yyyy)}}"
419+
"value": "{{fn:formatDate(item.PgrServiceModel.auditDetails.createdTime, 'date', dd MMM yyyy)}}"
389420
},
390421
{
391422
"key": "COMPLAINT_INBOX_COMPLAINT_AREA",
@@ -524,6 +555,7 @@ final dynamic sampleComplaintFlows = {
524555
"properties": [
525556
{
526557
"type": "string",
558+
"enums": [],
527559
"label": "COMPLAINT_TYPE_complaintType_LABEL",
528560
"order": 1,
529561
"value": "",
@@ -802,6 +834,16 @@ final dynamic sampleComplaintFlows = {
802834
"type": "required",
803835
"value": true,
804836
"message": "COMPLAINT_DETAILS_name_REQUIRED_ERROR"
837+
},
838+
{
839+
"type": "minLength",
840+
"value": 2,
841+
"message": "COMPLAINT_DETAILS_name_LABEL_MIN_VALIDATION"
842+
},
843+
{
844+
"type": "maxLength",
845+
"value": 64,
846+
"message": "COMPLAINT_DETAILS_name_LABEL_MAX_VALIDATION"
805847
}
806848
],
807849
"errorMessage": "",
@@ -871,6 +913,18 @@ final dynamic sampleComplaintFlows = {
871913
"deleteFlag": false,
872914
"innerLabel": "",
873915
"systemDate": false,
916+
"validations": [
917+
{
918+
"type": "minLength",
919+
"value": 2,
920+
"message": "SUPERVISOR_name_LABEL_MIN_VALIDATION"
921+
},
922+
{
923+
"type": "maxLength",
924+
"value": 64,
925+
"message": "SUPERVISOR_DETAILS_name_LABEL_MAX_VALIDATION"
926+
}
927+
],
874928
"errorMessage": "",
875929
"isMultiSelect": false
876930
},
@@ -985,7 +1039,9 @@ final dynamic sampleComplaintFlows = {
9851039
"message": "Navigation failed."
9861040
}
9871041
}
988-
]
1042+
],
1043+
"navigationMode": "popUntilAndPush",
1044+
"popUntilPageName": "complaintInbox"
9891045
}
9901046
}
9911047
],
@@ -1070,37 +1126,37 @@ final dynamic sampleComplaintFlows = {
10701126
"data": [
10711127
{
10721128
"key": "COMPLAINT_VIEW_COMPLAINTS_NUMBER",
1073-
"value": "{{0.PgrServiceModel.serviceRequestId}}",
1129+
"value": "{{contextData.0.PgrServiceModel.serviceRequestId}}",
10741130
"defaultValue": "Sync data to generate complaint number"
10751131
},
10761132
{
10771133
"key": "COMPLAINT_VIEW_COMPLAINTS_TYPE",
1078-
"value": "{{0.PgrServiceModel.serviceCode}}",
1134+
"value": "{{contextData.0.PgrServiceModel.serviceCode}}",
10791135
"defaultValue": "NA"
10801136
},
10811137
{
10821138
"key": "COMPLAINT_VIEW_COMPLAINTS_DATE",
1083-
"value": "{{fn:formatDate(0.PgrServiceModel.auditDetails.createdTime, 'date', dd MMM yyyy)}}",
1139+
"value": "{{fn:formatDate(contextData.0.PgrServiceModel.auditDetails.createdTime, 'date', dd MMM yyyy)}}",
10841140
"defaultValue": "NA"
10851141
},
10861142
{
10871143
"key": "COMPLAINT_VIEW_COMPLAINTS_AREA",
1088-
"value": "{{0.PgrServiceModel.address.locality.code}}",
1144+
"value": "{{contextData.0.PgrServiceModel.address.locality.code}}",
10891145
"defaultValue": "NA"
10901146
},
10911147
{
10921148
"key": "COMPLAINT_VIEW_COMPLAINANT_CONTACT",
1093-
"value": "{{0.PgrServiceModel.user.mobileNumber}}",
1149+
"value": "{{contextData.0.PgrServiceModel.user.mobileNumber}}",
10941150
"defaultValue": "NA"
10951151
},
10961152
{
10971153
"key": "COMPLAINT_VIEW_COMPLAINT_STATUS",
1098-
"value": "{{0.PgrServiceModel.applicationStatus}}",
1154+
"value": "{{contextData.0.PgrServiceModel.applicationStatus}}",
10991155
"defaultValue": "NA"
11001156
},
11011157
{
11021158
"key": "COMPLAINT_VIEW_COMPLAINT_DESCRIPTION",
1103-
"value": "{{0.PgrServiceModel.description}}",
1159+
"value": "{{contextData.0.PgrServiceModel.description}}",
11041160
"defaultValue": "NA"
11051161
}
11061162
],
@@ -1186,7 +1242,7 @@ final dynamic sampleComplaintFlows = {
11861242
],
11871243
"order": 4,
11881244
"active": true,
1189-
"project": "MR-DN",
1245+
"project": "Oncho",
11901246
"version": 1,
11911247
"disabled": false,
11921248
"isSelected": true,

0 commit comments

Comments
 (0)