Permalink
Browse files

Merge branch 'master' of git://github.com/flavour/eden

  • Loading branch information...
2 parents 7b34081 + 9c4c78f commit 505eb6ffbb8fc32fdbbe63fdab4c19d87e53ca86 @flavour committed Oct 7, 2012
Showing with 2,457 additions and 3,381 deletions.
  1. +1 −1 controllers/project.py
  2. +2 −1 modules/eden/asset.py
  3. +4 −3 modules/eden/hrm.py
  4. +2 −2 modules/eden/menus.py
  5. +6 −5 modules/eden/project.py
  6. +325 −169 modules/eden/transport.py
  7. +8 −6 modules/s3/s3search.py
  8. +2 −2 modules/s3cfg.py
  9. +3 −2 modules/tests/asset/asset.py
  10. +10 −5 modules/tests/asset/create_asset.py
  11. +4 −3 modules/tests/hrm/create_staff.py
  12. +4 −3 modules/tests/hrm/create_volunteer.py
  13. +3 −3 modules/tests/inv/create_catalog.py
  14. +1 −1 modules/tests/inv/create_warehouse.py
  15. +6 −2 modules/tests/inv/receive_item.py
  16. +4 −0 modules/tests/inv/send_item.py
  17. +8 −0 modules/tests/inv/send_receive_item.py
  18. +1 −1 modules/tests/member/create_member.py
  19. +5 −8 modules/tests/project/create_project.py
  20. +4 −3 modules/unit_tests/s3/s3widgets.py
  21. +132 −127 private/templates/IFRC/project_activity_type.csv
  22. +71 −67 private/templates/IFRC/project_theme.csv
  23. +1 −1 static/formats/s3csv/project/activity_type.csv
  24. +1 −0 static/formats/s3csv/project/activity_type.xsl
  25. +23 −9 static/scripts/S3/S3.js
  26. +23 −21 static/scripts/S3/S3.min.js
  27. +5 −3 static/scripts/S3/s3.dataTables.js
  28. +1 −1 static/scripts/S3/s3.dataTables.min.js
  29. +8 −8 static/scripts/S3/s3.gis.controls.js
  30. +2 −2 static/scripts/S3/s3.gis.min.js
  31. +3 −1 static/scripts/S3/s3.locationselector.widget.js
  32. +2 −2 static/scripts/S3/s3.locationselector.widget.min.js
  33. +41 −2 static/scripts/S3/s3.search.js
  34. +109 −111 static/scripts/gis/GeoExt.js
  35. +12 −12 static/scripts/gis/MGRS.min.js
  36. +1,459 −2,633 static/scripts/gis/OpenLayers.js
  37. +161 −161 static/scripts/gis/gxp.js
View
@@ -549,7 +549,7 @@ def demographic_data():
return s3db.stats_demographic_data_controller()
# -----------------------------------------------------------------------------
-def community_contact():
+def location_contact():
""" Show a list of all community contacts """
return s3_rest_controller()
View
@@ -155,7 +155,8 @@ def model(self):
widget = None,
script = None, # No Item Pack Filter
),
- organisation_id(script = SCRIPT('''
+ organisation_id(required = True,
+ script = SCRIPT('''
$(document).ready(function(){
S3FilterFieldChange({
'FilterField':'organisation_id',
View
@@ -132,6 +132,7 @@ def model(self):
S3FilterFieldChange({
'FilterField':'organisation_id',
'Field':'site_id',
+ 'FieldID':'site_id',
'FieldResource':'site',
'FieldPrefix':'org',
})
@@ -1903,9 +1904,9 @@ def model(self):
cols=report_fields,
facts=report_fields,
methods=["count", "list"],
- defaults=Storage(rows="hrm_training.course_id",
- cols="hrm_training.month",
- fact="hrm_training.person_id",
+ defaults=Storage(rows="training.course_id",
+ cols="training.month",
+ fact="training.person_id",
aggregate="count"),
),
list_fields = [
View
@@ -1481,8 +1481,8 @@ def project(self):
M("List All"),
M("Map", m="map"),
M("Search", m="search"),
- M("List All Community Contacts", f="community_contact"),
- M("Search Community Contacts", f="community_contact",
+ M("List All Community Contacts", f="location_contact"),
+ M("Search Community Contacts", f="location_contact",
m="search"),
),
)
View
@@ -705,6 +705,7 @@ def model(self):
table = define_table(tablename,
Field("name", length=128,
notnull=True, unique=True),
+ s3_comments(),
*s3_meta_fields())
# Field configuration?
@@ -1516,9 +1517,9 @@ def model(self):
msg_record_deleted = T("Contact Deleted"),
msg_list_empty = T("No Contacts Found"))
- community_contact_search = S3Search(
+ location_contact_search = S3Search(
advanced=(S3SearchSimpleWidget(
- name = "community_contact_search_simple",
+ name = "location_contact_search_simple",
label = T("Name"),
comment = T("You can search by person name - enter any of the first, middle or last names, separated by spaces. You may use % as wildcard. Press 'Search' without input to list all persons."),
field = ["person_id$first_name",
@@ -1527,13 +1528,13 @@ def model(self):
]
),
S3SearchOptionsWidget(
- name="community_contact_search_L1",
+ name="location_contact_search_L1",
field="person_id$L1",
location_level="L1",
cols = 3,
),
S3SearchOptionsWidget(
- name="community_contact_search_L2",
+ name="location_contact_search_L2",
field="person_id$L2",
location_level="L2",
cols = 3,
@@ -1543,7 +1544,7 @@ def model(self):
# Resource configuration
#hierarchy = current.gis.get_location_hierarchy()
configure(tablename,
- search_method=community_contact_search,
+ search_method=location_contact_search,
list_fields=["person_id",
# (hierarchy["L0"], "person_id$L0"),
# (hierarchy["L1"], "person_id$L1"),
Oops, something went wrong.

0 comments on commit 505eb6f

Please sign in to comment.