Merge lp:~trimardio/widelands-website/scheduler_utc_fix into lp:widelands-website

[Trimardio]

Fix the display of UTC. Currently, if there was no difference between your profile registered UTC and your browser's the text just says "you are currently noted as UTC" instead of "UTC + x"

[kaputtnik (franku)]

Looks good so far :)

+1 for renaming the function!

Can you please also take care of the '2 hours problem' which i reported in the forum? I guess it's caused by the js_offset in line 205?:

https://bazaar.launchpad.net/~trimardio/widelands-website/scheduler_utc_fix/view/head:/wlscheduling/static/js/scheduling.js#L205

[lp:~trimardio/widelands-website/scheduler_utc_fix]

543. By Trimard \<email address hidden> on 2019-06-30

fix displayed hour from other users

544. By Trimard \<email address hidden> on 2019-06-30

forbid adding of an hour that has already passed

[kaputtnik (franku)]

OK, this is merged and deployed now.

Users may have to press CTRL+F5 to reload the js.

Thanks for the fix :-)

=== modified file 'wlscheduling/static/js/scheduling.js'
--- wlscheduling/static/js/scheduling.js	2018-11-22 17:50:41 +0000
+++ wlscheduling/static/js/scheduling.js	2019-06-30 17:48:43 +0000
@@ -17,17 +17,17 @@
 
 
 // Add warning in case of disparency between browser and profil timezone
-function addTimeZoneWarningIfNeeded() {
+function addTimeZoneInfo() {
     var userTimeZone = document.getElementById('django-data').getAttribute('user-time-zone')
     var browserTimeZone = - new Date().getTimezoneOffset()/60
     if ( browserTimeZone != userTimeZone) {
         document.getElementById('timezone-error').removeAttribute("hidden");
-        profilTime = document.getElementsByClassName('profil-time');
-        for (var element in profilTime) {
-            profilTime[element].innerHTML = cleanAndAddSign(userTimeZone);
-        }
-        document.getElementById('browser-time').innerHTML = cleanAndAddSign(browserTimeZone);
-    }
+    }
+    profilTime = document.getElementsByClassName('profil-time');
+    for (var element in profilTime) {
+        profilTime[element].innerHTML = cleanAndAddSign(userTimeZone);
+    }
+    document.getElementById('browser-time').innerHTML = cleanAndAddSign(browserTimeZone);
 }
 
 function addPreviousDateFromUser(calendar) {
@@ -171,6 +171,7 @@
 }
 
 function createUserDivOrUpdateIt(user, availTime) {
+    // Create User div
     if (!document.getElementById("user-" + user)){
         var original = document.getElementById('other-user-template');
         // We clone the date and fix different attributes
@@ -201,10 +202,8 @@
     } else {
         otherUser = document.getElementById("user-" + user);
     }
+    // get exact hour from string 
     var dtavailTime = new Date(availTime + ":00:00");
-    // Remove timezone offset which js automatically add...
-    js_offset = dtavailTime.getTimezoneOffset()/60
-    dtavailTime = dtavailTime.addHours(js_offset);
     textDate = dtavailTime.toDateString();
     var dateFormated = dtavailTime.getFullYear() + "-" + dtavailTime.getMonth() + '-' + dtavailTime.getDay()
     var availTimeFormated = dtavailTime.getHours()

=== modified file 'wlscheduling/templates/wlscheduling/find.html'
--- wlscheduling/templates/wlscheduling/find.html	2018-11-09 07:00:30 +0000
+++ wlscheduling/templates/wlscheduling/find.html	2019-06-30 17:48:43 +0000
@@ -10,7 +10,7 @@
 {% block content_main %}
 <script type="text/javascript">
 document.addEventListener('DOMContentLoaded', function(){ 
-    addTimeZoneWarningIfNeeded();
+    addTimeZoneInfo();
     addOtherUsersAvailabilities();
 }, false);
 </script>

=== modified file 'wlscheduling/templates/wlscheduling/scheduling.html'
--- wlscheduling/templates/wlscheduling/scheduling.html	2018-03-11 16:12:19 +0000
+++ wlscheduling/templates/wlscheduling/scheduling.html	2019-06-30 17:48:43 +0000
@@ -12,7 +12,7 @@
 <script type="text/javascript">
 document.addEventListener('DOMContentLoaded', function(){ 
     var calendar = createCalendar();
-    addTimeZoneWarningIfNeeded();
+    addTimeZoneInfo();
     addPreviousDateFromUser(calendar);
     addOtherUsersAvailabilities();
     

=== modified file 'wlscheduling/views.py'
--- wlscheduling/views.py	2019-04-11 15:06:09 +0000
+++ wlscheduling/views.py	2019-06-30 17:48:43 +0000
@@ -26,7 +26,7 @@
     other_users_availabilities = {}
     for a in Availabilities.objects.exclude(user=current_user).order_by('avail_time'):
         user_utc_dt_avail_time = a.avail_time
-        if datetime.now() < user_utc_dt_avail_time:
+        if datetime.utcnow() < user_utc_dt_avail_time:
             other_user = a.user
             current_user_timezone = current_user.wlprofile.time_zone
             user_dt_avail_time = user_utc_dt_avail_time + timedelta(hours= current_user_timezone)
@@ -63,13 +63,13 @@
         
         for request_avail_time in request_avail_times:
             dt_avail_time = datetime.strptime(request_avail_time, TIME_FORMAT)
-            # Actual change of timezone, we got back to UTC
+            # Actual change of timezone, we go back to UTC
             utc_dt_avail_time =  dt_avail_time + timedelta(hours= - user_timezone)
             avail_time_already_exist = False
             for a in Availabilities.objects.filter(user=current_user, avail_time=utc_dt_avail_time):
                 avail_time_already_exist = True
             
-            if not avail_time_already_exist:
+            if not avail_time_already_exist and datetime.utcnow() < utc_dt_avail_time :
                 a = Availabilities.objects.create(
                     user=current_user,
                     avail_time=utc_dt_avail_time