+
Penalties
{% for penalty in form.penalties %}
{{ penalty.hidden_tag() }}
-
diff --git a/estusshots/views/enemies.py b/estusshots/views/enemies.py
index 60cd38e..530bd05 100644
--- a/estusshots/views/enemies.py
+++ b/estusshots/views/enemies.py
@@ -40,24 +40,20 @@ def enemy_edit(enemy_id: int):
form_title="Edit Enemy",
post_url=f"/enemy/{enemy_id}/edit",
)
+ db = orm.new_session()
+ enemy = db.query(Enemy).get(enemy_id)
+ form = forms.EnemyForm()
if request.method == "GET":
- db = orm.new_session()
- enemy = db.query(Enemy).filter(Enemy.id == enemy_id).first()
-
- form = forms.EnemyForm()
form.season_id.data = enemy.season_id if enemy.season_id else -1
form.name.data = enemy.name
form.is_boss.data = enemy.boss
form.enemy_id.data = enemy_id
-
model.form_title = f'Edit Enemy "{enemy.name}"'
return render_template("generic_form.html", model=model, form=form)
else:
form = forms.EnemyForm()
if form.validate_on_submit():
- db = orm.new_session()
- enemy = db.query(Enemy).filter(Enemy.id == enemy_id).first()
if not enemy:
enemy = Enemy()
db.add(enemy)
diff --git a/estusshots/views/episodes.py b/estusshots/views/episodes.py
index c05b008..0dc044c 100644
--- a/estusshots/views/episodes.py
+++ b/estusshots/views/episodes.py
@@ -86,4 +86,4 @@ def episode_edit(season_id: int, episode_id: int):
if errors:
model.errors = {"Error saving episode": [errors]}
return render_template("generic_form.html", model=model, form=form)
- return redirect(url_for("episode_detail", season_id=season_id, episode_id=episode_id))
+ return redirect(url_for("episode_detail", season_id=season.id, episode_id=episode.id))
diff --git a/estusshots/views/events.py b/estusshots/views/events.py
index 52fb283..5634e8d 100644
--- a/estusshots/views/events.py
+++ b/estusshots/views/events.py
@@ -60,6 +60,7 @@ def event_new(s_id: int, ep_id: int):
form = forms.EventForm()
form.episode_id.data = ep_id
form.enemy.choices = choices.enemy_choice_for_season(s_id)
+ form.player.choices = choices.player_choice_for_episode(episode)
form.event_type.data = EventType.Death.value
Penalty = namedtuple("Penalty", ["penalty_id", "player_id", "player", "drink"])
diff --git a/estusshots/views/players.py b/estusshots/views/players.py
index f4f3233..e6a6b0d 100644
--- a/estusshots/views/players.py
+++ b/estusshots/views/players.py
@@ -26,27 +26,26 @@ def player_edit(player_id: int):
form_title=f"Edit Player",
post_url=f"/player/{player_id}/edit",
)
+ db = orm.new_session()
+ player = db.query(Player).filter(Player.id == player_id).first()
+ form = forms.PlayerForm()
+
# Edit Existing Player
if request.method == "GET":
- db = orm.new_session()
- player = db.query(Player).filter(Player.id == player_id).first()
-
- form = forms.PlayerForm()
form.player_id.data = player.id
form.anonymize.data = player.anon
form.real_name.data = player.real_name
form.alias.data = player.alias
form.hex_id.data = player.hex_id
-
model.form_title = f'Edit Player "{player.name}"'
return render_template("generic_form.html", model=model, form=form)
-
# Save POSTed data
else:
form = forms.PlayerForm()
if form.validate_on_submit():
- db = orm.new_session()
- player = db.query(Player).filter(Player.id == player_id).first()
+ if not player:
+ player = Player()
+ db.add(player)
player.populate_from_form(form)
db.commit()
return redirect("/player")
diff --git a/static/js/estus-shots.js b/static/js/estus-shots.js
new file mode 100644
index 0000000..9186faf
--- /dev/null
+++ b/static/js/estus-shots.js
@@ -0,0 +1,37 @@
+var EditorModule = /** @class */ (function () {
+ function EditorModule() {
+ var _this = this;
+ this.setCurrentTime = function (elemId) {
+ var elem = document.getElementById(elemId);
+ if (!elem)
+ return;
+ elem.value = _this.currentTimeHHMM();
+ };
+ this.currentTimeHHMM = function () {
+ var d = new Date();
+ var hours = (d.getHours() < 10 ? '0' : '') + d.getHours();
+ var minutes = (d.getMinutes() < 10 ? '0' : '') + d.getMinutes();
+ return hours + ":" + minutes;
+ };
+ }
+ return EditorModule;
+}());
+var editorModule = new EditorModule();
+var EventEditor;
+(function (EventEditor) {
+ EventEditor.updateControls = function () {
+ var typeSelect = document.getElementById("event_type");
+ var selectedType = typeSelect.options[typeSelect.selectedIndex].value;
+ switch (selectedType) {
+ case "0":
+ console.log("Pause");
+ break;
+ case "1":
+ break;
+ case "2":
+ break;
+ default:
+ console.log("Unknown event type: " + selectedType);
+ }
+ };
+})(EventEditor || (EventEditor = {}));
diff --git a/tsconfig.json b/tsconfig.json
index 7277d56..c51a877 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,10 +4,9 @@
"noImplicitAny": true,
"removeComments": true,
"preserveConstEnums": true,
- "sourceMap": true,
- "outDir": "./estusshots/static/js"
+ "sourceMap": true
},
"include": [
"**/*.ts"
- ],
+ ]
}