STL: expose "Outcome for DS" box, introduce "monthly_income" in place of

"weekly_income" (the latter retained for data migration), styles fix, cleanup
flavour · Jan 13, 2017 · 4bf57de · 4bf57de
1 parent c1aa13b
commit 4bf57de
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0d494ce (2017-01-12 16:12:42)
+nursix-dev-746-gc1aa13b (2017-01-13 11:06:03)
diff --git a/modules/s3db/dvr.py b/modules/s3db/dvr.py
@@ -1597,8 +1597,10 @@ def model(self):
                              past = 0,
                              ),
                      # @todo: provide options lookup?
-                     Field("outcome",
+                     Field("outcome", "text",
                            label = T("Outcome"),
+                           represent = s3_text_represent,
+                           widget = s3_comments_widget,
                            ),
                      Field("completed", "boolean",
                            default = False,
@@ -2642,6 +2644,10 @@ def model(self):
                            label = T("Average Weekly Income"),
                            requires = IS_EMPTY_OR(IS_FLOAT_IN_RANGE(0.0, None)),
                            ),
+                     Field("monthly_income", "double",
+                           label = T("Average Monthly Income"),
+                           requires = IS_EMPTY_OR(IS_FLOAT_IN_RANGE(0.0, None)),
+                           ),
                      s3_currency(),
                      s3_comments(),
                      *s3_meta_fields())
@@ -2673,7 +2679,8 @@ def model(self):
         # CRUD Form
         crud_form = S3SQLCustomForm("housing_type_id",
                                     "monthly_costs",
-                                    "average_weekly_income",
+                                    #"average_weekly_income",
+                                    "monthly_income",
                                     "currency",
                                     S3SQLInlineLink("income_source",
                                                     field = "income_source_id",
@@ -2687,7 +2694,8 @@ def model(self):
         list_fields = ["housing_type_id",
                        "monthly_costs",
                        "income_source_economy.income_source_id",
-                       "average_weekly_income",
+                       #"average_weekly_income",
+                       "monthly_income",
                        "comments",
                        ]
 
@@ -3644,6 +3652,8 @@ def model(self):
                            ),
                      Field("reason", "text",
                            label = T("Reason"),
+                           represent = s3_text_represent,
+                           widget = s3_comments_widget,
                            ),
                      Field("proposal", "text",
                            label = T("Proposed Assistance"),

diff --git a/modules/templates/STL/config.py b/modules/templates/STL/config.py
@@ -565,13 +565,16 @@ def expose_human_resource_id(table):
 
             if r.function == "due_followups":
                 table = r.table
+                component = r.resource
                 # Filter activities by root service
                 query = (FS("service_id$root_service") == root_service_id)
-                r.resource.add_filter(query)
+                component.add_filter(query)
             else:
                 table = r.component.table
                 component = r.component
 
+            component.configure(orderby=~table.start_date)
+
             expose_project_id(table)
             expose_human_resource_id(table)
 
@@ -671,6 +674,7 @@ def expose_human_resource_id(table):
                                         "followup_date",
                                         "completed",
                                         "end_date",
+                                        (T("Outcome for DS"), "outcome"),
                                         "activity_funding.funding_required",
                                         "activity_funding.reason",
                                         S3SQLInlineComponent(

diff --git a/modules/templates/STL/menus.py b/modules/templates/STL/menus.py
@@ -169,7 +169,7 @@ def dvr():
                           ),
                         ),
                     M("Administration", c="dvr", link=False,
-                      restrict = ("ADMIN","ORG_ADMIN"))(
+                      restrict = (ADMIN, "ORG_ADMIN"))(
                         M("Beneficiary Types", f="beneficiary_type"),
                         M("Evaluation Questions", f="evaluation_question"),
                         M("Housing Types", f="housing_type"),
@@ -211,7 +211,7 @@ def org():
                        #M("Import", m="import"),
                     ),
                     M("Administration", c=("org", "project"), link=False,
-                      restrict = ("ADMIN","ORG_ADMIN"))(
+                      restrict = (ADMIN, "ORG_ADMIN"))(
                         M("Organization Types", f="organisation_type"),
                         M("Service Types", f="service"),
                         M("Facility Types", f="facility_type"),

diff --git a/static/themes/STL/eden.min.css b/static/themes/STL/eden.min.css
diff --git a/static/themes/STL/scss/custom/_rheader.scss b/static/themes/STL/scss/custom/_rheader.scss
@@ -39,7 +39,7 @@ div.tabs {
     margin: 0.8rem 0;
     padding: 0;
 
-    line-height: 1.3rem;
+    line-height: 1.25rem;
     text-align: left;
 
     border-bottom: 1px solid $rheader_tabs_bgcolor_inactive;

diff --git a/static/themes/STL/style.css b/static/themes/STL/style.css
@@ -468,7 +468,7 @@ div.tabs {
   width: 100%;
   margin: 0.8rem 0;
   padding: 0;
-  line-height: 1.3rem;
+  line-height: 1.25rem;
   text-align: left;
   border-bottom: 1px solid #20579A;
 }