Permalink
Browse files

HRM Team Membership prepop, move BulkImporter to s3import as more log…

…ical/easier to find. Re-enable Responsive in Bootstrap.
  • Loading branch information...
1 parent e433400 commit 87a9d53f0cf821b1e6011de40383049c659a0133 @flavour flavour committed Mar 20, 2013
Showing with 460 additions and 445 deletions.
  1. +1 −1 VERSION
  2. +6 −8 controllers/pr.py
  3. +2 −1 models/zzz_1st_run.py
  4. +12 −3 modules/eden/hrm.py
  5. +1 −1 modules/eden/pr.py
  6. +1 −1 modules/s3/codecs/xls.py
  7. +396 −7 modules/s3/s3import.py
  8. +0 −384 modules/s3/s3utils.py
  9. +1 −1 private/templates/ADAT/tasks.cfg
  10. +1 −1 private/templates/ARC/tasks.cfg
  11. +1 −1 private/templates/CERT/tasks.cfg
  12. +1 −1 private/templates/CSN/tasks.cfg
  13. +1 −1 private/templates/Crisis/tasks.cfg
  14. +5 −5 private/templates/DRMP/event.csv
  15. +1 −1 private/templates/DRMP/tasks.cfg
  16. +1 −1 private/templates/DRRPP/tasks.cfg
  17. +1 −1 private/templates/Delphi/tasks.cfg
  18. +1 −1 private/templates/EUROSHA/tasks.cfg
  19. +1 −1 private/templates/Georgia/tasks.cfg
  20. +1 −1 private/templates/IFRC/config.py
  21. +1 −1 private/templates/IFRC/tasks.cfg
  22. +1 −1 private/templates/IFRC_Demo/tasks.cfg
  23. +4 −0 private/templates/IFRC_Train/hrm_group_membership.csv
  24. +2 −1 private/templates/IFRC_Train/tasks.cfg
  25. +1 −1 private/templates/NYC/tasks.cfg
  26. +1 −1 private/templates/OCHA/tasks.cfg
  27. +1 −1 private/templates/Oxfam/tasks.cfg
  28. +1 −1 private/templates/RGIMS/tasks.cfg
  29. +1 −1 private/templates/SSF/tasks.cfg
  30. +1 −1 private/templates/SSF_Test/tasks.cfg
  31. +1 −1 private/templates/Sandy/tasks.cfg
  32. +1 −1 private/templates/SandyRelief/tasks.cfg
  33. +1 −1 private/templates/Shipment/tasks.cfg
  34. +1 −1 private/templates/Standard/tasks.cfg
  35. +1 −1 private/templates/default/tasks.cfg
  36. +1 −1 private/templates/regression/tasks.cfg
  37. +1 −1 private/templates/roles/tasks.cfg
  38. +1 −1 static/scripts/tools/build.sahana.py
  39. +3 −6 views/bootstrap_css.html
View
@@ -1 +1 @@
-4d95f2d (2013-03-19 16:27:28)
+e433400 (2013-03-20 10:57:23)
View
@@ -132,10 +132,9 @@ def prep(r):
elif r.interactive:
if r.representation == "popup":
# Hide "pe_label" and "missing" fields in person popups
- r.table.pe_label.readable = False
- r.table.pe_label.writable = False
- r.table.missing.readable = False
- r.table.missing.writable = False
+ table = r.table
+ table.pe_label.readable = table.pe_label.writable = False
+ table.missing.readable = table.missing.writable = False
# S3SQLCustomForm breaks popup return, so disable
s3db.clear_config("pr_person", "crud_form")
@@ -166,8 +165,7 @@ def prep(r):
raise HTTP(404)
elif r.id:
- r.table.volunteer.readable = True
- r.table.volunteer.writable = True
+ r.table.volunteer.readable = r.table.volunteer.writable = True
return True
s3.prep = prep
@@ -187,7 +185,7 @@ def postp(r, output):
list_fields=["id",
"group_id",
"group_head",
- "description"
+ "description",
])
# Basic tabs
@@ -203,7 +201,7 @@ def postp(r, output):
(T("Skills"), "competency"),
(T("Training"), "training"),
(T("Saved Searches"), "saved_search"),
- ]
+ ]
# Configuration tabs
tabs.append((T("Map Settings"), "config"))
View
@@ -265,7 +265,8 @@
grandTotalStart = datetime.datetime.now()
for pop_setting in pop_list:
start = datetime.datetime.now()
- bi.clear_tasks()
+ # Clear Tasklist
+ bi.tasks = []
# Import data specific to the prepopulate setting
if isinstance(pop_setting, str):
path = os.path.join(request.folder,
View
@@ -4652,7 +4652,9 @@ def hrm_configure_pr_group_membership():
msg_record_deleted = T("Membership deleted"),
msg_list_empty = T("No Members currently registered"))
- phone_label = current.deployment_settings.get_ui_label_mobile_phone()
+ settings = current.deployment_settings
+ phone_label = settings.get_ui_label_mobile_phone()
+ site_label = settings.get_org_site_label()
list_fields = ["id",
"group_id$description",
"group_head",
@@ -4661,6 +4663,9 @@ def hrm_configure_pr_group_membership():
"person_id$last_name",
(T("Email"), "person_id$email.value"),
(phone_label, "person_id$phone.value"),
+ (current.messages.ORGANISATION,
+ "person_id$hrm_human_resource:organisation_id$name"),
+ (site_label, "person_id$hrm_human_resource:site_id$name"),
]
if current.request.function == "group_membership":
list_fields.insert(1, "group_id")
@@ -4722,7 +4727,10 @@ def prep(r):
if r.interactive or r.representation == "xls":
if r.component_name == "group_membership":
hrm_configure_pr_group_membership()
-
+ if r.representation == "xls":
+ # Modify Title of Report to show Team Name
+ s3.crud_strings.pr_group_membership.title_list = r.record.name
+
return True
s3.prep = prep
@@ -4734,7 +4742,8 @@ def postp(r, output):
update_url = URL(args=["[id]", "group_membership"])
S3CRUD.action_buttons(r, update_url=update_url)
if current.deployment_settings.has_module("msg") and \
- current.auth.permission.has_permission("update", c="hrm", f="compose"):
+ current.auth.permission.has_permission("update", c="hrm",
+ f="compose"):
s3.actions.append({
"url": URL(f="compose",
vars = {"group_id": "[id]"}),
View
@@ -731,7 +731,7 @@ def model(self):
#"picture",
"gender",
"age_group",
- (messages.ORGANISATION, "hrm_human_resource:organisation_id$name")
+ (messages.ORGANISATION, "hrm_human_resource:organisation_id$name"),
],
crud_form = crud_form,
onvalidation=self.pr_person_onvalidation,
View
@@ -43,8 +43,8 @@
raise
from gluon import *
-from gluon.storage import Storage
from gluon.contenttype import contenttype
+from gluon.storage import Storage
from ..s3codec import S3Codec
from ..s3utils import s3_unicode, s3_strip_markup
Oops, something went wrong.

0 comments on commit 87a9d53

Please sign in to comment.