+  }})
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
- {{ message }}
+ {% endif %} + + diff --git a/templates/index2.html b/templates/index2.html new file mode 100644 index 000000000..f42448471 --- /dev/null +++ b/templates/index2.html @@ -0,0 +1,27 @@ + + + + + + +Use the navigation below:
+ + + + diff --git a/templates/index3.html b/templates/index3.html new file mode 100644 index 000000000..44c50d258 --- /dev/null +++ b/templates/index3.html @@ -0,0 +1,14 @@ + + + +Use the navigation below:
+ + + diff --git a/templates/index4.html b/templates/index4.html new file mode 100644 index 000000000..a0c9ba796 --- /dev/null +++ b/templates/index4.html @@ -0,0 +1,15 @@ + + + +Use the navigation below:
+ + + diff --git a/templates/low_salary.html b/templates/low_salary.html new file mode 100644 index 000000000..719502851 --- /dev/null +++ b/templates/low_salary.html @@ -0,0 +1,34 @@ + + + + + + +No pictures available for employees with salary less than $99,000.
+ {% endfor %} +{{ message }}
+ {% endif %} + + diff --git a/templates/result.html b/templates/result.html new file mode 100644 index 000000000..61417da12 --- /dev/null +++ b/templates/result.html @@ -0,0 +1,15 @@ + + + +No picture available.
+ {% endif %} + Search again + + diff --git a/templates/update_keywords.html b/templates/update_keywords.html new file mode 100644 index 000000000..773b294a6 --- /dev/null +++ b/templates/update_keywords.html @@ -0,0 +1,17 @@ + + + +{{ message }}
+ {% endif %} + + diff --git a/templates/update_or_add_picture.html b/templates/update_or_add_picture.html new file mode 100644 index 000000000..6001ec446 --- /dev/null +++ b/templates/update_or_add_picture.html @@ -0,0 +1,17 @@ + + + +{{ message }}
+ {% endif %} + + diff --git a/templates/update_picture.html b/templates/update_picture.html new file mode 100644 index 000000000..2441e3863 --- /dev/null +++ b/templates/update_picture.html @@ -0,0 +1,62 @@ + + + + + + + + + + +{{ message }}
+ {% endif %} + + + + From 3c18418de81e23431b78b5cfd536fafabd0b45f6 Mon Sep 17 00:00:00 2001 From: mohammedazharshaikh <68691119+mohammedazharshaikh@users.noreply.github.com> Date: Tue, 11 Jun 2024 17:09:07 -0500 Subject: [PATCH 2/8] s2 --- app.py | 301 ++++++++++++++++++++++--------------------- static/index.html | 17 +++ templates/index.html | 39 ++++-- 3 files changed, 194 insertions(+), 163 deletions(-) create mode 100644 static/index.html diff --git a/app.py b/app.py index ed9113c90..a24bf5270 100644 --- a/app.py +++ b/app.py @@ -1,166 +1,167 @@ -# import os +import os -# from flask import (Flask, redirect, render_template, request, -# send_from_directory, url_for) +from flask import (Flask, redirect, render_template, request, + send_from_directory, url_for) -# app = Flask(__name__) +app = Flask(__name__) -# @app.route('/') -# def index(): -# print('Request for index page received') -# return render_template('index.html') +@app.route('/') +def index(): + print('Request for index page received') + return render_template('index.html') -# @app.route('/favicon.ico') -# def favicon(): -# return send_from_directory(os.path.join(app.root_path, 'static'), -# 'favicon.ico', mimetype='image/vnd.microsoft.icon') +@app.route('/favicon.ico') +def favicon(): + return send_from_directory(os.path.join(app.root_path, 'static'), + 'favicon.ico', mimetype='image/vnd.microsoft.icon') -# @app.route('/hello', methods=['POST']) -# def hello(): -# name = request.form.get('name') +@app.route('/hello', methods=['POST']) +def hello(): + name = request.form.get('name') -# if name: -# print('Request for hello page received with name=%s' % name) -# return render_template('hello.html', name = name) -# else: -# print('Request for hello page received with no name or blank name -- redirecting') -# return redirect(url_for('index')) + if name: + print('Request for hello page received with name=%s' % name) + return render_template('hello.html', name = name) + else: + print('Request for hello page received with no name or blank name -- redirecting') + return redirect(url_for('index')) -# if __name__ == '__main__': -# app.run() +if __name__ == '__main__': + app.run() +#2 #g -from flask import Flask, render_template, request, redirect, url_for -import pandas as pd -import os -from werkzeug.utils import secure_filename +# from flask import Flask, render_template, request, redirect, url_for +# import pandas as pd +# import os +# from werkzeug.utils import secure_filename -app = Flask(__name__) +# app = Flask(__name__) -# Configuration -app.config['UPLOAD_FOLDER'] = 'static/images' # Ensure this directory exists -app.config['CSV_FILE'] = 'people.csv' -data = pd.read_csv(app.config['CSV_FILE']) # Load the data -data['Picture'].fillna('', inplace=True) # Ensure no null values in the Picture column -data['Salary'] = pd.to_numeric(data['Salary'], errors='coerce') # Convert salary to numeric, handling errors +# # Configuration +# app.config['UPLOAD_FOLDER'] = 'static/images' # Ensure this directory exists +# app.config['CSV_FILE'] = 'people.csv' +# data = pd.read_csv(app.config['CSV_FILE']) # Load the data +# data['Picture'].fillna('', inplace=True) # Ensure no null values in the Picture column +# data['Salary'] = pd.to_numeric(data['Salary'], errors='coerce') # Convert salary to numeric, handling errors -# Ensure the upload directory exists -os.makedirs(app.config['UPLOAD_FOLDER'], exist_ok=True) +# # Ensure the upload directory exists +# os.makedirs(app.config['UPLOAD_FOLDER'], exist_ok=True) -@app.route('/') -def home(): - return render_template('index.html') - -@app.route('/search', methods=['GET', 'POST']) -def search(): - if request.method == 'POST': - name_query = request.form['name'] - if name_query: - # Search for the name in the dataframe - result = data[data['Name'].str.lower() == name_query.lower()] - if not result.empty: - picture = result.iloc[0]['Picture'] - return render_template('result.html', picture=picture, name=name_query) - else: - return render_template('index1.html', message="No name found.") #changing search to index1 - else: - return render_template('index1.html', message="Please enter a name.") - return render_template('index1.html') - -@app.route('/low_salary') -def low_salary(): - # Filter entries with salary less than 99000 - filtered_data = data[data['Salary'] < 99000] - # Ensure we have valid picture filenames - pictures = filtered_data['Picture'].dropna().tolist() - return render_template('low_salary.html', pictures=pictures) - -@app.route('/update_or_add_picture', methods=['GET', 'POST']) -def update_or_add_picture(): - global data - message = '' - if request.method == 'POST': - name_query = request.form['name'].strip().lower() - file = request.files['file'] - if file and allowed_file(file.filename): - filename = secure_filename(file.filename) - if filename: # Check if filename is not empty - file_path = os.path.join(app.config['UPLOAD_FOLDER'], filename) - - # Check if the entry exists - existing_record = data[data['Name'].str.lower() == name_query] - if not existing_record.empty: - # Delete the old picture if it exists - old_filename = existing_record['Picture'].iloc[0] - if old_filename: - old_file_path = os.path.join(app.config['UPLOAD_FOLDER'], old_filename) - if os.path.exists(old_file_path): - os.remove(old_file_path) - - # Save the new file - file.save(file_path) - - # Update or add the record - if not existing_record.empty: - data.loc[data['Name'].str.lower() == name_query, 'Picture'] = filename - else: - # Add new entry if name does not exist - new_entry = {'Name': name_query.capitalize(), 'Picture': filename, 'Keywords': ''} - data = data.append(new_entry, ignore_index=True) - - # Save changes back to CSV - data.to_csv(app.config['CSV_FILE'], index=False) - message = 'Picture updated or added successfully for "{}".'.format(name_query.capitalize()) - else: - message = 'No valid filename provided.' - else: - message = 'Invalid file or file not provided.' - return render_template('update_or_add_picture.html', message=message) - -@app.route('/remove_entry', methods=['GET', 'POST']) -def remove_entry(): - global data - message = '' - if request.method == 'POST': - name_query = request.form['name'].strip().lower() - # Find if the entry exists - existing_record = data[data['Name'].str.lower() == name_query] - if not existing_record.empty: - # Delete the picture if it exists - old_filename = existing_record['Picture'].iloc[0] - if old_filename: - old_file_path = os.path.join(app.config['UPLOAD_FOLDER'], old_filename) - if os.path.exists(old_file_path): - os.remove(old_file_path) - # Remove the data entry - data = data[data['Name'].str.lower() != name_query] - data.to_csv(app.config['CSV_FILE'], index=False) - message = 'The entry for "{}" was removed successfully.'.format(name_query.capitalize()) - else: - message = 'Error: No entry found for the name "{}".'.format(name_query.capitalize()) - return render_template('remove_entry.html', message=message) - -@app.route('/update_keywords', methods=['GET', 'POST']) -def update_keywords(): - message = '' - if request.method == 'POST': - name_query = request.form['name'].strip().lower() - new_keywords = request.form['keywords'].strip() - # Check if the entry exists - if name_query in data['Name'].str.lower().values: - # Update the keywords for the given name - data.loc[data['Name'].str.lower() == name_query, 'Keywords'] = new_keywords - # Save changes back to CSV - data.to_csv(app.config['CSV_FILE'], index=False) - message = 'Keywords updated successfully for "{}".'.format(name_query.capitalize()) - else: - message = 'Error: No entry found for the name "{}".'.format(name_query.capitalize()) - return render_template('update_keywords.html', message=message) - -def allowed_file(filename): - return '.' in filename and filename.rsplit('.', 1)[1].lower() in {'png', 'jpg', 'jpeg', 'gif'} +# @app.route('/') +# def home(): +# return render_template('index.html') + +# @app.route('/search', methods=['GET', 'POST']) +# def search(): +# if request.method == 'POST': +# name_query = request.form['name'] +# if name_query: +# # Search for the name in the dataframe +# result = data[data['Name'].str.lower() == name_query.lower()] +# if not result.empty: +# picture = result.iloc[0]['Picture'] +# return render_template('result.html', picture=picture, name=name_query) +# else: +# return render_template('index1.html', message="No name found.") #changing search to index1 +# else: +# return render_template('index1.html', message="Please enter a name.") +# return render_template('index1.html') + +# @app.route('/low_salary') +# def low_salary(): +# # Filter entries with salary less than 99000 +# filtered_data = data[data['Salary'] < 99000] +# # Ensure we have valid picture filenames +# pictures = filtered_data['Picture'].dropna().tolist() +# return render_template('low_salary.html', pictures=pictures) + +# @app.route('/update_or_add_picture', methods=['GET', 'POST']) +# def update_or_add_picture(): +# global data +# message = '' +# if request.method == 'POST': +# name_query = request.form['name'].strip().lower() +# file = request.files['file'] +# if file and allowed_file(file.filename): +# filename = secure_filename(file.filename) +# if filename: # Check if filename is not empty +# file_path = os.path.join(app.config['UPLOAD_FOLDER'], filename) + +# # Check if the entry exists +# existing_record = data[data['Name'].str.lower() == name_query] +# if not existing_record.empty: +# # Delete the old picture if it exists +# old_filename = existing_record['Picture'].iloc[0] +# if old_filename: +# old_file_path = os.path.join(app.config['UPLOAD_FOLDER'], old_filename) +# if os.path.exists(old_file_path): +# os.remove(old_file_path) + +# # Save the new file +# file.save(file_path) + +# # Update or add the record +# if not existing_record.empty: +# data.loc[data['Name'].str.lower() == name_query, 'Picture'] = filename +# else: +# # Add new entry if name does not exist +# new_entry = {'Name': name_query.capitalize(), 'Picture': filename, 'Keywords': ''} +# data = data.append(new_entry, ignore_index=True) + +# # Save changes back to CSV +# data.to_csv(app.config['CSV_FILE'], index=False) +# message = 'Picture updated or added successfully for "{}".'.format(name_query.capitalize()) +# else: +# message = 'No valid filename provided.' +# else: +# message = 'Invalid file or file not provided.' +# return render_template('update_or_add_picture.html', message=message) + +# @app.route('/remove_entry', methods=['GET', 'POST']) +# def remove_entry(): +# global data +# message = '' +# if request.method == 'POST': +# name_query = request.form['name'].strip().lower() +# # Find if the entry exists +# existing_record = data[data['Name'].str.lower() == name_query] +# if not existing_record.empty: +# # Delete the picture if it exists +# old_filename = existing_record['Picture'].iloc[0] +# if old_filename: +# old_file_path = os.path.join(app.config['UPLOAD_FOLDER'], old_filename) +# if os.path.exists(old_file_path): +# os.remove(old_file_path) +# # Remove the data entry +# data = data[data['Name'].str.lower() != name_query] +# data.to_csv(app.config['CSV_FILE'], index=False) +# message = 'The entry for "{}" was removed successfully.'.format(name_query.capitalize()) +# else: +# message = 'Error: No entry found for the name "{}".'.format(name_query.capitalize()) +# return render_template('remove_entry.html', message=message) + +# @app.route('/update_keywords', methods=['GET', 'POST']) +# def update_keywords(): +# message = '' +# if request.method == 'POST': +# name_query = request.form['name'].strip().lower() +# new_keywords = request.form['keywords'].strip() +# # Check if the entry exists +# if name_query in data['Name'].str.lower().values: +# # Update the keywords for the given name +# data.loc[data['Name'].str.lower() == name_query, 'Keywords'] = new_keywords +# # Save changes back to CSV +# data.to_csv(app.config['CSV_FILE'], index=False) +# message = 'Keywords updated successfully for "{}".'.format(name_query.capitalize()) +# else: +# message = 'Error: No entry found for the name "{}".'.format(name_query.capitalize()) +# return render_template('update_keywords.html', message=message) + +# def allowed_file(filename): +# return '.' in filename and filename.rsplit('.', 1)[1].lower() in {'png', 'jpg', 'jpeg', 'gif'} -if __name__ == '__main__': - app.run(debug=True) +# if __name__ == '__main__': +# app.run(debug=True) diff --git a/static/index.html b/static/index.html new file mode 100644 index 000000000..d5fd5a92b --- /dev/null +++ b/static/index.html @@ -0,0 +1,17 @@ + + + + + + + +
+
+
-
-