luxick/DrunkSoulsStatTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create victory events function.

Browse Source
This commit is contained in:
luxick
2018-03-14 19:33:21 +01:00
parent 48ed0d830f
commit 5c346fb892
9 changed files with 352 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dsst/common/models.py
View File

@@ -76,6 +76,7 @@ class Victory:
self.player = arg.get('player') self.player = arg.get('player')
self.enemy = arg.get('enemy') self.enemy = arg.get('enemy')
self.episode = arg.get('episode') self.episode = arg.get('episode')
self.time = arg.get('time')
class SeasonStats: class SeasonStats:

107
dsst/dsst_gtk3/dialogs.py
View File

@@ -97,47 +97,11 @@ def edit_episode(app: 'gtk_ui.GtkUi', season_id: int, episode: 'models.Episode'=
return episode return episode
def edit_death(app: 'gtk_ui.GtkUi', death: 'models.Death'=None): def create_death(app: 'gtk_ui.GtkUi'):
"""Show a dialog to create or edit death events for an episode """Show a dialog to create death events for an episode
:param app: Main Gtk application :param app: Main Gtk application
:param death: (Optional) Existing death object to edit
:return: Death object or None if dialog was canceled :return: Death object or None if dialog was canceled
""" """
if not death:
death = models.Death()
death.episode = app.get_selected_episode_id()
death.info = ""
death.penalties = []
death.time = datetime.time(0, 0)
hour_spin = app.ui.get_object('death_hour_spin')
min_spin = app.ui.get_object('death_min_spin')
# Set time of death
hour_spin.set_value(death.time.hour)
min_spin.set_value(death.time.minute)
# Set Enemy
if death.enemy:
index = util.get_index_of_combo_model(app.ui.get_object('edit_death_enemy_combo'), 0, death.enemy.id)
app.ui.get_object('edit_death_enemy_combo').set_active(index)
# Set player
if death.player:
index = util.get_index_of_combo_model(app.ui.get_object('edit_death_player_combo'), 0, death.player.id)
app.ui.get_object('edit_death_player_combo').set_active(index)
# Set shot size
if death.penalties:
app.ui.get_object('edit_death_size_spin').set_value(death.penalties[0].size)
# Set info comment
app.ui.get_object('edit_death_comment_entry').set_text(death.info)
# Set penalties
default_drink = app.drinks.data[0].name
store = app.ui.get_object('player_penalties_store')
store.clear()
if death.penalties:
for penalty in death.penalties:
store.append([penalty.id, penalty.player.name, penalty.drink.name, penalty.player.id])
else:
for player in app.ui.get_object('episode_players_store'):
store.append([None, player[1], default_drink, player[0]])
# Run the dialog # Run the dialog
dialog = app.ui.get_object("edit_death_dialog") # type: Gtk.Dialog dialog = app.ui.get_object("edit_death_dialog") # type: Gtk.Dialog
result = dialog.run() result = dialog.run()
@@ -145,14 +109,18 @@ def edit_death(app: 'gtk_ui.GtkUi', death: 'models.Death'=None):
if result != Gtk.ResponseType.OK: if result != Gtk.ResponseType.OK:
return None return None
death = models.Death()
hour_spin = app.ui.get_object('death_hour_spin')
min_spin = app.ui.get_object('death_min_spin')
# Parse the inputs # Parse the inputs
death.time = datetime.time(int(hour_spin.get_value()), int(min_spin.get_value())) death.time = datetime.time(int(hour_spin.get_value()), int(min_spin.get_value()))
death.enemy = util.get_combo_value(app.ui.get_object('edit_death_enemy_combo'), 4) death.enemy = util.get_combo_value(app.ui.get_object('edit_death_enemy_combo'), 4)
death.player = util.get_combo_value(app.ui.get_object('edit_death_player_combo'), 0) death.player = util.get_combo_value(app.ui.get_object('edit_death_player_combo'), 0)
death.info = app.ui.get_object('edit_death_comment_entry').get_text() death.info = app.ui.get_object('edit_death_comment_entry').get_text()
death.episode = app.get_selected_episode_id()
store = app.ui.get_object('player_penalties_store') store = app.ui.get_object('player_penalties_store')
size = app.ui.get_object('edit_death_size_spin').get_value() size = app.ui.get_object('edit_death_size_spin').get_value()
death.penalties.clear() death.penalties = []
for entry in store: for entry in store:
drink_id = [drink.id for drink in app.drinks.data if drink.name == entry[2]][0] drink_id = [drink.id for drink in app.drinks.data if drink.name == entry[2]][0]
penalty = models.Penalty({'id': entry[0], 'size': size, 'drink': drink_id, 'player': entry[3]}) penalty = models.Penalty({'id': entry[0], 'size': size, 'drink': drink_id, 'player': entry[3]})
@@ -161,43 +129,24 @@ def edit_death(app: 'gtk_ui.GtkUi', death: 'models.Death'=None):
return death return death
def show_edit_victory_dialog(builder: Gtk.Builder, episode_id: int, victory): def create_victory(app: 'gtk_ui.GtkUi'):
pass """Show a dialog for creating victory events
# """Show a dialog for editing or creating victory events. :param app: Reference to main gtk ui object
# :param builder: A Gtk.Builder object :return: Created victory object or None, if canceled
# :param episode_id: ID to witch the victory event belongs to """
# :param victory: (Optional) Victory event witch should be edited dialog = app.ui.get_object('edit_victory_dialog')
# :return: Gtk.ResponseType of the dialog result = dialog.run()
# """ dialog.hide()
# dialog = builder.get_object("edit_victory_dialog") # type: Gtk.Dialog if result != Gtk.ResponseType.OK:
# dialog.set_transient_for(builder.get_object("main_window")) return None
# with sql.db.atomic():
# if victory: hour_spin = app.ui.get_object('vic_hour_spin')
# infos = [['edit_victory_player_combo', victory.player.id], min_spin = app.ui.get_object('vic_min_spin')
# ['edit_victory_enemy_combo', victory.enemy.id]] victory = models.Victory()
# for info in infos: victory.episode = app.get_selected_episode_id()
# combo = builder.get_object(info[0]) victory.info = app.ui.get_object('victory_comment_entry').get_text()
# index = util.get_index_of_combo_model(combo, 0, info[1]) victory.player = util.get_combo_value(app.ui.get_object('edit_victory_player_combo'), 0)
# combo.set_active(index) victory.enemy = util.get_combo_value(app.ui.get_object('edit_victory_enemy_combo'), 4)
# builder.get_object('victory_comment_entry').set_text(victory.info) victory.time = datetime.time(int(hour_spin.get_value()), int(min_spin.get_value()))
#
# # Run the dialog return victory
# result = dialog.run()
# dialog.hide()
# if result != Gtk.ResponseType.OK:
# sql.db.rollback()
# return result
#
# # Collect info from widgets and save to database
# player_id = util.get_combo_value(builder.get_object('edit_victory_player_combo'), 0)
# enemy_id = util.get_combo_value(builder.get_object('edit_victory_enemy_combo'), 3)
# comment = builder.get_object('victory_comment_entry').get_text()
# if not victory:
# sql.Victory.create(episode=episode_id, player=player_id, enemy=enemy_id, info=comment)
# else:
# victory.player = player_id
# victory.enemy = enemy_id
# victory.info = comment
# victory.save()
#
# return result

13
dsst/dsst_gtk3/gtk_ui.py
View File

@@ -65,22 +65,27 @@ class GtkUi:
def update_enemy(self, enemy: 'models.Enemy'): def update_enemy(self, enemy: 'models.Enemy'):
with util.network_operation(self): with util.network_operation(self):
self.data_client.send_request('update_enemy', enemy) self.data_client.send_request('update_enemy', enemy)
self.full_reload() self.full_reload()
def update_player(self, player: 'models.Player'): def update_player(self, player: 'models.Player'):
with util.network_operation(self): with util.network_operation(self):
self.data_client.send_request('update_player', player) self.data_client.send_request('update_player', player)
self.full_reload() self.full_reload()
def update_drink(self, drink: 'models.Drink'): def update_drink(self, drink: 'models.Drink'):
with util.network_operation(self): with util.network_operation(self):
self.data_client.send_request('update_drink', drink) self.data_client.send_request('update_drink', drink)
self.full_reload() self.full_reload()
def save_death(self, death: 'models.Death'): def save_death(self, death: 'models.Death'):
with util.network_operation(self): with util.network_operation(self):
self.data_client.send_request('save_death', death) self.data_client.send_request('save_death', death)
self.full_reload() self.full_reload()
def save_victory(self, victory: 'models.Victory'):
with util.network_operation(self):
self.data_client.send_request('save_victory', victory)
self.full_reload()
def update_season(self, season: 'models.Season'): def update_season(self, season: 'models.Season'):
with util.network_operation(self): with util.network_operation(self):

2
dsst/dsst_gtk3/handlers/death_handlers.py
View File

@@ -11,7 +11,7 @@ class DeathHandlers:
ep_id = self.app.get_selected_episode_id() ep_id = self.app.get_selected_episode_id()
if not ep_id: if not ep_id:
return return
death = dialogs.edit_death(self.app) death = dialogs.create_death(self.app)
if death: if death:
self.app.save_death(death) self.app.save_death(death)

8
dsst/dsst_gtk3/handlers/victory_handlers.py
View File

@@ -1,5 +1,5 @@
from gi.repository import Gtk from gi.repository import Gtk
from dsst_gtk3 import dialogs from dsst_gtk3 import dialogs, gtk_ui
class VictoryHandlers: class VictoryHandlers:
@@ -11,6 +11,6 @@ class VictoryHandlers:
ep_id = self.app.get_selected_episode_id() ep_id = self.app.get_selected_episode_id()
if not ep_id: if not ep_id:
return return
result = dialogs.show_edit_victory_dialog(self.app.ui, ep_id) victory = dialogs.create_victory(self.app)
if result == Gtk.ResponseType.OK: if victory:
self.app.full_reload() self.app.save_victory(victory)

5
dsst/dsst_gtk3/reload.py
View File

@@ -81,13 +81,14 @@ def reload_episode_stats(app: 'gtk_ui.GtkUi'):
penalties = [x.drink.name for x in death.penalties] penalties = [x.drink.name for x in death.penalties]
penalties = ['{}x {}'.format(number, drink) for drink, number in Counter(penalties).items()] penalties = ['{}x {}'.format(number, drink) for drink, number in Counter(penalties).items()]
penalty_string = ', '.join(penalties) penalty_string = ', '.join(penalties)
time_string = '{}:{}'.format(death.time.hour, death.time.minute) time_string = '{:02d}:{:02d}'.format(death.time.hour, death.time.minute)
store.append([death.id, death.player.name, death.enemy.name, penalty_string, time_string]) store.append([death.id, death.player.name, death.enemy.name, penalty_string, time_string])
# Reload victory store for notebook view # Reload victory store for notebook view
store = app.ui.get_object('episode_victories_store') store = app.ui.get_object('episode_victories_store')
store.clear() store.clear()
for victory in episode.victories: for victory in episode.victories:
store.append([victory.id, victory.player.name, victory.enemy.name, victory.info]) time_string = '{:02d}:{:02d}'.format(victory.time.hour, victory.time.minute)
store.append([victory.id, victory.player.name, victory.enemy.name, victory.info, time_string])
# Stat grid # Stat grid
app.ui.get_object('ep_stat_title').set_text('Stats for episode {}\n{}'.format(episode.number, episode.name)) app.ui.get_object('ep_stat_title').set_text('Stats for episode {}\n{}'.format(episode.number, episode.name))

497
dsst/dsst_gtk3/resources/glade/window.glade
View File

@@ -65,204 +65,6 @@
<column type="gchararray"/> <column type="gchararray"/>
</columns> </columns>
</object> </object>
<object class="GtkDialog" id="edit_victory_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Edit Victory Event</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="deletable">False</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="okButtonRename5">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancelButtonRename1">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="label" translatable="yes">Enemy</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="edit_victory_enemy_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">enemy_season_store</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="label" translatable="yes">Player</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="edit_victory_player_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">episode_players_store</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Comment</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="victory_comment_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-5">okButtonRename5</action-widget>
<action-widget response="-6">cancelButtonRename1</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkListStore" id="episode_victories_store"> <object class="GtkListStore" id="episode_victories_store">
<columns> <columns>
<!-- column-name victory_id --> <!-- column-name victory_id -->
@@ -273,6 +75,8 @@
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name comment --> <!-- column-name comment -->
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name time -->
<column type="gchararray"/>
</columns> </columns>
</object> </object>
<object class="GtkListStore" id="episodes_store"> <object class="GtkListStore" id="episodes_store">
@@ -613,6 +417,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="model">episodes_store</property> <property name="model">episodes_store</property>
<property name="enable_search">False</property>
<property name="search_column">0</property> <property name="search_column">0</property>
<signal name="row-activated" handler="on_episode_double_click" swapped="no"/> <signal name="row-activated" handler="on_episode_double_click" swapped="no"/>
<child internal-child="selection"> <child internal-child="selection">
@@ -1069,6 +874,17 @@
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection"/> <object class="GtkTreeSelection"/>
</child> </child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Time</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Player</property> <property name="title" translatable="yes">Player</property>
@@ -2140,6 +1956,289 @@
<placeholder/> <placeholder/>
</child> </child>
</object> </object>
<object class="GtkDialog" id="edit_victory_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Create Victory Event</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="deletable">False</property>
<property name="transient_for">main_window</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="okButtonRename5">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancelButtonRename1">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="label" translatable="yes">Time</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkSpinButton" id="vic_hour_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">2</property>
<property name="text" translatable="yes">0</property>
<property name="input_purpose">number</property>
<property name="adjustment">hour_adjustment</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="vic_min_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">2</property>
<property name="text" translatable="yes">0</property>
<property name="input_purpose">number</property>
<property name="adjustment">minute_adjustment</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="label" translatable="yes">Enemy</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="edit_victory_enemy_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">enemy_season_store</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="label" translatable="yes">Player</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="edit_victory_player_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">episode_players_store</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Comment</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="victory_comment_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-5">okButtonRename5</action-widget>
<action-widget response="-6">cancelButtonRename1</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkDialog" id="manage_drinks_dialog"> <object class="GtkDialog" id="manage_drinks_dialog">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">Manage Drinks</property> <property name="title" translatable="yes">Manage Drinks</property>
@@ -2794,7 +2893,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property> <property name="pack_type">end</property>
<property name="position">1</property> <property name="position">1</property>

1
dsst/dsst_server/data_access/sql.py
View File

@@ -95,6 +95,7 @@ class Penalty(Model):
class Victory(Model): class Victory(Model):
id = AutoField() id = AutoField()
info = CharField(null=True) info = CharField(null=True)
time = TimeField(default=datetime.time(0, 0))
player = ForeignKeyField(Player) player = ForeignKeyField(Player)
enemy = ForeignKeyField(Enemy) enemy = ForeignKeyField(Enemy)
episode = ForeignKeyField(Episode, backref='victories') episode = ForeignKeyField(Episode, backref='victories')

7
dsst/dsst_server/func_write.py
View File

@@ -42,6 +42,13 @@ class WriteFunctions:
for penalty in death.penalties: for penalty in death.penalties:
sql.Penalty.create(death=created_id, size=penalty.size, drink=penalty.drink, player=penalty.player) sql.Penalty.create(death=created_id, size=penalty.size, drink=penalty.drink, player=penalty.player)
@staticmethod
def save_victory(victory: 'models.Victory'):
(sql.Victory
.insert(info=victory.info, player=victory.player, enemy=victory.enemy, time=victory.time,
episode=victory.episode, id=victory.id)
.execute())
@staticmethod @staticmethod
def update_season(season: 'models.Season', *_): def update_season(season: 'models.Season', *_):
(sql.Season (sql.Season