Initial Git version of the VITA branch

sahana · Dec 29, 2011 · ac93bfa · ac93bfa
1 parent be6c3e2
commit ac93bfa
Show file tree

Hide file tree

Showing 2,200 changed files with 270,796 additions and 350,223 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,5 @@
 *.ttf
 .~lock.*.csv#
 *.log
-*.pyc
+*.pyc
+*.~*~
diff --git a/ABOUT b/ABOUT
@@ -1,5 +1,5 @@
-Sahana Eden is an Emergency Development Environment - an Open Source framework to rapidly build powerful applications for Emergency Management.
-
-It is a web based collaboration tool that addresses the common coordination problems during a disaster from finding missing people, managing aid, managing volunteers, tracking camps effectively between Government groups, the civil society (NGOs) and the victims themselves.
-
-Please see the website for more details: http://eden.sahanafoundation.org/
+Sahana Eden is an Emergency Development Environment - an Open Source framework to rapidly build powerful applications for Emergency Management.
+
+It is a web based collaboration tool that addresses the common coordination problems during a disaster from finding missing people, managing aid, managing volunteers, tracking camps effectively between Government groups, the civil society (NGOs) and the victims themselves.
+
+Please see the website for more details: http://eden.sahanafoundation.org/
diff --git a/INSTALL b/INSTALL
@@ -1,5 +1,5 @@
-Sahana Eden
------------
-This package is designed to be uploaded into a running instance of Web2Py:
-
-http://eden.sahanafoundation.org/wiki/InstallationGuidelines
+Sahana Eden
+-----------
+This package is designed to be uploaded into a running instance of Web2Py:
+
+http://eden.sahanafoundation.org/wiki/InstallationGuidelines
diff --git a/LICENSE b/LICENSE
@@ -1,24 +1,24 @@
-http://en.wikipedia.org/wiki/MIT_License
-
-Copyright: 2010 (c) Sahana Software Foundation
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+http://en.wikipedia.org/wiki/MIT_License
+
+Copyright: 2010 (c) Sahana Software Foundation
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README b/README
@@ -1,5 +1,5 @@
-Sahana Eden is an Emergency Development Environment - an Open Source framework to rapidly build powerful applications for Emergency Management.
-
-It is a web based collaboration tool that addresses the common coordination problems during a disaster from finding missing people, managing aid, managing volunteers, tracking camps effectively between Government groups, the civil society (NGOs) and the victims themselves.
-
-Please see the website for more details: http://eden.sahanafoundation.org/
+Sahana Eden is an Emergency Development Environment - an Open Source framework to rapidly build powerful applications for Emergency Management.
+
+It is a web based collaboration tool that addresses the common coordination problems during a disaster from finding missing people, managing aid, managing volunteers, tracking camps effectively between Government groups, the civil society (NGOs) and the victims themselves.
+
+Please see the website for more details: http://eden.sahanafoundation.org/
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-r3091 (2011-12-27 23:13:10)
+vita-0.5.5-devel-13-g19a4774 (2011-12-29 15:12:02)
diff --git a/__init__.py b/__init__.py
diff --git a/controllers/admin.py b/controllers/admin.py
diff --git a/controllers/appadmin.py b/controllers/appadmin.py
diff --git a/controllers/auth.py b/controllers/auth.py
diff --git a/controllers/budget.py b/controllers/budget.py
diff --git a/controllers/cr.py b/controllers/cr.py
@@ -250,12 +250,15 @@ def cr_shelter_prep(r):
                 # Set defaults
                 db.pr_presence.datetime.default = request.utcnow
                 db.pr_presence.observer.default = s3_logged_in_person()
+                popts = s3db.pr_presence_opts
+                pcnds = s3db.pr_presence_conditions
                 cr_shelter_presence_opts = {
-                    vita.CHECK_IN: vita.presence_conditions[vita.CHECK_IN],
-                    vita.CHECK_OUT: vita.presence_conditions[vita.CHECK_OUT]}
+                    popts.CHECK_IN: pcnds[popts.CHECK_IN],
+                    popts.CHECK_OUT: pcnds[popts.CHECK_OUT]
+                }
                 db.pr_presence.presence_condition.requires = IS_IN_SET(
                     cr_shelter_presence_opts, zero=None)
-                db.pr_presence.presence_condition.default = vita.CHECK_IN
+                db.pr_presence.presence_condition.default = popts.CHECK_IN
                 # Change the Labels
                 s3.crud_strings.pr_presence = Storage(
                     title_create = T("Register Person"),

diff --git a/controllers/default.py b/controllers/default.py
@@ -414,15 +414,16 @@ def site():
         site_id = request.args[0]
         site_r = db.org_site[site_id]
         tablename = site_r.instance_type
-        query = (db[tablename].site_id == site_id)
-        id = db(query).select(db[tablename].id,
-                              limitby = (0, 1)).first().id
-        cf = tablename.split("_", 1)
-        redirect(URL(c = cf[0],
-                     f = cf[1],
-                     args = [id]))
-    else:
-        raise HTTP(404)
+        table = s3db.table(tablename)
+        if table:
+            query = (table.site_id == site_id)
+            id = db(query).select(db[tablename].id,
+                                  limitby = (0, 1)).first().id
+            cf = tablename.split("_", 1)
+            redirect(URL(c = cf[0],
+                         f = cf[1],
+                         args = [id]))
+    raise HTTP(404)
 
 # -----------------------------------------------------------------------------
 def message():

diff --git a/controllers/delphi.py b/controllers/delphi.py
diff --git a/controllers/dvi.py b/controllers/dvi.py
@@ -131,8 +131,9 @@ def body():
 
     s3mgr.configure("dvi_body", main="pe_label", extra="gender")
 
-    db.pr_note.status.readable = False
-    db.pr_note.status.writable = False
+    ntable = s3db.pr_note
+    ntable.status.readable = False
+    ntable.status.writable = False
 
     dvi_tabs = [(T("Recovery"), ""),
                 (T("Checklist"), "checklist"),

diff --git a/controllers/dvr.py b/controllers/dvr.py
diff --git a/controllers/hms.py b/controllers/hms.py
diff --git a/controllers/hrm.py b/controllers/hrm.py
@@ -57,11 +57,10 @@ def s3_menu_prep():
         org_filter()
 
     # Set mode
-    if session.s3.hrm.mode != "personal" and \
-       (ADMIN in roles or session.s3.hrm.orgs):
-        session.s3.hrm.mode = None
-    elif deployment_settings.get_security_policy() in (1, 2):
-        session.s3.hrm.mode = None
+    if session.s3.hrm.mode != "personal":
+        if (ADMIN in roles or session.s3.hrm.orgs) or \
+           deployment_settings.get_security_policy() in (1, 2):
+            session.s3.hrm.mode = None
     else:
         session.s3.hrm.mode = "personal"
 

diff --git a/controllers/pr.py b/controllers/pr.py
@@ -325,10 +325,6 @@ def presence():
 
     # Settings suitable for use in Map Popups
 
-    # This filter should be added to the gis_layer_feature query
-    #response.s3.filter = ((table.presence_condition.belongs(vita.PERSISTANT_PRESENCE)) & \
-    #                      (table.closed == False))
-
     table.pe_id.readable = True
     table.pe_id.label = "Name"
     table.pe_id.represent = person_represent
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,5 @@ @@
     *.ttf
     .~lock.*.csv#
     *.log
-    *.pyc
+    *.pyc
+    *.~*~
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		r3091 (2011-12-27 23:13:10)
		vita-0.5.5-devel-13-g19a4774 (2011-12-29 15:12:02)