Merge pull request #109 from CodeForAfrica/feature/upgrade_all_apps

Release v0.1.0

Author: phillipahereza

CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.1.0] - 2019-01-15
+
+### Added
+- Update all apps to use data sets & releases
+- Improve Docker support
+- Added HURUmap-land app
+- Added Afrobarometer Round 7 survey for Uganda and Zambia
+- Added CHANGELOG
+
+### Changed
+- Hide Empty sections on the profile page

Dockerfile

@@ -1,4 +1,4 @@
-FROM codeforafrica/hurumap:0.0.12
+FROM codeforafrica/hurumap:0.1.1
 
 # Set env variables used in this Dockerfile
 # HURUmap App and Django settings

Makefile

@@ -16,12 +16,18 @@ compilescss:
 dumpdata:
 	$(COMPOSE) exec web python manage.py dumpdata wazimap hurumap ${HURUMAP_APP} -o ${HURUMAP_APP}/fixtures/${HURUMAP_APP}.json
 
+migrate:
+	$(COMPOSE) exec web python manage.py migrate
+
 makemigrations:
 	$(COMPOSE) exec web python manage.py makemigrations
 
 createdb:
 	$(COMPOSE) exec db createdb ${HURUMAP_APP}
 
+dropdb:
+	$(COMPOSE) exec db dropdb ${HURUMAP_APP}
+
 loaddata:
 	$(COMPOSE) exec -T web ./contrib/loaddata.sh  # Load the DB with data
 

README.md

@@ -33,6 +33,11 @@ cat $HURUMAP_APP/sql/*.sql | docker-compose exec -T db psql $HURUMAP_APP
 cat $HURUMAP_APP/sql/*.sql | docker-compose exec -T -e PGPASSWORD=<pass> db psql -h <db.host.com> -U <user> $HURUMAP_APP
 ```
 
+#### `elimu_yangu` `.sql` files
+
+`olevel_student_performance.sql` has been split into 2 files by year because as a single 
+file, it surpasses the maximum file size allowed by Github
+
 ### Import Data into HURUmap
 
 TODO: Needs to use docker-compose, test, and QA

contrib/loaddata.sh

@@ -3,4 +3,5 @@
 if [ -z ${HURUMAP_APP+x} ]; then HURUMAP_APP='hurumap_land'; fi
 
 cat ${HURUMAP_APP}/sql/*.sql | psql            # Load tables / data into DB (TBD)
-python manage.py loaddata ${HURUMAP_APP}.json  # Load fixtures
+python manage.py loaddata ${HURUMAP_APP}/fixtures/${HURUMAP_APP}.json  # Load fixtures
+

elimu_yangu/fixtures/elimu_yangu.json

@@ -3,11 +3,11 @@
 # Define our tables so the data API can discover them.
 # TODO: Add comments so that we can quickly see categories/topics
 # TODO: Rework format to a standard
-FieldTable(['code', 'name', 'region', 'district', 'ward', 'ownership', 'latitude', 'longitude',
-    'pass_rate', 'change_previous_year_pass_rate', 'avg_gpa', 'chane_previous_year_gpa', 'rank',
-    'year_of_result', 'more_than_40', 'national_rank_all', 'regional_rank_all',
-    'district_rank_all'], id='secondary_schools')
+# FieldTable(['code', 'name', 'region', 'district', 'ward', 'ownership', 'latitude', 'longitude',
+#     'pass_rate', 'change_previous_year_pass_rate', 'avg_gpa', 'chane_previous_year_gpa', 'rank',
+#     'year_of_result', 'more_than_40', 'national_rank_all', 'regional_rank_all',
+#     'district_rank_all'], id='secondary_school', dataset="School's League", year='2017')
 
 
 FieldTable(['code', 'name', 'region', 'district', 'ward', 'ownership', 'gender', 'latitude', 'longitude',
-     'avg_gpa', 'year_of_result', 'more_than_40', 'national_rank_all', 'regional_rank_all'], id='secondary_school')
+     'avg_gpa', 'year_of_result', 'more_than_40', 'national_rank_all', 'regional_rank_all'], id='secondary_school', dataset="School's League", year='2017')

elimu_yangu/leaguetable/tables.py

@@ -22,7 +22,7 @@
         regex   = r'^profiles/(?P<geography_id>\w+-\w+)(-(?P<slug>[\w-]+))?/$',
         view    = cache_page(STANDARD_CACHE_TIME)(GeographyDetailView.as_view()),
         kwargs  = {},
-        name    = 'geography_detail',
+        name    = 'league_table_geography_detail',
     ),
 
     # url for specific school page

elimu_yangu/leaguetable/urls.py

@@ -2,7 +2,7 @@
 import json
 from django.utils import translation
 
-from django.http import HttpResponse
+from django.http import HttpResponse, Http404
 from django.shortcuts import render_to_response, render, redirect
 from django.utils.module_loading import import_string
 from django.utils.safestring import SafeString
@@ -11,11 +11,9 @@
 from django.conf import settings
 
 from wazimap.geo import geo_data
-from wazimap.data.tables import get_model_from_fields, get_model_for_db_table
 from wazimap.profiles import enhance_api_data
 from wazimap.data.base import Base
-from wazimap.data.utils import (LocationNotFound, calculate_median, get_session, get_stat_data,
-                                merge_dicts, get_objects_by_geo, group_remainder)
+from wazimap.data.utils import (get_session)
 
 from sqlalchemy import Column, ForeignKey, Integer, String, Table, func, or_, and_, desc, asc, cast
 
@@ -104,7 +102,7 @@ def get_context_data(self, *args, **kwargs):
             self.geo_code = school.geo_code
             version = '2009'
             self.geo = geo_data.get_geography(self.geo_code, self.geo_level, version)
-        except (ValueError, LocationNotFound):
+        except (ValueError, Exception):
             raise Http404
         # load the profile
         # profile_method = settings.WAZIMAP.get('profile_builder', None)
@@ -157,7 +155,7 @@ def dispatch(self, *args, **kwargs):
         try:
             self.geo_level, self.geo_code = self.geo_id.split('-', 1)
             self.geo = geo_data.get_geography(self.geo_code, self.geo_level, version)
-        except (ValueError, LocationNotFound):
+        except (ValueError, Exception):
             raise Http404
 
         # check slug
@@ -215,8 +213,6 @@ def get_template_names(self):
         return ['leaguetable/profile/profile_detail_%s.html' % self.profile_name, 'leaguetable/embed_map.html']
 
 
-
-
 class GeographyDetailView(BaseGeographyDetailView):
     adjust_slugs = True
     default_geo_version = None
@@ -230,7 +226,7 @@ def dispatch(self, *args, **kwargs):
         try:
             self.geo_level, self.geo_code = self.geo_id.split('-', 1)
             self.geo = geo_data.get_geography(self.geo_code, self.geo_level, version)
-        except (ValueError, LocationNotFound):
+        except (ValueError, Exception):
             raise Http404
 
         # check slug
@@ -300,14 +296,16 @@ def get_context_data(self, geo_id1, geo_id2):
 
             level, code = geo_id2.split('-', 1)
             page_context['geo2'] = geo_data.get_geography(code, level)
-        except (ValueError, LocationNotFound):
+        except (ValueError, Exception):
             raise Http404
 
         return page_context
 
 def get_overall_topschools(year, geo_level, geo_code, session):
     schools = {}
     # Choosing sorting option
+
+    Base.metadata.reflect()
     rank_column = Base.metadata.tables['secondary_school'].c.national_rank_all
     # Fetching schools
     top_schools_40_more = session.query(Base.metadata.tables['secondary_school'])\