Skip to content

Commit 355e155

Browse files
akarivakariv
committed
Add 2025 + better changes filters
1 parent b7151a4 commit 355e155

File tree

14 files changed

+820
-1609
lines changed

14 files changed

+820
-1609
lines changed

‎projects/budgetkey/src/app/common-components/theme.budgetkey.he.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export const DEFAULT_THEME: any={
8181
"id": "latest",
8282
"display": "שנת התקציב הנוכחית",
8383
"filters": {
84-
"year": 2024
84+
"year": 2025
8585
}
8686
}
8787
]
@@ -192,6 +192,13 @@ export const DEFAULT_THEME: any={
192192
"id": "all",
193193
"display": "כל שנות התקציב"
194194
},
195+
{
196+
"id": "2025",
197+
"display": "2025",
198+
"filters": {
199+
"year": 2025
200+
}
201+
},
195202
{
196203
"id": "2024",
197204
"display": "2024",

‎projects/budgetkey/src/app/item/items/base-org-item/questions.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ export default [
2727
"2021": "=2021",
2828
"2022": "=2022",
2929
"2023": "=2023",
30-
"2024": "=2024"
30+
"2024": "=2024",
31+
"2025": "=2025",
3132
}
3233
},
3334
defaults: {
@@ -70,7 +71,8 @@ export default [
7071
"2021": "=2021",
7172
"2022": "=2022",
7273
"2023": "=2023",
73-
"2024": "=2024"
74+
"2024": "=2024",
75+
"2025": "=2025"
7476
}
7577
},
7678
headers: [
@@ -113,7 +115,8 @@ export default [
113115
"2021": "=2021",
114116
"2022": "=2022",
115117
"2023": "=2023",
116-
"2024": "=2024"
118+
"2024": "=2024",
119+
"2025": "=2025"
117120
}
118121
},
119122
defaults: {
@@ -195,7 +198,8 @@ export default [
195198
"2021": "=2021",
196199
"2022": "=2022",
197200
"2023": "=2023",
198-
"2024": "=2024"
201+
"2024": "=2024",
202+
"2025": "=2025"
199203
}
200204
},
201205
defaults: {
@@ -240,7 +244,8 @@ export default [
240244
"2021": "2021",
241245
"2022": "2022",
242246
"2023": "2023",
243-
"2024": "2024"
247+
"2024": "2024",
248+
"2025": "2025"
244249
}
245250
},
246251
defaults: {
@@ -283,7 +288,8 @@ export default [
283288
"2021": "2021",
284289
"2022": "2022",
285290
"2023": "2023",
286-
"2024": "2024"
291+
"2024": "2024",
292+
"2025": "2025"
287293
}
288294
},
289295
defaults: {

‎projects/budgetkey/src/app/item/items/item-budget/questions_parents.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export default [
1818
parameters: {
1919
period: {
2020
"כל השנים": ">0",
21+
"2025": "=2025",
2122
"2024": "=2024",
2223
"2023": "=2023",
2324
"2022": "=2022",

‎projects/budgetkey/src/app/item/items/item-budget/questions_spending.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export default [
2929
"2021": "=2021",
3030
"2022": "=2022",
3131
"2023": "=2023",
32-
"2024": "=2024"
32+
"2024": "=2024",
33+
"2025": "=2025"
3334
}
3435
},
3536
defaults: {
@@ -78,7 +79,8 @@ export default [
7879
"2021": "=2021",
7980
"2022": "=2022",
8081
"2023": "=2023",
81-
"2024": "=2024"
82+
"2024": "=2024",
83+
"2025": "=2025",
8284
}
8385
},
8486
defaults: {
@@ -127,7 +129,8 @@ export default [
127129
"2021": "=2021",
128130
"2022": "=2022",
129131
"2023": "=2023",
130-
"2024": "=2024"
132+
"2024": "=2024",
133+
"2025": "=2025",
131134
}
132135
},
133136
defaults: {
@@ -170,7 +173,8 @@ export default [
170173
"2021": "=2021",
171174
"2022": "=2022",
172175
"2023": "=2023",
173-
"2024": "=2024"
176+
"2024": "=2024",
177+
"2025": "=2025",
174178
}
175179
},
176180
defaults: {
@@ -218,7 +222,8 @@ export default [
218222
"2021": "2021",
219223
"2022": "2022",
220224
"2023": "2023",
221-
"2024": "2024"
225+
"2024": "2024",
226+
"2025": "2025",
222227
}
223228
},
224229
defaults: {
@@ -269,7 +274,8 @@ export default [
269274
"2021": "2021",
270275
"2022": "2022",
271276
"2023": "2023",
272-
"2024": "2024"
277+
"2024": "2024",
278+
"2025": "2025",
273279
}
274280
},
275281
defaults: {

‎projects/budgetkey/src/app/item/items/item-budget/questions_spending8.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export default [
2929
"2021": "=2021",
3030
"2022": "=2022",
3131
"2023": "=2023",
32-
"2024": "=2024"
32+
"2024": "=2024",
33+
"2025": "=2025",
3334
}
3435
},
3536
defaults: {
@@ -78,7 +79,8 @@ export default [
7879
"2021": "=2021",
7980
"2022": "=2022",
8081
"2023": "=2023",
81-
"2024": "=2024"
82+
"2024": "=2024",
83+
"2025": "=2025",
8284
}
8385
},
8486
defaults: {
@@ -127,7 +129,8 @@ export default [
127129
"2021": "=2021",
128130
"2022": "=2022",
129131
"2023": "=2023",
130-
"2024": "=2024"
132+
"2024": "=2024",
133+
"2025": "=2025",
131134
}
132135
},
133136
defaults: {
@@ -170,7 +173,8 @@ export default [
170173
"2021": "=2021",
171174
"2022": "=2022",
172175
"2023": "=2023",
173-
"2024": "=2024"
176+
"2024": "=2024",
177+
"2025": "=2025",
174178
}
175179
},
176180
defaults: {
@@ -218,7 +222,8 @@ export default [
218222
"2021": "2021",
219223
"2022": "2022",
220224
"2023": "2023",
221-
"2024": "2024"
225+
"2024": "2024",
226+
"2025": "2025",
222227
}
223228
},
224229
defaults: {
@@ -269,7 +274,8 @@ export default [
269274
"2021": "2021",
270275
"2022": "2022",
271276
"2023": "2023",
272-
"2024": "2024"
277+
"2024": "2024",
278+
"2025": "2025",
273279
}
274280
},
275281
defaults: {

‎projects/budgetkey/src/app/item/items/item-supports/questions.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ export default [
3434
"2021": "=2021",
3535
"2022": "=2022",
3636
"2023": "=2023",
37-
"2024": "=2024"
37+
"2024": "=2024",
38+
"2025": "=2025",
3839
}
3940
},
4041
"defaults": {

0 commit comments

Comments
 (0)