diff --git a/amadeus/settings.py b/amadeus/settings.py index e733a04..0075afc 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -72,6 +72,7 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.locale.LocaleMiddleware', + 'core.middleware.TimeSpentMiddleware', #libs-middleware ] diff --git a/amadeus/uploads/django-summernote/2016-11-03/46bdc2b1-ba27-4385-b504-89916637edca.jpg b/amadeus/uploads/django-summernote/2016-11-03/46bdc2b1-ba27-4385-b504-89916637edca.jpg new file mode 100644 index 0000000..aaf500a Binary files /dev/null and b/amadeus/uploads/django-summernote/2016-11-03/46bdc2b1-ba27-4385-b504-89916637edca.jpg differ diff --git a/amadeus/uploads/django-summernote/2016-11-03/bde587ad-9c4a-4e81-b07d-8f8aa5dced21.jpeg b/amadeus/uploads/django-summernote/2016-11-03/bde587ad-9c4a-4e81-b07d-8f8aa5dced21.jpeg new file mode 100644 index 0000000..e44fa62 Binary files /dev/null and b/amadeus/uploads/django-summernote/2016-11-03/bde587ad-9c4a-4e81-b07d-8f8aa5dced21.jpeg differ diff --git a/amadeus/uploads/django-summernote/2016-11-03/eaa22970-1d01-4deb-8232-60fd2be4f9fa.jpeg b/amadeus/uploads/django-summernote/2016-11-03/eaa22970-1d01-4deb-8232-60fd2be4f9fa.jpeg new file mode 100644 index 0000000..e44fa62 Binary files /dev/null and b/amadeus/uploads/django-summernote/2016-11-03/eaa22970-1d01-4deb-8232-60fd2be4f9fa.jpeg differ diff --git a/amadeus/uploads/links/default.jpg b/amadeus/uploads/links/default.jpg new file mode 100644 index 0000000..e13a95c Binary files /dev/null and b/amadeus/uploads/links/default.jpg differ diff --git a/amadeus/uploads/users/Captura_de_tela_de_2016-09-21_21-09-40.png b/amadeus/uploads/users/Captura_de_tela_de_2016-09-21_21-09-40.png new file mode 100644 index 0000000..61bff01 Binary files /dev/null and b/amadeus/uploads/users/Captura_de_tela_de_2016-09-21_21-09-40.png differ diff --git a/core/middleware.py b/core/middleware.py new file mode 100644 index 0000000..fe7da5e --- /dev/null +++ b/core/middleware.py @@ -0,0 +1,40 @@ +from datetime import datetime +from django.shortcuts import get_object_or_404 +import json + +from core.models import Log + +class TimeSpentMiddleware(object): + def __init__(self, get_response = None): + self.get_response = get_response + + def process_request(self, request): + log_id = request.session.get('log_id', None) + + if not log_id is None: + log = get_object_or_404(Log, id = log_id) + + date_time_click = datetime.strptime(request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f") + _now = datetime.now() + + time_spent = _now - date_time_click + + secs = time_spent.total_seconds() + hours = int(secs / 3600) + minutes = int(secs / 60) % 60 + secs = secs % 60 + + log_context = json.loads(log.context) + + log_context['time_spent'] = {} + log_context['time_spent']['hours'] = hours + log_context['time_spent']['minutes'] = minutes + log_context['time_spent']['seconds'] = secs + + log.context = json.dumps(log_context) + + log.save() + + request.session['log_id'] = None + + -- libgit2 0.21.2