Skip to content

Commit ab67f0b

Browse files
aunindadfaunindadf
authored
Merge pull request #627 from DFID/add-searched-term-highlighting
Add searched term highlighting
2 parents 0599703 + 3d69711 commit ab67f0b

10 files changed

Lines changed: 265 additions & 113 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: 112 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -3,173 +3,206 @@
33
[
44
{
55
"name":"Foreign, Commonwealth and Development Office",
6-
"year":"2021",
7-
"value": 8308,
8-
"percentage": 72.3,
6+
"year":"2023",
7+
"value": 9491,
8+
"percentage": 61.90,
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":
14-
[
15-
{
16-
"name":"Department for Business, Energy and Industrial Strategy",
17-
"year":"2021",
18-
"value": 929,
19-
"percentage": 8.1,
20-
"shortName": "BEIS",
21-
"note": ""
22-
}
23-
],
2413
"HO":
2514
[
2615
{
2716
"name":"Home Office",
28-
"year":"2021",
29-
"value": 915,
30-
"percentage": 8.0,
17+
"year":"2023",
18+
"value": 2954,
19+
"percentage": 19.30,
3120
"shortName": "Home Office",
3221
"note": ""
3322
}
3423
],
35-
"CSSF":
24+
"DH":
3625
[
3726
{
38-
"name":"Conflict, Stability and Security Fund",
39-
"year":"2021",
40-
"value": 430,
41-
"percentage": 3.7,
42-
"shortName": "CSSF",
27+
"name":"Department of Health and Social Care",
28+
"year":"2023",
29+
"value": 535,
30+
"percentage": 3.50,
31+
"shortName": "DoH",
4332
"note": ""
4433
}
4534
],
46-
"DH":
35+
"MHCLG":
4736
[
4837
{
49-
"name":"Department of Health and Social Care",
50-
"year":"2021",
51-
"value": 223,
52-
"percentage": 1.9,
53-
"shortName": "DoH",
38+
"name":"Ministry of Housing, Communities and Local Government",
39+
"year":"2023",
40+
"value": 466,
41+
"percentage": 3.00,
42+
"shortName": "MHCLG",
5443
"note": ""
5544
}
5645
],
57-
"CO":
46+
"DESNZ":
5847
[
5948
{
60-
"name":"Cabinet Office",
61-
"year":"2021",
62-
"value": 108,
63-
"percentage": 0.9,
64-
"shortName": "CO",
49+
"name":"Department for Energy Security and Net Zero",
50+
"year":"2023",
51+
"value": 440,
52+
"percentage": 2.90,
53+
"shortName": "DESNZ",
6554
"note": ""
6655
}
6756
],
68-
"DEFRA":
57+
"CSSF":
6958
[
7059
{
71-
"name":"Department for Environment Food and Rural Affairs",
72-
"year":"2021",
73-
"value": 76,
74-
"percentage": 0.7,
75-
"shortName": "DEFRA",
60+
"name":"UK Integrated Security Fund",
61+
"year":"2023",
62+
"value": 326,
63+
"percentage": 2.10,
64+
"shortName": "CSSF",
7665
"note": ""
7766
}
7867
],
79-
"PF":
68+
"DWP":
8069
[
8170
{
82-
"name":"Cross-Government Prosperity Fund",
83-
"year":"2021",
84-
"value": 53,
85-
"percentage": 0.5,
86-
"shortName": "CGPF",
71+
"name":"Department for Work and Pensions",
72+
"year":"2023",
73+
"value": 257,
74+
"percentage": 1.70,
75+
"shortName": "DWP",
8776
"note": ""
8877
}
8978
],
9079
"DFE":
9180
[
9281
{
9382
"name":"Department for Education",
94-
"year":"2021",
95-
"value": 18,
96-
"percentage": 0.2,
83+
"year":"2023",
84+
"value": 169,
85+
"percentage": 1.10,
9786
"shortName": "DoE",
9887
"note": ""
9988
}
10089
],
101-
"DWP":
90+
"DSIT":
10291
[
10392
{
104-
"name":"Department for Work and Pensions",
105-
"year":"2021",
106-
"value": 9,
107-
"percentage": 0.1,
108-
"shortName": "DWP",
93+
"name":"Department for Science, Innovation and Technology",
94+
"year":"2023",
95+
"value": 167,
96+
"percentage": 1.10,
97+
"shortName": "DSIT",
98+
"note": ""
99+
}
100+
],
101+
"DEFRA":
102+
[
103+
{
104+
"name":"Department for Environment Food and Rural Affairs",
105+
"year":"2023",
106+
"value": 165,
107+
"percentage": 1.10,
108+
"shortName": "DEFRA",
109+
"note": ""
110+
}
111+
],
112+
"HMRC":
113+
[
114+
{
115+
"name":"HM Revenue and Customs",
116+
"year":"2023",
117+
"value": 34,
118+
"percentage": 0.20,
119+
"shortName": "HMRC",
109120
"note": ""
110121
}
111122
],
112123
"DCMS":
113124
[
114125
{
115-
"name":"Department for Culture, Media and Sports",
116-
"year":"2021",
117-
"value": 7,
126+
"name":"Department for Culture, Media and Sport",
127+
"year":"2023",
128+
"value": 10,
118129
"percentage": 0.1,
119130
"shortName": "DCMS",
120131
"note": ""
121132
}
122133
],
123-
"MOD":
134+
"ONS":
124135
[
125136
{
126-
"name":"Ministry of Defence",
127-
"year":"2021",
128-
"value": 5,
137+
"name":"Office for National Statistics",
138+
"year":"2023",
139+
"value": 4,
129140
"percentage": 0.0,
130-
"shortName": "MOD",
141+
"shortName": "ONS",
131142
"note": ""
132143
}
133144
],
134-
"HMRC":
145+
"MOD":
135146
[
136147
{
137-
"name":"HM Revenue and Customs",
138-
"year":"2021",
139-
"value": 3,
148+
"name":"Ministry of Defence",
149+
"year":"2023",
150+
"value": 4,
140151
"percentage": 0.0,
141-
"shortName": "HMRC",
152+
"shortName": "MOD",
142153
"note": ""
143154
}
144155
],
145156
"HMT":
146157
[
147158
{
148159
"name":"HM Treasury",
149-
"year":"2021",
150-
"value": 2,
160+
"year":"2023",
161+
"value": 4,
151162
"percentage": 0.0,
152163
"shortName": "HMT",
153164
"note": ""
154165
}
155166
],
156-
"ONS":
167+
"BEIS":
157168
[
158169
{
159-
"name":"Office for National Statistics",
160-
"year":"2021",
161-
"value": 2,
162-
"percentage": 0.0,
163-
"shortName": "ONS",
170+
"name":"Department for Business, Energy and Industrial Strategy",
171+
"year":"2023",
172+
"value": 0,
173+
"percentage": 0,
174+
"shortName": "BEIS",
175+
"note": ""
176+
}
177+
],
178+
"CO":
179+
[
180+
{
181+
"name":"Cabinet Office",
182+
"year":"2023",
183+
"value": 0,
184+
"percentage": 0,
185+
"shortName": "CO",
186+
"note": ""
187+
}
188+
],
189+
"PF":
190+
[
191+
{
192+
"name":"Cross-Government Prosperity Fund",
193+
"year":"2023",
194+
"value": 0,
195+
"percentage": 0,
196+
"shortName": "CGPF",
164197
"note": ""
165198
}
166199
],
167200
"DIT":
168201
[
169202
{
170203
"name":"Department of International Trade",
171-
"year":"2021",
172-
"value": 0.4,
204+
"year":"2023",
205+
"value": 0,
173206
"percentage": 0.0,
174207
"shortName": "DIT",
175208
"note": ""

‎data/participatingOrgList.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@
12641264
"Name": "Department for Business, Innovation and Skills"
12651265
}, {
12661266
"Code": "GB-GOV-12",
1267-
"Name": "Department for Culture, Media and Sports"
1267+
"Name": "Department for Culture, Media and Sport"
12681268
}, {
12691269
"Code": "GB-GOV-2",
12701270
"Name": "HM Treasury"

0 commit comments

Comments
 (0)