Fix united spending queries

OpenBudget · Jun 13, 2024 · cf575cc · cf575cc
1 parent cd3fe54
commit cf575cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
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
@@ -4,10 +4,10 @@ export default [
   {
     text: "פירוט כל ההוצאות מסעיף זה ששולמו ב <period>",
     query: ["with a as (",
-    "select year_paid as \"שנה\", entity_name as \"מקבל הכספים\", amount_paid as \"סך כולל\", support_title as \"תיאור\", 'תמיכה' as \"סוג ההוצאה\"",
-    "from  supports_by_payment_year where budget_code like ':code%%' and amount_paid>0 and year_paid :period union",
-    "select min_year as \"שנה\", entity_name as \"מקבל הכספים\", executed as \"סך כולל\", purpose as \"תיאור\", 'רכש' as \"סוג ההוצאה\"",
-    "from contract_spending where budget_code like ':code%%' and executed > 0 and min_year :period)",
+    "select year_paid as \"שנה\", coalesce(entity_name, recipient) as \"מקבל הכספים\", amount_paid as \"סך כולל\", support_title as \"תיאור\", 'תמיכה' as \"סוג ההוצאה\"",
+    "from  supports_by_payment_year where budget_code = ':code' and amount_paid>0 and year_paid :period union",
+    "select min_year as \"שנה\", coalesce(entity_name, supplier_name->>0) as \"מקבל הכספים\", executed as \"סך כולל\", purpose as \"תיאור\", 'רכש' as \"סוג ההוצאה\"",
+    "from contract_spending where budget_code = ':code' and executed > 0 and min_year :period)",
     "select * from a order by \"שנה\" desc, \"סך כולל\" desc"
     ],
     parameters: {

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
@@ -4,9 +4,9 @@ export default [
   {
     text: "פירוט כל ההוצאות מתקנה זו ששולמו ב <period>",
     query: ["with a as (",
-    "select year_paid as \"שנה\", entity_name as \"מקבל הכספים\", amount_paid as \"סך כולל\", support_title as \"תיאור\", 'תמיכה' as \"סוג ההוצאה\"",
+    "select year_paid as \"שנה\", coalesce(entity_name, recipient) as \"מקבל הכספים\", amount_paid as \"סך כולל\", support_title as \"תיאור\", 'תמיכה' as \"סוג ההוצאה\"",
     "from  supports_by_payment_year where budget_code = ':code' and amount_paid>0 and year_paid :period union",
-    "select min_year as \"שנה\", entity_name as \"מקבל הכספים\", executed as \"סך כולל\", purpose as \"תיאור\", 'רכש' as \"סוג ההוצאה\"",
+    "select min_year as \"שנה\", coalesce(entity_name, supplier_name->>0) as \"מקבל הכספים\", executed as \"סך כולל\", purpose as \"תיאור\", 'רכש' as \"סוג ההוצאה\"",
     "from contract_spending where budget_code = ':code' and executed > 0 and min_year :period)",
     "select * from a order by \"שנה\" desc, \"סך כולל\" desc"
     ],