Commit c56813b8 authored by Manas Gabani's avatar Manas Gabani

ylabel adjusted for distribution graphs

parent a6afa664
......@@ -73,9 +73,9 @@ def students():
global trend_elementary_enrolment, distribution_elementary_enrolment, distribution_rural_enrolment, rural_enrolment_summary, elementary_enrolment_summary, rural_enrolment_category, elementary_enrolment_category
elementary_enrolment_category, rural_enrolment_category = 'Government', 'Government'
distribution_rural_enrolment = "img/distribution_rural_enrolment_govt_{}.jpeg".format(latest_year)
rural_enrolment_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_rural_enrolment), final_df, latest_year, main_dimension = "Rural Elementary Enrolment", sub_dimension=elementary_enrolment_category)
rural_enrolment_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_rural_enrolment), final_df, latest_year, ylabel="Enrolments / Population", main_dimension = "Rural Elementary Enrolment", sub_dimension=elementary_enrolment_category)
distribution_elementary_enrolment = "img/distribution_elementary_enrolment_govt_{}.jpeg".format(latest_year)
elementary_enrolment_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_elementary_enrolment), final_df, latest_year, main_dimension = "Elementary Enrolment by School Category", sub_dimension=rural_enrolment_category)
elementary_enrolment_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_elementary_enrolment), final_df, latest_year, ylabel="Enrolments / Population", main_dimension = "Elementary Enrolment by School Category", sub_dimension=rural_enrolment_category)
trend_elementary_enrolment = "img/trend_elementary_enrolment_category_{}.jpeg".format(default_state_code)
total_enrolment_by_category(os.path.join(app.config['UPLOAD_FOLDER'], trend_elementary_enrolment), final_df, main_dimension='Elementary Enrolment by School Category', state_code=default_state_code, ylabel='Enrolments')
return render_template('students.html', trend_elementary_enrolment=trend_elementary_enrolment, distribution_rural_enrolment=distribution_rural_enrolment, distribution_elementary_enrolment=distribution_elementary_enrolment, rural_enrolment_summary=rural_enrolment_summary, elementary_enrolment_summary=elementary_enrolment_summary, rural_enrolment_category=rural_enrolment_category, elementary_enrolment_category=elementary_enrolment_category)
......@@ -92,9 +92,9 @@ def teachers():
global trend_teachers, distribution_teachers_by_educational_qualification, distribution_teachers_by_category, teachers_by_category_summary, teachers_by_educational_qualification_summary, teachers_category, teachers_qualification
teachers_category, teachers_qualification = 'Government', 'Below Secondary'
distribution_teachers_by_category = "img/distribution_teachers_by_category_govt_{}.jpeg".format(latest_year)
teachers_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_teachers_by_category), final_df, latest_year, main_dimension = "Teachers by School Category", sub_dimension=teachers_category)
teachers_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_teachers_by_category), final_df, latest_year, ylabel="Teachers / Population", main_dimension = "Teachers by School Category", sub_dimension=teachers_category)
distribution_teachers_by_educational_qualification = "img/distribution_teachers_by_educational_qualification_below_secondary_{}.jpeg".format(latest_year)
teachers_by_educational_qualification_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_teachers_by_educational_qualification), final_df, latest_year, main_dimension = "Teachers by Educational Qualification", sub_dimension=teachers_qualification)
teachers_by_educational_qualification_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_teachers_by_educational_qualification), final_df, latest_year, ylabel="Teachers / Population", main_dimension = "Teachers by Educational Qualification", sub_dimension=teachers_qualification)
trend_teachers="img/trend_teachers_by_category_{}.jpeg".format(default_state_code)
total_teachers_by_main_dimension(os.path.join(app.config['UPLOAD_FOLDER'], trend_teachers), final_df, "Teachers by School Category", default_state_code)
return render_template('teachers.html', trend_teachers=trend_teachers, distribution_teachers_by_category=distribution_teachers_by_category, distribution_teachers_by_educational_qualification=distribution_teachers_by_educational_qualification, teachers_by_category_summary=teachers_by_category_summary, teachers_by_educational_qualification_summary=teachers_by_educational_qualification_summary, teachers_category=teachers_category, teachers_qualification=teachers_qualification)
......@@ -111,9 +111,9 @@ def schools():
global trend_schools, distribution_rural_schools_by_category, distribution_schools_by_category, schools_by_category_summary, rural_schools_by_category_summary, school_category, rural_school_category
school_category, rural_school_category = 'Government', 'Government'
distribution_schools_by_category = "img/distribution_schools_by_category_govt_{}.jpeg".format(latest_year)
schools_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_schools_by_category), final_df, latest_year, main_dimension = "School by Category", sub_dimension=school_category)
schools_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_schools_by_category), final_df, latest_year, ylabel="Schools / Population", main_dimension = "School by Category", sub_dimension=school_category)
distribution_rural_schools_by_category = "img/distribution_rural_schools_by_category_below_secondary_{}.jpeg".format(latest_year)
rural_schools_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_rural_schools_by_category), final_df, latest_year, main_dimension = "Rural Schools", sub_dimension=rural_school_category)
rural_schools_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_rural_schools_by_category), final_df, latest_year, ylabel="Schools / Population", main_dimension = "Rural Schools", sub_dimension=rural_school_category)
trend_schools = "img/trend_schools_category_{}.jpeg".format(default_state_code)
total_enrolment_by_category(os.path.join(app.config['UPLOAD_FOLDER'], trend_schools), final_df, main_dimension='School by Category', state_code=default_state_code, ylabel='Number of schools')
return render_template('schools.html', trend_schools=trend_schools, distribution_schools_by_category=distribution_schools_by_category, distribution_rural_schools_by_category=distribution_rural_schools_by_category, schools_by_category_summary=schools_by_category_summary, rural_schools_by_category_summary=rural_schools_by_category_summary, school_category=school_category, rural_school_category=rural_school_category)
......@@ -127,7 +127,7 @@ def classrooms():
global trend_classrooms, distribution_classroom_by_condition, classroom_condition_summary, classroom_condition
classroom_condition = 'Good Condition'
distribution_classroom_by_condition = "img/distribution_classroom_by_condition_good_{}.jpeg".format(latest_year)
classroom_condition_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_classroom_by_condition), final_df, latest_year, main_dimension = "Total Classrooms", sub_dimension=classroom_condition)
classroom_condition_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_classroom_by_condition), final_df, latest_year, ylabel="Classrooms / Population", main_dimension = "Total Classrooms", sub_dimension=classroom_condition)
trend_classrooms = "img/trend_classrooms_{}.jpeg".format(default_state_code)
total_classrooms_by_trend(os.path.join(app.config['UPLOAD_FOLDER'], trend_classrooms), final_df, default_state_code)
return render_template('classrooms.html', trend_classrooms=trend_classrooms, distribution_classroom_by_condition=distribution_classroom_by_condition, classroom_condition_summary=classroom_condition_summary, classroom_condition=classroom_condition)
......@@ -141,7 +141,7 @@ def facilities():
global trend_school_facilities, distribution_school_facility, school_facility_summary, school_facility
school_facility = 'Enrolment <= 50'
distribution_school_facility = "img/distribution_school_facility_enrolment_lt_50_{}.jpeg".format(latest_year)
school_facility_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_school_facility), final_df, latest_year, main_dimension = "School Facilities", sub_dimension=school_facility)
school_facility_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_school_facility), final_df, latest_year, ylabel="Schools / Population", main_dimension = "School Facilities", sub_dimension=school_facility)
trend_school_facilities = "img/trend_school_facilities_{}.jpeg".format(default_state_code)
total_schools_for_facilities(os.path.join(app.config['UPLOAD_FOLDER'], trend_school_facilities), final_df, default_state_code)
return render_template('facilities.html', trend_school_facilities=trend_school_facilities, distribution_school_facility=distribution_school_facility, school_facility_summary=school_facility_summary, school_facility=school_facility)
......@@ -169,7 +169,7 @@ def get_distribution_for_elementary_enrolment():
elementary_enrolment_category = form_value_to_sub_dimension_mapping[request.form['category']]
requested_year = int(request.form['year'])
distribution_elementary_enrolment = "img/distribution_elementary_enrolment_{}_{}.jpeg".format(request.form['category'], requested_year)
elementary_enrolment_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_elementary_enrolment), final_df, requested_year, main_dimension = "Elementary Enrolment by School Category", sub_dimension=elementary_enrolment_category)
elementary_enrolment_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_elementary_enrolment), final_df, requested_year, ylabel="Enrolments / Population", main_dimension = "Elementary Enrolment by School Category", sub_dimension=elementary_enrolment_category)
return render_template('students.html', trend_elementary_enrolment=trend_elementary_enrolment, distribution_rural_enrolment=distribution_rural_enrolment, distribution_elementary_enrolment=distribution_elementary_enrolment, rural_enrolment_summary=rural_enrolment_summary, elementary_enrolment_summary=elementary_enrolment_summary, rural_enrolment_category=rural_enrolment_category, elementary_enrolment_category=elementary_enrolment_category)
@app.route('/get_distribution_for_rural_enrolment', methods=['POST'])
......@@ -178,7 +178,7 @@ def get_distribution_for_rural_enrolment():
rural_enrolment_category = form_value_to_sub_dimension_mapping[request.form['category']]
requested_year = int(request.form['year'])
distribution_rural_enrolment = "img/distribution_elementary_enrolment_{}_{}.jpeg".format(request.form['category'], requested_year)
rural_enrolment_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_rural_enrolment), final_df, requested_year, main_dimension = "Elementary Enrolment by School Category", sub_dimension=rural_enrolment_category)
rural_enrolment_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_rural_enrolment), final_df, requested_year, ylabel="Enrolments / Population", main_dimension = "Elementary Enrolment by School Category", sub_dimension=rural_enrolment_category)
return render_template('students.html', trend_elementary_enrolment=trend_elementary_enrolment, distribution_rural_enrolment=distribution_rural_enrolment, distribution_elementary_enrolment=distribution_elementary_enrolment, rural_enrolment_summary=rural_enrolment_summary, elementary_enrolment_summary=elementary_enrolment_summary, rural_enrolment_category=rural_enrolment_category, elementary_enrolment_category=elementary_enrolment_category)
@app.route('/get_trend_for_teachers', methods=['POST'])
......@@ -196,7 +196,7 @@ def get_distribution_for_teachers_by_category():
teachers_category = form_value_to_sub_dimension_mapping[request.form['category']]
requested_year = int(request.form['year'])
distribution_teachers_by_category = "img/distribution_teachers_by_category_{}_{}.jpeg".format(request.form['category'], requested_year)
teachers_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_teachers_by_category), final_df, requested_year, main_dimension = "Teachers by School Category", sub_dimension=teachers_category)
teachers_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_teachers_by_category), final_df, requested_year,ylabel="Teachers / Population", main_dimension = "Teachers by School Category", sub_dimension=teachers_category)
return render_template('teachers.html', trend_teachers=trend_teachers, distribution_teachers_by_category=distribution_teachers_by_category, distribution_teachers_by_educational_qualification=distribution_teachers_by_educational_qualification, teachers_by_category_summary=teachers_by_category_summary, teachers_by_educational_qualification_summary=teachers_by_educational_qualification_summary, teachers_category=teachers_category, teachers_qualification=teachers_qualification)
@app.route('/get_distribution_for_teachers_by_educational_qualification', methods=['POST'])
......@@ -205,7 +205,7 @@ def get_distribution_for_teachers_by_educational_qualification():
teachers_qualification = form_value_to_sub_dimension_mapping[request.form['qualification']]
requested_year = int(request.form['year'])
distribution_teachers_by_educational_qualification = "img/distribution_teachers_by_educational_qualification_{}_{}.jpeg".format(request.form['qualification'], requested_year)
teachers_by_educational_qualification_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_teachers_by_educational_qualification), final_df, requested_year, main_dimension = "Teachers by Educational Qualification", sub_dimension=teachers_qualification)
teachers_by_educational_qualification_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_teachers_by_educational_qualification), final_df, requested_year, ylabel="Teachers / Population", main_dimension = "Teachers by Educational Qualification", sub_dimension=teachers_qualification)
return render_template('teachers.html', trend_teachers=trend_teachers, distribution_teachers_by_category=distribution_teachers_by_category, distribution_teachers_by_educational_qualification=distribution_teachers_by_educational_qualification, teachers_by_category_summary=teachers_by_category_summary, teachers_by_educational_qualification_summary=teachers_by_educational_qualification_summary, teachers_category=teachers_category, teachers_qualification=teachers_qualification)
@app.route('/get_trend_for_schools', methods=['POST'])
......@@ -223,7 +223,7 @@ def get_distribution_of_schools_by_category():
school_category = form_value_to_sub_dimension_mapping[request.form['category']]
requested_year = int(request.form['year'])
distribution_schools_by_category = "img/distribution_schools_by_category_{}_{}.jpeg".format(request.form['category'], requested_year)
schools_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_schools_by_category), final_df, requested_year, main_dimension = "School by Category", sub_dimension=school_category)
schools_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_schools_by_category), final_df, requested_year, ylabel="Schools / Population", main_dimension = "School by Category", sub_dimension=school_category)
return render_template('schools.html', trend_schools=trend_schools, distribution_schools_by_category=distribution_schools_by_category, distribution_rural_schools_by_category=distribution_rural_schools_by_category, schools_by_category_summary=schools_by_category_summary, rural_schools_by_category_summary=rural_schools_by_category_summary, school_category=school_category, rural_school_category=rural_school_category)
@app.route('/get_distribution_of_rural_schools_by_category', methods=['POST'])
......@@ -232,7 +232,7 @@ def get_distribution_of_rural_schools_by_category():
rural_school_category = form_value_to_sub_dimension_mapping[request.form['category']]
requested_year = int(request.form['year'])
distribution_rural_schools_by_category = "img/distribution_rural_schools_by_category_{}_{}.jpeg".format(request.form['category'], requested_year)
rural_schools_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_rural_schools_by_category), final_df, requested_year, main_dimension = "Rural Schools", sub_dimension=rural_school_category)
rural_schools_by_category_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_rural_schools_by_category), final_df, requested_year, ylabel="Schools / Population", main_dimension = "Rural Schools", sub_dimension=rural_school_category)
return render_template('schools.html', trend_schools=trend_schools, distribution_schools_by_category=distribution_schools_by_category, distribution_rural_schools_by_category=distribution_rural_schools_by_category, schools_by_category_summary=schools_by_category_summary, rural_schools_by_category_summary=rural_schools_by_category_summary, school_category=school_category, rural_school_category=rural_school_category)
@app.route('/get_trend_for_classrooms', methods=['POST'])
......@@ -249,7 +249,7 @@ def get_distribution_of_classroom_conditions():
classroom_condition = form_value_to_sub_dimension_mapping[request.form['condition']]
requested_year = int(request.form['year'])
distribution_classroom_by_condition = "img/distribution_classroom_by_condition_{}_{}.jpeg".format(request.form['condition'], requested_year)
classroom_condition_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_classroom_by_condition), final_df, latest_year, main_dimension = "Total Classrooms", sub_dimension=classroom_condition)
classroom_condition_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_classroom_by_condition), final_df, latest_year, ylabel="Classrooms / Population", main_dimension = "Total Classrooms", sub_dimension=classroom_condition)
return render_template('classrooms.html', trend_classrooms=trend_classrooms, distribution_classroom_by_condition=distribution_classroom_by_condition, classroom_condition_summary=classroom_condition_summary, classroom_condition=classroom_condition)
@app.route('/get_trend_for_schools_with_facilities', methods=['POST'])
......@@ -266,7 +266,7 @@ def get_distribution_of_school_facilities():
school_facility = form_value_to_sub_dimension_mapping[request.form['facility']]
requested_year = int(request.form['year'])
distribution_school_facility = "img/distribution_school_facility_{}_{}.jpeg".format(request.form['facility'], requested_year)
school_facility_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_school_facility), final_df, latest_year, main_dimension = "School Facilities", sub_dimension=school_facility)
school_facility_summary = statewise_distribution(os.path.join(app.config['UPLOAD_FOLDER'], distribution_school_facility), final_df, latest_year, ylabel="Schools / Population", main_dimension = "School Facilities", sub_dimension=school_facility)
return render_template('facilities.html', trend_school_facilities=trend_school_facilities, distribution_school_facility=distribution_school_facility, school_facility_summary=school_facility_summary, school_facility=school_facility)
if __name__ == "__main__":
......
......@@ -29,7 +29,7 @@ def read_all_csv(path='./rawdata_csv/', extension='csv'):
return final_df
def statewise_distribution(output_filename, input_df, year, main_dimension, sub_dimension=''):
def statewise_distribution(output_filename, input_df, year, ylabel, main_dimension, sub_dimension=''):
if sub_dimension:
df_filtered = input_df.loc[(input_df['Main_Dimension'] == main_dimension) & ((input_df['Sub_Dimension'] == sub_dimension))]
else:
......@@ -41,7 +41,8 @@ def statewise_distribution(output_filename, input_df, year, main_dimension, sub_
fig = plt.figure(figsize=(fig_size_w,fig_size_h))
plt.xticks(rotation=90, ha="right")
plt.bar(df_sum['State_Name'],df_sum['total_by_population'], align='center')
plt.ylabel('Enrollements/Population')
# plt.ylabel('Enrollements/Population')
plt.ylabel(ylabel)
list_states=list(df_sum['State_Name'])
dict_summary['top3']=[list_states[0],list_states[1],list_states[2]]
dict_summary['bottom3']=[list_states[-1],list_states[-2],list_states[-3]]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment