diff --git a/ActualProjectCode/DjangoProject/templates/modelForms/approveInvoice.html b/ActualProjectCode/DjangoProject/templates/modelForms/approveInvoice.html index 533a8063672a138520460bb2236c59c5c0129499..0f7cd31f929ff3147809725c1df6cbfbed5d15b7 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 5fe03642e8825ffff965b6b1a36e9af24601c2b8..e1f6d8b6a4d040047a4207e9ad03658851f53353 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 430dac35ea831b6cfe2d2e85ca75065163a2d8f4..a2c11a97f9df93f36b0bc6a8ba301559c374b198 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 a00e87a46bed21fc3ac6cb975433a259b623c166..0b9adb3d98840071b8f29de618d120b5e0a6e330 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 10b6685fb14baec6771f9fa8089dd731d4e97dc3..4669f569edaa4c6030045d046a6ff6a160dca2ef 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 602e5fc850cc404fbfc9d4113e59f100b5341eb2..5fc34a203774ccdee7d305ff4a39632f62fa9024 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 03759d5c62000281739b73422d01f4e0b047d188..8429a7e07743120aa77cb8bcd46a6c5184a5f73a 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 f1fe7747eb15f0ac9c187b053ba933fddf06d926..cb4a576110b22736b47dcb538543984cc378799a 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 7edf8b68ca04786d318eebd91098adec73b7169d..8bba35be01deeb360a3efa66c861a3aeae263a15 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 7ce256763bbce782c010b495102776bad8e4ef36..7a85e02bdf8535722b2e9047deb682f05cb6018b 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 01770e8c01d18471b36f0aad95e494fb0c3ec682..8024f3e9e0842efe0675e7a082ec0310f20da34d 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 a85e26d77a94de194a7ee055b92c6d72d227cd01..210756e04d2668e2c13104a4f23d640a1a95eeab 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 e6be531b9f4781ae6451af0b61f666be0e8acf7c..67a71af67c0fdf6afeb9604f5224e3154c4cc88d 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 c15d3678f591db18cd2780d409eb387a88e726e2..e5c33c118facb1b915a117f24953014124a3bd74 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 38b576a58d716eeb3bd0eebcc95b2aaadecaeec8..9602e9d61884dfb9ec2983ec6156e79f114da1d3 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 eb0ccbfd2703c1a0a01e5372c8edb8b7866c5dbc..b7977b1426477c1d728727b36fc98af20896b2a3 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 ad63c1433fca77eb34def9ccb492a1b248674ffb..0df0491ee203b82f20f163b09c7aee3617e442b9 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 de4f1b56c30698453775a15162e623ce26cda38f..d89504fb0d1858f2188d92eeca8352cbb630009d 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