diff --git a/routes/upload.py b/routes/upload.py index 6b98d1b..83d37b3 100644 --- a/routes/upload.py +++ b/routes/upload.py @@ -22,11 +22,21 @@ def upload_file(): try: # Extract data from the CSV file - assets = get_csv_data(file) - session['assets'] = assets # Store assets in session + csvdata = get_csv_data(file) + new_assets = [] + existing_assets = [] + for row in csvdata: + tag = row['assettag'] + asset_exists = Asset.query.filter_by(assettag=tag).first() + if asset_exists: + existing_assets.append(row) + else: + new_assets.append(row) + + session['assets'] = new_assets # Store assets in session # Redirect to preview page with the CSV data - return render_template('csv_preview.html', assets=assets) + return render_template('csv_preview.html', new_assets=new_assets, existing=existing_assets) except Exception as e: # Handle errors during file processing diff --git a/templates/csv_preview.html b/templates/csv_preview.html index f56dbfd..ee7aa02 100644 --- a/templates/csv_preview.html +++ b/templates/csv_preview.html @@ -10,6 +10,8 @@
New assets:
{{ asset.assettag }} | {{ asset.hostname }} | @@ -32,10 +34,41 @@ {% endfor %}
These assets are already in the database:
+Asset Tag | +Hostname | +Warranty From | +Status | +Staff Number | +
---|---|---|---|---|
{{ asset.assettag }} | +{{ asset.hostname }} | +{{ asset.warrantyfrom }} | +{{ asset.status }} | +{{ asset.staffnum }} | +