Skip to content

Commit 4696eb3

Browse files
aunindadfaunindadf
committed
Added new departments. updated old departments. added search term highlighting.
1 parent baa8368 commit 4696eb3

9 files changed

Lines changed: 192 additions & 120 deletions

File tree

‎data/OGDs.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,15 @@
7878
{
7979
"identifiers":"GB-GOV-15",
8080
"name": "Department for International Trade"
81+
},
82+
"DSIT":
83+
{
84+
"identifiers":"GB-GOV-26",
85+
"name": "Department of Science, Innovation and Technology"
86+
},
87+
"DESNZ":
88+
{
89+
"identifiers":"GB-GOV-25",
90+
"name": "Department for Energy, Security and Net Zero"
8191
}
8292
}

‎data/custom-codes/ogds.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,13 @@
5858
"gb-gov-15":
5959
{
6060
"name": "Department for International Trade"
61+
},
62+
"gb-gov-26":
63+
{
64+
"name": "Department of Science, Innovation and Technology"
65+
},
66+
"gb-gov-25":
67+
{
68+
"name": "Department for Energy, Security and Net Zero"
6169
}
6270
}

‎data/odas.json‎

Lines changed: 110 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -3,164 +3,197 @@
33
[
44
{
55
"name":"Foreign, Commonwealth and Development Office",
6-
"year":"2021",
7-
"value": 8308,
8-
"percentage": 72.3,
6+
"year":"2023",
7+
"value": 2954,
8+
"percentage": 19.30,
99
"shortName": "FCDO",
1010
"note": "This figure is calculated by summing the those for the recently combined Department for International Development (DFID) and Foreign and Commonwealth Office (FCO) to reflect the new department. The source data describes these institutions separately."
1111
}
1212
],
13-
"BEIS":
13+
"DH":
1414
[
1515
{
16-
"name":"Department for Business, Energy and Industrial Strategy",
17-
"year":"2021",
18-
"value": 929,
19-
"percentage": 8.1,
20-
"shortName": "BEIS",
16+
"name":"Department of Health and Social Care",
17+
"year":"2023",
18+
"value": 535,
19+
"percentage": 3.50,
20+
"shortName": "DoH",
2121
"note": ""
2222
}
2323
],
24-
"HO":
24+
"MHCLG":
2525
[
2626
{
27-
"name":"Home Office",
28-
"year":"2021",
29-
"value": 915,
30-
"percentage": 8.0,
31-
"shortName": "Home Office",
27+
"name":"Ministry of Housing, Communities and Local Government",
28+
"year":"2023",
29+
"value": 466,
30+
"percentage": 3.00,
31+
"shortName": "MHCLG",
3232
"note": ""
3333
}
3434
],
35-
"CSSF":
35+
"DESNZ":
3636
[
3737
{
38-
"name":"Conflict, Stability and Security Fund",
39-
"year":"2021",
40-
"value": 430,
41-
"percentage": 3.7,
42-
"shortName": "CSSF",
38+
"name":"Department for Energy Security and Net Zero",
39+
"year":"2023",
40+
"value": 440,
41+
"percentage": 2.90,
42+
"shortName": "DESNZ",
4343
"note": ""
4444
}
4545
],
46-
"DH":
46+
"CSSF":
4747
[
4848
{
49-
"name":"Department of Health and Social Care",
50-
"year":"2021",
51-
"value": 223,
52-
"percentage": 1.9,
53-
"shortName": "DoH",
49+
"name":"UK Integrated Security Fund",
50+
"year":"2023",
51+
"value": 326,
52+
"percentage": 2.10,
53+
"shortName": "CSSF",
5454
"note": ""
5555
}
5656
],
57-
"CO":
57+
"DWP":
5858
[
5959
{
60-
"name":"Cabinet Office",
61-
"year":"2021",
62-
"value": 108,
63-
"percentage": 0.9,
64-
"shortName": "CO",
60+
"name":"Department for Work and Pensions",
61+
"year":"2023",
62+
"value": 257,
63+
"percentage": 1.70,
64+
"shortName": "DWP",
6565
"note": ""
6666
}
6767
],
68-
"DEFRA":
68+
"DFE":
6969
[
7070
{
71-
"name":"Department for Environment Food and Rural Affairs",
72-
"year":"2021",
73-
"value": 76,
74-
"percentage": 0.7,
75-
"shortName": "DEFRA",
71+
"name":"Department for Education",
72+
"year":"2023",
73+
"value": 169,
74+
"percentage": 1.10,
75+
"shortName": "DoE",
7676
"note": ""
7777
}
7878
],
79-
"PF":
79+
"DSIT":
8080
[
8181
{
82-
"name":"Cross-Government Prosperity Fund",
83-
"year":"2021",
84-
"value": 53,
85-
"percentage": 0.5,
86-
"shortName": "CGPF",
82+
"name":"Department for Science, Innovation and Technology",
83+
"year":"2023",
84+
"value": 167,
85+
"percentage": 1.10,
86+
"shortName": "DSIT",
8787
"note": ""
8888
}
8989
],
90-
"DFE":
90+
"DEFRA":
9191
[
9292
{
93-
"name":"Department for Education",
94-
"year":"2021",
95-
"value": 18,
96-
"percentage": 0.2,
97-
"shortName": "DoE",
93+
"name":"Department for Environment Food and Rural Affairs",
94+
"year":"2023",
95+
"value": 165,
96+
"percentage": 1.10,
97+
"shortName": "DEFRA",
9898
"note": ""
9999
}
100100
],
101-
"DWP":
101+
"HMRC":
102102
[
103103
{
104-
"name":"Department for Work and Pensions",
105-
"year":"2021",
106-
"value": 9,
107-
"percentage": 0.1,
108-
"shortName": "DWP",
104+
"name":"HM Revenue and Customs",
105+
"year":"2023",
106+
"value": 34,
107+
"percentage": 0.20,
108+
"shortName": "HMRC",
109109
"note": ""
110110
}
111111
],
112112
"DCMS":
113113
[
114114
{
115-
"name":"Department for Culture, Media and Sports",
116-
"year":"2021",
117-
"value": 7,
115+
"name":"Department for Digital, Culture, Media and Sports",
116+
"year":"2023",
117+
"value": 10,
118118
"percentage": 0.1,
119119
"shortName": "DCMS",
120120
"note": ""
121121
}
122122
],
123-
"MOD":
123+
"ONS":
124124
[
125125
{
126-
"name":"Ministry of Defence",
127-
"year":"2021",
128-
"value": 5,
126+
"name":"Office for National Statistics",
127+
"year":"2023",
128+
"value": 4,
129129
"percentage": 0.0,
130-
"shortName": "MOD",
130+
"shortName": "ONS",
131131
"note": ""
132132
}
133133
],
134-
"HMRC":
134+
"MOD":
135135
[
136136
{
137-
"name":"HM Revenue and Customs",
138-
"year":"2021",
139-
"value": 3,
137+
"name":"Ministry of Defence",
138+
"year":"2023",
139+
"value": 4,
140140
"percentage": 0.0,
141-
"shortName": "HMRC",
141+
"shortName": "MOD",
142142
"note": ""
143143
}
144144
],
145145
"HMT":
146146
[
147147
{
148148
"name":"HM Treasury",
149-
"year":"2021",
150-
"value": 2,
149+
"year":"2023",
150+
"value": 4,
151151
"percentage": 0.0,
152152
"shortName": "HMT",
153153
"note": ""
154154
}
155155
],
156-
"ONS":
156+
"BEIS":
157157
[
158158
{
159-
"name":"Office for National Statistics",
159+
"name":"Department for Business, Energy and Industrial Strategy",
160160
"year":"2021",
161-
"value": 2,
162-
"percentage": 0.0,
163-
"shortName": "ONS",
161+
"value": 929,
162+
"percentage": 8.1,
163+
"shortName": "BEIS",
164+
"note": ""
165+
}
166+
],
167+
"HO":
168+
[
169+
{
170+
"name":"Home Office",
171+
"year":"2021",
172+
"value": 915,
173+
"percentage": 8.0,
174+
"shortName": "Home Office",
175+
"note": ""
176+
}
177+
],
178+
"CO":
179+
[
180+
{
181+
"name":"Cabinet Office",
182+
"year":"2021",
183+
"value": 108,
184+
"percentage": 0.9,
185+
"shortName": "CO",
186+
"note": ""
187+
}
188+
],
189+
"PF":
190+
[
191+
{
192+
"name":"Cross-Government Prosperity Fund",
193+
"year":"2021",
194+
"value": 53,
195+
"percentage": 0.5,
196+
"shortName": "CGPF",
164197
"note": ""
165198
}
166199
],

