Skip to content

Commit 835764f

Browse files
phillipaherezaphillipahereza
committed
fixed uganda
1 parent 6fafadf commit 835764f

File tree

4 files changed

+127
-89
lines changed

4 files changed

+127
-89
lines changed

‎elimu_yangu/sql/university_finder.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
SET statement_timeout = 0;
99
SET lock_timeout = 0;
10-
SET idle_in_transaction_session_timeout = 0;
1110
SET client_encoding = 'UTF8';
1211
SET standard_conforming_strings = on;
1312
SELECT pg_catalog.set_config('search_path', '', false);
@@ -27,6 +26,7 @@ CREATE EXTENSION IF NOT EXISTS hstore SCHEMA public;
2726

2827
ALTER TABLE IF EXISTS ONLY public.university_finder DROP CONSTRAINT IF EXISTS pk_university_finder;
2928
DROP TABLE IF EXISTS public.university_finder;
29+
DROP SEQUENCE IF EXISTS public.university_finder_id_seq;
3030

3131
CREATE TABLE public.university_finder (
3232
id integer NOT NULL,

‎elimu_yangu/universityfinder/views.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,14 @@ def index(request):
2121
# user_language = translation.get_language()
2222
# print LANGUAGE_CODE
2323
# translation.activate(user_language)
24+
print "\n\n\n\n\n\n\n\n"
25+
print request.method
26+
print "\n\n\n\n\n\n\n\n"
2427
try:
2528
if request.method == 'POST':
29+
print "\n\n\n\n\n\n\n\n"
30+
print request.body
31+
print "\n\n\n\n\n\n\n\n"
2632
dataRequest = json.loads(request.body)
2733
subjects = dataRequest['subjectGrade']
2834
majors = dataRequest["preferedCourse"]

‎hurumap_ug/profiles/census.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ def get_demographics_profile(geo, session, year):
4848
except Exception:
4949
urban_dist_data = LOCATIONNOTFOUND
5050

51+
is_missing = sex_dist_data.get('is_missing') and urban_dist_data.get('is_missing')
52+
5153
final_data = {
54+
'is_missing': is_missing,
5255
'sex_ratio': sex_dist_data,
5356
'urban_distribution': urban_dist_data,
5457
'urbanised': {
@@ -90,7 +93,10 @@ def get_households_profile(geo, session, year):
9093
light_source = LOCATIONNOTFOUND
9194
energy_source, _ = LOCATIONNOTFOUND, 0
9295

96+
is_missing = permanency.get('is_missing') and light_source.get('is_missing') and energy_source.get('is_missing')
97+
9398
final_data = {
99+
'is_missing': is_missing,
94100
'percentage_by_permanency': permanency,
95101
'light_source_distribution': light_source,
96102
'energy_source_distribution': energy_source,
@@ -123,7 +129,10 @@ def get_elections2016_profile(geo, session):
123129
if data == 'numerators':
124130
total_museveni += value['this']
125131

132+
is_missing = candidate.get('is_missing')
133+
126134
final_data = {
135+
'is_missing': is_missing,
127136
'candidate_distribution': candidate,
128137
'museveni_votes': {
129138
'name': 'Museveni Votes',
@@ -169,7 +178,10 @@ def get_disabilities_profile(geo, session, year):
169178
if data == 'numerators':
170179
total_disabled += value['this']
171180

181+
is_missing = disability.get('is_missing') and disabled_or_not.get('is_missing')
182+
172183
final_data = {
184+
'is_missing': is_missing,
173185
'disabled_or_not_distribution': disabled_or_not,
174186
'disability': disability,
175187
'total_disabled': {

‎hurumap_ug/templates/profile/profile_detail.html

Lines changed: 108 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -36,89 +36,101 @@
3636

3737

3838
{% block profile_detail %}
39-
<article id="demographics"
40-
class="clearfix {% if 'demographics' not in selected_sections %}hide{% endif %}">
41-
<header class="section-contents">
42-
<h1>Demographics</h1>
43-
</header>
44-
<div class="section-container">
45-
46-
<section class="clearfix stat-row">
47-
<h2 class="header-for-columns">
48-
<a class="permalink"
49-
href="#pop_count"
50-
id="pop_count">Population <i
51-
class="fa fa-link"></i></a></h2>
52-
<div class="column-quarter">
53-
{% include 'profile/_blocks/_stat_list.html' with stat=demographics.total_population stat_type='number' %}
54-
</div>
55-
<div class="column-quarter"
56-
id="chart-pie-demographics-sex_ratio"
57-
data-stat-type="percentage" data-chart-title="Sex"></div>
58-
<div class="column-quarter">
59-
{% include 'profile/_blocks/_stat_list.html' with stat=demographics.urbanised stat_type='percentage' %}
60-
</div>
61-
<div class="column-quarter"
62-
id="chart-grouped_column-demographics-urban_distribution"
63-
data-stat-type="scaled-percentage"
64-
data-chart-title="Urban vs rural by sex"></div>
65-
</section>
66-
67-
</div>
68-
</article>
69-
70-
<article id="households"
71-
class="clearfix {% if 'households' not in selected_sections %}hide{% endif %}">
72-
<header class="section-contents">
73-
<h1>Households</h1>
74-
</header>
75-
<div class="section-container">
39+
{% if not demographics.is_missing %}
40+
<article id="demographics"
41+
class="clearfix">
42+
<header class="section-contents">
43+
<h1>Demographics</h1>
44+
</header>
45+
<div class="section-container">
7646

77-
<section class="clearfix stat-row">
78-
<h2><a class="permalink" href="#households">Households <i
79-
class="fa fa-link"></i></a></h2>
80-
<div class="column-third">
81-
{% include 'profile/_blocks/_stat_list.html' with stat=households.total_households stat_type='number' %}
82-
</div>
83-
</section>
84-
{% if not households.percentage_by_permanency.is_missing %}
8547
<section class="clearfix stat-row">
86-
<h2><a class="permalink" href="#households-water"
87-
id="households-water">Percentage by Permanency <i
88-
class="fa fa-link"></i></a></h2>
89-
<div class="column-three-quarters"
90-
id="chart-histogram-households-percentage_by_permanency"
91-
data-stat-type="scaled-percentage"
92-
data-chart-title="Households Percentage by permanency"></div>
48+
<h2 class="header-for-columns">
49+
<a class="permalink"
50+
href="#pop_count"
51+
id="pop_count">Population <i
52+
class="fa fa-link"></i></a></h2>
53+
<div class="column-quarter">
54+
{% include 'profile/_blocks/_stat_list.html' with stat=demographics.total_population stat_type='number' %}
55+
</div>
56+
{% if not demographics.sex_ratio.is_missing %}
57+
<div class="column-quarter"
58+
id="chart-pie-demographics-sex_ratio"
59+
data-stat-type="percentage" data-chart-title="Sex"></div>
60+
{% endif %} <!-- end if -->
61+
{% if not demographics.urbanised %}
62+
<div class="column-quarter">
63+
{% include 'profile/_blocks/_stat_list.html' with stat=demographics.urbanised stat_type='percentage' %}
64+
</div>
65+
{% endif %} <!-- end if -->
66+
67+
{% if not demographics.urban_distribution.is_missing %}
68+
<div class="column-quarter"
69+
id="chart-grouped_column-demographics-urban_distribution"
70+
data-stat-type="scaled-percentage"
71+
data-chart-title="Urban vs rural by sex"></div>
72+
{% endif %} <!-- end if -->
9373
</section>
94-
{% endif %} <!-- end if -->
9574

96-
{% if not households.light_source_distribution.is_missing %}
97-
<section class="clearfix stat-row">
98-
<h2><a class="permalink" href="#households-lighting"
99-
id="households-lighting">Main source of lighting <i
100-
class="fa fa-link"></i></a></h2>
101-
<div class="column-three-quarters"
102-
id="chart-histogram-households-light_source_distribution"
103-
data-stat-type="scaled-percentage"
104-
data-chart-title="Light source distribution"></div>
105-
</section>
106-
{% endif %} <!-- end if -->
75+
</div>
76+
</article>
77+
{% endif %} <!-- end if -->
78+
79+
{% if not households.is_missing %}
80+
<article id="households"
81+
class="clearfix {% if 'households' not in selected_sections %}hide{% endif %}">
82+
<header class="section-contents">
83+
<h1>Households</h1>
84+
</header>
85+
<div class="section-container">
10786

108-
{% if not households.energy_source_distribution.is_missing %}
10987
<section class="clearfix stat-row">
110-
<h2><a class="permalink" href="#households-lighting"
111-
id="households-lighting">Main source of energy <i
88+
<h2><a class="permalink" href="#households">Households <i
11289
class="fa fa-link"></i></a></h2>
113-
<div class="column-three-quarters"
114-
id="chart-histogram-households-energy_source_distribution"
115-
data-stat-type="scaled-percentage"
116-
data-chart-title="Energy source distribution"></div>
90+
<div class="column-third">
91+
{% include 'profile/_blocks/_stat_list.html' with stat=households.total_households stat_type='number' %}
92+
</div>
11793
</section>
118-
{% endif %} <!-- end if -->
94+
{% if not households.percentage_by_permanency.is_missing %}
95+
<section class="clearfix stat-row">
96+
<h2><a class="permalink" href="#households-water"
97+
id="households-water">Percentage by Permanency <i
98+
class="fa fa-link"></i></a></h2>
99+
<div class="column-three-quarters"
100+
id="chart-histogram-households-percentage_by_permanency"
101+
data-stat-type="scaled-percentage"
102+
data-chart-title="Households Percentage by permanency"></div>
103+
</section>
104+
{% endif %} <!-- end if -->
105+
106+
{% if not households.light_source_distribution.is_missing %}
107+
<section class="clearfix stat-row">
108+
<h2><a class="permalink" href="#households-lighting"
109+
id="households-lighting">Main source of lighting <i
110+
class="fa fa-link"></i></a></h2>
111+
<div class="column-three-quarters"
112+
id="chart-histogram-households-light_source_distribution"
113+
data-stat-type="scaled-percentage"
114+
data-chart-title="Light source distribution"></div>
115+
</section>
116+
{% endif %} <!-- end if -->
117+
118+
{% if not households.energy_source_distribution.is_missing %}
119+
<section class="clearfix stat-row">
120+
<h2><a class="permalink" href="#households-lighting"
121+
id="households-lighting">Main source of energy <i
122+
class="fa fa-link"></i></a></h2>
123+
<div class="column-three-quarters"
124+
id="chart-histogram-households-energy_source_distribution"
125+
data-stat-type="scaled-percentage"
126+
data-chart-title="Energy source distribution"></div>
127+
</section>
128+
{% endif %} <!-- end if -->
129+
130+
</div>
131+
</article>
132+
{% endif %} <!-- end if -->
119133

120-
</div>
121-
</article>
122134

123135
<article id="disability"
124136
class="clearfix {% if 'households' not in selected_sections %}hide{% endif %}">
@@ -132,17 +144,23 @@ <h2><a class="permalink" href="#households">Population <i
132144
<div class="column-quarter">
133145
{% include 'profile/_blocks/_stat_list.html' with stat=disability.total_ stat_type='number' %}
134146
</div>
135-
<div class="column-quarter"
136-
id="chart-pie-disability-disabled_or_not_distribution"
137-
data-stat-type="percentage"
138-
data-chart-title="With or Without Disability"></div>
147+
{% if not disability.disabled_or_not_distribution.is_missing %}
148+
<div class="column-quarter"
149+
id="chart-pie-disability-disabled_or_not_distribution"
150+
data-stat-type="percentage"
151+
data-chart-title="With or Without Disability"></div>
152+
{% endif %} <!-- end if -->
153+
139154
<div class="column-quarter">
140155
{% include 'profile/_blocks/_stat_list.html' with stat=disability.total_disabled stat_type='percentage' %}
141156
</div>
142-
<div class="column-quarter"
143-
id="chart-pie-disability-disability"
144-
data-stat-type="percentage"
145-
data-chart-title="Type of disability"></div>
157+
{% if not disability.disability.is_missing %}
158+
<div class="column-quarter"
159+
id="chart-pie-disability-disability"
160+
data-stat-type="percentage"
161+
data-chart-title="Type of disability"></div>
162+
{% endif %} <!-- end if -->
163+
146164
</section>
147165

148166
</div>
@@ -170,13 +188,15 @@ <h2><a class="permalink" href="#households">Votes Cast
170188
</div>
171189

172190
</section>
191+
{% if not elections2016.candidate_distribution.is_missing %}
192+
<section class="clearfix stat-row">
193+
<div class="column-three-quarters"
194+
id="chart-histogram-elections2016-candidate_distribution"
195+
data-stat-type="scaled-percentage"
196+
data-chart-title="Votes Distribution"></div>
197+
</section>
198+
{% endif %} <!-- end if -->
173199

174-
<section class="clearfix stat-row">
175-
<div class="column-three-quarters"
176-
id="chart-histogram-elections2016-candidate_distribution"
177-
data-stat-type="scaled-percentage"
178-
data-chart-title="Votes Distribution"></div>
179-
</section>
180200
</div>
181201
</article>
182202

0 commit comments

Comments
 (0)