Commit 6f640d7b authored by Manas Gabani's avatar Manas Gabani

ylabel adjusted for distribution graphs

parent c56813b8
......@@ -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, ylabel="Teachers / Population", 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="Number of 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, ylabel="Teachers / Population", 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="Number of 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,11 +111,11 @@ 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, ylabel="Schools / Population", 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="Number of 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, ylabel="Schools / Population", 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="Number of 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')
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)
trend_classrooms = ''
......@@ -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, ylabel="Classrooms / Population", 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="Number of 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, ylabel="Schools / Population", 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="Number of 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)
......@@ -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,ylabel="Teachers / Population", 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="Number of 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, ylabel="Teachers / Population", 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="Number of 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'])
......@@ -214,7 +214,7 @@ def get_trend_for_schools():
main_dimension = form_value_to_main_dimension_mapping[request.form['type']]
state_code = int(request.form['state_code'])
trend_schools = "img/trend_{}_{}.jpeg".format(request.form['type'], state_code)
total_enrolment_by_category(os.path.join(app.config['UPLOAD_FOLDER'], trend_schools), final_df, main_dimension, state_code=default_state_code, ylabel='Number of schools')
total_enrolment_by_category(os.path.join(app.config['UPLOAD_FOLDER'], trend_schools), final_df, main_dimension, 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)
@app.route('/get_distribution_of_schools_by_category', 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, ylabel="Schools / Population", 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="Number of 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, ylabel="Schools / Population", 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="Number of 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, ylabel="Classrooms / Population", 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="Number of 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, ylabel="Schools / Population", 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="Number of 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__":
......
......@@ -130,7 +130,7 @@ def total_classrooms_by_trend(output_filename, input_df, state_code):
plt.legend()
plt.xticks(np.arange(min_year, max_year+1, 1.0))
plt.ylabel('Number of classrooms')
plt.ylabel('Number of Classrooms')
plt.xlabel('Year')
plt.savefig(output_filename)
plt.close(fig)
......@@ -159,7 +159,7 @@ def total_schools_for_facilities(output_filename, input_df, state_code):
plt.legend()
plt.xticks(np.arange(min_year, max_year+1, 1.0))
plt.ylabel('Number of schools')
plt.ylabel('Number of Schools')
plt.xlabel('Year')
plt.savefig(output_filename)
plt.close(fig)
......@@ -216,7 +216,7 @@ def total_schools_for_facilities_overall(output_filename, input_df):
plt.legend()
plt.xticks(np.arange(min_year, max_year+1, 1.0))
plt.ylabel('Number of schools')
plt.ylabel('Number of Schools')
plt.xlabel('Year')
plt.savefig(output_filename)
plt.close(fig)
\ No newline at end of file
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