Merge lp:~ptressel/sahana-eden/stalled into lp:sahana-eden

[Pat Tressel]

Add required field * to names of shelter types and services.
(Trac bugs #597 and #603.)

Move setting of required field * for school_code and hospital_id from .js file to model file.

Do this for hospital_id by copying the reusable field and adjusting the comment. No reusable fields were harmed. The one other use of hospital_id, in hms_hrequest (hospital request) does not get a * on its comment.

[lp:~ptressel/sahana-eden/stalled]

1154. By Fran Boon on 2010-09-01

Progress the Location Selector (set the Dropdowns if an Lx is selected in the Name box), add useful jquery.form-extension library

1155. By Fran Boon on 2010-09-01

Merge ptressel: Add required field * to names of shelter types and services

=== modified file 'models/cr.py'
--- models/cr.py	2010-08-31 21:51:59 +0000
+++ models/cr.py	2010-09-01 00:36:48 +0000
@@ -20,7 +20,9 @@
     resource = "shelter_type"
     tablename = module + "_" + resource
     table = db.define_table(tablename, timestamp, uuidstamp, deletion_status,
-                    Field("name", notnull=True),
+                    Field("name",
+                          notnull=True,
+                          comment = SPAN("*", _class="req")),
                     comments,
                     migrate=migrate)
     
@@ -55,7 +57,9 @@
     resource = "shelter_service"
     tablename = module + "_" + resource
     table = db.define_table(tablename, timestamp, uuidstamp, deletion_status,
-                    Field("name", notnull=True),
+                    Field("name",
+                          notnull=True,
+                          comment = SPAN("*", _class="req")),
                     comments,
                     migrate=migrate)
     
@@ -134,16 +138,26 @@
                     # are for Pakistan flood response.  It is simpler
                     # to keep this info in the shelter table and hide it if
                     # the shelter is not a school.
-                    Field("school_code", "integer"),
+                    Field("school_code", "integer",
+                          comment = SPAN("*", _class="req")),
                     Field("school_pf", "integer"),
                     )
+
     fields_after_hospital = db.Table(None, None, comments)
 
+    # Make a copy of reusable field hospital_id and change its comment to
+    # include a *.  # We want it to look required whenever it's visible.
+    cr_hospital_id = db.Table(None, "hospital_id", hospital_id)
+    comment_with_star = DIV(SPAN("*", _class="req"), 
+                            cr_hospital_id.hospital_id.comment)
+    cr_hospital_id.hospital_id.comment = comment_with_star
+
+
     # Only include hospital_id if the hms module is enabled.
     if deployment_settings.has_module("hms"):
         table = db.define_table(tablename,
                                 fields_before_hospital,
-                                hospital_id,
+                                cr_hospital_id,
                                 fields_after_hospital,
                                 migrate=migrate)
     else:

=== modified file 'views/cr/shelter_optional_data.js'
--- views/cr/shelter_optional_data.js	2010-08-31 21:51:59 +0000
+++ views/cr/shelter_optional_data.js	2010-09-01 00:36:48 +0000
@@ -15,14 +15,11 @@
     // Adding tooltip here is too late to get proper decorations, so add them.
     $('#is_school_tooltip').cluetip(
         {activation: 'hover', sticky: false, splitTitle: '|'});
-    // Make the school code line appear required -- we'll test for a non-empty
-    // code if the checkbox is checked.  (This jQuery selector tests within
-    // the set selected by the first selector for a child matching the second.)
-    $('#cr_shelter_school_code__row .w2p_fc').append(
-        '{{=SPAN("*", _class="req")}}');
     // If data is present (on update), or if there's a validation error
     // (meaning box was checked but no school code filled in on create),
-    // set checked and do not hide.
+    // set checked and do not hide.  (The jQuery selector with two terms
+    // tests within the set selected by the first selector, for a child
+    // matching the second.)
     if ($('#cr_shelter_school_code').val() != "" ||
         $('#cr_shelter_school_code__row #school_code__error').length != 0) {
         $('#is_school').attr('checked','on');
@@ -64,9 +61,6 @@
         // Add tooltip decorations.
         $('#is_hospital_tooltip').cluetip(
             {activation: 'hover', sticky: false, splitTitle: '|'});
-        // Make hospital_id appear required.
-        $('#cr_shelter_hospital_id__row .w2p_fc').append(
-            '{{=SPAN("*", _class="req")}}');
         // If data is present (on update), or if there's a validation error
         // (meaning box was checked but no hospital id filled in on create),
         // set checked and do not hide.