optimize and add new service of get report and download report.

This commit is contained in:
2026-04-03 12:10:47 +05:30
parent 0b72adef7d
commit 73cd97f3c8
27 changed files with 1416 additions and 1292 deletions

View File

@@ -1,3 +1,7 @@
from flask import Blueprint, render_template, request, redirect, url_for, flash, jsonify
from flask_login import login_required
@@ -7,14 +11,14 @@ from model.State import State
# Create Blueprint
village_bp = Blueprint('village', __name__)
village = Village()
# ------------------------- Add Village -------------------------
@village_bp.route('/add_village', methods=['GET', 'POST'])
@login_required
def add_village():
village = Village()
# village = Village()
if request.method == 'POST':
village.AddVillage(request=request)
@@ -75,24 +79,25 @@ def get_blocks(district_id):
@village_bp.route('/check_village', methods=['POST'])
@login_required
def check_village():
village = Village()
# village = Village()
return village.CheckVillage(request=request)
@village_bp.route('/delete_village/<int:village_id>')
@login_required
def delete_village(village_id):
village = Village()
# village = Village()
village.DeleteVillage(request=request, village_id=village_id)
# Convert resultMessage to string if it's a Response or tuple
# Convert resultMessage to string if it's a Response or tuple
raw_msg = village.resultMessage
if isinstance(raw_msg, tuple):
# e.g., (<Response ...>, 200)
msg = "Village deleted successfully!"
elif hasattr(raw_msg, 'get_data'):
# Flask Response object
msg = raw_msg.get_data(as_text=True)
msg = raw_msg.get_data(as_text=True) # get raw text
else:
# fallback
msg = str(raw_msg) if raw_msg else "Village deleted successfully!"
@@ -107,7 +112,7 @@ def delete_village(village_id):
@login_required
def edit_village(village_id):
village = Village()
# village = Village()
if request.method == 'POST':
@@ -130,6 +135,7 @@ def edit_village(village_id):
)
else:
# ✅ FIXED HERE (removed request)
village_data = village.GetVillageByID(id=village_id)
if not village.isSuccess: