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 0000000..b2d43e2 Binary files /dev/null and b/app/static/img/favicon.ico differ diff --git a/app/static/img/ts3_viewer/1165367857.png b/app/static/img/ts3_viewer/1165367857.png new file mode 100644 index 0000000..a0c0105 Binary files /dev/null and b/app/static/img/ts3_viewer/1165367857.png differ 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 @@ 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 @@