From d7830971c6791f547351eaccbb9765d3ffaa6dad Mon Sep 17 00:00:00 2001
From: JayanthBontha <Jayanth2921@gmail.com>
Date: Tue, 24 Oct 2023 20:40:36 +0530
Subject: [PATCH 1/3] Workout comments are now editable

---
 wger/manager/templates/set/edit.html |  8 ++++++--
 wger/manager/views/set.py            | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/wger/manager/templates/set/edit.html b/wger/manager/templates/set/edit.html
index e45ac0872..3694119ec 100644
--- a/wger/manager/templates/set/edit.html
+++ b/wger/manager/templates/set/edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load static %}
-
+{% load i18n static crispy_forms_tags %}
 
 <!--
         Title
@@ -21,7 +21,11 @@
     {% for formset in formsets %}
         {% include 'set/formset.html' with base=formset.base formset=formset.formset helper=helper %}
     {% endfor %}
-
+    <div class="form-group">
+        <label for="id_comment" class="control-label">{% translate "Comment" %}:</label>
+        <input id="id_comment" name="comment" class="form-control" type="text" value="{{ comment }}">
+    </div>    
+    <br>
      <input type="submit" class="btn btn-primary btn-success btn-block" value="{% translate 'Update' %}">
 </form>
 {% endblock %}
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index ef6c143b1..814049fca 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -192,6 +192,9 @@ def edit(request, pk):
         formsets.append({'base': base, 'formset': formset})
 
     if request.method == "POST":
+        set_obj.comment = request.POST.get('comment',"")  # Update the comment value for the Set object
+        set_obj.save()  # Save the changes to the Set object
+
         formsets = []
         for base in set_obj.exercise_bases:
             formset = SettingFormsetEdit(request.POST, prefix='exercise{0}'.format(base.id))
@@ -205,18 +208,18 @@ def edit(request, pk):
 
         if all_valid:
             for formset in formsets:
-                instances = formset['formset'].save(commit=False)
+                  instances = formset['formset'].save(commit=False)
 
-                for instance in instances:
-                    # Double check that we are allowed to edit the set
-                    if instance.get_owner_object().user != request.user:
-                        return HttpResponseForbidden()
-                    instance.save()
+            for instance in instances:
+                # Double check that we are allowed to edit the set
+                if instance.get_owner_object().user != request.user:
+                    return HttpResponseForbidden()
+                instance.save()
 
             return HttpResponseRedirect(
                 reverse('manager:workout:view', kwargs={'pk': set_obj.get_owner_object().id})
             )
 
     # Other context we need
-    context = {'formsets': formsets, 'helper': WorkoutLogFormHelper()}
-    return render(request, 'set/edit.html', context)
+    context = {'formsets': formsets, 'helper': WorkoutLogFormHelper(),'comment': set_obj.comment }
+    return render(request, 'set/edit.html', context)
\ No newline at end of file

From f5ee4efe94a1d50b10e131fa364c58fbdba0487d Mon Sep 17 00:00:00 2001
From: Jayanth Bontha <112277163+JayanthBontha@users.noreply.github.com>
Date: Tue, 24 Oct 2023 21:39:36 +0530
Subject: [PATCH 2/3] Update edit.html

---
 wger/manager/templates/set/edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wger/manager/templates/set/edit.html b/wger/manager/templates/set/edit.html
index 3694119ec..62bcb044c 100644
--- a/wger/manager/templates/set/edit.html
+++ b/wger/manager/templates/set/edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load static %}
-{% load i18n static crispy_forms_tags %}
+
 
 <!--
         Title

From 7c7b46a77175a2ca32adce0d9a3ca06ec385c98f Mon Sep 17 00:00:00 2001
From: Jayanth Bontha <112277163+JayanthBontha@users.noreply.github.com>
Date: Tue, 24 Oct 2023 21:44:54 +0530
Subject: [PATCH 3/3] Update set.py

---
 wger/manager/views/set.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 814049fca..02a20921b 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -208,13 +208,13 @@ def edit(request, pk):
 
         if all_valid:
             for formset in formsets:
-                  instances = formset['formset'].save(commit=False)
+                instances = formset['formset'].save(commit=False)
 
-            for instance in instances:
-                # Double check that we are allowed to edit the set
-                if instance.get_owner_object().user != request.user:
-                    return HttpResponseForbidden()
-                instance.save()
+                for instance in instances:
+                    # Double check that we are allowed to edit the set
+                    if instance.get_owner_object().user != request.user:
+                        return HttpResponseForbidden()
+                    instance.save()
 
             return HttpResponseRedirect(
                 reverse('manager:workout:view', kwargs={'pk': set_obj.get_owner_object().id})
@@ -222,4 +222,4 @@ def edit(request, pk):
 
     # Other context we need
     context = {'formsets': formsets, 'helper': WorkoutLogFormHelper(),'comment': set_obj.comment }
-    return render(request, 'set/edit.html', context)
\ No newline at end of file
+    return render(request, 'set/edit.html', context)