Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added feature of displaying changes of user login time in local timezone and resolved some other issues. #6

Merged
merged 2 commits into from
Dec 12, 2019
Merged

Added feature of displaying changes of user login time in local timezone and resolved some other issues. #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf2222e
Update mixins.py
Ankitashinde0 Dec 11, 2019
08bc5eb
Update mixins.py
Ankitashinde0 Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions src/auditlog/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
from .middleware import AuditlogMiddleware
import threading
import time
import requests
from auditlog.models import LogEntry
import pytz


try:
Expand All @@ -31,7 +34,7 @@ def disp_remote_addr(self,obj):

class LogEntryAdminMixin(object):

#GOIP API used to get user location details.
#GEOIP API used to get user location details.
headers = {
'accept': "application/json",
'content-type': "application/json"
Expand All @@ -41,14 +44,13 @@ class LogEntryAdminMixin(object):
tz_from_response = response_dict["time_zone"]

def created(self, obj):
Audit_data = LogEntry.objects.all()
for audit_obj in Audit_data:
new_ts = audit_obj.timestamp.strftime("%m/%d/%Y %I:%M %p")
new_ts = audit_obj.timestamp.strptime(new_ts,"%m/%d/%Y %I:%M %p")
system_tz = pytz.timezone('UTC')
local_tz = pytz.timezone(LogEntryAdminMixin.tz_from_response) #local tz set as timezone from response
local_ts = system_tz.localize(new_ts).astimezone(local_tz) #returns datetime in the local timezone
return obj.timestamp.strftime('%b. %d, %Y, %I:%M %p') #Displays date in diff format
new_ts = obj.timestamp.strftime("%m/%d/%Y %I:%M %p")
new_ts = obj.timestamp.strptime(new_ts,"%m/%d/%Y %I:%M %p")
system_tz = pytz.timezone(settings.TIME_ZONE)
local_tz = pytz.timezone(LogEntryAdminMixin.tz_from_response) #local tz set as timezone from response
local_ts = system_tz.localize(new_ts).astimezone(local_tz) #returns datetime in the local timezone
local_ts = local_ts.strftime("%m/%d/%Y %I:%M %p")
return local_ts
created.short_description = 'Date'

def entity_type(self,obj):
Expand Down Expand Up @@ -84,9 +86,6 @@ def resource_url(self, obj):
link = urlresolvers.reverse(viewname, args=args)
except NoReverseMatch:
obj_store = obj.object_repr
print('obj_store---- in alice test----',obj_store)
print("type(obj_store-----1st in alice test----",type(obj_store))
print(obj_store.isnumeric())
return obj.object_repr
else:
obj_store = str(obj.object_repr)
Expand Down Expand Up @@ -118,13 +117,17 @@ def msg(self, obj):
#changes for last_login field in logging entries
if field == 'last_login':
for i in range(len(changes[field])): #iterating list
system_tz = pytz.timezone(settings.TIME_ZONE)
local_tz = pytz.timezone(LogEntryAdminMixin.tz_from_response) #local tz set as timezone from response
ologin_date = changes[field][0] #storing value at index 0 as old login date
ologin_date = datetime.datetime.strptime(ologin_date, '%Y-%m-%d %H:%M:%S.%f') #converting string into datetime obj
ologin_date = ologin_date.strftime("%m/%d/%Y %I:%M %p") #converting date into string type
nlogin_date = changes[field][1] #storing value at index 1 as new login date
nlogin_date = datetime.datetime.strptime(nlogin_date, '%Y-%m-%d %H:%M:%S.%f') #converting string into datetime obj
nlogin_date = nlogin_date.strftime("%m/%d/%Y %I:%M %p") #converting date into string type
value = [i,field] + [ologin_date,nlogin_date]
ologin_date = datetime.datetime.strptime(ologin_date, "%Y-%m-%d %H:%M:%S.%f") #from str to dt obj
local_ologin_date = system_tz.localize(ologin_date).astimezone(local_tz) #returns datetime in the local timezone
local_ologin_date = local_ologin_date.strftime("%m/%d/%Y %I:%M %p") #converting date into string type
nlogin_date = changes[field][1] #storing value at index 0 as old login date
nlogin_date = datetime.datetime.strptime(nlogin_date, "%Y-%m-%d %H:%M:%S.%f") #from str to dt obj
local_nlogin_date = system_tz.localize(nlogin_date).astimezone(local_tz) #returns datetime in the local timezone
local_nlogin_date = local_nlogin_date.strftime("%m/%d/%Y %I:%M %p") #converting date into string type
value = [i,field] + [local_ologin_date,local_nlogin_date]
msg += '<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>' % tuple(value)
msg += '</table>'
return mark_safe(msg) #mark_safe is used to return html code in Python
Expand Down