Skip to content

Commit

Permalink
Fixed test / removed baselineIndicatorMapping from forms #3280
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisala
chrisala committed Jul 26, 2024
1 parent 0cd9837 commit 92e6c53
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 61,819 deletions.
142 changes: 11 additions & 131 deletions forms/nht/grantsAndOthersProgressReport.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7852,7 +7852,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 12 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 12 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -8158,18 +8158,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"dataType": "number",
"name": "totalSurveyBaseline",
Expand Down Expand Up @@ -8766,7 +8754,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 13 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 13 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -9063,18 +9051,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down Expand Up @@ -10928,7 +10904,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 15 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 15 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -11234,18 +11210,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down Expand Up @@ -12820,7 +12784,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 42 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 42 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -13095,18 +13059,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down Expand Up @@ -17926,7 +17878,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 23 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 23 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -18223,18 +18175,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down Expand Up @@ -22746,7 +22686,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 24 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and deepEquals(relatedOutcomes,dataSet.outcomesLabel) and 'Indicator' == baselineIndicatorMapping.lookupValue(dataSet.type)"
"expression": "dataSet.serviceId == 24 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and deepEquals(relatedOutcomes,dataSet.outcomesLabel) and 'Indicator' == dataSet.type"
}
}
},
Expand Down Expand Up @@ -22898,7 +22838,7 @@
],
"validate": "required",
"computed": {
"expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); baselineIndicatorMapping.lookupValue(x.type)"
"expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.type"
}
},
{
Expand Down Expand Up @@ -23105,18 +23045,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down Expand Up @@ -24681,7 +24609,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 29 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 29 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -24925,18 +24853,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down Expand Up @@ -25577,7 +25493,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 30 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 30 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -25832,18 +25748,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down Expand Up @@ -28721,7 +28625,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 32 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 32 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -28986,18 +28890,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down Expand Up @@ -29768,7 +29660,7 @@
},
"filter": {
"namespace": "dataSet",
"expression": "dataSet.serviceId == 33 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
"expression": "dataSet.serviceId == 33 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == dataSet.type and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
}
}
},
Expand Down Expand Up @@ -30071,18 +29963,6 @@
}
]
},
{
"dataType": "lookupTable",
"name": "baselineIndicatorMapping",
"config": {
"source": {
"literal": {
"Baseline dataset associated with a project outcome": "Baseline",
"Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
}
}
}
},
{
"allowRowDelete": "false",
"columns": [
Expand Down
Loading

0 comments on commit 92e6c53

Please sign in to comment.