Skip to content
This repository
Browse code

* Fixing Bugs:

 - Community (Location) COntact pages
 -  Staff & Vol Training Reports
 - FilterField for site_id
* Fixing Selenium Tests
* Add comments field to project_activity_type
  • Loading branch information...
commit 7476368107ade97251bde7a8efbc3e260e4242ff 1 parent d1da5e6
Michael Howden authored October 05, 2012
2  controllers/project.py
@@ -549,7 +549,7 @@ def demographic_data():
549 549
     return s3db.stats_demographic_data_controller()
550 550
 
551 551
 # -----------------------------------------------------------------------------
552  
-def community_contact():
  552
+def location_contact():
553 553
     """ Show a list of all community contacts """
554 554
 
555 555
     return s3_rest_controller()
3  modules/eden/asset.py
@@ -155,7 +155,8 @@ def model(self):
155 155
                                                  widget = None,
156 156
                                                  script = None, # No Item Pack Filter
157 157
                                                  ),
158  
-                             organisation_id(script = SCRIPT('''
  158
+                             organisation_id(required = True,
  159
+                                             script = SCRIPT('''
159 160
 $(document).ready(function(){
160 161
  S3FilterFieldChange({
161 162
   'FilterField':'organisation_id',
7  modules/eden/hrm.py
@@ -132,6 +132,7 @@ def model(self):
132 132
  S3FilterFieldChange({
133 133
   'FilterField':'organisation_id',
134 134
   'Field':'site_id',
  135
+  'FieldID':'site_id',
135 136
   'FieldResource':'site',
136 137
   'FieldPrefix':'org',
137 138
  })
@@ -1903,9 +1904,9 @@ def model(self):
1903 1904
                       cols=report_fields,
1904 1905
                       facts=report_fields,
1905 1906
                       methods=["count", "list"],
1906  
-                      defaults=Storage(rows="hrm_training.course_id",
1907  
-                                      cols="hrm_training.month",
1908  
-                                      fact="hrm_training.person_id",
  1907
+                      defaults=Storage(rows="training.course_id",
  1908
+                                      cols="training.month",
  1909
+                                      fact="training.person_id",
1909 1910
                                       aggregate="count"),
1910 1911
                   ),
1911 1912
                   list_fields = [
4  modules/eden/menus.py
@@ -1481,8 +1481,8 @@ def project(self):
1481 1481
                         M("List All"),
1482 1482
                         M("Map", m="map"),
1483 1483
                         M("Search", m="search"),
1484  
-                        M("List All Community Contacts", f="community_contact"),
1485  
-                        M("Search Community Contacts", f="community_contact",
  1484
+                        M("List All Community Contacts", f="location_contact"),
  1485
+                        M("Search Community Contacts", f="location_contact",
1486 1486
                           m="search"),
1487 1487
                      ),
1488 1488
                     )
11  modules/eden/project.py
@@ -705,6 +705,7 @@ def model(self):
705 705
         table = define_table(tablename,
706 706
                              Field("name", length=128,
707 707
                                    notnull=True, unique=True),
  708
+                             s3_comments(),
708 709
                              *s3_meta_fields())
709 710
 
710 711
         # Field configuration?
@@ -1516,9 +1517,9 @@ def model(self):
1516 1517
             msg_record_deleted = T("Contact Deleted"),
1517 1518
             msg_list_empty = T("No Contacts Found"))
1518 1519
 
1519  
-        community_contact_search = S3Search(
  1520
+        location_contact_search = S3Search(
1520 1521
             advanced=(S3SearchSimpleWidget(
1521  
-                            name = "community_contact_search_simple",
  1522
+                            name = "location_contact_search_simple",
1522 1523
                             label = T("Name"),
1523 1524
                             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."),
1524 1525
                             field = ["person_id$first_name",
@@ -1527,13 +1528,13 @@ def model(self):
1527 1528
                                     ]
1528 1529
                         ),
1529 1530
                         S3SearchOptionsWidget(
1530  
-                            name="community_contact_search_L1",
  1531
+                            name="location_contact_search_L1",
1531 1532
                             field="person_id$L1",
1532 1533
                             location_level="L1",
1533 1534
                             cols = 3,
1534 1535
                         ),
1535 1536
                         S3SearchOptionsWidget(
1536  
-                            name="community_contact_search_L2",
  1537
+                            name="location_contact_search_L2",
1537 1538
                             field="person_id$L2",
1538 1539
                             location_level="L2",
1539 1540
                             cols = 3,
@@ -1543,7 +1544,7 @@ def model(self):
1543 1544
         # Resource configuration
1544 1545
         #hierarchy = current.gis.get_location_hierarchy()
1545 1546
         configure(tablename,
1546  
-                  search_method=community_contact_search,
  1547
+                  search_method=location_contact_search,
1547 1548
                   list_fields=["person_id",
1548 1549
                                # (hierarchy["L0"], "person_id$L0"),
1549 1550
                                # (hierarchy["L1"], "person_id$L1"),
5  modules/tests/asset/asset.py
@@ -57,14 +57,15 @@ def test_asset001_create_asset(self):
57 57
                        "WS-100-17"),
58 58
                      ( "item_id",
59 59
                        "Water Purification Unit",
60  
-                       "autocomplete"),
  60
+                       "option"),
61 61
                      #( "type",
62 62
                      #  "Other"
63 63
                      #  "option"),
64 64
                      ( "sn",
65 65
                        "WPU-4536-9381"),
66 66
                      ( "supplier",
67  
-                       "Breville"),
  67
+                       "Acme Suppliers",
  68
+                       "option"),
68 69
                      ( "purchase_date",
69 70
                        today ),
70 71
                      ( "purchase_price",
15  modules/tests/asset/create_asset.py
@@ -54,14 +54,19 @@ def test_asset001_create_asset(self):
54 54
                        "WS_100_17"),
55 55
                      ( "item_id",
56 56
                        "Blankets",
57  
-                       "autocomplete"),
58  
-                     ( "site_id",
59  
-                       "AP Zone (Office)",
60 57
                        "option"),
  58
+                     ("organisation_id", 
  59
+                      "International Federation of Red Cross and Red Crescent Societies (IFRC)", 
  60
+                      "option"),
  61
+                     ( "site_id",
  62
+                       "AP Zone",
  63
+                       "option",
  64
+                        4),
61 65
                      ( "sn",
62 66
                        "WPU-4536-9381"),
63  
-                     ( "supplier",
64  
-                       "Breville"),
  67
+                     ( "supply_org_id",
  68
+                       "Acme Suppliers",
  69
+                       "option"),
65 70
                      ( "purchase_date",
66 71
                        today),
67 72
                      ( "purchase_price",
7  modules/tests/hrm/create_staff.py
@@ -49,7 +49,7 @@ def test_hrm001_create_staff(self):
49 49
 
50 50
         self.create("hrm_human_resource", 
51 51
                     [( "organisation_id",
52  
-                       "Acme Suppliers",
  52
+                       "International Federation of Red Cross and Red Crescent Societies (IFRC)",
53 53
                        "option"),
54 54
                      ( "first_name",
55 55
                        "Robert",
@@ -67,8 +67,9 @@ def test_hrm001_create_staff(self):
67 67
                        "Warehouse Manager",
68 68
                        "option"),
69 69
                      ( "site_id",
70  
-                       "AP Zone (Office)",
71  
-                       "option"),
  70
+                       "AP Zone",
  71
+                       "option",
  72
+                       3),
72 73
                      ]
73 74
                      )
74 75
         
7  modules/tests/hrm/create_volunteer.py
@@ -49,7 +49,7 @@ def test_hrm002_create_volunteer(self):
49 49
 
50 50
         self.create("hrm_human_resource", 
51 51
                     [( "organisation_id",
52  
-                       "Acme Suppliers",
  52
+                       "International Federation of Red Cross and Red Crescent Societies (IFRC)",
53 53
                        "option"),
54 54
                      ( "first_name",
55 55
                        "John",
@@ -64,8 +64,9 @@ def test_hrm002_create_volunteer(self):
64 64
                        "Security",
65 65
                        "option"),
66 66
                      ( "site_id",
67  
-                       "AP Zone (Office)",
68  
-                       "option"),
  67
+                       "AP Zone",
  68
+                       "option",
  69
+                       3),
69 70
                      ]
70 71
                      )
71 72
 
6  modules/tests/inv/create_catalog.py
@@ -47,10 +47,10 @@ def test_inv006_create_catalog(self):
47 47
         self.login(account="admin", nexturl="supply/catalog/create")
48 48
         self.create("supply_catalog", 
49 49
                     [( "name",
50  
-                       "Romanian Food Catalogue" ),
  50
+                       "IFRC Food Catalogue" ),
51 51
                      ( "organisation_id",
52  
-                       "Romanian Food Assistance Association",
53  
-                       "autocomplete" ),
  52
+                       "International Federation of Red Cross and Red Crescent Societies (IFRC)",
  53
+                       "option" ),
54 54
                      ( "comments",
55 55
                        "This is a test Catalogue")
56 56
                      ]
2  modules/tests/inv/create_warehouse.py
@@ -56,7 +56,7 @@ def test_inv004_create_warehouse(self, items=[0]):
56 56
         # 1st field used to check whether record already exists
57 57
         ("name", "Bucharest RFAAT Central Warehouse (Test)"),
58 58
         ("code", "12345679"),
59  
-        ("organisation_id", "Romanian Food Assistance Association", "autocomplete"),
  59
+        ("organisation_id", "International Federation of Red Cross and Red Crescent Societies (IFRC)", "option"),
60 60
         ("comments", "This is a Test Warehouse"),
61 61
     ],
62 62
 ]
8  modules/tests/inv/receive_item.py
@@ -60,9 +60,13 @@ def test_inv002a_receive_items(self):
60 60
                       "option",
61 61
                      ),
62 62
                      ("type",
63  
-                      "-",
  63
+                      "Internal Shipment",
64 64
                       "option",
65  
-                     )
  65
+                     ),
  66
+                     ("from_site_id",
  67
+                      "Ainaro Warehouse (Warehouse)",
  68
+                      "option",
  69
+                     ),
66 70
                     ]
67 71
 
68 72
         item_data = [
4  modules/tests/inv/send_item.py
@@ -55,6 +55,10 @@ def test_inv001_send_items(self):
55 55
                  "Timor-Leste Red Cross Society (CVTL) National Warehouse (Warehouse)",
56 56
                  "option",
57 57
                 ),
  58
+                 ("type",
  59
+                  "Internal Shipment",
  60
+                  "option",
  61
+                 ),
58 62
                 ("to_site_id",
59 63
                  "Lospalos Warehouse (Warehouse)",
60 64
                  "option",
8  modules/tests/inv/send_receive_item.py
@@ -53,6 +53,10 @@ def test_inv003_send_receive_items(self):
53 53
                  "Timor-Leste Red Cross Society (CVTL) National Warehouse (Warehouse)",
54 54
                  "option",
55 55
                 ),
  56
+                 ("type",
  57
+                  "Internal Shipment",
  58
+                  "option",
  59
+                 ),
56 60
                 ("to_site_id",
57 61
                  "Lospalos Warehouse (Warehouse)",
58 62
                  "option",
@@ -126,6 +130,10 @@ def test_inv021_send_and_confirm(self):
126 130
                  "Timor-Leste Red Cross Society (CVTL) National Warehouse (Warehouse)",
127 131
                  "option",
128 132
                 ),
  133
+                 ("type",
  134
+                  "Internal Shipment",
  135
+                  "option",
  136
+                 ),
129 137
                 ("to_site_id",
130 138
                  "Lori (Facility)",
131 139
                  "option",
2  modules/tests/member/create_member.py
@@ -49,7 +49,7 @@ def test_mem001_create_member(self):
49 49
         self.login(account="admin", nexturl="member/membership/create")
50 50
         self.create("member_membership", 
51 51
                     [( "organisation_id",
52  
-                       "Timor-Leste Red Cross Society",
  52
+                       "Timor-Leste Red Cross Society (CVTL)",
53 53
                        "option"),
54 54
                      ( "first_name",
55 55
                        "Denise",
13  modules/tests/project/create_project.py
@@ -51,7 +51,10 @@ def test_project001_create_project(self):
51 51
         self.login(account="admin", nexturl="project/project/create")
52 52
         
53 53
         self.create("project_project", 
54  
-                    [( "name",
  54
+                    [("organisation_id", 
  55
+                      "International Federation of Red Cross and Red Crescent Societies (IFRC)", 
  56
+                      "option"),
  57
+                     ( "name",
55 58
                        "Community Strengthening through Dance" ),
56 59
                      ( "comments",
57 60
                        "Host National Society")
@@ -100,14 +103,8 @@ def test_project001_create_project(self):
100 103
                        "gis_location"),
101 104
                      ( "lon",
102 105
                        "0",
103  
-                       "gis_location"),
  106
+                       "gis_location")
104 107
                      # @ToDo: Activities - Community Organisation, Contingency Planning, Logistics
105  
-                     ( "population",
106  
-                       "1000"),
107  
-                     ( "number_families",
108  
-                       "200"),
109  
-                     ( "comments",
110  
-                       "First Community")
111 108
                      ]
112 109
                      )
113 110
 
259  private/templates/IFRC/project_activity_type.csv
... ...
@@ -1,127 +1,132 @@
1  
-Name,Sector:Health,Sector:DRR,Sector:OD,Sector:WatSan,Notes
2  
-Auxiliary role,,Yes,,,
3  
-Climate change awareness ,,Yes,,,
4  
-"Climate change mainstreaming, ",,Yes,,,
5  
-Coastal conservation ,,Yes,,,
6  
-Community disaster awareness,,Yes,,,
7  
-Community early warning systems,,Yes,,,
8  
-Education & advocacy,,Yes,,,
9  
-"Financial risk sharing (community funds, etc.), ",,Yes,,,
10  
-Insurance ,,Yes,,,
11  
-"legislation/IDRL, ",,Yes,,,
12  
-Logistics & warehouses,,Yes,,,
13  
-National DM planning ,,Yes,,,
14  
-Provision of tools and equipment,,Yes,,,
15  
-RDRT (Regional disaster response teams),,Yes,,,
16  
-"School safety and children education,",,Yes,,,
17  
-"Simulation small scale mitigation, ",,Yes,,,
18  
-"Staff/volunteer capacity building, (does this mean volunteering development guidelines??)",,Yes,,,
19  
-Tree  and mangrove planting ,,Yes,,,
20  
-Volunteering in emergencies guidelines/toolkit,,Yes,,,
21  
-Vulnerability and Capacity Assessments,,Yes,,,
22  
-Advocacy,Yes,,,,
23  
-Behaviour change communication,Yes,,,,
24  
-Better programming initiative guidance,Yes,,,,DRR
25  
-Blood banking,Yes,,,,
26  
-Club 25 / Pledge 25,Yes,,,,
27  
-Community action planning,Yes,,,,DRR
28  
-Community health committees,Yes,,,,
29  
-Community health initiative/projects,Yes,,,,
30  
-Community health risk assessments,Yes,,,,
31  
-Community mobilisation,Yes,,,,
32  
-Community preparedness,Yes,,,,
33  
-Contingency planning/preparedness planning,Yes,,,,
34  
-Coordination and partnerships,Yes,,,,
35  
-Disease prevention,Yes,,,,
36  
-"Distribution of prevention items – such as condoms, mosquito nets, soap",Yes,,,,
37  
-Donor recruitment,Yes,,,,
38  
-Feeding programmes,Yes,,,,
39  
-First Aid,Yes,,,,
40  
-Food supplementation,Yes,,,,
41  
-"Health awareness, promotion",Yes,,,,
42  
-Health facilities - construction and operation,Yes,,,,
43  
-"Health policy, strategy development",Yes,,,,
44  
-Immunisation campaigns,Yes,,,,
45  
-Infant and young child feeding,Yes,,,,
46  
-Knowledge management ,Yes,,,,
47  
-Medical supplies and equipment,Yes,,,,
48  
-Mobile health units,Yes,,,,
49  
-Monitoring and evaluation,Yes,,,,
50  
-Nutritional assessments,Yes,,,,
51  
-Organisational preparedness – NHQ and branches,Yes,,,,
52  
-Peer support,Yes,,,,
53  
-Project assessments and planning,Yes,,,,
54  
-Psychosocial support (tools/guidelines/trainings in cross-cultural contexts),Yes,,,,
55  
-Referral,Yes,,,,
56  
-Risk management and quality assurance,Yes,,,,
57  
-School-based activities,Yes,,,,
58  
-Situation monitoring/community surveillance,Yes,,,,
59  
-Staff capacity building,Yes,,,,
60  
-"Stockpiling, prepositioning of supplies",Yes,,,,
61  
-Tools and guidelines development,Yes,,,,
62  
-Training of community/first responders ,Yes,,,,
63  
-Training of master trainers/trainers,Yes,,,,
64  
-Vector control,Yes,,,,
65  
-Volunteer capacity building - training and mobilisation,Yes,,,,
66  
-Volunteer training,Yes,,,,
67  
-Volunteering in pandemic emergency situations (Jim had shared guidelines earlier?),Yes,,,,
68  
-Branch planning,,,Yes,,
69  
-Capacity building of governance,,,Yes,,
70  
-Capacity building of management staff,,,Yes,,
71  
-"Database development (vol, member, donors)",,,Yes,,
72  
-Policy development,,,Yes,,
73  
-"Resource Mobilisation (fundraising, income generation, in-kind support, partnership) ",,,Yes,,
74  
-School RC units development,,,Yes,,
75  
-SOPs and guidelines development,,,Yes,,
76  
-Strategy development,,,Yes,,
77  
-Training ,,,Yes,,
78  
-Volunteer insurance,,,Yes,,
79  
-Volunteer recognition,,,Yes,,
80  
-Volunteer recruitment (normal and ViE too),,,Yes,,
81  
-Volunteer training,,,Yes,,
82  
-Youth leadership development,,,Yes,,
83  
-Catchment protection,,,,Yes,
84  
-Clean-up campaign,,,,Yes,
85  
-"Construction of water supply systems (gravity-fed, shallow wells, boreholes)",,,,Yes,
86  
-Desluding ,,,,Yes,
87  
-Emergency householdwater treatment and storage,,,,Yes,
88  
-Emergency water supply,,,,Yes,
89  
-Hand washing facilities and demonstration,,,,Yes,
90  
-Installation of rainwater harvesting systems,,,,Yes,
91  
-latrine construction (emergency and permanent),,,,Yes,
92  
-Participatory Hygiene and Sanitation Transformation,,,,Yes,
93  
-Planning and construction of drainage systems ,,,,Yes,
94  
-Solid waste management,,,,Yes,
95  
-Spraying of vectors,,,,Yes,
96  
-Training and capacity building,,,,Yes,
97  
-Water testing,,,,Yes,
98  
-Advocacy,,,,,
99  
-Awareness raising,,,,,
100  
-BDRT (Branch disaster response teams),,,,,DRR
101  
-Capacity Building,,,,,
102  
-CDRT (Community disaster response teams),,,,,DRR
103  
-Children's Education,,,,,
104  
-Climate change mitigation,,,,,
105  
-Climate change preparedness,,,,,DRR
106  
-Community Based Health and First Aid (CBHFA),,,,,
107  
-Community organisation,,,,,DRR
108  
-Contingency planning,,,,,DRR
109  
-DM Planning,,,,,
110  
-Early warning,,,,,
111  
-Evacuation drills,,,,,DRR
112  
-Food security ,,,,,
113  
-Hygiene promotion,,,,,
114  
-IDRL,,,,,
115  
-IEC Materials,,,,,"Development/dissemination WatSan,DRR"
116  
-Livelihoods,,,,,
117  
-Logistics,,,,,
118  
-Mainstreaming DRR,,,,,DRR
119  
-NDRT (National disaster response teams),,,,,DRR
120  
-Nutrition,,,,,
121  
-Risk transfer,,,,,
122  
-Sanitation,,,,,
123  
-School Safety,,,,,
124  
-Small scale mitigation,,,,,
125  
-Tools & Equipment,,,,,
126  
-VCA (Vulnerability and Capacity Assessment),,,,,
127  
-Water Supply,,,,,
  1
+Name,Comments,Sector:Health,Sector:DRR,Sector:Od,Sector:Watsan,Sector:Livelihoods,Sector:Shelter,Notes
  2
+Advocacy,,,,,,,,
  3
+Assessment and Community/Beneficiary Identification,,,,,,,,
  4
+Auxiliary Role,,,,,,,,
  5
+Awareness Raising,,,,,,,,
  6
+Bdrt (Branch Disaster Response Teams),,,Yes,,,,,
  7
+Behaviour Change Communication,,,,,,,,
  8
+Better Programming Initiative Guidance,,,,,,,,
  9
+Blood Banking,,Yes,,,,,,
  10
+Blood Donor Recruitment,,Yes,,,,,,
  11
+Boq and Cost Estimation,,,,,,,Yes,
  12
+Branch Planning,,,,Yes,,,,
  13
+Capacity Building,,,,,,,,
  14
+Capacity Building of Governance,,,,Yes,,,,
  15
+Capacity Building of Management Staff,,,,Yes,,,,
  16
+Capacity Building of Staff,,,,,,,,
  17
+Capacity Building of Volunteers,training and mobilisation,,,,,,,
  18
+Catchment Protection,,,,,Yes,,,
  19
+CDRT (Community Disaster Response Teams),,,,Yes,,,,
  20
+Children'S Education,,,,,,,,
  21
+Clean-Up Campaign,,,,,Yes,,,
  22
+Climate Change Adaptation ,,,,,,,,
  23
+Climate Change Mitigation,,,,,,,,
  24
+Club 25 / Pledge 25,,Yes,,,,,,
  25
+Coastal Conservation ,,,Yes,,,,,
  26
+Community Action Planning,,,,,,,,DRR
  27
+Community Based Health and First Aid (Cbhfa),,Yes,,,,,,
  28
+Community Disaster Awareness,,,Yes,,,,,
  29
+Community Early Warning Systems,,,Yes,,,,,
  30
+Community Health Committees,,Yes,,,,,,
  31
+Community Health Initiative/Projects,,Yes,,,,,,
  32
+Community Health Risk Assessments,,Yes,,,,,,
  33
+Community Mobilisation,,,,,,,,
  34
+Community Organisation,,,,,,,,
  35
+Community Preparedness,,Yes,Yes,,,,,
  36
+Construction Activities,,,,,,,Yes,
  37
+Construction of Water Supply Systems,"gravity-fed, shallow wells, boreholes",,,,Yes,,,
  38
+Contingency/Preparedness Planning,,,,,,,,
  39
+Contractual Agreements (Community/Individual),,,,,,,Yes,
  40
+Contractual Agreements (Governmental),,,,,,,Yes,
  41
+Coordination and Partnerships,,,,,,,,
  42
+Database Development,,,,,,,,
  43
+Desluding ,,,,,Yes,,,
  44
+Disaster Law,,,,,,,,
  45
+Disease Prevention,,Yes,,,,,,
  46
+Distribution of Food,,,,,,,,
  47
+Distribution of Non-Food Items,,,,,,,,
  48
+DM Planning,,,,,,,,
  49
+Early Warning Systems,,,Yes,,,,,
  50
+Education & Advocacy,,,Yes,,,,,
  51
+Emergency Householdwater Treatment and Storage,,,,,Yes,,,
  52
+Emergency Water Supply,,,,,Yes,,,
  53
+Enterprise Development Training ,"Financial, Planning, etc",,,,,Yes,,
  54
+Evacuation Drills,,Yes,,,,,,
  55
+Feeding Programmes,,Yes,,,,,,
  56
+Financial Risk Sharing ,"community funds, etc",,Yes,,,,,
  57
+Financial Services,"savings, credit, insurance",,,,,Yes,,
  58
+First Aid,,Yes,,,,,,
  59
+Food Security ,,,,,,,,
  60
+Food Supplementation,,Yes,,,,,,
  61
+Hand Washing Facilities,,,,,Yes,,,
  62
+"Health Awareness, Promotion",,Yes,,,,,,
  63
+Health Facilities - Construction and Operation,,Yes,,,,,,
  64
+"Health Policy, Strategy Development",,Yes,,,,,,
  65
+House Design,,,,,,,Yes,
  66
+IEC Materials,,,,,,,,
  67
+Immunisation Campaigns,,Yes,,,,,,
  68
+Improved Production Techniques,"demonstration, training and support",,,,,Yes,,
  69
+Infant and Young Child Feeding,,Yes,,,,,,
  70
+Installation of Rainwater Harvesting Systems,,,,,Yes,,,
  71
+Insurance ,,,Yes,,,,,
  72
+Irrigation and Watershed Management,,,,,,Yes,,
  73
+Knowledge Management ,,,,,,,,
  74
+Latrine Construction,emergency and permanent,,,,Yes,,,
  75
+Legal Approvals,,,,,,,Yes,
  76
+Logistics & Warehouses,,,,,,,,
  77
+Mainstreaming DRR,,,,,,,,DRR
  78
+"Markets/Marketing Analysis, Linkages and Support",,,,,,Yes,,
  79
+Medical Supplies and Equipment,,Yes,,,,,,
  80
+Mobile Health Units,,Yes,,,,,,
  81
+Monitoring and Evaluation,,Yes,,,,,,
  82
+NDRT (National Disaster Response Teams),,,,,,,,DRR
  83
+Nutrition,,,,,,,,
  84
+Nutritional Assessments,,Yes,,,,,,
  85
+Organisational Preparedness – Nhq and Branches,,Yes,,,,,,
  86
+Participatory Hygiene Promotion,,Yes,,,Yes,,,
  87
+Peer Support,,Yes,,,,,,
  88
+Planning and Construction of Drainage Systems ,,,,,Yes,,,
  89
+Policy Development,,,,Yes,,,,
  90
+Post Harvest Storage and Management,,,,,,Yes,,
  91
+"Programme Preparation and Action Plan, Budget & Schedule",,,,,,,,
  92
+Project Assessments and Planning,,,,,,,,
  93
+Provision of Inputs,"seeds, tools, fertilizers, fishing nets, other equipment for livelihoods activities",,,,,Yes,,
  94
+Provision of Tools and Equipment,,,,,,,,
  95
+Psychosocial Support,tools/guidelines/trainings in cross-cultural contexts,Yes,,,,,,
  96
+"Rangeland, Fisheries and Forest Management",,,,,,Yes,,
  97
+RDRT (Regional Disaster Response Teams),,,Yes,,,,,
  98
+Referral,,Yes,,,,,,
  99
+Resource Transfers for Acquiring Assets,"cash, voucher, food aid",,,,,Yes,,
  100
+Resource Transfers for Replacing/ Provisioning Or Consumption,"cash, vouchers, food aid",,,,,Yes,,
  101
+Risk Management and Quality Assurance,,Yes,,,,,,
  102
+Risk Transfer,,,,,,,,
  103
+Sanitation,,,,,,,,
  104
+School RC Units Development,,,,Yes,,,,
  105
+"School Safety and Children Education,",,,Yes,,,,,
  106
+Simulation ,,,Yes,,,,,
  107
+Site Planning,,,,,,,Yes,
  108
+Site Selection,,,,,,,Yes,
  109
+Situation Monitoring/Community Surveillance,,Yes,,,,,,
  110
+Small Scale Mitigation,,,Yes,,,,,
  111
+Social Mobilisation,,,,,,,Yes,
  112
+Solid Waste Management,,,,,Yes,,,
  113
+Sops and Guidelines Development,,,,,,,,
  114
+Spraying of Vectors,,,,,Yes,,,
  115
+"Stockpiling, Prepositioning of Supplies",,Yes,,,,,,
  116
+Strategy Development,,,,Yes,,,,
  117
+Tools and Guidelines Development,,,,,,,,
  118
+Training ,,,,Yes,,,,
  119
+Training of Community/First Responders ,,Yes,,,,,,
  120
+Training of Master Trainers/Trainers,,Yes,,,,,,
  121
+Tree  and Mangrove Planting ,,,Yes,,,,,
  122
+VCA (Vulnerability and Capacity Assessment),,,,,,,,
  123
+Vector Control,,Yes,,,,,,
  124
+Vocational Training and Employment Skills,,,,,,Yes,,
  125
+Volunteer Insurance,,,,Yes,,,,
  126
+Volunteer Recognition,,,,Yes,,,,
  127
+Volunteer Recruitment,normal and ViE too,,,Yes,,,,
  128
+Volunteer Training,,Yes,,,,,,
  129
+Volunteering in Emergencies Guidelines/Toolkit,,,Yes,,,,,
  130
+Volunteering in Pandemic Emergency Situations,,Yes,,,,,,
  131
+Water Testing,,,,,Yes,,,
  132
+Youth Leadership Development,,,,Yes,,,,
138  private/templates/IFRC/project_theme.csv
... ...
@@ -1,67 +1,71 @@
1  
-Name,Comments,Sector:Health,Sector:DRR,Sector:OD,Sector:WatSan,Notes
2  
-CBDRM ,,,Yes,,,
3  
-Climate Change Adaptation and Mitigation,,,Yes,,,
4  
-Early Warning Systems,,,Yes,,,
5  
-Gender and DM sensitisation guidelines,,,Yes,,,
6  
-Infrastructure Development,,,Yes,,,
7  
-Partnerships ,,,Yes,,,
8  
-Risk transfer mechanism ,,,Yes,,,
9  
-Urban Risk Management,,,Yes,,,
10  
-Blood donation and services,,Yes,,,,
11  
-"Communicable diseases (including emerging and re-emerging diseases, vaccine preventable diseases, HIV, TB)",,Yes,,,,
12  
-Community health,,Yes,,,,
13  
-Emergency health,,Yes,,,,
14  
-Epidemic preparedness/pandemic preparedness,,Yes,,,,
15  
-"Maternal, newborn and child health",,Yes,,,,
16  
-Medical services,,Yes,,,,
17  
-Non-communicable diseases,,Yes,,,,
18  
-Nutrition,,Yes,,,,
19  
-Psychosocial support,,Yes,,,,
20  
-Road safety,,Yes,,,,
21  
-School health,,Yes,,,,
22  
-Sexual and reproductive health,,Yes,,,,
23  
-Branch Capacity development ,,,,Yes,,
24  
-Communication capacity building,,,,Yes,,
25  
-Financial system development,,,,Yes,,
26  
-Gender sensitisation and guidelines,,,,Yes,,
27  
-Human Resource development ,,,,Yes,,
28  
-IT – Digital Divide,,,,Yes,,
29  
-Member base development,,,,Yes,,
30  
-PMER development,,,,Yes,,
31  
-Programme planning and management ,,,,Yes,,
32  
-"RM (fundraising, income generation, in-kind support, partnership)",,,,Yes,,
33  
-Social inclusion/ diversity/ violence prevention,,,,Yes,,
34  
-Volunteer and staff  Management or HR,,,,Yes,,
35  
-Youth Development,,,,Yes,,
36  
-Drainage,,,,,Yes,
37  
-Excreta Disposal,,,,,Yes,
38  
-Hygiene promotion,,,,,Yes,
39  
-Solid Waste Management,,,,,Yes,
40  
-Vector Control,,,,,Yes,
41  
-Water Supply,,,,,Yes,
42  
-Capacity Development,"training and development, institutional strengthening, institutional learning",,,,,DRR
43  
-Civil Society/NGOs,"civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action",,,,,
44  
-Climate Change,"adaptation to climate change, sustainable development",,,,,
45  
-Community-based DRR,"local knowledge, local risk mapping",,,,,
46  
-Complex Emergency,"multiple hazard crisis, humanitarian crisis, conflict",,,,,
47  
-Critical Infrastructure,"communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies",,,,,
48  
-Disaster Risk Management,"civil protection, contingency and emergency planning, early recovery, preparedness",,,,,
49  
-Early Warning,"risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling",,,,,
50  
-Economics of DRR,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters",,,,,
51  
-Education & School Safety,"learning, safe schools",,,,,
52  
-Environment,"sustainable development, environmental degradation, ecosystems and environmental management",,,,,
53  
-Gender,"gendered vulnerability, gender-sensitive disaster risk management",,,,,
54  
-GIS & Mapping,"geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping",,,,,
55  
-Governance,"disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction",,,,,
56  
-Health & Health Facilities,"capacity of health practitioners, mental health",,,,,
57  
-Information Management,"disaster databases, disaster information, disaster risk information portals, ICT",,,,,
58  
-Media,"disaster reporting, disaster information dissemination",,,,,
59  
-Private-public Partnerships,"corporate social responsibility, private sector engagement in DRR",,,,,
60  
-Recovery,"building back better, long-term recovery and reconstruction, rehabilitation, shelter",,,,,
61  
-Risk Identification & Assessment,"risk assessment, loss data, disaster risk management",,,,,DRR
62  
-Risk Transfer & Insurance,"disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling",,,,,
63  
-Social Impacts & Resilience,"coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention",,,,,
64  
-Structural Safety,"building codes, building standards, building materials, construction, retrofitting",,,,,
65  
-Urban Risk & Planning,"urban planning, urban management",,,,,
66  
-Vulnerable Populations,,,,,,
67  
-Water,"drinking water, freshwater, irrigation, potable water, water and sanitation, water resource management",HHH,EEE,LLL,PPP,
  1
+Name,Comments,Sector:Health,Sector:DRR,Sector:OD,Sector:WatSan,Sector:Livelihoods,Sector:Shelter,Notes
  2
+Blood Donation and Services,,Yes,,,,,,
  3
+Branch Capacity Development ,,,,Yes,,,,
  4
+Capacity Development,"training and development, institutional strengthening, institutional learning",,,,,,,
  5
+CBDRM ,,,Yes,,,,,
  6
+Civil Society/NGOs,"civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action",,,,,,,
  7
+Climate Change,"adaptation to climate change, sustainable development",,,,,,,
  8
+Communicable Diseases,"Including emerging and re-emerging diseases, vaccine preventable diseases, HIV, TB",Yes,,,,,,
  9
+Community health,,Yes,,,,,,
  10
+Community-based DRR,"local knowledge, local risk mapping",,Yes,,,,,
  11
+Complex Emergency,"multiple hazard crisis, humanitarian crisis, conflict",,,,,,,
  12
+Critical Infrastructure,"communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies",,,,,,,
  13
+Disaster Risk Management,"civil protection, contingency and emergency planning, early recovery, preparedness",,Yes,,,,,
  14
+Diversifying Livelihoods,,,,,,Yes,,
  15
+Donor Driven Housing Reconstruction,,,,,,,Yes,
  16
+Drainage,,,,,Yes,,,
  17
+Early Warning,"risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling",,Yes,,,,,
  18
+Economics of DRR,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters",,Yes,,,,,
  19
+Education & School Safety,"learning, safe schools",,,,,,,
  20
+Emergency Health,,Yes,,,,,,
  21
+Environment,"sustainable development, environmental degradation, ecosystems and environmental management",,,,,,,
  22
+Epidemic/Pandemic Preparedness,,Yes,,,,,,
  23
+Excreta Disposal,,,,,Yes,,,
  24
+Financial System Development,,,,Yes,,,,
  25
+Gender,"gendered vulnerability, gender-sensitive disaster risk management",,,,,,,
  26
+GIS & Mapping,"geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping",,,,,,,
  27
+Governance,"disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction",,,,,,,
  28
+Health & Health Facilities,"capacity of health practitioners, mental health",,,,,,,
  29
+Housing Repair and Retrofitting ,,,,,,,Yes,
  30
+Human Resource development ,,,,Yes,,,,
  31
+Hygiene Promotion,,,,,Yes,,,
  32
+Information Management,"disaster databases, disaster information, disaster risk information portals, ICT",,,,,,,
  33
+Information Technology,,,,Yes,,,,
  34
+Infrastructure Development,,,Yes,,,,,
  35
+"Maternal, Newborn and Child Health",,Yes,,,,,,
  36
+Media,"disaster reporting, disaster information dissemination",,,,,,,
  37
+Medical Services,,Yes,,,,,,
  38
+Member Base Development,,,,Yes,,,,
  39
+Non-Communicable Diseases,,Yes,,,,,,
  40
+Nutrition,,Yes,,,,,,
  41
+Owner Driven Housing Reconstruction,,,,,,,Yes,
  42
+Partnerships ,,,,,,,,
  43
+PASSA,,,,,,,Yes,
  44
+PMER development,,,,Yes,,,,
  45
+Private-Public Partnerships,"corporate social responsibility, private sector engagement in DRR",,,,,,,
  46
+Programme planning and management ,,,,Yes,,,,
  47
+Protecting Livelihoods,,,,,,Yes,,
  48
+Psychosocial Support,,Yes,,,,,,
  49
+Recovery,"building back better, long-term recovery and reconstruction, rehabilitation, shelter",,,,,,,
  50
+Replacing or Provisioning Livelihoods,,,,,,Yes,,
  51
+Resource Mobilization,"Fundraising, income generation, in-kind support, partnership",,,Yes,,,,
  52
+Restarting Livelihoods,,,,,,Yes,,
  53
+Risk Identification & Assessment,"risk assessment, loss data, disaster risk management",,Yes,,,,,
  54
+Risk Transfer & Insurance,"disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling",,Yes,,,,,
  55
+Road Safety,,Yes,,,,,,
  56
+School Health,,Yes,,,,,,
  57
+Sexual and Reproductive Health,,Yes,,,,,,
  58
+Social Impacts & Resilience,"coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention",,,,,,,
  59
+Social Inclusion / Diversity,,,,Yes,,,,
  60
+Solid Waste Management,,,,,Yes,,,
  61
+Strengthening Livelihoods,,,,,,Yes,,
  62
+Structural Safety,"building codes, building standards, building materials, construction, retrofitting",,,,,,,
  63
+Transitional Shelter Construction ,,,,,,,Yes,
  64
+Urban Risk & Planning,"urban planning, urban management",,Yes,,,,,
  65
+Vector Control,,,,,Yes,,,
  66
+Violence Prevention,,,,Yes,,,,
  67
+Volunteer and Staff Management,,,,Yes,,,,
  68
+Vulnerable Populations,,,,,,,,
  69
+Water,"drinking water, freshwater, irrigation, potable water, water and sanitation, water resource management",,,,,,,
  70
+Water Supply,,,,,Yes,,,
  71
+Youth Development,,,,Yes,,,,
2  static/formats/s3csv/project/activity_type.csv
... ...
@@ -1 +1 @@
1  
-Name
  1
+Name,Comments
1  static/formats/s3csv/project/activity_type.xsl
@@ -8,6 +8,7 @@
8 8
          CSV column...........Format..........Content
9 9
 
10 10
          Name.................string..........Name
  11
+         Comments.............string..........Comments
11 12
          Sector:<Sector Abrv>.Yes/blank.......Flag to link activity type to Sector 
12 13
 
13 14
     *********************************************************************** -->
2  static/scripts/S3/S3.js
@@ -657,7 +657,7 @@ function S3FilterFieldChange (setting) {
657 657
         		FieldVal.push($(this).val());
658 658
         	});
659 659
         }
660  
-        if (url.indexOf("?")) {
  660
+        if (url.indexOf("?") != -1) {
661 661
             url = url.concat("&value=");
662 662
         } else {
663 663
             url = url.concat("?value=");

0 notes on commit 7476368

Please sign in to comment.
Something went wrong with that request. Please try again.