Add more filters to change requests

Author: akariv

projects/budgetkey/src/assets/themes/theme.budgetkey.he.json

@@ -248,17 +248,17 @@
             "display": "בשנת התקציב",
             "id": "fiscal-year",
             "options": [
-              {
-                "display": "כל שנות התקציב",
-                "id": "all"
-              },
               {
                 "display": "2025",
                 "filters": {
                   "year": 2025
                 },
                 "id": "2025"
               },
+              {
+                "display": "כל שנות התקציב",
+                "id": "all"
+              },
               {
                 "display": "2024",
                 "filters": {
@@ -382,10 +382,42 @@
                 "id": "pending"
               }
             ]
+          },
+          {
+            "display": "סוג",
+            "id": "kind",
+            "options": [
+              {
+                "display": "כל הסוגים",
+                "id": "all"
+              },
+              {
+                "display": "לאישור וועדת הכספים",
+                "filters": {
+                  "change_type_name": "אישור ועדה"
+                },
+                "id": "approve"
+              },
+              {
+                "display": "הודעה לוועדת הכספים",
+                "filters": {
+                  "change_type_name": "הודעה לועדה"
+                },
+                "id": "notify"
+              },
+              {
+                "display": "באישור שר האוצר",
+                "filters": {
+                  "change_type_name": "אישור אגף"
+                },
+                "id": "minister"
+              }
+            ]
           }
         ],
         "id": "national-budget-changes",
         "name": "שינויים תקציביים",
+        "ordering": "-date",
         "placeholder": "חפשו פרטים על שינויים תקציביים...",
         "types": [
           "national-budget-changes"

themes/extract_translations.py

@@ -11,7 +11,9 @@
 
 API = os.environ['TX_TOKEN']
 HEB=re.compile('[א-ת]')
-OUTBASE='../projects/budgetkey/src/assets/themes/'
+THEMES = Path(__file__).parent
+ROOT = THEMES.parent
+OUTBASE = ROOT / 'projects/budgetkey/src/assets/themes/'
 
 transifex_api.setup(auth=API)
 
@@ -22,9 +24,10 @@
 ]
 
 def sources(kind):
-    for fn in Path('.').glob('{}*.he.json'.format(kind[0])):
+    for fn in THEMES.glob('{}*.he.json'.format(kind[0])):
         project = str(fn).split('.')[1]
-        yield fn, project, json.load(open(fn))
+        print('Found', fn, project)
+        yield fn, fn.name, project, json.load(open(fn))
 
 def keys(v, root=''):
     if isinstance(v, list):
@@ -44,7 +47,7 @@ def replace_with(v, replacements, project):
             yield k, replacements[k]
 
 def allkeys(kind):
-    for _, project, theme in sources(kind):
+    for _, _, project, theme in sources(kind):
         yield from keys(theme, project + '___')
 
 def hebrew(x):
@@ -89,9 +92,9 @@ def handle_kind(kind):
         translations = requests.get(url).text
         translations = yaml.load(translations, Loader=SafeLoader)['he']
 
-        for srcfn, project, theme in sources(kind):
-            fn = str(srcfn).replace('.he.', f'.{lang}.')
-            fn = OUTBASE + fn
+        for srcfn, filename, project, theme in sources(kind):
+            fn = str(filename).replace('.he.', f'.{lang}.')
+            fn = OUTBASE / fn
             for k, v in list(replace_with(theme, translations, project)):
                 parts = k.split('___')[1:]
                 ptr = theme
@@ -105,10 +108,11 @@ def handle_kind(kind):
                 ptr[parts[0]] = v
             json.dump(theme, open(fn, 'w'), indent=2, sort_keys=True, ensure_ascii=False)
             with srcfn.open('r') as f:
-                outsrcfn = str(OUTBASE / srcfn)
+                outsrcfn = str(OUTBASE / filename)
                 if '.he.' not in outsrcfn:
                     outsrcfn = outsrcfn.replace('.json', '.he.json')
                 with open(outsrcfn, 'w') as f2:
+                    print('Copying', srcfn, 'to', outsrcfn)
                     json.dump(json.load(f), f2, indent=2, sort_keys=True, ensure_ascii=False)
 
 

themes/theme.budgetkey.he.json

@@ -186,22 +186,23 @@
         "description": "שינויים בתקציב המדינה המתרחשים במהלך השנה.",
         "types": ["national-budget-changes"],
         "placeholder": "חפשו פרטים על שינויים תקציביים...",
+        "ordering": "-date",
         "filterMenu": [
           {
             "id": "fiscal-year",
             "display": "בשנת התקציב",
             "options":[
-              {
-                "id": "all",
-                "display": "כל שנות התקציב"
-              },
               {
                 "id": "2025",
                 "display": "2025",
                 "filters": {
                   "year": 2025
                 }                
               },
+              {
+                "id": "all",
+                "display": "כל שנות התקציב"
+              },
               {
                 "id": "2024",
                 "display": "2024",
@@ -325,6 +326,37 @@
                 }
               }
             ]
+          },
+          {
+            "id": "kind",
+            "display": "סוג",
+            "options": [
+              {
+                "id": "all",
+                "display": "כל הסוגים"
+              },
+              {
+                "id": "approve",
+                "display": "לאישור וועדת הכספים",
+                "filters": {
+                  "change_type_name": "אישור ועדה"
+                }
+              },
+              {
+                "id": "notify",
+                "display": "הודעה לוועדת הכספים",
+                "filters": {
+                  "change_type_name": "הודעה לועדה"
+                }
+              },
+              {
+                "id": "minister",
+                "display": "באישור שר האוצר",
+                "filters": {
+                  "change_type_name": "אישור אגף"
+                }
+              }
+            ]
           }
         ]
       },