Order spending by size

Author: akariv

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

@@ -274,7 +274,9 @@ export default [
               "end_date AS \"תאריך סיום\",",
               "case when manof_excerpts is not null and jsonb_array_length(manof_excerpts) > 0 then ((manof_excerpts->0)::jsonb)->>'soproc_name' else null end as \"שירות חברתי\",",
               "case when manof_excerpts is not null and jsonb_array_length(manof_excerpts) > 0 then 'activities/gov_social_service/' || (((manof_excerpts->0)::jsonb)->>'soproc_id')::text else null end as soproc_id",
-              "FROM contract_spending WHERE entity_id=':id' AND ((:period BETWEEN min_year AND max_year) or (min_year is null and :period <= max_year) or (max_year is null and :period >= min_year) or (:period is null))"],
+              "FROM contract_spending WHERE entity_id=':id' AND ((:period BETWEEN min_year AND max_year) or (min_year is null and :period <= max_year) or (max_year is null and :period >= min_year) or (:period is null))",
+              "ORDER BY \"היקף\" DESC NULLS LAST"
+            ],
     parameters: {
       period: {
         "כל השנים": "null",

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

@@ -259,7 +259,8 @@ export default [
               "FROM contract_spending ", 
               "WHERE budget_code like ':code%%' AND ((:period BETWEEN min_year AND max_year) or (min_year is null and :period <= max_year) or ", 
               "(max_year is null and :period >= min_year) or (:period is null))",
-              "ORDER BY order_date desc nulls last"
+              "ORDER BY \"היקף\" DESC NULLS LAST"
+              // "ORDER BY order_date desc nulls last"
             ],
     parameters: {
       period: {

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

@@ -259,7 +259,8 @@ export default [
               "FROM contract_spending ", 
               "WHERE budget_code = ':code' AND ((:period BETWEEN min_year AND max_year) or (min_year is null and :period <= max_year) or ", 
               "(max_year is null and :period >= min_year) or (:period is null))",
-              "ORDER BY order_date desc nulls last"
+              // "ORDER BY order_date desc nulls last"
+              "ORDER BY \"היקף\" DESC NULLS LAST"
             ],
     parameters: {
       period: {