edit_event timezones, admin ts icon, fix ts3_award_points
This commit is contained in:
parent
73f7f9e567
commit
8dbfaadc02
@ -100,6 +100,7 @@ class User(db.Model):
|
|||||||
self.random_heroes = {'current':None, 'completed':[]}
|
self.random_heroes = {'current':None, 'completed':[]}
|
||||||
self.az_completions = 0
|
self.az_completions = 0
|
||||||
self.ts3_connections = {'list':[]}
|
self.ts3_connections = {'list':[]}
|
||||||
|
self.ts3_rewardtime = datetime.utcnow()
|
||||||
self.created = datetime.utcnow()
|
self.created = datetime.utcnow()
|
||||||
self.last_seen = datetime.utcnow()
|
self.last_seen = datetime.utcnow()
|
||||||
self.bio_text = None
|
self.bio_text = None
|
||||||
@ -154,14 +155,14 @@ class User(db.Model):
|
|||||||
self.ts3_endtime = now
|
self.ts3_endtime = now
|
||||||
# Add general TS3 points here
|
# Add general TS3 points here
|
||||||
if self.ts3_endtime and self.ts3_rewardtime:
|
if self.ts3_endtime and self.ts3_rewardtime:
|
||||||
duration = (self.ts3_endtime - self.ts3_rewardtime) / 60.0
|
delta = (self.ts3_endtime - self.ts3_rewardtime)
|
||||||
|
duration = (delta.seconds % 3600) // 60
|
||||||
if duration > reward_threshold:
|
if duration > reward_threshold:
|
||||||
self.ts3_rewardtime = datetime.utcnow()
|
self.ts3_rewardtime = datetime.utcnow()
|
||||||
self.points_from_ts3 += 1
|
self.points_from_ts3 += 1
|
||||||
else:
|
else:
|
||||||
self.ts3_rewardtime = datetime.utcnow()
|
self.ts3_rewardtime = datetime.utcnow()
|
||||||
self.last_seen = datetime.utcnow()
|
self.last_seen = datetime.utcnow()
|
||||||
print self.ts3_starttime, self.ts3_endtime, self.ts3_rewardtime
|
|
||||||
db.session.commit();
|
db.session.commit();
|
||||||
|
|
||||||
def finalize_connection(self):
|
def finalize_connection(self):
|
||||||
|
BIN
app/static/img/favicon.ico
Normal file
BIN
app/static/img/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
BIN
app/static/img/ts3_viewer/1165367857.png
Normal file
BIN
app/static/img/ts3_viewer/1165367857.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 501 B |
@ -65,13 +65,14 @@
|
|||||||
<link rel=stylesheet href="//cdnjs.cloudflare.com/ajax/libs/uikit/2.4.0/addons/datepicker/datepicker.gradient.css"></link>
|
<link rel=stylesheet href="//cdnjs.cloudflare.com/ajax/libs/uikit/2.4.0/addons/datepicker/datepicker.gradient.css"></link>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
var s = $("#start_time").val().split(" ");
|
var tz = new Date().getTimezoneOffset();
|
||||||
var e = $("#end_time").val().split(" ");
|
var s = moment.utc($("#start_time").val(), "DD.MM.YYYY HH:mm").zone(tz);
|
||||||
|
var e = moment.utc($("#end_time").val(), "DD.MM.YYYY HH:mm").zone(tz);
|
||||||
|
|
||||||
$("#start_d").val(s[0]);
|
$("#start_d").val(s.format("DD.MM.YYYY"));
|
||||||
$("#start_t").val(s[1]);
|
$("#start_t").val(s.format("HH:mm"));
|
||||||
$("#end_d").val(e[0]);
|
$("#end_d").val(e.format("DD.MM.YYYY"));
|
||||||
$("#end_t").val(e[1]);
|
$("#end_t").val(e.format("HH:mm"));
|
||||||
});
|
});
|
||||||
|
|
||||||
$(".uk-form").submit(function(event) {
|
$(".uk-form").submit(function(event) {
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
<!-- CSS includes -->
|
<!-- CSS includes -->
|
||||||
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/uikit/2.8.0/css/uikit.gradient.min.css" />
|
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/uikit/2.8.0/css/uikit.gradient.min.css" />
|
||||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/app.css') }}" />
|
<link rel="stylesheet" href="{{ url_for('static', filename='css/app.css') }}" />
|
||||||
|
<link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.ico') }}">
|
||||||
|
|
||||||
<!-- Javascript includes -->
|
<!-- Javascript includes -->
|
||||||
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
|
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
|
||||||
|
@ -63,15 +63,15 @@
|
|||||||
<tbody class="uk-text-small">
|
<tbody class="uk-text-small">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="uk-width-4-10">TS Points</td>
|
<td class="uk-width-4-10">TS Points</td>
|
||||||
<td class="uk-width-6-10 uk-text-right">0</td>
|
<td class="uk-width-6-10 uk-text-right">{{ user.points_from_ts3 }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Events Points</td>
|
<td>Events Points</td>
|
||||||
<td class="uk-text-right">0</td>
|
<td class="uk-text-right">{{ user.points_from_events }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Forum Points</td>
|
<td>Forum Points</td>
|
||||||
<td class="uk-text-right">0</td>
|
<td class="uk-text-right">{{ user.points_from_forum }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Last Seen</td>
|
<td>Last Seen</td>
|
||||||
@ -83,8 +83,13 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
{% if not user.winrate_data['data'] %}
|
||||||
|
<h3 class="uk-text-warning">No data compiled, check back tomorrow!</h3>
|
||||||
|
<button class="uk-button uk-button-success uk-align-center" data-uk-modal="{target: '#winrate_modal'}" disabled>View Winrate</button>
|
||||||
|
{% else %}
|
||||||
<button class="uk-button uk-button-success uk-align-center" data-uk-modal="{target: '#winrate_modal'}">View Winrate</button>
|
<button class="uk-button uk-button-success uk-align-center" data-uk-modal="{target: '#winrate_modal'}">View Winrate</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -99,7 +104,6 @@
|
|||||||
|
|
||||||
{% block pagescripts %}
|
{% block pagescripts %}
|
||||||
<script src="http://code.highcharts.com/highcharts.js"></script>
|
<script src="http://code.highcharts.com/highcharts.js"></script>
|
||||||
{% cache 60*700 %}
|
|
||||||
<script>
|
<script>
|
||||||
$('#winrate_modal').on({
|
$('#winrate_modal').on({
|
||||||
'uk.modal.show': function(){
|
'uk.modal.show': function(){
|
||||||
@ -130,5 +134,4 @@
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
{% endcache %}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
1
run.py
1
run.py
@ -70,7 +70,6 @@ def admin(name):
|
|||||||
@manager.command
|
@manager.command
|
||||||
def calc_winrates():
|
def calc_winrates():
|
||||||
from app.analytics import calculate_winrates
|
from app.analytics import calculate_winrates
|
||||||
tsServer = createTeamspeakInstance()
|
|
||||||
calculate_winrates()
|
calculate_winrates()
|
||||||
|
|
||||||
@manager.command
|
@manager.command
|
||||||
|
Loading…
x
Reference in New Issue
Block a user