Llloooggg/Jarvis
1
0
Fork 0
mirror of https://github.com/Llloooggg/Jarvis.git synced 2026-03-06 03:56:23 +03:00
Code Issues 21 Packages Projects Releases Wiki Activity

Добаил возможность удаления сценариев

Browse Source
This commit is contained in:
Denis Podshivalov
2020-03-19 20:30:36 +03:00
parent a6041be187
commit d2d65e44a0
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
__init__.py
View File

@@ -61,9 +61,9 @@ def workshop():
if request.method == 'POST': if request.method == 'POST':
if 'NewScenarioName' in request.form: if 'NewScenarioName' in request.form:
newScenarioName = request.form['NewScenarioName'] newScenarioName = request.form['NewScenarioName']
triggerName = request.form['TriggerName'] triggerName = request.form['TriggerID']
triggerArgs = request.form['TriggerArgs'] triggerArgs = request.form['TriggerArgs']
actionName = request.form['ActionName'] actionName = request.form['ActionID']
actionArgs = request.form['ActionArgs'] actionArgs = request.form['ActionArgs']
db_routing.add_scenario(current_user.get_id(), newScenarioName, triggerName, triggerArgs, actionName, db_routing.add_scenario(current_user.get_id(), newScenarioName, triggerName, triggerArgs, actionName,
actionArgs) actionArgs)
@@ -74,7 +74,10 @@ def workshop():
db_routing.tg_username_update(current_user.get_id(), new_tg_username) db_routing.tg_username_update(current_user.get_id(), new_tg_username)
return redirect(url_for('workshop')) 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() triggers_list = db_routing.get_trigers()
actions_list = db_routing.get_actions() actions_list = db_routing.get_actions()
@@ -88,9 +91,9 @@ def workshop():
user_scripts_list=user_scripts_list, tg_username=tg_username) user_scripts_list=user_scripts_list, tg_username=tg_username)
# @app.errorhandler(Exception) @app.errorhandler(Exception)
# def universal_error(error): def universal_error(error):
# return render_template('error.html'), 404 return render_template('error.html'), 404
def string_check(string): def string_check(string):

1
db_routing.py
View File

@@ -97,6 +97,7 @@ def get_user_scripts(current_user_id):
def delete_scenario(scenario_id): def delete_scenario(scenario_id):
print(scenario_id)
scenario = Scenario.query.filter_by(id=scenario_id).first() scenario = Scenario.query.filter_by(id=scenario_id).first()
db.session.delete(scenario) db.session.delete(scenario)
db.session.commit() db.session.commit()

20
templates/workshop.html
View File

@@ -60,7 +60,7 @@
<div class="form__field-title"> <div class="form__field-title">
Условие: Условие:
</div> </div>
<select class="form__input-text" name="TriggerName"> <select class="form__input-text" name="TriggerID">
{% for trigger in triggers_list %} {% for trigger in triggers_list %}
<option value="{{ trigger.id }}">{{ trigger.name }}</option> <option value="{{ trigger.id }}">{{ trigger.name }}</option>
{% endfor %} {% endfor %}
@@ -75,7 +75,7 @@
<div class="form__field-title"> <div class="form__field-title">
Действие: Действие:
</div> </div>
<select class="form__input-text" name="ActionName"> <select class="form__input-text" name="ActionID">
{% for action in actions_list %} {% for action in actions_list %}
<option value="{{ action.id }}">{{ action.name }}</option> <option value="{{ action.id }}">{{ action.name }}</option>
{% endfor %} {% endfor %}
@@ -110,10 +110,10 @@
<form action="/workshop" method="POST" name="Scenarios"> <form action="/workshop" method="POST" name="Scenarios">
<ul class="events_list"> <ul class="events_list">
{% if user_scripts_list %} {% if user_scripts_list %}
{% set count = 1 %}
{% for user_script in user_scripts_list%} {% for user_script in user_scripts_list%}
<li class="events_item"> <li class="events_item">
<p>{{ user_script.scenario_name }}</p> <p>• {{ user_script.scenario_name }}</p>
<div class="cl-btn-7"></div>
</li> </li>
{% endfor %} {% endfor %}
{% else %} {% else %}
@@ -132,9 +132,9 @@
<form action="/workshop" method="POST" name="Telegram"> <form action="/workshop" method="POST" name="Telegram">
<label class="form__log"> <label class="form__log">
{% if tg_username %} {% 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 %} {% else %}
<input class="form__input-text" name="TGUsername" placeholder="Логин" type="text"> <input class="form__input-text" name="TGUsername" placeholder="@Логин" type="text">
{% endif %} {% endif %}
</label> </label>
<div class="form__btns"> <div class="form__btns">
@@ -152,16 +152,16 @@
</div> </div>
<div class="form"> <div class="form">
<div class="form__title"> <div class="form__title">
Удалить событие Удалить сценарий
</div> </div>
<form action="/workshop" method="POST" name=""> <form action="/workshop" method="POST" name="">
<label class="form__log"> <label class="form__log">
<div class="form__field-title"> <div class="form__field-title">
Выберите событие Выберите событие
</div> </div>
<select class="form__input-text" name=""> <select class="form__input-text" name="ScenarioID">
{% for trigger in triggers_list %} {% for user_script in user_scripts_list %}
<option>{{ trigger.name }}</option> <option value="{{ user_script.id }}">{{ user_script.scenario_name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</label> </label>