Add 2025 + better changes filters

OpenBudget · Jan 4, 2025 · 355e155 · 355e155
1 parent b7151a4
commit 355e155
Show file tree

Hide file tree

Showing 14 changed files with 820 additions and 1,609 deletions.
diff --git a/projects/budgetkey/src/app/common-components/theme.budgetkey.he.ts b/projects/budgetkey/src/app/common-components/theme.budgetkey.he.ts
@@ -81,7 +81,7 @@ export const DEFAULT_THEME: any={
               "id": "latest",
               "display": "שנת התקציב הנוכחית",
               "filters": {
-                "year": 2024
+                "year": 2025
               }
             }
           ]
@@ -192,6 +192,13 @@ export const DEFAULT_THEME: any={
               "id": "all",
               "display": "כל שנות התקציב"
             },
+            {
+              "id": "2025",
+              "display": "2025",
+              "filters": {
+                "year": 2025
+              }                
+            },
             {
               "id": "2024",
               "display": "2024",

diff --git a/projects/budgetkey/src/app/item/items/base-org-item/questions.ts b/projects/budgetkey/src/app/item/items/base-org-item/questions.ts
@@ -27,7 +27,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     defaults: {
@@ -70,7 +71,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025"
       }
     },
     headers: [
@@ -113,7 +115,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025"
       }
     },
     defaults: {
@@ -195,7 +198,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025"
       }
     },
     defaults: {
@@ -240,7 +244,8 @@ export default [
         "2021": "2021",
         "2022": "2022",
         "2023": "2023",
-        "2024": "2024"
+        "2024": "2024",
+        "2025": "2025"
       }
     },
     defaults: {
@@ -283,7 +288,8 @@ export default [
         "2021": "2021",
         "2022": "2022",
         "2023": "2023",
-        "2024": "2024"
+        "2024": "2024",
+        "2025": "2025"
       }
     },
     defaults: {

diff --git a/projects/budgetkey/src/app/item/items/item-budget/questions_parents.ts b/projects/budgetkey/src/app/item/items/item-budget/questions_parents.ts
@@ -18,6 +18,7 @@ export default [
     parameters: {
       period: {
         "כל השנים": ">0",
+        "2025": "=2025",
         "2024": "=2024",
         "2023": "=2023",
         "2022": "=2022",

diff --git a/projects/budgetkey/src/app/item/items/item-budget/questions_spending.ts b/projects/budgetkey/src/app/item/items/item-budget/questions_spending.ts
@@ -29,7 +29,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025"
       }
     },
     defaults: {
@@ -78,7 +79,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     defaults: {
@@ -127,7 +129,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     defaults: {
@@ -170,7 +173,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     defaults: {
@@ -218,7 +222,8 @@ export default [
         "2021": "2021",
         "2022": "2022",
         "2023": "2023",
-        "2024": "2024"
+        "2024": "2024",
+        "2025": "2025",
       }
     },
     defaults: {
@@ -269,7 +274,8 @@ export default [
         "2021": "2021",
         "2022": "2022",
         "2023": "2023",
-        "2024": "2024"
+        "2024": "2024",
+        "2025": "2025",
       }
     },
     defaults: {

diff --git a/projects/budgetkey/src/app/item/items/item-budget/questions_spending8.ts b/projects/budgetkey/src/app/item/items/item-budget/questions_spending8.ts
@@ -29,7 +29,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     defaults: {
@@ -78,7 +79,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     defaults: {
@@ -127,7 +129,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     defaults: {
@@ -170,7 +173,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     defaults: {
@@ -218,7 +222,8 @@ export default [
         "2021": "2021",
         "2022": "2022",
         "2023": "2023",
-        "2024": "2024"
+        "2024": "2024",
+        "2025": "2025",
       }
     },
     defaults: {
@@ -269,7 +274,8 @@ export default [
         "2021": "2021",
         "2022": "2022",
         "2023": "2023",
-        "2024": "2024"
+        "2024": "2024",
+        "2025": "2025",
       }
     },
     defaults: {

diff --git a/projects/budgetkey/src/app/item/items/item-supports/questions.ts b/projects/budgetkey/src/app/item/items/item-supports/questions.ts
@@ -34,7 +34,8 @@ export default [
         "2021": "=2021",
         "2022": "=2022",
         "2023": "=2023",
-        "2024": "=2024"
+        "2024": "=2024",
+        "2025": "=2025",
       }
     },
     "defaults": {