Merge lp:~zubairassad89/sahana-eden/vms into lp:~sahana-eden-vms/sahana-eden/vms

[zubair assad]

Merge assad-dev-vms

Merge assad-dev-vms

[Pat Tressel (ptressel)]

Eventually the skillcust table will have all the types of skills in it, even if the site starts out using a pre-defined set. So maybe we shouldn't call it skillcust. Would be nice if we could use something generic. Maybe skill_types?

I recall you wanted to start out with just one level of category (easier to get something working, and maybe users don't want more than that). So how about taking out the subcategory?

review: Needs Fixing

[zubair assad (zubairassad89)]

Nice idea, with all skills converging into a single table.
Ok, i will take out the subcategory and change the name of skillcust to skill_type.

> Eventually the skillcust table will have all the types of skills in it, even
> if the site starts out using a pre-defined set. So maybe we shouldn't call it
> skillcust. Would be nice if we could use something generic. Maybe
> skill_types?
>
> I recall you wanted to start out with just one level of category (easier to
> get something working, and maybe users don't want more than that). So how
> about taking out the subcategory?

review: Approve

[Pat Tressel (ptressel)]

I still see "skillcust" in a comment and in the name of an html file.

How about putting in CRUD strings for skill_types?

I wonder if you need a custom form if you have CRUD strings -- see what happens if you don't have an html page.

You'll need something like Add Skill Types in the top level menu, and take it out of the person menu -- it doesn't go with a specific person.

[zubair assad (zubairassad89)]

Sorry about that skillcust!
put the CRUD for skill_types
add skill types put in top menu

> I still see "skillcust" in a comment and in the name of an html file.
>
> How about putting in CRUD strings for skill_types?
>
> I wonder if you need a custom form if you have CRUD strings -- see what
> happens if you don't have an html page.
>
> You'll need something like Add Skill Types in the top level menu, and take it
> out of the person menu -- it doesn't go with a specific person.

review: Approve

[Pat Tressel (ptressel)]

Want to take out that alert foo from skill.js? Also there are some code lines commented out -- those can go away.

The skill_types table looks like it has some debug stuff -- the name and category fields are commented out, and there's an extra comment1 field (or do you want a "description" field in there)? The subcategory field is still there but commented out -- it can go away.

Some formatting cleanup needed:

Extra blank lines in menu, before the ) in add_component, in between code blocks (ok to have 2 blank lines between major sections, like different tables), in skill.js.

Line num_column=3 in models/vol.py looks like it's got a newline in front of it.

When you post a reply comment, set the "Review" to comment only. ;-)

review: Needs Fixing

[Pat Tressel (ptressel)]

At about line 149 in the current diff, the indent for the name Field isn't same as the other Field lines. Also put the args for that first Field on the same line.

How about using just category rather than skill_category? Or use skill_name instead of name -- just looks odd to have one say skill and the other not.

Search for SK -- some of the CRUD strings have uppercase K.

What about using a list_create form for skill types? There isn't a way to see a list right now. You can get this by just taking away the skill_types_list_create.html file. Try that and see what you think.

