From 8dbfaadc02ab5288ea795ee9b844c173f41920e3 Mon Sep 17 00:00:00 2001
From: binaryatrocity <brandon.cornejo@gmail.com>
Date: Fri, 25 Jul 2014 11:40:33 -0500
Subject: [PATCH] edit_event timezones, admin ts icon, fix ts3_award_points

---
 app/models.py                            |   5 +++--
 app/static/img/favicon.ico               | Bin 0 -> 1150 bytes
 app/static/img/ts3_viewer/1165367857.png | Bin 0 -> 501 bytes
 app/templates/edit_event.html            |  13 +++++++------
 app/templates/layout.html                |   1 +
 app/templates/profile.html               |  13 ++++++++-----
 run.py                                   |   1 -
 7 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 app/static/img/favicon.ico
 create mode 100644 app/static/img/ts3_viewer/1165367857.png

diff --git a/app/models.py b/app/models.py
index bad7a56..6645d5a 100644
--- a/app/models.py
+++ b/app/models.py
@@ -100,6 +100,7 @@ class User(db.Model):
             self.random_heroes = {'current':None, 'completed':[]}
             self.az_completions = 0
             self.ts3_connections = {'list':[]}
+            self.ts3_rewardtime = datetime.utcnow()
             self.created = datetime.utcnow()
             self.last_seen = datetime.utcnow()
             self.bio_text = None 
@@ -154,14 +155,14 @@ class User(db.Model):
             self.ts3_endtime = now
             # Add general TS3 points here
             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:
                     self.ts3_rewardtime = datetime.utcnow()
                     self.points_from_ts3 += 1
                 else:
                     self.ts3_rewardtime = datetime.utcnow()
             self.last_seen = datetime.utcnow()
-            print self.ts3_starttime, self.ts3_endtime, self.ts3_rewardtime
             db.session.commit();
 
         def finalize_connection(self):
