made changes to edit function

Author: Sarah Drury

Diff for: webapp_prototype/portfolio/portfolio.db

@@ -360,16 +360,12 @@ def edit_task(id):
 
     user_id = session["user_id"]
     username = session["username"]
-    icons = [
-        "Analytics", "Cloud", "Coding", "Communication", "CSS", "Database", 
-        "HTML", "JavaScript", "Leadership", "Project Management", "Public Speaking", 
-        "Sale", "Science", "Teamwork", "Translation", "Writing"
-    ]
+    icons = [ "Prescription Request", "Patient Communication","Sick Notes", "Referral Letters", "Medical Reports", "Review Results" ]
 
     #validate ownership
-    sql_validate = "SELECT user_id FROM tasks WHERE task_id = :task_id"
+    sql_validate = "SELECT user_id FROM tasks WHERE id = :id"
     sql_validate_q = text(sql_validate)
-    result = db.engine.connect().execute(sql_validate_q, {'task_id':id}).fetchone()
+    result = db.engine.connect().execute(sql_validate_q, {'id':id}).fetchone()
     if not result:
         abort(404, description="Item not found.")
         return redirect(url_for('tasks'))
@@ -402,7 +398,7 @@ def edit_task(id):
                 UPDATE tasks 
                 SET  
                 task_name= :task_name, task_icon = :task_icon, task_content = :task_content
-                WHERE user_id = :user_id AND task_id = :task_id
+                WHERE user_id = :user_id AND id = :id
             """
         sql_q = text(sql)
 
@@ -415,7 +411,7 @@ def edit_task(id):
             "task_icon": new_task_icon,
             "task_content": new_task_content,
             "user_id": user_id,
-            "task_id": id
+            "id": id
                 }
         )
         db.session.commit()
@@ -424,9 +420,9 @@ def edit_task(id):
 
 
     #Query for current task
-    sql = "SELECT * FROM tasks WHERE user_id = :user_id AND task_id = :task_id"
+    sql = "SELECT * FROM tasks WHERE user_id = :user_id AND id = :id"
     sql_q = text(sql)
-    user_task = db.engine.connect().execute(sql_q, {'user_id':user_id, 'task_id':id}).fetchone()
+    user_task = db.engine.connect().execute(sql_q, {'user_id':user_id, 'id':id}).fetchone()
 
 
 

Diff for: webapp_prototype/portfolio/routes.py

@@ -0,0 +1,50 @@
+{% extends "layout.html" %}
+{% block content %}
+
+<div class="container">
+
+    <div class="text-center">
+        <h1 class="h4 mb-2 fw-normal">Edit task</h1>
+    </div>
+    
+        
+    <div class="container text-left form-container">
+        <p class="text-center">Edit your Task in the form below.</p>
+        <form  method="POST" class="row g-2">
+            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+
+            <!-- Skill name -->
+            <div class="mb-3 col-md-6">
+                <label for="task_name" class="form-label">Task name</label>
+                <input type="text" name="task_name" class="form-control" placeholder="Python" value="{{user_task.task_name}}" required>
+            </div>
+
+
+            <!-- Task Icon -->
+            <div class="mb-3 col-md-6">
+                <label for="task_icon" class="form-label">Icon</label>
+                <select name="task_icon" class="form-select" required>
+                    <option disabled selected="">Select an icon</option>
+                    {% for icon in icons %}
+                        <option>{{ icon }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            
+
+            <!-- Task Description -->
+            <div class="mb-3">
+                <label for="task_content" class="form-label">Description</label>
+                <textarea id="task_content" name="task_content" class="form-control" rows="3" placeholder="Details about the task..."></textarea>
+            </div>
+
+
+            <!-- Submit Button -->
+            <div class="d-grid gap-2">
+                <button type="submit" class="btn btn-primary">Update Task</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+{% endblock content %}