From d2d65e44a09fd23027b7be70d31cb866f1dab6af Mon Sep 17 00:00:00 2001
From: burzuf <poddeo3@gmail.com>
Date: Thu, 19 Mar 2020 20:30:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B8=D0=BB=20=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D1=86?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __init__.py             | 15 +++++++++------
 db_routing.py           |  1 +
 templates/workshop.html | 20 ++++++++++----------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/__init__.py b/__init__.py
index cc9022b..90c6036 100644
--- a/__init__.py
+++ b/__init__.py
@@ -61,9 +61,9 @@ def workshop():
     if request.method == 'POST':
         if 'NewScenarioName' in request.form:
             newScenarioName = request.form['NewScenarioName']
-            triggerName = request.form['TriggerName']
+            triggerName = request.form['TriggerID']
             triggerArgs = request.form['TriggerArgs']
-            actionName = request.form['ActionName']
+            actionName = request.form['ActionID']
             actionArgs = request.form['ActionArgs']
             db_routing.add_scenario(current_user.get_id(), newScenarioName, triggerName, triggerArgs, actionName,
                                     actionArgs)
@@ -74,7 +74,10 @@ def workshop():
             db_routing.tg_username_update(current_user.get_id(), new_tg_username)
             return redirect(url_for('workshop'))
 
-        # if 'NewScenarioName' in request.form:
+        if 'ScenarioID' in request.form:
+            scnarioID = request.form['ScenarioID']
+            db_routing.delete_scenario(scnarioID)
+            return redirect(url_for('workshop'))
 
     triggers_list = db_routing.get_trigers()
     actions_list = db_routing.get_actions()
@@ -88,9 +91,9 @@ def workshop():
                            user_scripts_list=user_scripts_list, tg_username=tg_username)
 
 
-# @app.errorhandler(Exception)
-# def universal_error(error):
-#     return render_template('error.html'), 404
+@app.errorhandler(Exception)
+def universal_error(error):
+    return render_template('error.html'), 404
 
 
 def string_check(string):
diff --git a/db_routing.py b/db_routing.py
index 7716663..bf30fdb 100644
--- a/db_routing.py
+++ b/db_routing.py
@@ -97,6 +97,7 @@ def get_user_scripts(current_user_id):
 
 
 def delete_scenario(scenario_id):
+    print(scenario_id)
     scenario = Scenario.query.filter_by(id=scenario_id).first()
     db.session.delete(scenario)
     db.session.commit()
diff --git a/templates/workshop.html b/templates/workshop.html
index b2f2a99..64641b1 100644
--- a/templates/workshop.html
+++ b/templates/workshop.html
@@ -60,7 +60,7 @@
                             <div class="form__field-title">
                                 Условие:
                             </div>
-                            <select class="form__input-text" name="TriggerName">
+                            <select class="form__input-text" name="TriggerID">
                                 {% for trigger in triggers_list %}
                                 <option value="{{ trigger.id }}">{{ trigger.name }}</option>
                                 {% endfor %}
@@ -75,7 +75,7 @@
                             <div class="form__field-title">
                                 Действие:
                             </div>
-                            <select class="form__input-text" name="ActionName">
+                            <select class="form__input-text" name="ActionID">
                                 {% for action in actions_list %}
                                 <option value="{{ action.id }}">{{ action.name }}</option>
                                 {% endfor %}
@@ -110,10 +110,10 @@
                 <form action="/workshop" method="POST" name="Scenarios">
                     <ul class="events_list">
                         {% if user_scripts_list %}
+                        {% set count = 1 %}
                         {% for user_script in user_scripts_list%}
                         <li class="events_item">
-                            <p>{{ user_script.scenario_name }}</p>
-                            <div class="cl-btn-7"></div>
+                            <p>• {{ user_script.scenario_name }}</p>
                         </li>
                         {% endfor %}
                         {% else %}
@@ -132,9 +132,9 @@
                 <form action="/workshop" method="POST" name="Telegram">
                     <label class="form__log">
                         {% if tg_username %}
-                        <input class="form__input-text" name="TGUsername" placeholder={{tg_username}} type="text">
+                        <input class="form__input-text" name="TGUsername" placeholder=@{{tg_username}} type="text">
                         {% else %}
-                        <input class="form__input-text" name="TGUsername" placeholder="Логин" type="text">
+                        <input class="form__input-text" name="TGUsername" placeholder="@Логин" type="text">
                         {% endif %}
                     </label>
                     <div class="form__btns">
@@ -152,16 +152,16 @@
             </div>
             <div class="form">
                 <div class="form__title">
-                    Удалить событие
+                    Удалить сценарий
                 </div>
                 <form action="/workshop" method="POST" name="">
                     <label class="form__log">
                         <div class="form__field-title">
                             Выберите событие
                         </div>
-                        <select class="form__input-text" name="">
-                            {% for trigger in triggers_list %}
-                            <option>{{ trigger.name }}</option>
+                        <select class="form__input-text" name="ScenarioID">
+                            {% for user_script in user_scripts_list %}
+                            <option value="{{ user_script.id }}">{{ user_script.scenario_name }}</option>
                             {% endfor %}
                         </select>
                     </label>