candifloss/assettrack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Validation and error messages on submitting csv

Browse Source
This commit is contained in:
Candifloss 2025-02-25 00:13:40 +05:30
parent 14d26fbaeb
commit 312a54e624
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
routes/confirm_save.py
View File

@ -1,24 +1,40 @@
from flask import Blueprint, redirect, session, request, jsonify from flask import Blueprint, redirect, session, request, flash, url_for
from definitions.models import Asset, db from definitions.models import Asset, db
import json from functions.validate_values import validate_values
from config import item_attributes from config import item_attributes
import json
confirm_save_bp = Blueprint('confirm_save', __name__) confirm_save_bp = Blueprint('confirm_save', __name__)
@confirm_save_bp.route('/confirm_save', methods=['POST']) @confirm_save_bp.route('/confirm_save', methods=['POST'])
def confirm_save(): def confirm_save():
# Check if assets data is present in the request
if 'assets' not in request.form: if 'assets' not in request.form:
return "No assets data found in the request.", 400 flash("No assets data found in the request.", "error")
return redirect(url_for('uploadcsv.upload_file'))
try: try:
# Parse the JSON data from the form
edited_assets = json.loads(request.form['assets']) edited_assets = json.loads(request.form['assets'])
except json.JSONDecodeError: except json.JSONDecodeError:
return "Invalid JSON data in the request.", 400 flash("Invalid JSON data in the request.", "error")
return redirect(url_for('uploadcsv.upload_file'))
session['assets'] = edited_assets # Validate each asset
errors = []
for i, asset_data in enumerate(edited_assets, start=1):
error = validate_values(asset_data)
if error:
errors.append(f"Row {i}: {error}")
if errors:
# If there are validation errors, flash them and redirect back to the preview page
for error in errors:
flash(error, "error")
return redirect(url_for('uploadcsv.upload_file'))
# Save validated assets to the database
for asset_data in edited_assets: for asset_data in edited_assets:
# Dynamically create the Asset object using item_attributes
asset = Asset(**{ asset = Asset(**{
attrib.attrib_name: asset_data[attrib.attrib_name] attrib.attrib_name: asset_data[attrib.attrib_name]
for attrib in item_attributes for attrib in item_attributes
@ -29,7 +45,10 @@ def confirm_save():
db.session.commit() db.session.commit()
except Exception as e: except Exception as e:
db.session.rollback() db.session.rollback()
return f"Error saving data to the database: {str(e)}", 500 flash(f"Error saving data to the database: {str(e)}", "error")
return redirect(url_for('uploadcsv.upload_file'))
session.pop('assets', None) # Clear session data # Clear session data after successful insertion
session.pop('assets', None)
flash("Data successfully saved to the database.", "success")
return redirect('/viewall') return redirect('/viewall')

2
templates/csv_preview.html
View File

@ -9,7 +9,7 @@
<body> <body>
<h1>CSV Preview</h1> <h1>CSV Preview</h1>
<!-- Display error messages from confirm_save --> <!-- Display error messages -->
{% with messages = get_flashed_messages(with_categories=true) %} {% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %} {% if messages %}
<details> <details>

13
templates/upload.html
View File

@ -8,12 +8,17 @@
<body> <body>
<h1>Upload CSV File</h1> <h1>Upload CSV File</h1>
<!-- Display flash messages --> <!-- Display error messages -->
{% with messages = get_flashed_messages(with_categories=true) %} {% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %} {% if messages %}
{% for category, message in messages %} <details>
<p><strong>{{ category }}:</strong> {{ message }}</p> <summary>Errors found during submission (click to expand):</summary>
{% endfor %} <ul>
{% for category, message in messages %}
<li><strong>{{ category }}:</strong> {{ message }}</li>
{% endfor %}
</ul>
</details>
{% endif %} {% endif %}
{% endwith %} {% endwith %}