diff --git a/controllers/block_controller.py b/controllers/block_controller.py index e547687..16309a7 100644 --- a/controllers/block_controller.py +++ b/controllers/block_controller.py @@ -1,7 +1,7 @@ +import config from flask import Blueprint, render_template, request, redirect, url_for, jsonify from flask_login import login_required -import config from model.State import State from model.Block import Block from model.Utilities import HtmlHelper diff --git a/controllers/district_controller.py b/controllers/district_controller.py index d326d68..fe6efd7 100644 --- a/controllers/district_controller.py +++ b/controllers/district_controller.py @@ -6,11 +6,10 @@ from model.State import State district_bp = Blueprint('district', __name__) - +# ------- District page -------- @district_bp.route('/add_district', methods=['GET', 'POST']) @login_required def add_district(): - district = District() if request.method == 'POST': @@ -28,7 +27,7 @@ def add_district(): states=states ) - +# ------- District check -------- @district_bp.route('/check_district', methods=['POST']) @login_required def check_district(): @@ -37,7 +36,7 @@ def check_district(): return district.CheckDistrict(request=request) - +# ------- District delete by district id -------- @district_bp.route('/delete_district/') @login_required def delete_district(district_id): @@ -52,6 +51,7 @@ def delete_district(district_id): return redirect(url_for('district.add_district')) +# ------- District update by district id -------- @district_bp.route('/edit_district/', methods=['GET', 'POST']) @login_required def edit_district(district_id): diff --git a/controllers/state_controller.py b/controllers/state_controller.py index 2ccada9..a26c951 100644 --- a/controllers/state_controller.py +++ b/controllers/state_controller.py @@ -4,7 +4,7 @@ from model.State import State state_bp = Blueprint('state', __name__) - +# ----- State page ------ @state_bp.route('/add_state', methods=['GET', 'POST']) @login_required def add_state(): @@ -19,7 +19,7 @@ def add_state(): return render_template('add_state.html', statedata=statedata) - +# ----- State check ------ @state_bp.route('/check_state', methods=['POST']) @login_required def check_state(): @@ -28,21 +28,21 @@ def check_state(): return state.CheckState(request=request) - +# ----- State delete by state id ------ @state_bp.route('/delete_state/') @login_required def deleteState(id): state = State() - msg = state.DeleteState(request=request, id=id) + state.DeleteState(request=request, id=id) if not state.isSuccess: return state.resultMessage else: return redirect(url_for('state.add_state')) - +# ----- State update by state id ------ @state_bp.route('/edit_state/', methods=['GET', 'POST']) @login_required def editState(id): diff --git a/model/Block.py b/model/Block.py index c963d28..5543ed1 100644 --- a/model/Block.py +++ b/model/Block.py @@ -1,7 +1,3 @@ -from flask import Flask, render_template, request, redirect, url_for, send_from_directory, flash, jsonify, json -from flask import current_app - -from datetime import datetime from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType diff --git a/model/District.py b/model/District.py index 14ecea5..2901f3e 100644 --- a/model/District.py +++ b/model/District.py @@ -1,20 +1,6 @@ -from flask import Flask, render_template, request, redirect, url_for, send_from_directory, flash, jsonify, json -from flask import current_app - -from datetime import datetime -from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user - -from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType -from model.Log import LogData, LogHelper - -import os -import config -import re - -import mysql.connector -from mysql.connector import Error - +from model.Utilities import ItemCRUDType from model.ItemCRUD import ItemCRUD + class District: isSuccess = False @@ -24,7 +10,7 @@ class District: self.isSuccess = False self.resultMessage = "" - + # edit district def EditDistrict(self, request, district_id): district = ItemCRUD(itemType=ItemCRUDType.District) @@ -36,7 +22,7 @@ class District: self.resultMessage = district.resultMessage return - + # add district def AddDistrict(self, request): district = ItemCRUD(ItemCRUDType.District) @@ -50,7 +36,7 @@ class District: return - + # get all district data def GetAllDistricts(self, request): district = ItemCRUD(itemType=ItemCRUDType.District) districtsdata = district.GetAllData(request=request, storedproc="GetAllDistricts") @@ -58,7 +44,7 @@ class District: self.resultMessage = district.resultMessage return districtsdata - + # check district validation def CheckDistrict(self, request): district = ItemCRUD(itemType=ItemCRUDType.District) district_name = request.json.get('district_Name', '').strip() @@ -68,13 +54,7 @@ class District: self.resultMessage = district.resultMessage return result - - # def GetDistrictByID(self, request,district_id): - # district = ItemCRUD(itemType=ItemCRUDType.District) - # districtdata = district.GetAllData(id=district_id,storedproc="GetDistrictDataByID") - # self.isSuccess = district.isSuccess - # self.resultMessage = district.resultMessage - # return districtdata + # get district by district id def GetDistrictByID(self, request, district_id): district = ItemCRUD(itemType=ItemCRUDType.District) @@ -92,7 +72,7 @@ class District: return districtdata -#Delete District + # Delete District by district id def DeleteDistrict(self, request, district_id): district = ItemCRUD(itemType=ItemCRUDType.District) district.DeleteItem(request=request,itemID=district_id,storedprocDelete="DeleteDistrict") diff --git a/model/State.py b/model/State.py index 9245a99..cca6d6c 100644 --- a/model/State.py +++ b/model/State.py @@ -1,13 +1,9 @@ -from flask import request, redirect, url_for -from flask_login import current_user - -from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType -from model.Log import LogHelper -from model.ItemCRUD import ItemCRUD - import config -import re import mysql.connector +from flask import request, redirect, url_for + +from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType +from model.ItemCRUD import ItemCRUD class State: @@ -20,7 +16,6 @@ class State: # ADD STATE (USING ITEM CRUD) # ---------------------------------------------------------- def AddState(self, request): - state_name = request.form['state_Name'].strip() crud = ItemCRUD(ItemCRUDType.State) @@ -42,16 +37,14 @@ class State: # GET ALL STATES (NO CHANGE - THIS IS CORRECT) # ---------------------------------------------------------- def GetAllStates(self, request): - connection = config.get_db_connection() data = [] if not connection: return [] - cursor = connection.cursor() - try: + cursor = connection.cursor() cursor.callproc("GetAllStates") for res in cursor.stored_results(): data = res.fetchall() @@ -77,7 +70,6 @@ class State: # CHECK STATE (USING ITEM CRUD) # ---------------------------------------------------------- def CheckState(self, request): - state_name = request.json.get('state_Name', '').strip() crud = ItemCRUD(ItemCRUDType.State) @@ -94,7 +86,6 @@ class State: # DELETE STATE (USING ITEM CRUD) # ---------------------------------------------------------- def DeleteState(self, request, id): - crud = ItemCRUD(ItemCRUDType.State) crud.DeleteItem( @@ -113,7 +104,6 @@ class State: # EDIT STATE (USING ITEM CRUD) # ---------------------------------------------------------- def EditState(self, request, id): - state_name = request.form['state_Name'].strip() crud = ItemCRUD(ItemCRUDType.State) @@ -136,16 +126,14 @@ class State: # GET STATE BY ID (KEEP SAME) # ---------------------------------------------------------- def GetStateByID(self, request, id): - connection = config.get_db_connection() data = None if not connection: return None - cursor = connection.cursor() - try: + cursor = connection.cursor() cursor.callproc("GetStateByID", (id,)) for res in cursor.stored_results(): data = res.fetchone() diff --git a/model/Utilities.py b/model/Utilities.py index 83868ba..1b88456 100644 --- a/model/Utilities.py +++ b/model/Utilities.py @@ -62,5 +62,5 @@ class HtmlHelper: @staticmethod def json_response(message_obj, status_code): return jsonify(message_obj), status_code - #May need to refactor further + diff --git a/model/Village.py b/model/Village.py index fa5b9bd..f716073 100644 --- a/model/Village.py +++ b/model/Village.py @@ -1,4 +1,3 @@ -# return blocks from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType import config import mysql.connector