pjpatil12/Payment_Reconciliation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Village module delete issue resolved and also message shown in alert' (#8) from swapnil-dev into main

Browse Source 
Reviewed-on: #8
This commit was merged in pull request #8.
This commit is contained in:
Pankaj J Patil
2026-03-24 06:25:19 +00:00
parent 2679554e98 6b4beb5af8
commit e7646eee76
6 changed files with 135 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -3,4 +3,5 @@ venv/
__pycache__/ __pycache__/
static/downloads/ static/downloads/
static/uploads/ static/uploads/

2
controllers/village_controller.py
View File

@@ -19,7 +19,7 @@ village_bp = Blueprint('village', __name__)
def add_village(): def add_village():
village = Village() village = Village()
if request.method == 'POST': if request.method == 'POST':
village.AddVillage(request=request) village.AddVillage(request=request)
return village.resultMessage return village.resultMessage

92
model/ItemCRUD.py
View File

@@ -1,3 +1,6 @@
from flask_login import current_user from flask_login import current_user
from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType
from model.Log import LogHelper from model.Log import LogHelper
@@ -35,6 +38,7 @@ class ItemCRUD:
def __init__(self, itemType): def __init__(self, itemType):
self.isSuccess = False self.isSuccess = False
self.resultMessage = "" self.resultMessage = ""
self.response = {} # ✅ ADDED
self.itemCRUDType = itemType self.itemCRUDType = itemType
self.itemCRUDMapping = itemCRUDMapping(itemType) self.itemCRUDMapping = itemCRUDMapping(itemType)
@@ -56,16 +60,14 @@ class ItemCRUD:
connection.commit() connection.commit()
self.isSuccess = True self.isSuccess = True
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.delete_success(self.itemCRUDMapping.name)
ResponseHandler.delete_success(self.itemCRUDMapping.name), 200 self.resultMessage = self.response["message"]
)
except mysql.connector.Error as e: except mysql.connector.Error as e:
print(f"Error deleting {self.itemCRUDMapping.name}: {e}") print(f"Error deleting {self.itemCRUDMapping.name}: {e}")
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.delete_failure(self.itemCRUDMapping.name)
ResponseHandler.delete_failure(self.itemCRUDMapping.name), 500 self.resultMessage = self.response["message"]
)
finally: finally:
cursor.close() cursor.close()
@@ -79,9 +81,8 @@ class ItemCRUD:
connection = config.get_db_connection() connection = config.get_db_connection()
if not connection: if not connection:
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.add_failure(self.itemCRUDMapping.name)
ResponseHandler.db_connection_failure(), 500 self.resultMessage = self.response["message"]
)
return return
cursor = connection.cursor() cursor = connection.cursor()
@@ -92,12 +93,8 @@ class ItemCRUD:
) )
try: try:
# ====================================================== # SUBCONTRACTOR
# SUBCONTRACTOR (MULTI-FIELD)
# ======================================================
if data: if data:
# Duplicate check
cursor.callproc(storedprocfetch, (data['Contractor_Name'],)) cursor.callproc(storedprocfetch, (data['Contractor_Name'],))
existing_item = None existing_item = None
@@ -106,12 +103,10 @@ class ItemCRUD:
if existing_item: if existing_item:
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.already_exists(self.itemCRUDMapping.name)
ResponseHandler.already_exists(self.itemCRUDMapping.name), 409 self.resultMessage = self.response["message"]
)
return return
# Insert
cursor.callproc(storedprocadd, ( cursor.callproc(storedprocadd, (
data['Contractor_Name'], data['Contractor_Name'],
data['Address'], data['Address'],
@@ -127,22 +122,17 @@ class ItemCRUD:
connection.commit() connection.commit()
self.isSuccess = True self.isSuccess = True
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.add_success(self.itemCRUDMapping.name)
ResponseHandler.add_success(self.itemCRUDMapping.name), 200 self.resultMessage = self.response["message"]
)
return return
# ====================================================== # NORMAL
# NORMAL (Village / Block / State)
# ======================================================
if not re.match(RegEx.patternAlphabetOnly, childname): if not re.match(RegEx.patternAlphabetOnly, childname):
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.invalid_name(self.itemCRUDMapping.name)
ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400 self.resultMessage = self.response["message"]
)
return return
# Duplicate check
if parentid is None: if parentid is None:
cursor.callproc(storedprocfetch, (childname,)) cursor.callproc(storedprocfetch, (childname,))
else: else:
@@ -154,12 +144,10 @@ class ItemCRUD:
if existing_item: if existing_item:
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.already_exists(self.itemCRUDMapping.name)
ResponseHandler.already_exists(self.itemCRUDMapping.name), 409 self.resultMessage = self.response["message"]
)
return return
# Insert
if parentid is None: if parentid is None:
cursor.callproc(storedprocadd, (childname,)) cursor.callproc(storedprocadd, (childname,))
else: else:
@@ -168,17 +156,14 @@ class ItemCRUD:
connection.commit() connection.commit()
self.isSuccess = True self.isSuccess = True
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.add_success(self.itemCRUDMapping.name)
self.resultMessage = self.response["message"]
ResponseHandler.add_success(self.itemCRUDMapping.name), 200
)
except mysql.connector.Error as e: except mysql.connector.Error as e:
print(f"Database Error: {e}") print(f"Database Error: {e}")
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.add_failure(self.itemCRUDMapping.name)
ResponseHandler.add_failure(self.itemCRUDMapping.name), 500 self.resultMessage = self.response["message"]
)
finally: finally:
cursor.close() cursor.close()
@@ -198,9 +183,6 @@ class ItemCRUD:
) )
try: try:
# ======================================================
# SUBCONTRACTOR (MULTI-FIELD)
# ======================================================
if data: if data:
cursor.callproc(storedprocupdate, ( cursor.callproc(storedprocupdate, (
childid, childid,
@@ -218,17 +200,14 @@ class ItemCRUD:
connection.commit() connection.commit()
self.isSuccess = True self.isSuccess = True
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.update_success(self.itemCRUDMapping.name)
ResponseHandler.update_success(self.itemCRUDMapping.name), 200 self.resultMessage = self.response["message"]
)
return return
# ======================================================
# NORMAL
# ======================================================
if not re.match(RegEx.patternAlphabetOnly, childname): if not re.match(RegEx.patternAlphabetOnly, childname):
self.isSuccess = False self.isSuccess = False
self.resultMessage = ResponseHandler.update_failure(self.itemCRUDMapping.name)['message'] self.response = ResponseHandler.update_failure(self.itemCRUDMapping.name)
self.resultMessage = self.response["message"]
return return
if parentid is None: if parentid is None:
@@ -239,14 +218,14 @@ class ItemCRUD:
connection.commit() connection.commit()
self.isSuccess = True self.isSuccess = True
self.resultMessage = ResponseHandler.update_success(self.itemCRUDMapping.name)['message'] self.response = ResponseHandler.update_success(self.itemCRUDMapping.name)
self.resultMessage = self.response["message"]
except mysql.connector.Error as e: except mysql.connector.Error as e:
print(f"Error updating {self.itemCRUDMapping.name}: {e}") print(f"Error updating {self.itemCRUDMapping.name}: {e}")
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.update_failure(self.itemCRUDMapping.name)
ResponseHandler.update_failure(self.itemCRUDMapping.name), 500 self.resultMessage = self.response["message"]
)
finally: finally:
cursor.close() cursor.close()
@@ -276,9 +255,8 @@ class ItemCRUD:
except mysql.connector.Error as e: except mysql.connector.Error as e:
print(f"Error fetching {self.itemCRUDMapping.name}: {e}") print(f"Error fetching {self.itemCRUDMapping.name}: {e}")
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response( self.response = ResponseHandler.fetch_failure(self.itemCRUDMapping.name)
ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500 self.resultMessage = self.response["message"]
)
return [] return []
finally: finally:
@@ -312,7 +290,7 @@ class ItemCRUD:
return data return data
# ---------------------------------------------------------- # ----------------------------------------------------------
# CHECK ITEM # CHECK ITEM (KEEP AS IS - API USE)
# ---------------------------------------------------------- # ----------------------------------------------------------
def CheckItem(self, request, parentid, childname, storedprocfetch): def CheckItem(self, request, parentid, childname, storedprocfetch):

30
model/Village.py
View File

@@ -1,9 +1,11 @@
from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType
import config import config
import mysql.connector import mysql.connector
from model.ItemCRUD import ItemCRUD from model.ItemCRUD import ItemCRUD
class Village: class Village:
isSuccess = False isSuccess = False
resultMessage = "" resultMessage = ""
@@ -11,12 +13,19 @@ class Village:
def __init__(self): def __init__(self):
self.isSuccess = False self.isSuccess = False
self.resultMessage = "" self.resultMessage = ""
self.response = {} # ✅ ADDED
self.village = ItemCRUD(itemType=ItemCRUDType.Village) self.village = ItemCRUD(itemType=ItemCRUDType.Village)
# 🔹 Helper: sync status # 🔹 Helper: sync status
def _set_status(self, village): def _set_status(self, village):
self.isSuccess = village.isSuccess self.isSuccess = village.isSuccess
self.resultMessage = village.resultMessage
# ✅ UPDATED (safe handling)
if hasattr(village, "response"):
self.response = village.response
self.resultMessage = village.response.get("message", "")
else:
self.resultMessage = village.resultMessage
# 🔹 Helper: get request data # 🔹 Helper: get request data
def _get_form_data(self, request): def _get_form_data(self, request):
@@ -28,8 +37,9 @@ class Village:
block_id, village_name = self._get_form_data(request) block_id, village_name = self._get_form_data(request)
if not village_name: if not village_name:
self.response = ResponseHandler.invalid_name("village") # ✅ UPDATED
self.resultMessage = self.response["message"]
self.isSuccess = False self.isSuccess = False
self.resultMessage = "Village name cannot be empty"
return return
try: try:
@@ -65,8 +75,9 @@ class Village:
block_id, village_name = self._get_form_data(request) block_id, village_name = self._get_form_data(request)
if not village_name: if not village_name:
self.response = ResponseHandler.invalid_name("village") # ✅ UPDATED
self.resultMessage = self.response["message"]
self.isSuccess = False self.isSuccess = False
self.resultMessage = "Village name cannot be empty"
return None return None
try: try:
@@ -102,8 +113,9 @@ class Village:
block_id, village_name = self._get_form_data(request) block_id, village_name = self._get_form_data(request)
if not village_name: if not village_name:
self.response = ResponseHandler.invalid_name("village") # ✅ UPDATED
self.resultMessage = self.response["message"]
self.isSuccess = False self.isSuccess = False
self.resultMessage = "Village name cannot be empty"
return return
try: try:
@@ -163,9 +175,11 @@ class Village:
except mysql.connector.Error as e: except mysql.connector.Error as e:
print(f"Error fetching blocks: {e}") print(f"Error fetching blocks: {e}")
self.isSuccess = False self.isSuccess = False
self.resultMessage = HtmlHelper.json_response(
ResponseHandler.fetch_failure("block"), 500 # ✅ FIXED (removed jsonify response)
) self.response = ResponseHandler.fetch_failure("block")
self.resultMessage = self.response["message"]
return [] return []
finally: finally:

72
static/js/village.js
View File

@@ -1,9 +1,40 @@
window.onload = function () { window.onload = function () {
document.getElementById('Village_Name').focus(); document.getElementById('Village_Name').focus();
}; };
$(document).ready(function () { $(document).ready(function () {
// 🔥 RESTORE VIEW MODE AFTER RELOAD
var viewMode = localStorage.getItem("viewMode");
if (viewMode === "table") {
$('#addForm').hide();
$('#addTable').show();
} else {
$('#addForm').show();
$('#addTable').hide();
}
// 🔥 BUTTON TOGGLE LOGIC
$('#addButton').click(function () {
$('#addForm').show();
$('#addTable').hide();
localStorage.setItem("viewMode", "form");
});
$('#displayButton').click(function () {
$('#addForm').hide();
$('#addTable').show();
localStorage.setItem("viewMode", "table");
});
// STATE → DISTRICT // STATE → DISTRICT
$('#state_Id').change(function () { $('#state_Id').change(function () {
@@ -179,7 +210,7 @@ $(document).ready(function () {
} else { } else {
alert('Error adding village. Please try again.'); alert(response.message || 'Error adding village. Please try again.');
} }
@@ -195,4 +226,39 @@ $(document).ready(function () {
}); });
}); });
// 🔥 DELETE FUNCTION (UPDATED)
function deleteVillage(villageId) {
if (!confirm("Are you sure you want to delete this village?")) {
return;
}
// ✅ save that user is on table
localStorage.setItem("viewMode", "table");
$.ajax({
url: '/delete_village/' + villageId,
type: 'GET',
success: function () {
setTimeout(function () {
alert("Village deleted successfully!");
// reload but stay on table
location.reload();
}, 1000);
},
error: function () {
alert("Error deleting village. Please try again.");
}
});
}

12
templates/add_village.html
View File

@@ -28,7 +28,7 @@
<option value="{{ state[0] }}">{{ state[1] }}</option> <option value="{{ state[0] }}">{{ state[1] }}</option>
{% endfor %} {% endfor %}
</select> </select>
<label for="district_Id">District:</label> <label for="district_Id">District:</label>
<select id="district_Id" name="district_Id" required disabled> <select id="district_Id" name="district_Id" required disabled>
<option value="" disabled selected>Select District</option> <option value="" disabled selected>Select District</option>
@@ -84,11 +84,11 @@
</a> </a>
</td> </td>
<td> <td>
<a href="{{ url_for('village.delete_village', village_id=village[0]) }}" <a href="#"
onclick="return confirm('Are you sure you want to delete this village?');"> onclick="deleteVillage({{ village[0] }}); return false;">
<img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete" <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}"
class="icon"> alt="Delete" class="icon">
</a> </a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}