‎data/solr-config.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,71 +37,71 @@
3737
{
3838
"title": "Activity Status",
3939
"field": "activity_status_code",
40-
"url": "search/activity/?facet=on&facet.field=activity_status_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND ",
40+
"url": "search/activity/?facet=on&facet.field=activity_status_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
4141
"mappingFile": "data/mappingSolrFilters/activity_status.json",
4242
"defaultValue": "2",
4343
"isFieldTypeString": "0"
4444
},
4545
{
4646
"title": "Government Department(s)",
4747
"field": "reporting_org_ref",
48-
"url": "search/activity/?facet=on&facet.field=reporting_org_ref&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND ",
48+
"url": "search/activity/?facet=on&facet.field=reporting_org_ref&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
4949
"mappingFile": "data/custom-codes/ogds.json",
5050
"defaultValue": "",
5151
"isFieldTypeString": "1"
5252
},
5353
{
5454
"title": "Tags",
5555
"field": "tag_code",
56-
"url": "search/activity/?facet=on&facet.field=tag_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND ",
56+
"url": "search/activity/?facet=on&facet.field=tag_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
5757
"mappingFile": "data/custom-codes/policy-priorities.json",
5858
"defaultValue": "",
5959
"isFieldTypeString": "1"
6060
},
6161
{
6262
"title": "Sectors",
6363
"field": "sector_code",
64-
"url": "search/activity/?facet=on&facet.field=sector_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND ",
64+
"url": "search/activity/?facet=on&facet.field=sector_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
6565
"mappingFile": "sectorHierarchies.json",
6666
"defaultValue": "",
6767
"isFieldTypeString": "0"
6868
},
6969
{
7070
"title": "Participating Orgs",
7171
"field": "participating_org_ref",
72-
"url": "search/activity/?facet=on&facet.field=participating_org_ref&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND participating_org_role:4 AND ",
72+
"url": "search/activity/?facet=on&facet.field=participating_org_ref&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND participating_org_role:4 AND ",
7373
"mappingFile": "iati_publishers_list.json",
7474
"defaultValue": "",
7575
"isFieldTypeString": "1"
7676
},
7777
{
7878
"title": "Activity Dates",
7979
"field": "activity_date_iso_date",
80-
"url": "search/activity/?facet=on&facet.field=activity_date_iso_date&facet.limit=-1&facet.mincount=1&q=participating_org_ref:GB-GOV-* AND ",
80+
"url": "search/activity/?facet=on&facet.field=activity_date_iso_date&facet.limit=-1&facet.mincount=1&q=participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
8181
"mappingFile": "",
8282
"defaultValue": "",
8383
"isFieldTypeString": "1"
8484
},
8585
{
8686
"title": "Benefiting Countries",
8787
"field": "recipient_country_code",
88-
"url": "search/activity/?facet=on&facet.field=recipient_country_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND ",
88+
"url": "search/activity/?facet=on&facet.field=recipient_country_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
8989
"mappingFile": "data/country-codes/country_codes.json",
9090
"defaultValue": "",
9191
"isFieldTypeString": "1"
9292
},
9393
{
9494
"title": "Benefiting Regions",
9595
"field": "recipient_region_code",
96-
"url": "search/activity/?facet=on&facet.field=recipient_region_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND ",
96+
"url": "search/activity/?facet=on&facet.field=recipient_region_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
9797
"mappingFile": "data/regionCodes.json",
9898
"defaultValue": "",
9999
"isFieldTypeString": "1"
100100
},
101101
{
102102
"title": "Document Categories",
103103
"field": "document_link_category_code",
104-
"url": "search/activity/?facet=on&facet.field=document_link_category_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND ",
104+
"url": "search/activity/?facet=on&facet.field=document_link_category_code&facet.limit=-1&facet.mincount=1&q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
105105
"mappingFile": "data/custom-codes/DocumentCategory.json",
106106
"defaultValue": "",
107107
"isFieldTypeString": "1"
@@ -127,7 +127,7 @@
127127
},
128128
"O":
129129
{
130-
"url": "/search/activity/?q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND ",
130+
"url": "/search/activity/?q=hierarchy:1 AND participating_org_ref:(GB-GOV-* OR GB-COH-*) AND ",
131131
"fieldDependency": "reporting_org_ref"
132132
},
133133
"S":

0 commit comments

Comments
 (0)