From a1fd6c893a16715ca3e6cfdc7100ca36f2e0aa77 Mon Sep 17 00:00:00 2001
From: James <james2.burt@live.uwe.ac.uk>
Date: Thu, 8 May 2025 10:50:20 +0100
Subject: [PATCH] Trained Regression fix + return to home page button All code
is in ActualProjectCode/ DjangoProject
---
.../DjangoProject/templates/modelForms/approveInvoice.html | 1 +
.../DjangoProject/templates/modelForms/billingsView.html | 2 +-
.../DjangoProject/templates/modelForms/deleteBillings.html | 1 +
.../DjangoProject/templates/modelForms/deleteModel.html | 1 +
.../DjangoProject/templates/modelForms/deleteRecord.html | 1 +
.../DjangoProject/templates/modelForms/deleteUsers.html | 1 +
.../DjangoProject/templates/modelForms/genBillings.html | 1 +
.../DjangoProject/templates/modelForms/interactionView.html | 2 +-
.../DjangoProject/templates/modelForms/manageInvoice.html | 2 +-
.../DjangoProject/templates/modelForms/manageModels.html | 2 +-
.../DjangoProject/templates/modelForms/manageUsers.html | 2 +-
.../DjangoProject/templates/modelForms/mlUpload.html | 4 ++--
.../DjangoProject/templates/modelForms/updateModel.html | 1 +
.../DjangoProject/templates/modelForms/updateUsers.html | 1 +
.../DjangoProject/templates/modelForms/userUpload.html | 5 +++--
.../DjangoProject/templates/modelForms/viewUploads.html | 2 +-
ActualProjectCode/DjangoProject/templates/profile.html | 2 +-
Working Models/Trained_Regression.py | 3 ++-
18 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/approveInvoice.html b/ActualProjectCode/DjangoProject/templates/modelForms/approveInvoice.html
index 533a806..0f7cd31 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/approveInvoice.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/approveInvoice.html
@@ -55,6 +55,7 @@
<body>
<div class="container">
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<p>Are you sure you want to approve this billing?</p>
<form action="{% url 'approveInvoice' invoice.billingID %}" method="POST">
{% csrf_token %}
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/billingsView.html b/ActualProjectCode/DjangoProject/templates/modelForms/billingsView.html
index 5fe0364..e1f6d8b 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/billingsView.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/billingsView.html
@@ -144,7 +144,7 @@
<body>
<div class="container">
- <p><a href="{% url 'profile' %}">Return to Profile</a></p>
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<!-- Filter Form Section -->
<div class="filter-section">
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/deleteBillings.html b/ActualProjectCode/DjangoProject/templates/modelForms/deleteBillings.html
index 430dac3..a2c11a9 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/deleteBillings.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/deleteBillings.html
@@ -56,6 +56,7 @@
<body>
<div class="container">
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<p>Are you sure you want to delete this billing?</p>
<form action="{% url 'deleteBillings' record.billingID %}" method="POST">
{% csrf_token %}
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/deleteModel.html b/ActualProjectCode/DjangoProject/templates/modelForms/deleteModel.html
index a00e87a..0b9adb3 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/deleteModel.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/deleteModel.html
@@ -60,6 +60,7 @@
<body>
<div class="container">
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<p>Are you sure you want to delete this model named "<strong>{{ model.modelTitle }}</strong>"</p>
<form action="{% url 'deleteModel' model.modelID %}" method="POST">
{% csrf_token %}
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/deleteRecord.html b/ActualProjectCode/DjangoProject/templates/modelForms/deleteRecord.html
index 10b6685..4669f56 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/deleteRecord.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/deleteRecord.html
@@ -56,6 +56,7 @@
<body>
<div class="container">
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<p>Are you sure you want to delete this record?</p>
<form action="{% url 'deleteRecord' record.recordID %}" method="POST">
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/deleteUsers.html b/ActualProjectCode/DjangoProject/templates/modelForms/deleteUsers.html
index 602e5fc..5fc34a2 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/deleteUsers.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/deleteUsers.html
@@ -61,6 +61,7 @@
<body>
<div class="container">
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<p>Are you sure you want to delete the account named "<strong>{{ user.user }}</strong>"?</p>
<form action="{% url 'deleteUsers' user.user_id %}" method="POST">
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/genBillings.html b/ActualProjectCode/DjangoProject/templates/modelForms/genBillings.html
index 03759d5..8429a7e 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/genBillings.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/genBillings.html
@@ -62,6 +62,7 @@
<body>
<div class="container">
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<h2>Billing Form</h2>
<form action="" method="POST">
{% csrf_token %}
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/interactionView.html b/ActualProjectCode/DjangoProject/templates/modelForms/interactionView.html
index f1fe774..cb4a576 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/interactionView.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/interactionView.html
@@ -74,7 +74,7 @@
<body>
<div class="container">
- <p><a href="{% url 'profile' %}">Return to Profile</a></p>
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
{% for record in interactions %}
<div class="record">
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/manageInvoice.html b/ActualProjectCode/DjangoProject/templates/modelForms/manageInvoice.html
index 7edf8b6..8bba35b 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/manageInvoice.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/manageInvoice.html
@@ -88,7 +88,7 @@
<body>
<div class="container">
- <p><a href="{% url 'profile' %}">Return to Profile</a></p>
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
{% for invoice in billings %}
{% if invoice.approvalStatus == 'unapproved' %}
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/manageModels.html b/ActualProjectCode/DjangoProject/templates/modelForms/manageModels.html
index 7ce2567..7a85e02 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/manageModels.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/manageModels.html
@@ -89,7 +89,7 @@
<body>
<div class="container">
- <p><a href="{% url 'profile' %}">Return To Profile</a></p>
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
{% for model in models %}
<div class="user-card">
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/manageUsers.html b/ActualProjectCode/DjangoProject/templates/modelForms/manageUsers.html
index 01770e8..8024f3e 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/manageUsers.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/manageUsers.html
@@ -90,7 +90,7 @@
<body>
<div class="container">
- <p><a href="{% url 'profile' %}">Return to Admin Profile</a></p>
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
{% for p in profile %}
<div class="user-card">
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/mlUpload.html b/ActualProjectCode/DjangoProject/templates/modelForms/mlUpload.html
index a85e26d..210756e 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/mlUpload.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/mlUpload.html
@@ -59,7 +59,7 @@
<div class="container">
<h2>Upload a new ML model</h2>
- <p><a href="{% url 'profile' %}">Return to Profile</a></p>
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 15px; transition: background-color 0.3s ease; box-shadow: 0 2px 4px rgba(0,0,0,0.2);">Return to Profile</a></p>
<form action="" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form.as_p }}
@@ -68,4 +68,4 @@
</div>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/updateModel.html b/ActualProjectCode/DjangoProject/templates/modelForms/updateModel.html
index e6be531..67a71af 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/updateModel.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/updateModel.html
@@ -78,6 +78,7 @@
<div class="container">
<form action="" method="POST">
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<h2>Updating Model <strong>{{ model.modelTitle }}</strong></h2>
{% csrf_token %}
{{ form.as_p }}
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/updateUsers.html b/ActualProjectCode/DjangoProject/templates/modelForms/updateUsers.html
index c15d367..e5c33c1 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/updateUsers.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/updateUsers.html
@@ -79,6 +79,7 @@
<body>
<div class="container">
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<form action="" method="POST">
<h2>Form Submission</h2>
{% csrf_token %}
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/userUpload.html b/ActualProjectCode/DjangoProject/templates/modelForms/userUpload.html
index 38b576a..9602e9d 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/userUpload.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/userUpload.html
@@ -13,6 +13,7 @@
.container {
display: flex;
+ flex-direction: column;
justify-content: center;
align-items: center;
min-height: 100vh;
@@ -78,7 +79,7 @@
</head>
<body>
<div class="container">
- <p><a href="{% url 'profile' %}">Return to Profile</a></p>
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
<form action="" method="POST" enctype="multipart/form-data">
{% for model in models %}
<h2> {{ model.modelTitle }}</h2>
@@ -96,4 +97,4 @@
</div>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/viewUploads.html b/ActualProjectCode/DjangoProject/templates/modelForms/viewUploads.html
index eb0ccbf..b7977b1 100644
--- a/ActualProjectCode/DjangoProject/templates/modelForms/viewUploads.html
+++ b/ActualProjectCode/DjangoProject/templates/modelForms/viewUploads.html
@@ -74,7 +74,7 @@
<body>
<div class="container">
- <p><a href="{% url 'profile' %}">Return to Profile</a></p>
+ <p><a href="{% url 'profile' %}" style="display: inline-block; background-color: #4CAF50; color: white; text-decoration: none; padding: 10px 15px; border-radius: 5px; font-weight: bold; margin-bottom: 20px; transition: background-color 0.3s ease;">Return to Profile</a></p>
{% for i in uploads %}
<div class="record">
<p><strong>Record ID: </strong> {{ i.recordID }} </p>
diff --git a/ActualProjectCode/DjangoProject/templates/profile.html b/ActualProjectCode/DjangoProject/templates/profile.html
index ad63c14..0df0491 100644
--- a/ActualProjectCode/DjangoProject/templates/profile.html
+++ b/ActualProjectCode/DjangoProject/templates/profile.html
@@ -169,7 +169,7 @@
<h1 class="sectionTitle">AI Engineer Section</h1>
<!-- AI Section -->
<h2>Upload Dataset</h2>
- <h2><a href="{% url 'userUpload' %}">Upload</a></h2>
+ <h2><a href="{% url 'mlUpload' %}">Upload</a></h2>
<h2>Access ML Interactions</h2>
<h2><a href="{% url 'interactionView' %}">All Interactions</a></h2>
<h2>Manage Models</h2>
diff --git a/Working Models/Trained_Regression.py b/Working Models/Trained_Regression.py
index de4f1b5..d89504f 100644
--- a/Working Models/Trained_Regression.py
+++ b/Working Models/Trained_Regression.py
@@ -10,6 +10,7 @@ from sklearn.metrics import mean_squared_error, r2_score
# Path setup
script_dir = os.path.dirname(os.path.abspath(__file__))
csv_path = f"{sys.argv[2]}"
+input_path = os.path.dirname(csv_path)
model_path = os.path.join(script_dir, "symbolic_model.pkl")
scaler_path = os.path.join(script_dir, "symbolic_scaler.pkl")
imputer_path = os.path.join(script_dir, "symbolic_imputer.pkl")
@@ -46,7 +47,7 @@ predictions = model.predict(X_scaled)
#Save output
output_df = df.copy()
output_df[f"Predicted_{target_col}"] = predictions
-output_path = os.path.join(script_dir, "symbolic_regression_trained_data.csv") # error here with script_dir
+output_path = os.path.join(input_path, "symbolic_regression_trained_data.csv") # error here with script_dir
output_df.to_csv(output_path, index=False)
# Optional evaluation
--
GitLab