82 midify detail view

zeton/api/points.py

@@ -22,10 +22,11 @@ def is_limit_reached(child_id, exercise_id, days, max_column):
             return False
     return True
 
-@bp.route("/child/<child_id>/points/add/<points>/<exercise_id>", methods=['POST'])
+@bp.route("/child/<child_id>/points/add/<points>/<exercise_id>/<is_detail>", methods=['POST'])
 @auth.login_required
 @auth.logged_child_or_caregiver_only
-def add_points(child_id, points, exercise_id):
+
+def add_points(child_id, points, exercise_id,is_detail):
     if is_limit_reached(child_id, exercise_id, 1, 'max_day') and is_limit_reached(child_id, exercise_id, 7, 'max_week'):
         logged_user_id = g.user_data['id']
         return_url = request.args.get('return_url', '/')
@@ -46,15 +47,23 @@ def add_points(child_id, points, exercise_id):
         if role == 'child':
             return redirect(return_url)
         else:
-            return redirect(url_for('views.child', child_id=child_id))
+            if is_detail == "0":
+                return redirect(url_for('views.child', child_id=child_id))
+            else:
+                return redirect(url_for('views.task_detail', child_id=child_id))
     else:
         if not is_limit_reached(child_id, exercise_id, 1, 'max_day'):
             flash(f'W ciągu ostatniej doby został przekroczony limit punktów')
 
         if not is_limit_reached(child_id, exercise_id, 7, 'max_week'):
             flash(f'W ciągu ostatnich 7 dni został przekroczony limit punktów')
-
-        return redirect(url_for('views.child', child_id=child_id))
+
+
+        if is_detail == "0":
+            return redirect(url_for('views.child', child_id=child_id))
+        else:
+            return redirect(url_for('views.task_detail', child_id=child_id))
+
 
 
 @bp.route("/child/<child_id>/points/use", methods=['POST'])

zeton/templates/base/childs_basic_data.html

@@ -4,6 +4,10 @@ <h2> Ilość punktów {{ child_points.points }} punktów</h2>
     <h3>Punkty doświadczenia {{ child_points.exp }} punktów</h3>
     <h3>Szkolny rekord tygodnia : {{ child_points.school_weekly_highscore }}</h3>
 
+    {% if messages %}
+        <div class="alert alert-dark">{{ messages[0] }}</div>
+    {% endif %}
+
     {% if child.bans.6.active %}
     <h2 style="color: red;"> Masz BANA !</h2>
     <h4> Ban konczy sie: {{ child.bans.6.stop|ban_time }}</h4>

zeton/templates/base/index_child.html

@@ -62,7 +62,7 @@ <h2 class="text-center">Sposób na zdobycie punktów</h2>
                         <td>{{ loop.index }}</td>
                         <td>{{ task.name }}</td>
                         <td>{{ task.points }}</td>
-                        <form action="/api/child/{{ child.id }}/points/add/{{ task.points }}/{{ task.id }}"
+                        <form action="/api/child/{{ child.id }}/points/add/{{ task.points }}/{{ task.id }}/0"
                               method="post">
                             <td><input class="btn btn-info" type="submit" name="Dodaj punkty" value="Dodaj"/></td>
                         </form>

zeton/templates/tasks/task_detail.html

@@ -24,6 +24,10 @@ <h2 class="text-center">Sposoby na zdobycie punktów</h2>
                             <td>{{ task.max_day }}</td>
                             <td>{{ task.max_week }}</td>
                             {% if role == 'caregiver' %}
+                            <form action="/api/child/{{ child.id }}/points/add/{{ task.points }}/{{ task.id }}/1"
+                              method="post">
+                            <td><input class="btn btn-info" type="submit" name="Dodaj punkty" value="Dodaj"/></td>
+                            </form>
                             <form action="/api/child/{{ child.id }}/tasks/deactivate/{{ task.id }}"
                                   method="post">
                                 <td><input class="btn btn-info" type="submit" name="Deactivate_task"

zeton/views/details.py

@@ -23,7 +23,9 @@ def task_detail(child_id):
                'child_points': child_points
                }
 
-    return render_template('tasks/task_detail.html', **context)
+    messages = get_flashed_messages()
+
+    return render_template('tasks/task_detail.html', **context, messages=messages)
 
 
 @bp.route('/prizes_detail/<child_id>')