diff options
| author | raylu <raylu@gridium.com> | 2013-10-24 23:05:00 -0700 |
|---|---|---|
| committer | raylu <raylu@gridium.com> | 2013-10-24 23:05:00 -0700 |
| commit | 3805dfe7bfcb9d41c074fa6d07fe300c243bf591 (patch) | |
| tree | 75e73b5401ea6bd133fa79b9bbd584d4227f56bf | |
| parent | 0187a3f26bb44c1cfcdeb5dbdd2185db8e4ba48b (diff) | |
| download | ykill-3805dfe7bfcb9d41c074fa6d07fe300c243bf591.tar.xz | |
handle {ship,fleet} hangar, fix kill_time minute
| -rw-r--r-- | db/queries.py | 6 | ||||
| -rw-r--r-- | web/static/js/kill.js | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/db/queries.py b/db/queries.py index 3e81c8f..a77fe8f 100644 --- a/db/queries.py +++ b/db/queries.py @@ -128,6 +128,10 @@ def kill(kill_id): slot = 'cargo' elif 133 <= flag <= 143: slot = 'special hold' + elif flag == 90: + slot = 'ship hangar' + elif flag == 155: + slot = 'fleet hangar' elif flag == 89: slot = 'implant' else: @@ -183,7 +187,7 @@ def top_cost(): return kills def _format_kill_time(kill_time): - return kill_time.strftime('%Y-%m-%d %H:%m') + return kill_time.strftime('%Y-%m-%d %H:%M') def _security_status(system_name, security): wspace = False diff --git a/web/static/js/kill.js b/web/static/js/kill.js index 7a5dea1..e1e601a 100644 --- a/web/static/js/kill.js +++ b/web/static/js/kill.js @@ -105,7 +105,10 @@ window.addEvent('domready', function() { new Element('td', {'html': ykill.format_isk(victim['ship_cost'])}) ) ); - var slots = ['subsystem', 'high', 'medium', 'low', 'rig', 'drone bay', 'cargo', 'special hold', 'implant', '???']; + var slots = [ + 'subsystem', 'high', 'medium', 'low', 'rig', 'drone bay', + 'cargo', 'special hold', 'ship hangar', 'fleet hangar', 'implant', '???' + ]; slots.each(function(slot) { if (!items[slot]) return; |