Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit f347e6a01ce68cc6ddc3ed1c4442598f0d2aece1 2 parents 69a7391 + 7476368
@flavour authored
View
2  controllers/project.py
@@ -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
3  modules/eden/asset.py
@@ -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
7 modules/eden/hrm.py
@@ -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
4 modules/eden/menus.py
@@ -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
11 modules/eden/project.py
@@ -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"),
View
5 modules/tests/asset/asset.py
@@ -57,14 +57,15 @@ def test_asset001_create_asset(self):
"WS-100-17"),
( "item_id",
"Water Purification Unit",
- "autocomplete"),
+ "option"),
#( "type",
# "Other"
# "option"),
( "sn",
"WPU-4536-9381"),
( "supplier",
- "Breville"),
+ "Acme Suppliers",
+ "option"),
( "purchase_date",
today ),
( "purchase_price",
View
15 modules/tests/asset/create_asset.py
@@ -54,14 +54,19 @@ def test_asset001_create_asset(self):
"WS_100_17"),
( "item_id",
"Blankets",
- "autocomplete"),
- ( "site_id",
- "AP Zone (Office)",
"option"),
+ ("organisation_id",
+ "International Federation of Red Cross and Red Crescent Societies (IFRC)",
+ "option"),
+ ( "site_id",
+ "AP Zone",
+ "option",
+ 4),
( "sn",
"WPU-4536-9381"),
- ( "supplier",
- "Breville"),
+ ( "supply_org_id",
+ "Acme Suppliers",
+ "option"),
( "purchase_date",
today),
( "purchase_price",
View
7 modules/tests/hrm/create_staff.py
@@ -49,7 +49,7 @@ def test_hrm001_create_staff(self):
self.create("hrm_human_resource",
[( "organisation_id",
- "Acme Suppliers",
+ "International Federation of Red Cross and Red Crescent Societies (IFRC)",
"option"),
( "first_name",
"Robert",
@@ -67,8 +67,9 @@ def test_hrm001_create_staff(self):
"Warehouse Manager",
"option"),
( "site_id",
- "AP Zone (Office)",
- "option"),
+ "AP Zone",
+ "option",
+ 3),
]
)
View
7 modules/tests/hrm/create_volunteer.py
@@ -49,7 +49,7 @@ def test_hrm002_create_volunteer(self):
self.create("hrm_human_resource",
[( "organisation_id",
- "Acme Suppliers",
+ "International Federation of Red Cross and Red Crescent Societies (IFRC)",
"option"),
( "first_name",
"John",
@@ -64,8 +64,9 @@ def test_hrm002_create_volunteer(self):
"Security",
"option"),
( "site_id",
- "AP Zone (Office)",
- "option"),
+ "AP Zone",
+ "option",
+ 3),
]
)
View
6 modules/tests/inv/create_catalog.py
@@ -47,10 +47,10 @@ def test_inv006_create_catalog(self):
self.login(account="admin", nexturl="supply/catalog/create")
self.create("supply_catalog",
[( "name",
- "Romanian Food Catalogue" ),
+ "IFRC Food Catalogue" ),
( "organisation_id",
- "Romanian Food Assistance Association",
- "autocomplete" ),
+ "International Federation of Red Cross and Red Crescent Societies (IFRC)",
+ "option" ),
( "comments",
"This is a test Catalogue")
]
View
2  modules/tests/inv/create_warehouse.py
@@ -56,7 +56,7 @@ def test_inv004_create_warehouse(self, items=[0]):
# 1st field used to check whether record already exists
("name", "Bucharest RFAAT Central Warehouse (Test)"),
("code", "12345679"),
- ("organisation_id", "Romanian Food Assistance Association", "autocomplete"),
+ ("organisation_id", "International Federation of Red Cross and Red Crescent Societies (IFRC)", "option"),
("comments", "This is a Test Warehouse"),
],
]
View
8 modules/tests/inv/receive_item.py
@@ -60,9 +60,13 @@ def test_inv002a_receive_items(self):
"option",
),
("type",
- "-",
+ "Internal Shipment",
"option",
- )
+ ),
+ ("from_site_id",
+ "Ainaro Warehouse (Warehouse)",
+ "option",
+ ),
]
item_data = [
View
4 modules/tests/inv/send_item.py
@@ -55,6 +55,10 @@ def test_inv001_send_items(self):
"Timor-Leste Red Cross Society (CVTL) National Warehouse (Warehouse)",
"option",
),
+ ("type",
+ "Internal Shipment",
+ "option",
+ ),
("to_site_id",
"Lospalos Warehouse (Warehouse)",
"option",
View
8 modules/tests/inv/send_receive_item.py
@@ -53,6 +53,10 @@ def test_inv003_send_receive_items(self):
"Timor-Leste Red Cross Society (CVTL) National Warehouse (Warehouse)",
"option",
),
+ ("type",
+ "Internal Shipment",
+ "option",
+ ),
("to_site_id",
"Lospalos Warehouse (Warehouse)",
"option",
@@ -126,6 +130,10 @@ def test_inv021_send_and_confirm(self):
"Timor-Leste Red Cross Society (CVTL) National Warehouse (Warehouse)",
"option",
),
+ ("type",
+ "Internal Shipment",
+ "option",
+ ),
("to_site_id",
"Lori (Facility)",
"option",
View
2  modules/tests/member/create_member.py
@@ -49,7 +49,7 @@ def test_mem001_create_member(self):
self.login(account="admin", nexturl="member/membership/create")
self.create("member_membership",
[( "organisation_id",
- "Timor-Leste Red Cross Society",
+ "Timor-Leste Red Cross Society (CVTL)",
"option"),
( "first_name",
"Denise",
View
13 modules/tests/project/create_project.py
@@ -51,7 +51,10 @@ def test_project001_create_project(self):
self.login(account="admin", nexturl="project/project/create")
self.create("project_project",
- [( "name",
+ [("organisation_id",
+ "International Federation of Red Cross and Red Crescent Societies (IFRC)",
+ "option"),
+ ( "name",
"Community Strengthening through Dance" ),
( "comments",
"Host National Society")
@@ -100,14 +103,8 @@ def test_project001_create_project(self):
"gis_location"),
( "lon",
"0",
- "gis_location"),
+ "gis_location")
# @ToDo: Activities - Community Organisation, Contingency Planning, Logistics
- ( "population",
- "1000"),
- ( "number_families",
- "200"),
- ( "comments",
- "First Community")
]
)
View
259 private/templates/IFRC/project_activity_type.csv
@@ -1,127 +1,132 @@
-Name,Sector:Health,Sector:DRR,Sector:OD,Sector:WatSan,Notes
-Auxiliary role,,Yes,,,
-Climate change awareness ,,Yes,,,
-"Climate change mainstreaming, ",,Yes,,,
-Coastal conservation ,,Yes,,,
-Community disaster awareness,,Yes,,,
-Community early warning systems,,Yes,,,
-Education & advocacy,,Yes,,,
-"Financial risk sharing (community funds, etc.), ",,Yes,,,
-Insurance ,,Yes,,,
-"legislation/IDRL, ",,Yes,,,
-Logistics & warehouses,,Yes,,,
-National DM planning ,,Yes,,,
-Provision of tools and equipment,,Yes,,,
-RDRT (Regional disaster response teams),,Yes,,,
-"School safety and children education,",,Yes,,,
-"Simulation small scale mitigation, ",,Yes,,,
-"Staff/volunteer capacity building, (does this mean volunteering development guidelines??)",,Yes,,,
-Tree and mangrove planting ,,Yes,,,
-Volunteering in emergencies guidelines/toolkit,,Yes,,,
-Vulnerability and Capacity Assessments,,Yes,,,
-Advocacy,Yes,,,,
-Behaviour change communication,Yes,,,,
-Better programming initiative guidance,Yes,,,,DRR
-Blood banking,Yes,,,,
-Club 25 / Pledge 25,Yes,,,,
-Community action planning,Yes,,,,DRR
-Community health committees,Yes,,,,
-Community health initiative/projects,Yes,,,,
-Community health risk assessments,Yes,,,,
-Community mobilisation,Yes,,,,
-Community preparedness,Yes,,,,
-Contingency planning/preparedness planning,Yes,,,,
-Coordination and partnerships,Yes,,,,
-Disease prevention,Yes,,,,
-"Distribution of prevention items � such as condoms, mosquito nets, soap",Yes,,,,
-Donor recruitment,Yes,,,,
-Feeding programmes,Yes,,,,
-First Aid,Yes,,,,
-Food supplementation,Yes,,,,
-"Health awareness, promotion",Yes,,,,
-Health facilities - construction and operation,Yes,,,,
-"Health policy, strategy development",Yes,,,,
-Immunisation campaigns,Yes,,,,
-Infant and young child feeding,Yes,,,,
-Knowledge management ,Yes,,,,
-Medical supplies and equipment,Yes,,,,
-Mobile health units,Yes,,,,
-Monitoring and evaluation,Yes,,,,
-Nutritional assessments,Yes,,,,
-Organisational preparedness � NHQ and branches,Yes,,,,
-Peer support,Yes,,,,
-Project assessments and planning,Yes,,,,
-Psychosocial support (tools/guidelines/trainings in cross-cultural contexts),Yes,,,,
-Referral,Yes,,,,
-Risk management and quality assurance,Yes,,,,
-School-based activities,Yes,,,,
-Situation monitoring/community surveillance,Yes,,,,
-Staff capacity building,Yes,,,,
-"Stockpiling, prepositioning of supplies",Yes,,,,
-Tools and guidelines development,Yes,,,,
-Training of community/first responders ,Yes,,,,
-Training of master trainers/trainers,Yes,,,,
-Vector control,Yes,,,,
-Volunteer capacity building - training and mobilisation,Yes,,,,
-Volunteer training,Yes,,,,
-Volunteering in pandemic emergency situations (Jim had shared guidelines earlier?),Yes,,,,
-Branch planning,,,Yes,,
-Capacity building of governance,,,Yes,,
-Capacity building of management staff,,,Yes,,
-"Database development (vol, member, donors)",,,Yes,,
-Policy development,,,Yes,,
-"Resource Mobilisation (fundraising, income generation, in-kind support, partnership) ",,,Yes,,
-School RC units development,,,Yes,,
-SOPs and guidelines development,,,Yes,,
-Strategy development,,,Yes,,
-Training ,,,Yes,,
-Volunteer insurance,,,Yes,,
-Volunteer recognition,,,Yes,,
-Volunteer recruitment (normal and ViE too),,,Yes,,
-Volunteer training,,,Yes,,
-Youth leadership development,,,Yes,,
-Catchment protection,,,,Yes,
-Clean-up campaign,,,,Yes,
-"Construction of water supply systems (gravity-fed, shallow wells, boreholes)",,,,Yes,
-Desluding ,,,,Yes,
-Emergency householdwater treatment and storage,,,,Yes,
-Emergency water supply,,,,Yes,
-Hand washing facilities and demonstration,,,,Yes,
-Installation of rainwater harvesting systems,,,,Yes,
-latrine construction (emergency and permanent),,,,Yes,
-Participatory Hygiene and Sanitation Transformation,,,,Yes,
-Planning and construction of drainage systems ,,,,Yes,
-Solid waste management,,,,Yes,
-Spraying of vectors,,,,Yes,
-Training and capacity building,,,,Yes,
-Water testing,,,,Yes,
-Advocacy,,,,,
-Awareness raising,,,,,
-BDRT (Branch disaster response teams),,,,,DRR
-Capacity Building,,,,,
-CDRT (Community disaster response teams),,,,,DRR
-Children's Education,,,,,
-Climate change mitigation,,,,,
-Climate change preparedness,,,,,DRR
-Community Based Health and First Aid (CBHFA),,,,,
-Community organisation,,,,,DRR
-Contingency planning,,,,,DRR
-DM Planning,,,,,
-Early warning,,,,,
-Evacuation drills,,,,,DRR
-Food security ,,,,,
-Hygiene promotion,,,,,
-IDRL,,,,,
-IEC Materials,,,,,"Development/dissemination WatSan,DRR"
-Livelihoods,,,,,
-Logistics,,,,,
-Mainstreaming DRR,,,,,DRR
-NDRT (National disaster response teams),,,,,DRR
-Nutrition,,,,,
-Risk transfer,,,,,
-Sanitation,,,,,
-School Safety,,,,,
-Small scale mitigation,,,,,
-Tools & Equipment,,,,,
-VCA (Vulnerability and Capacity Assessment),,,,,
-Water Supply,,,,,
+Name,Comments,Sector:Health,Sector:DRR,Sector:Od,Sector:Watsan,Sector:Livelihoods,Sector:Shelter,Notes
+Advocacy,,,,,,,,
+Assessment and Community/Beneficiary Identification,,,,,,,,
+Auxiliary Role,,,,,,,,
+Awareness Raising,,,,,,,,
+Bdrt (Branch Disaster Response Teams),,,Yes,,,,,
+Behaviour Change Communication,,,,,,,,
+Better Programming Initiative Guidance,,,,,,,,
+Blood Banking,,Yes,,,,,,
+Blood Donor Recruitment,,Yes,,,,,,
+Boq and Cost Estimation,,,,,,,Yes,
+Branch Planning,,,,Yes,,,,
+Capacity Building,,,,,,,,
+Capacity Building of Governance,,,,Yes,,,,
+Capacity Building of Management Staff,,,,Yes,,,,
+Capacity Building of Staff,,,,,,,,
+Capacity Building of Volunteers,training and mobilisation,,,,,,,
+Catchment Protection,,,,,Yes,,,
+CDRT (Community Disaster Response Teams),,,,Yes,,,,
+Children'S Education,,,,,,,,
+Clean-Up Campaign,,,,,Yes,,,
+Climate Change Adaptation ,,,,,,,,
+Climate Change Mitigation,,,,,,,,
+Club 25 / Pledge 25,,Yes,,,,,,
+Coastal Conservation ,,,Yes,,,,,
+Community Action Planning,,,,,,,,DRR
+Community Based Health and First Aid (Cbhfa),,Yes,,,,,,
+Community Disaster Awareness,,,Yes,,,,,
+Community Early Warning Systems,,,Yes,,,,,
+Community Health Committees,,Yes,,,,,,
+Community Health Initiative/Projects,,Yes,,,,,,
+Community Health Risk Assessments,,Yes,,,,,,
+Community Mobilisation,,,,,,,,
+Community Organisation,,,,,,,,
+Community Preparedness,,Yes,Yes,,,,,
+Construction Activities,,,,,,,Yes,
+Construction of Water Supply Systems,"gravity-fed, shallow wells, boreholes",,,,Yes,,,
+Contingency/Preparedness Planning,,,,,,,,
+Contractual Agreements (Community/Individual),,,,,,,Yes,
+Contractual Agreements (Governmental),,,,,,,Yes,
+Coordination and Partnerships,,,,,,,,
+Database Development,,,,,,,,
+Desluding ,,,,,Yes,,,
+Disaster Law,,,,,,,,
+Disease Prevention,,Yes,,,,,,
+Distribution of Food,,,,,,,,
+Distribution of Non-Food Items,,,,,,,,
+DM Planning,,,,,,,,
+Early Warning Systems,,,Yes,,,,,
+Education & Advocacy,,,Yes,,,,,
+Emergency Householdwater Treatment and Storage,,,,,Yes,,,
+Emergency Water Supply,,,,,Yes,,,
+Enterprise Development Training ,"Financial, Planning, etc",,,,,Yes,,
+Evacuation Drills,,Yes,,,,,,
+Feeding Programmes,,Yes,,,,,,
+Financial Risk Sharing ,"community funds, etc",,Yes,,,,,
+Financial Services,"savings, credit, insurance",,,,,Yes,,
+First Aid,,Yes,,,,,,
+Food Security ,,,,,,,,
+Food Supplementation,,Yes,,,,,,
+Hand Washing Facilities,,,,,Yes,,,
+"Health Awareness, Promotion",,Yes,,,,,,
+Health Facilities - Construction and Operation,,Yes,,,,,,
+"Health Policy, Strategy Development",,Yes,,,,,,
+House Design,,,,,,,Yes,
+IEC Materials,,,,,,,,
+Immunisation Campaigns,,Yes,,,,,,
+Improved Production Techniques,"demonstration, training and support",,,,,Yes,,
+Infant and Young Child Feeding,,Yes,,,,,,
+Installation of Rainwater Harvesting Systems,,,,,Yes,,,
+Insurance ,,,Yes,,,,,
+Irrigation and Watershed Management,,,,,,Yes,,
+Knowledge Management ,,,,,,,,
+Latrine Construction,emergency and permanent,,,,Yes,,,
+Legal Approvals,,,,,,,Yes,
+Logistics & Warehouses,,,,,,,,
+Mainstreaming DRR,,,,,,,,DRR
+"Markets/Marketing Analysis, Linkages and Support",,,,,,Yes,,
+Medical Supplies and Equipment,,Yes,,,,,,
+Mobile Health Units,,Yes,,,,,,
+Monitoring and Evaluation,,Yes,,,,,,
+NDRT (National Disaster Response Teams),,,,,,,,DRR
+Nutrition,,,,,,,,
+Nutritional Assessments,,Yes,,,,,,
+Organisational Preparedness � Nhq and Branches,,Yes,,,,,,
+Participatory Hygiene Promotion,,Yes,,,Yes,,,
+Peer Support,,Yes,,,,,,
+Planning and Construction of Drainage Systems ,,,,,Yes,,,
+Policy Development,,,,Yes,,,,
+Post Harvest Storage and Management,,,,,,Yes,,
+"Programme Preparation and Action Plan, Budget & Schedule",,,,,,,,
+Project Assessments and Planning,,,,,,,,
+Provision of Inputs,"seeds, tools, fertilizers, fishing nets, other equipment for livelihoods activities",,,,,Yes,,
+Provision of Tools and Equipment,,,,,,,,
+Psychosocial Support,tools/guidelines/trainings in cross-cultural contexts,Yes,,,,,,
+"Rangeland, Fisheries and Forest Management",,,,,,Yes,,
+RDRT (Regional Disaster Response Teams),,,Yes,,,,,
+Referral,,Yes,,,,,,
+Resource Transfers for Acquiring Assets,"cash, voucher, food aid",,,,,Yes,,
+Resource Transfers for Replacing/ Provisioning Or Consumption,"cash, vouchers, food aid",,,,,Yes,,
+Risk Management and Quality Assurance,,Yes,,,,,,
+Risk Transfer,,,,,,,,
+Sanitation,,,,,,,,
+School RC Units Development,,,,Yes,,,,
+"School Safety and Children Education,",,,Yes,,,,,
+Simulation ,,,Yes,,,,,
+Site Planning,,,,,,,Yes,
+Site Selection,,,,,,,Yes,
+Situation Monitoring/Community Surveillance,,Yes,,,,,,
+Small Scale Mitigation,,,Yes,,,,,
+Social Mobilisation,,,,,,,Yes,
+Solid Waste Management,,,,,Yes,,,
+Sops and Guidelines Development,,,,,,,,
+Spraying of Vectors,,,,,Yes,,,
+"Stockpiling, Prepositioning of Supplies",,Yes,,,,,,
+Strategy Development,,,,Yes,,,,
+Tools and Guidelines Development,,,,,,,,
+Training ,,,,Yes,,,,
+Training of Community/First Responders ,,Yes,,,,,,
+Training of Master Trainers/Trainers,,Yes,,,,,,
+Tree and Mangrove Planting ,,,Yes,,,,,
+VCA (Vulnerability and Capacity Assessment),,,,,,,,
+Vector Control,,Yes,,,,,,
+Vocational Training and Employment Skills,,,,,,Yes,,
+Volunteer Insurance,,,,Yes,,,,
+Volunteer Recognition,,,,Yes,,,,
+Volunteer Recruitment,normal and ViE too,,,Yes,,,,
+Volunteer Training,,Yes,,,,,,
+Volunteering in Emergencies Guidelines/Toolkit,,,Yes,,,,,
+Volunteering in Pandemic Emergency Situations,,Yes,,,,,,
+Water Testing,,,,,Yes,,,
+Youth Leadership Development,,,,Yes,,,,
View
138 private/templates/IFRC/project_theme.csv
@@ -1,67 +1,71 @@
-Name,Comments,Sector:Health,Sector:DRR,Sector:OD,Sector:WatSan,Notes
-CBDRM ,,,Yes,,,
-Climate Change Adaptation and Mitigation,,,Yes,,,
-Early Warning Systems,,,Yes,,,
-Gender and DM sensitisation guidelines,,,Yes,,,
-Infrastructure Development,,,Yes,,,
-Partnerships ,,,Yes,,,
-Risk transfer mechanism ,,,Yes,,,
-Urban Risk Management,,,Yes,,,
-Blood donation and services,,Yes,,,,
-"Communicable diseases (including emerging and re-emerging diseases, vaccine preventable diseases, HIV, TB)",,Yes,,,,
-Community health,,Yes,,,,
-Emergency health,,Yes,,,,
-Epidemic preparedness/pandemic preparedness,,Yes,,,,
-"Maternal, newborn and child health",,Yes,,,,
-Medical services,,Yes,,,,
-Non-communicable diseases,,Yes,,,,
-Nutrition,,Yes,,,,
-Psychosocial support,,Yes,,,,
-Road safety,,Yes,,,,
-School health,,Yes,,,,
-Sexual and reproductive health,,Yes,,,,
-Branch Capacity development ,,,,Yes,,
-Communication capacity building,,,,Yes,,
-Financial system development,,,,Yes,,
-Gender sensitisation and guidelines,,,,Yes,,
-Human Resource development ,,,,Yes,,
-IT � Digital Divide,,,,Yes,,
-Member base development,,,,Yes,,
-PMER development,,,,Yes,,
-Programme planning and management ,,,,Yes,,
-"RM (fundraising, income generation, in-kind support, partnership)",,,,Yes,,
-Social inclusion/ diversity/ violence prevention,,,,Yes,,
-Volunteer and staff Management or HR,,,,Yes,,
-Youth Development,,,,Yes,,
-Drainage,,,,,Yes,
-Excreta Disposal,,,,,Yes,
-Hygiene promotion,,,,,Yes,
-Solid Waste Management,,,,,Yes,
-Vector Control,,,,,Yes,
-Water Supply,,,,,Yes,
-Capacity Development,"training and development, institutional strengthening, institutional learning",,,,,DRR
-Civil Society/NGOs,"civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action",,,,,
-Climate Change,"adaptation to climate change, sustainable development",,,,,
-Community-based DRR,"local knowledge, local risk mapping",,,,,
-Complex Emergency,"multiple hazard crisis, humanitarian crisis, conflict",,,,,
-Critical Infrastructure,"communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies",,,,,
-Disaster Risk Management,"civil protection, contingency and emergency planning, early recovery, preparedness",,,,,
-Early Warning,"risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling",,,,,
-Economics of DRR,"cost benefit analysis, disaster risk financing, financial effects of disasters, poverty and disaster risk, risk sharing, socio-economic impacts of disasters",,,,,
-Education & School Safety,"learning, safe schools",,,,,
-Environment,"sustainable development, environmental degradation, ecosystems and environmental management",,,,,
-Gender,"gendered vulnerability, gender-sensitive disaster risk management",,,,,
-GIS & Mapping,"geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping",,,,,
-Governance,"disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction",,,,,
-Health & Health Facilities,"capacity of health practitioners, mental health",,,,,
-Information Management,"disaster databases, disaster information, disaster risk information portals, ICT",,,,,
-Media,"disaster reporting, disaster information dissemination",,,,,
-Private-public Partnerships,"corporate social responsibility, private sector engagement in DRR",,,,,
-Recovery,"building back better, long-term recovery and reconstruction, rehabilitation, shelter",,,,,
-Risk Identification & Assessment,"risk assessment, loss data, disaster risk management",,,,,DRR
-Risk Transfer & Insurance,"disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling",,,,,
-Social Impacts & Resilience,"coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention",,,,,
-Structural Safety,"building codes, building standards, building materials, construction, retrofitting",,,,,
-Urban Risk & Planning,"urban planning, urban management",,,,,
-Vulnerable Populations,,,,,,
-Water,"drinking water, freshwater, irrigation, potable water, water and sanitation, water resource management",HHH,EEE,LLL,PPP,
+Name,Comments,Sector:Health,Sector:DRR,Sector:OD,Sector:WatSan,Sector:Livelihoods,Sector:Shelter,Notes
+Blood Donation and Services,,Yes,,,,,,
+Branch Capacity Development ,,,,Yes,,,,
+Capacity Development,"training and development, institutional strengthening, institutional learning",,,,,,,
+CBDRM ,,,Yes,,,,,
+Civil Society/NGOs,"civic action, collective community action, community-based organization (CBO) action, grassroots action, integrative DRR, non-governmental organization (NGO) action",,,,,,,
+Climate Change,"adaptation to climate change, sustainable development",,,,,,,
+Communicable Diseases,"Including emerging and re-emerging diseases, vaccine preventable diseases, HIV, TB",Yes,,,,,,
+Community health,,Yes,,,,,,
+Community-based DRR,"local knowledge, local risk mapping",,Yes,,,,,
+Complex Emergency,"multiple hazard crisis, humanitarian crisis, conflict",,,,,,,
+Critical Infrastructure,"communications systems, health facilities, 'lifelines', power and energy, emergency evacuation shelters, financial infrastructure, schools, transportation, waste disposal, water supplies",,,,,,,
+Disaster Risk Management,"civil protection, contingency and emergency planning, early recovery, preparedness",,Yes,,,,,
+Diversifying Livelihoods,,,,,,Yes,,
+Donor Driven Housing Reconstruction,,,,,,,Yes,
+Drainage,,,,,Yes,,,
+Early Warning,"risk knowledge, monitoring and warning service, risk communication, response capability, disaster preparedness, risk modelling",,Yes,,,,,
+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,,,,,
+Education & School Safety,"learning, safe schools",,,,,,,
+Emergency Health,,Yes,,,,,,
+Environment,"sustainable development, environmental degradation, ecosystems and environmental management",,,,,,,
+Epidemic/Pandemic Preparedness,,Yes,,,,,,
+Excreta Disposal,,,,,Yes,,,
+Financial System Development,,,,Yes,,,,
+Gender,"gendered vulnerability, gender-sensitive disaster risk management",,,,,,,
+GIS & Mapping,"geographic information systems, hazard exposure mapping, vulnerability mapping, risk mapping",,,,,,,
+Governance,"disaster risk reduction policy and legislation, National Platform for disaster risk reduction, Regional Platforms for disaster risk reduction",,,,,,,
+Health & Health Facilities,"capacity of health practitioners, mental health",,,,,,,
+Housing Repair and Retrofitting ,,,,,,,Yes,
+Human Resource development ,,,,Yes,,,,
+Hygiene Promotion,,,,,Yes,,,
+Information Management,"disaster databases, disaster information, disaster risk information portals, ICT",,,,,,,
+Information Technology,,,,Yes,,,,
+Infrastructure Development,,,Yes,,,,,
+"Maternal, Newborn and Child Health",,Yes,,,,,,
+Media,"disaster reporting, disaster information dissemination",,,,,,,
+Medical Services,,Yes,,,,,,
+Member Base Development,,,,Yes,,,,
+Non-Communicable Diseases,,Yes,,,,,,
+Nutrition,,Yes,,,,,,
+Owner Driven Housing Reconstruction,,,,,,,Yes,
+Partnerships ,,,,,,,,
+PASSA,,,,,,,Yes,
+PMER development,,,,Yes,,,,
+Private-Public Partnerships,"corporate social responsibility, private sector engagement in DRR",,,,,,,
+Programme planning and management ,,,,Yes,,,,
+Protecting Livelihoods,,,,,,Yes,,
+Psychosocial Support,,Yes,,,,,,
+Recovery,"building back better, long-term recovery and reconstruction, rehabilitation, shelter",,,,,,,
+Replacing or Provisioning Livelihoods,,,,,,Yes,,
+Resource Mobilization,"Fundraising, income generation, in-kind support, partnership",,,Yes,,,,
+Restarting Livelihoods,,,,,,Yes,,
+Risk Identification & Assessment,"risk assessment, loss data, disaster risk management",,Yes,,,,,
+Risk Transfer & Insurance,"disaster insurance, contingency funding, micro-insurance, post-disaster loans, risk financing, risk insurance, risk sharing, pooling",,Yes,,,,,
+Road Safety,,Yes,,,,,,
+School Health,,Yes,,,,,,
+Sexual and Reproductive Health,,Yes,,,,,,
+Social Impacts & Resilience,"coping capacity, loss absorption, loss acceptance, psychosocial support, social vulnerability, trauma prevention",,,,,,,
+Social Inclusion / Diversity,,,,Yes,,,,
+Solid Waste Management,,,,,Yes,,,
+Strengthening Livelihoods,,,,,,Yes,,
+Structural Safety,"building codes, building standards, building materials, construction, retrofitting",,,,,,,
+Transitional Shelter Construction ,,,,,,,Yes,
+Urban Risk & Planning,"urban planning, urban management",,Yes,,,,,
+Vector Control,,,,,Yes,,,
+Violence Prevention,,,,Yes,,,,
+Volunteer and Staff Management,,,,Yes,,,,
+Vulnerable Populations,,,,,,,,
+Water,"drinking water, freshwater, irrigation, potable water, water and sanitation, water resource management",,,,,,,
+Water Supply,,,,,Yes,,,
+Youth Development,,,,Yes,,,,
View
2  static/formats/s3csv/project/activity_type.csv
@@ -1 +1 @@
-Name
+Name,Comments
View
1  static/formats/s3csv/project/activity_type.xsl
@@ -8,6 +8,7 @@
CSV column...........Format..........Content
Name.................string..........Name
+ Comments.............string..........Comments
Sector:<Sector Abrv>.Yes/blank.......Flag to link activity type to Sector
*********************************************************************** -->
View
2  static/scripts/S3/S3.js
@@ -657,7 +657,7 @@ function S3FilterFieldChange (setting) {
FieldVal.push($(this).val());
});
}
- if (url.indexOf("?")) {
+ if (url.indexOf("?") != -1) {
url = url.concat("&value=");
} else {
url = url.concat("?value=");
Please sign in to comment.
Something went wrong with that request. Please try again.