How about using just "Skill Types" on the main menu, to go along with using the list_create form (since it's not just adding)?

[lp:~zubairassad89/sahana-eden/vms]

770. By zubair assad on 2010-06-17

Addition of Skill Type and Formatting of VMS files

[Pat Tressel (ptressel)]

Looks good!

review: Approve

[zubair assad (zubairassad89)]

Commit Approved. Ready to merge.

review: Approve

=== modified file 'controllers/vol.py'
--- controllers/vol.py	2010-06-14 23:12:57 +0000
+++ controllers/vol.py	2010-06-17 14:33:30 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-    Volunteer Management Module
+    Volunteer Management System
 """
 
 module = "vol"
@@ -10,6 +10,7 @@
     session.error = T("Module disabled!")
     redirect(URL(r=request, c="default", f="index"))
 
+
 # Options Menu (available in all Functions)
 def shn_menu():
     menu = [
@@ -43,19 +44,22 @@
                     [T('Address'), False, URL(r=request, f='person', args='address')],
                     [T('Contact'), False, URL(r=request, f='person', args='pe_contact')],
                     [T('Identity'), False, URL(r=request, f='person', args='identity')],
+                    [T('Skill'), False, URL(r=request, f='person', args='skill')],                    
                 ]]
             ]
             menu.extend(menu_person)
+    
+              
     if auth.user is not None:
         menu_user = [
-            [T('My Tasks'), False, URL(r=request, f='task', args='')]
+            [T('My Tasks'), False, URL(r=request, f='task', args='')],
+            [T('Skill Type'), False, URL(r=request, f='skill_types')],
         ]
         menu.extend(menu_user)
     response.menu_options = menu
 
 shn_menu()
 
-
 def index():
 
     """ Module's Home Page """
@@ -130,3 +134,6 @@
     response.s3.pagination = True
 
     return shn_rest_controller(module, 'task', listadd=False)
+ 
+def skill_types():
+    return shn_rest_controller(module, 'skill_types')

=== modified file 'models/vol.py'
--- models/vol.py	2010-06-14 23:12:57 +0000
+++ models/vol.py	2010-06-17 14:33:30 +0000
@@ -638,3 +638,135 @@
                     return rheader
 
         return None
+
+
+    # -----------------------------------------------------------------------------
+    # vol_skill
+    #   Selecting a Skill
+    #
+
+    resource = 'skill'
+    tablename = module + '_' + resource
+    table = db.define_table(tablename, timestamp, uuidstamp, deletion_status,
+                person_id,
+        Field('General_Skill', 'boolean'),
+            Field('Animals', 'boolean'),
+                Field('Animal_Control_Vehicles', 'boolean'),
+                Field('Animal_Handling', 'boolean'),
+                Field('Other', 'boolean'),
+            Field('Automotives', 'boolean'),
+                Field('Body_Repair', 'boolean'),
+                Field('Engine_Repair', 'boolean'),
+                Field('Tire_Repair', 'boolean'),
+            Field('Electrical', 'boolean'),
+                Field('External_Wiring', 'boolean'),
+                Field('Internal_Wiring', 'boolean'),
+        Field('Resources', 'boolean'),
+            Field('Building_Aide', 'boolean'),
+                Field('Own_BackHoe', 'boolean'),
+                Field('Own_Crane', 'boolean'),
+            Field('Vehicle', 'boolean'),
+                Field('Own_Aircraft', 'boolean'),
+                Field('Own_Boat', 'boolean'),
+            Field('Warehouse', 'boolean'),
+                Field('ForkLift', 'boolean'),
+                Field('General', 'boolean'),
+        Field('Restrictions', 'boolean'),
+            Field('Can_not_Drive', 'boolean'),
+            Field('Can_not_Swim', 'boolean'),
+            Field('No_Heavy_Lifting', 'boolean'),
+        Field('Site_Manager', 'boolean'),
+        Field('Unskilled', 'boolean'),
+            Field('Skill_Other', 'boolean'),
+                Field('Baby_Care_Help', 'boolean'),
+                Field('Clerical', 'boolean'),
+                Field('Food_Help', 'boolean'),
+            Field('With_Tools', 'boolean'),
+                Field('With_Brooms', 'boolean'),
+                Field('With_Carpentry_Tools', 'boolean'),
+                Field('With_Other_Tools', 'boolean'),    
+        Field('status',requires=IS_IN_SET(['approved','unapproved','denied']),label=T('status'), notnull=True, default='unapproved'),             
+                    migrate=migrate)  
+   
+                         
+    # CRUD Strings
+    ADD_SKILL = T('Add Skill')
+    SKILL = T('Skill')
+    s3.crud_strings[tablename] = Storage(
+        title_create = ADD_SKILL,
+        title_display = T('Skill Details'),
+        title_list = SKILL,
+        title_update = T('Edit Skill'),
+        title_search = T('Search Skill'),
+        subtitle_create = T('Add New Skill'),
+        subtitle_list = SKILL,
+        label_list_button = T('List Skill'),
+        label_create_button = ADD_SKILL,
+        msg_record_created = T('Skill added'),
+        msg_record_modified = T('Skill updated'),
+        msg_record_deleted = T('Skill deleted'),
+        msg_list_empty = T('No skills currently set'))
+                    
+
+    s3xrc.model.add_component(module, resource,
+        multiple=True,
+        joinby=dict(pr_person='person_id'),
+        deletable=True,
+        editable=True,
+        main='person_id',
+
+        )
+
+
+    # -----------------------------------------------------------------------------
+    # vol_skill_types
+    #   Customize to add more client defined Skill
+    #
+
+    resource = 'skill_types'
+    tablename = module + '_' + resource
+    table = db.define_table(tablename, timestamp, uuidstamp, deletion_status,
+            Field('name', length=128, notnull=True),                      
+            Field('category', 'string', length=50),
+            Field('description'),
+            migrate=migrate)
+
+# Field settings
+table.uuid.requires = IS_NOT_IN_DB(db, '%s.uuid' % tablename)
+table.name.requires = [IS_NOT_EMPTY(), IS_NOT_IN_DB(db, '%s.name' % tablename)]
+table.name.label = T('Name')
+table.name.comment = SPAN("*", _class="req")
+
+# CRUD strings
+s3.crud_strings[tablename] = Storage(
+    title_create = T('Add Skill Type'),
+    title_display = T('Skill Type Details'),
+    title_list = T('Skill Type'),
+    title_update = T('Edit Skill Type'),
+    title_search = T('Search Skill Type'),
+    subtitle_create = T('Add New Skill Type'),
+    subtitle_list = T('Skill Type'),
+    label_list_button = T('List Skill Types'),
+    label_create_button = T('Add Skill Types'),
+    label_delete_button = T('Delete Skill Type'),
+    msg_record_created = T('Skill Type added'),
+    msg_record_modified = T('Skill Type updated'),
+    msg_record_deleted = T('Skill Type deleted'),
+    msg_list_empty = T('No Skill Types currently set'))
+
+field_settings = S3CheckboxesWidget(db = db, 
+                                    lookup_table_name = "vol_skill_types", 
+                                    lookup_field_name = "name",
+                                    multiple = True,
+                                    num_column=3
+                                    )
+
+# Reusable field
+skill_ids = SQLTable(None, 'skill_ids',
+                     FieldS3( 'skill_ids', 
+                           requires = field_settings.requires, 
+                           widget = field_settings.widget,                           
+                           represent = field_settings.represent,
+                           label = T("skills"),
+                           ondelete = "RESTRICT"
+                          ))

=== modified file 'views/vol/index.html'
--- views/vol/index.html	2010-02-14 01:51:37 +0000
+++ views/vol/index.html	2010-06-17 14:33:30 +0000
@@ -8,5 +8,6 @@
 <ul>
 <li>{{=T("Registering ad-hoc volunteers willing to contribute")}}</li>
 <li>{{=T("Capturing the essential services each Volunteer is providing and where")}}</li>
+<li>{{=T("Choosing Skill and Resources of Volunteers")}}</li>
 </ul>
 </div>

=== added file 'views/vol/person_skill_list_create.html'
--- views/vol/person_skill_list_create.html	1970-01-01 00:00:00 +0000
+++ views/vol/person_skill_list_create.html	2010-06-17 14:33:30 +0000
@@ -0,0 +1,21 @@
+{{extend 'layout.html'}}
+{{ include 'vol/skill.js' }}
+{{try:}}
+ {{=H2(addtitle)}}
+{{except:}}
+{{pass}}
+<div id='rheader'>
+{{try:}}
+ {{=rheader}}
+{{except:}}
+ {{pass}}
+</div>
+{{pass}}
+{{include 'formats.html'}}
+<div class='form-container'>
+{{try:}}
+ {{=form}}
+{{except:}}
+{{pass}}
+</div>
+{{include 'pagenav.html'}}

=== removed file 'views/vol/person_skills_list_create.html'
--- views/vol/person_skills_list_create.html	2010-06-15 12:39:36 +0000
+++ views/vol/person_skills_list_create.html	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-{{extend 'layout.html'}}
-{{try:}}
- {{=H2(title)}}
-{{except:}}
-{{pass}}
-<div id='rheader'>
-{{try:}}
- {{=rheader}}
-{{except:}}
- {{pass}}
-</div>
-{{try:}}
- {{=H3(subtitle)}}
-{{except:}}
-{{pass}}
-{{include 'formats.html'}}
-<div id='table-container'>
-{{try:}}
- {{=items}}
- <p>&nbsp;</p>
-{{except:}}
-{{pass}}
-</div>
-{{try:}}
- {{=H3(addtitle)}}
-{{except:}}
-{{pass}}
-<div class='form-container'>
-{{try:}}
- {{=form}}
-{{except:}}
-{{pass}}
-</div>
-{{include 'key.html'}}
-{{include 'pagenav.html'}}
-{{include 'searchbox.html'}}
-<p>&nbsp;</p>
-{{include 'colorbox.html'}}
-{{include 'dataTables.html'}}

=== added file 'views/vol/skill.js'
--- views/vol/skill.js	1970-01-01 00:00:00 +0000
+++ views/vol/skill.js	2010-06-17 14:33:30 +0000
@@ -0,0 +1,234 @@
+<head>
+    <script type="text/javascript">
+        //<![CDATA[
+        $(document).ready(function() {
+            $("#vol_skill_Animals__row").hide();
+            $("#vol_skill_Animal_Control_Vehicles__row").hide();
+            $("#vol_skill_Animal_Handling__row").hide();
+            $("#vol_skill_Other__row").hide();
+            $("#vol_skill_Automotives__row").hide();
+            $("#vol_skill_Body_Repair__row").hide();
+            $("#vol_skill_Engine_Repair__row").hide();
+            $("#vol_skill_Tire_Repair__row").hide();
+            $("#vol_skill_Electrical__row").hide();
+            $("#vol_skill_External_Wiring__row").hide();
+            $("#vol_skill_Internal_Wiring__row").hide();
+
+            $("#vol_skill_Building_Aide__row").hide();
+            $("#vol_skill_Own_BackHoe__row").hide();
+            $("#vol_skill_Own_Crane__row").hide();
+            $("#vol_skill_Vehicle__row").hide();
+            $("#vol_skill_Own_Aircraft__row").hide();
+            $("#vol_skill_Own_Boat__row").hide();
+            $("#vol_skill_Warehouse__row").hide();
+            $("#vol_skill_ForkLift__row").hide();
+            $("#vol_skill_General__row").hide();
+
+            $("#vol_skill_Can_not_Drive__row").hide();
+            $("#vol_skill_Can_not_Swim__row").hide();
+            $("#vol_skill_No_Heavy_Lifting__row").hide();
+
+            $("#vol_skill_Skill_Other__row").hide();
+            $("#vol_skill_Baby_Care_Help__row").hide();
+            $("#vol_skill_Clerical__row").hide();
+            $("#vol_skill_Food_Help__row").hide();
+            $("#vol_skill_With_Tools__row").hide();
+            $("#vol_skill_With_Brooms__row").hide();
+            $("#vol_skill_With_Carpentry_Tools__row").hide();
+            $("#vol_skill_With_Other_Tools__row").hide();
+
+            //General skill
+            $('#vol_skill_General_Skill').css({
+                'margin-left': '50px'
+            }).change(function() {
+                if ($('#vol_skill_General_Skill').attr('checked')) {
+                    $("#vol_skill_Animals__row").show();
+                    $('#vol_skill_Animals').css({
+                        'margin-left': '50px'
+                    }).change(function() {
+                        if ($('#vol_skill_Animals').attr('checked')) {
+                            $("#vol_skill_Animal_Control_Vehicles__row").show();
+                            $("#vol_skill_Animal_Handling__row").show();
+                            $("#vol_skill_Other__row").show();
+                        } else {
+                            $("#vol_skill_Animal_Control_Vehicles__row").hide();
+                            $("#vol_skill_Animal_Handling__row").hide();
+                            $("#vol_skill_Other__row").hide();
+                            $("#vol_skill_Animal_Control_Vehicles").removeAttr('checked');
+                            $("#vol_skill_Animal_Handling").removeAttr('checked');
+                            $("#vol_skill_Other").removeAttr('checked');
+                        }
+                    });
+                    $("#vol_skill_Automotives__row").show();
+                    $('#vol_skill_Automotives').css({
+                        'margin-left': '50px'
+                    }).change(function() {
+                        if ($('#vol_skill_Automotives').attr('checked')) {
+                            $("#vol_skill_Body_Repair__row").show();
+                            $("#vol_skill_Engine_Repair__row").show();
+                            $("#vol_skill_Tire_Repair__row").show();
+                        } else {
+                            $("#vol_skill_Body_Repair__row").hide();
+                            $("#vol_skill_Engine_Repair__row").hide();
+                            $("#vol_skill_Tire_Repair__row").hide();
+                            $("#vol_skill_Body_Repair").removeAttr('checked');
+                            $("#vol_skill_Engine_Repair").removeAttr('checked');
+                            $("#vol_skill_Tire_Repair").removeAttr('checked');
+                        }
+                    });
+                    $("#vol_skill_Electrical__row").show();
+                    $('#vol_skill_Electrical').css({
+                        'margin-left': '50px'
+                    }).change(function() {
+                        if ($('#vol_skill_Electrical').attr('checked')) {
+                            $("#vol_skill_External_Wiring__row").show();
+                            $("#vol_skill_Internal_Wiring__row").show();
+                        } else {
+                            $("#vol_skill_External_Wiring__row").hide();
+                            $("#vol_skill_Internal_Wiring__row").hide();
+                            $("#vol_skill_External_Wiring").removeAttr('checked');
+                            $("#vol_skill_Internal_Wiring").removeAttr('checked');
+                        }
+                    });
+
+                } else {
+                    $("#vol_skill_Animals__row").hide();
+                    $("#vol_skill_Automotives__row").hide();
+                    $("#vol_skill_Electrical__row").hide();
+
+                    $("#vol_skill_Animal_Control_Vehicles__row").hide();
+                    $("#vol_skill_Animal_Handling__row").hide();
+                    $("#vol_skill_Other__row").hide();
+
+                    $("#vol_skill_Body_Repair__row").hide();
+                    $("#vol_skill_Engine_Repair__row").hide();
+                    $("#vol_skill_Tire_Repair__row").hide();
+
+                    $("#vol_skill_External_Wiring__row").hide();
+                    $("#vol_skill_Internal_Wiring__row").hide();
+
+                    $("#vol_skill_Animals").removeAttr('checked');
+                    $("#vol_skill_Automotives").removeAttr('checked');
+                    $("#vol_skill_Electrical").removeAttr('checked');
+
+                    $("#vol_skill_Animal_Control_Vehicles").removeAttr('checked');
+                    $("#vol_skill_Animal_Handling").removeAttr('checked');
+                    $("#vol_skill_Other").removeAttr('checked');
+
+                    $("#vol_skill_Body_Repair").removeAttr('checked');
+                    $("#vol_skill_Engine_Repair").removeAttr('checked');
+                    $("#vol_skill_Tire_Repair").removeAttr('checked');
+
+                    $("#vol_skill_External_Wiring").removeAttr('checked');
+                    $("#vol_skill_Internal_Wiring").removeAttr('checked');
+                }
+            });
+
+            //Resources Start        
+            $('#vol_skill_Resources').css({
+                'margin-left': '50px'
+            }).change(function() {
+                if ($('#vol_skill_Resources').attr('checked')) {
+                    $("#vol_skill_Building_Aide__row").show();
+                    $("#vol_skill_Vehicle__row").show();
+                    $("#vol_skill_Warehouse__row").show();
+                } else {
+                    $("#vol_skill_Building_Aide__row").hide();
+                    $("#vol_skill_Vehicle__row").hide();
+                    $("#vol_skill_Warehouse__row").hide();
+                    $("#vol_skill_Building_Aide").removeAttr('checked');
+                    $("#vol_skill_Vehicle").removeAttr('checked');
+                    $("#vol_skill_Warehouse").removeAttr('checked');
+                }
+            });
+
+            //Restriction Start        
+            $('#vol_skill_Restrictions').css({
+                'margin-left': '50px'
+            }).change(function() {
+                if ($('#vol_skill_Restrictions').attr('checked')) {
+                    $("#vol_skill_Can_not_Drive__row").show();
+                    $("#vol_skill_Can_not_Swim__row").show();
+                    $("#vol_skill_No_Heavy_Lifting__row").show();
+                } else {
+                    $("#vol_skill_Can_not_Drive__row").hide();
+                    $("#vol_skill_Can_not_Swim__row").hide();
+                    $("#vol_skill_No_Heavy_Lifting__row").hide();
+                    $("#vol_skill_Can_not_Drive").removeAttr('checked');
+                    $("#vol_skill_Can_not_Swim").removeAttr('checked');
+                    $("#vol_skill_No_Heavy_Lifting").removeAttr('checked');
+                }
+            });
+
+            $('#vol_skill_Site_Manager').css({
+                'margin-left': '50px'
+            });
+            //Unskilled Start 
+            $('#vol_skill_Unskilled').css({
+                'margin-left': '50px'
+            }).change(function() {
+                if ($('#vol_skill_Unskilled').attr('checked')) {
+                    $("#vol_skill_Skill_Other__row").show();
+                    $('#vol_skill_Skill_Other').css({
+                        'margin-left': '50px'
+                    }).change(function() {
+                        if ($('#vol_skill_Skill_Other').attr('checked')) {
+                            $("#vol_skill_Baby_Care_Help__row").show();
+                            $("#vol_skill_Clerical__row").show();
+                            $("#vol_skill_Food_Help__row").show();
+                        } else {
+                            $("#vol_skill_Baby_Care_Help__row").hide();
+                            $("#vol_skill_Clerical__row").hide();
+                            $("#vol_skill_Food_Help__row").hide();
+                            $("#vol_skill_Baby_Care_Help").removeAttr('checked');
+                            $("#vol_skill_Clerical").removeAttr('checked');
+                            $("#vol_skill_Food_Help").removeAttr('checked');
+                        }
+                    });
+                    $("#vol_skill_With_Tools__row").show();
+                    $('#vol_skill_With_Tools').css({
+                        'margin-left': '50px'
+                    }).change(function() {
+                        if ($('#vol_skill_With_Tools').attr('checked')) {
+                            $("#vol_skill_With_Brooms__row").show();
+                            $("#vol_skill_With_Carpentry_Tools__row").show();
+                            $("#vol_skill_With_Other_Tools__row").show();
+                        } else {
+                            $("#vol_skill_With_Brooms__row").hide();
+                            $("#vol_skill_With_Carpentry_Tools__row").hide();
+                            $("#vol_skill_With_Other_Tools__row").hide();
+                            $("#vol_skill_With_Brooms").removeAttr('checked');
+                            $("#vol_skill_With_Carpentry_Tools").removeAttr('checked');
+                            $("#vol_skill_With_Other_Tools").removeAttr('checked');
+                        }
+                    });
+
+                } else {
+                    $("#vol_skill_Skill_Other__row").hide();
+                    $("#vol_skill_With_Tools__row").hide();
+
+                    $("#vol_skill_Baby_Care_Help__row").hide();
+                    $("#vol_skill_Clerical__row").hide();
+                    $("#vol_skill_Food_Help__row").hide();
+
+                    $("#vol_skill_With_Brooms__row").hide();
+                    $("#vol_skill_With_Carpentry_Tools__row").hide();
+                    $("#vol_skill_With_Other_Tools__row").hide();
+
+                    $("#vol_skill_Skill_Other").removeAttr('checked');
+                    $("#vol_skill_With_Tools").removeAttr('checked');
+
+                    $("#vol_skill_Baby_Care_Help").removeAttr('checked');
+                    $("#vol_skill_Clerical").removeAttr('checked');
+                    $("#vol_skill_Food_Help").removeAttr('checked');
+
+                    $("#vol_skill_With_Brooms").removeAttr('checked');
+                    $("#vol_skill_With_Carpentry_Tools").removeAttr('checked');
+                    $("#vol_skill_With_Other_Tools").removeAttr('checked');
+
+                }
+            });
+
+        });
+    </script>
+</head>