diff --git a/app/static/img/favicon.ico b/app/static/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b2d43e29af7ae8fa25c1ddb3203f77bb01fd2901
GIT binary patch
literal 1150
zcmaKsdu&rx9LK-y>Toi`X!o*Z>)Nfiy?v~`z4mr}+_t0b#@61}mI9aXaDyclrhyTI
zyt_>U#2HL<L<Itoknmc}vKSE)!8wf~#`uZ}=sz+sQMRBa#-Pz1&q`w4Fgquo^Z5OK
z-;?tO6f{><fR+u&tAJ_%778^{%Y8eo0P0gOzE82gKw&i7QQv4$8B8{Xk+Cfh`JhXu
zG(cC+K)c)|=;|09<-wo@EH!Z!m8?Of4ciO#n;&yE$O5W%nu`j}v1a_2`NLGb#-aLE
z9+ksfQ2$2w2g6A8YRz7k?FjT>E~Ma?*rYa&b#m3mc~#9RVZI#oqfzL`;)}HB#S4~q
z)5LNvL6#@o-x?aZ?k1t7i5uOVuzj?lc^CN++Oxqq`bHZM<LhlO9*(hwBP(t*y-~tQ
zA!6wCO&PqNjFIKlj%P9tmD7{zn0#rDmUV~V^tCA%XV7Ni1D8$y;NNCmB(_3|SgzzI
z*^gxd`=LBXGuz?5%2!(7Ti4!ns<Yd)J`yxr0wJrsa>6yzMZB+c6K-RgSofyx*?XmJ
zE?AY$me`yzJl||@6u#cR&2??dI_CKfwg1lp5Z>wC>YLn69-lr+r13#wPbY|7h+T7d
zV@oLriD9&cTXFu_FqWw`&}b^bn62O=X-H%gfw%geYyIUAS@Zh|BL8-hcrW%6S2Q`s
zyF1GGa1txy?Z`=K$k{AvYad0pH4dL&1Q*F*8BpRM$X`r+F+|qiI6>ClJx!8#he=@n
zlRxu5sm&2fV#$s;65(8N9mXazT6{qS#Rxoc86I&}snEXqxHl(XcRrQ<z;$)Y+v(|-
z&t=D79PmW5Ydq0RyR~1EOe3j5_I)`}r#FJNI-nV(cl<gO?p(&z5?`Bj3#r9b2OW=;
z4QWf28&yiGfo;E}ww_rv<h<Oq+VkntJ;Kc$;_M`Rw{{^q^FoR1lb)USOY%PFhNS5L
zE}{HQ)4zLd|Evq;W30k^qi<92`+Yrx5QNCtqCYg%kI-~~srXYt7H;-Mn#Z3Q;6BeU
zaeuj$z9BuTYqdr4WCC5}3NkZil#xFUVg9T1O+E|%?LDR9orC_+okE#7Re-Kek1DF4
v<^R%50hr~lJruh6_ev;>fbaA)dMWU58L*pDLEFXuqyd<?1&njRuVLUHo(Tgf

literal 0
HcmV?d00001

diff --git a/app/static/img/ts3_viewer/1165367857.png b/app/static/img/ts3_viewer/1165367857.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c0105810705269046bbfabb81eacf81d4c79fe
GIT binary patch
literal 501
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqJ0BaT`mrcJAE1zIW=KSdbAE1aYF-JD%fR4Vl$uzQ
znxasiS(2gP?&%wlqL<3fz`z*k>Eak-aeC?Gy?#uA0<HTa!!|f5vxY3#xOmI*4TfR+
znvVTo*w;99T3B27NA~}VN<xlwv2aU^HXrRewqp0YzN3e#$|JS%%qJH=n`ikwhH;8!
zA8)|Dc!ri|-?S7Og3f+Vu!wDY5VTiXP_*J!@rFZAi_&ggoKj_S#YoYpamJh3TSd)|
zC}i?zaI$)uhV42s;Z<&FA-8T_`MYH2s}F8?dMcZLIqtrmJ+ai%;jY51*h`{EN?)91
zuwzbH%ph;)___8ISJIv%93pcp61ZnJyPjx}vtF5>+S?=CyrxlT&R)f>mTQ(qE-~{j
zcqOpHtxer#!ijpuTe<AN<ZgX0;9mQ}?EOXc@Qulq8;-vfJ|~^XW$b?1qmZrk>xXjr
zAFp;i(JDLRQf(7^%5^dOQ=MyRnoPgj&)1aOM5xC$N_efyyT0OCe1LM;&E2A1U*82R
pKH}@c|6%_|p~WX7)-3;Zu6|ut+tl80ejQNgd%F6$taD0e0sxc8$kPA-

literal 0
HcmV?d00001

diff --git a/app/templates/edit_event.html b/app/templates/edit_event.html
index b7a8fd9..5f6205f 100644
--- a/app/templates/edit_event.html
+++ b/app/templates/edit_event.html
@@ -65,13 +65,14 @@
 <link rel=stylesheet href="//cdnjs.cloudflare.com/ajax/libs/uikit/2.4.0/addons/datepicker/datepicker.gradient.css"></link>
 <script>
     $(document).ready(function(){
-        var s = $("#start_time").val().split(" ");
-        var e = $("#end_time").val().split(" ");
+        var tz = new Date().getTimezoneOffset();
+        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_t").val(s[1]);
-        $("#end_d").val(e[0]);
-        $("#end_t").val(e[1]);
+        $("#start_d").val(s.format("DD.MM.YYYY"));
+        $("#start_t").val(s.format("HH:mm"));
+        $("#end_d").val(e.format("DD.MM.YYYY"));
+        $("#end_t").val(e.format("HH:mm"));
     });
 
     $(".uk-form").submit(function(event) {
diff --git a/app/templates/layout.html b/app/templates/layout.html
index 755648b..91461e0 100644
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -12,6 +12,7 @@
         <!-- CSS includes -->
         <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="shortcut icon" href="{{ url_for('static', filename='img/favicon.ico') }}">
 
         <!-- Javascript includes -->
         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
diff --git a/app/templates/profile.html b/app/templates/profile.html
index 2a61d39..878748c 100644
--- a/app/templates/profile.html
+++ b/app/templates/profile.html
@@ -63,15 +63,15 @@
             <tbody class="uk-text-small">
                 <tr>
                     <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>
                     <td>Events Points</td>
-                    <td class="uk-text-right">0</td>
+                    <td class="uk-text-right">{{ user.points_from_events }}</td>
                 </tr>
                 <tr>
                     <td>Forum Points</td>
-                    <td class="uk-text-right">0</td>
+                    <td class="uk-text-right">{{ user.points_from_forum }}</td>
                 </tr>
                 <tr>
                     <td>Last Seen</td>
@@ -83,8 +83,13 @@
                 </tr>
             </tbody>
         </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>
         {% endif %}
+        {% endif %}
     </div>
 </div>
 
@@ -99,7 +104,6 @@
 
 {% block pagescripts %}
 <script src="http://code.highcharts.com/highcharts.js"></script>
-{% cache 60*700 %}
 <script>
     $('#winrate_modal').on({
         'uk.modal.show': function(){
@@ -130,5 +134,4 @@
         });
     });
 </script>
-{% endcache %}
 {% endblock %}
diff --git a/run.py b/run.py
index b603c46..35473d0 100755
--- a/run.py
+++ b/run.py
@@ -70,7 +70,6 @@ def admin(name):
 @manager.command
 def calc_winrates():
     from app.analytics import calculate_winrates
-    tsServer = createTeamspeakInstance()
     calculate_winrates()
 
 @manager.command