bugfixed time saved in db tables

L'heure sauvegardée dans les tables weatherwatch et sitewatch (updated) était en UTC alors que le django setting est en UTC+1 (France). C'est maintenant la bonne heure qui est sauvée !!!

bugfixed time saved in db tables
L'heure sauvegardée dans les tables weatherwatch et sitewatch (updated) était en UTC alors que le django setting est en UTC+1 (France). C'est maintenant la bonne heure qui est sauvée !!!
Etienne Pallier
1 parent b4e8963c
Showing 6 changed files with 27 additions and 6 deletions Show diff stats
README.md
pyros.py
simulators/plc/plcSimulator.py
src/monitoring/start_agent_monitoring.py
src/monitoring/tasks.py
src/pyros/settings.py
@@ -64,7 +64,7 @@ LAST VERSION
  
 Date: 13/03/2018
 By: E. Pallier
-Version: 0.16.7
+Version: 0.16.8
 - each agent (envmonitor, majordome, alert) can be started independently with a script (new script start_agent in each agent directory)
 - new command "pyros start" to start pyros in different ways (different options : everything or only some components)
  
+#!/usr/bin/env python3
+
 import sys
 import os
 import subprocess
+#!/usr/bin/env python3
+
 import os
 import sys
 import json
@@ -13,8 +13,12 @@ os.environ.setdefault(&quot;DJANGO_SETTINGS_MODULE&quot;, &quot;src.pyros.settings&quot;)
 #os.environ['SECRET_KEY'] = 'abc'
 #os.environ['ENVIRONMENT'] = 'production'
 import django
+
 django.setup()
  
+#import datetime
+#print(datetime.datetime.now())
+
 # MONITORING AGENT setup
 agent="monitoring"
  
@@ -274,6 +274,8 @@ class Monitoring(Task):
         print("Status received from PLC (read and parsed ok):")
         print(status_plc)
         #return self.saveStatus()
+        #print(datetime.datetime.now())
+
         self.saveStatus()
         return True
  
@@ -142,7 +142,7 @@ if not CELERY_TEST:
                 'PASSWORD': 'DjangoPyros',
             }
         }
-        
+
 # CELERY_TEST = False ==> 'TEST' RUN MODE, use pyros_test database     
 else:
     DATABASES = {
@@ -178,16 +178,27 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
  
-LANGUAGE_CODE = 'en-us'
  
-TIME_ZONE = 'UTC'
+#LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'fr-FR'
+
+#TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Paris'
  
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
 USE_I18N = True
  
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale.
 USE_L10N = True
  
-USE_TZ = True
-
+# EP change
+# If you set this to False, Django will not use timezone-aware datetimes.
+# If true => "updated" fields in weatherwatch or sitewatch will be saved as UTC time
+# If false => "updated" fields in weatherwatch or sitewatch will be saved as UTC+1 time (French time)
+#USE_TZ = True
+USE_TZ = False
  
 # To find the media files {{ MEDIA_URL }}
 MEDIA_URL = '/public/static/media/'