purchase order ui chnage
This commit is contained in:
parent
caeb381319
commit
13ca8d315c
@ -8360,100 +8360,6 @@ def user_management(request):
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# def AuditLogDashboardView(request):
|
||||
# q=request.GET.get('q')
|
||||
|
||||
# context={}
|
||||
# model_events_raw = CRUDEvent.objects.all().order_by('-datetime')
|
||||
# processed_model_events = []
|
||||
# page = request.GET.get('page', 1)
|
||||
|
||||
|
||||
|
||||
# # context['model_events'] = processed_model_events
|
||||
# # context['auth_events'] = LoginEvent.objects.all().order_by('-datetime')
|
||||
# # context['request_events'] = RequestEvent.objects.all().order_by('-datetime')
|
||||
# if(q=='userActions'):
|
||||
# for event in model_events_raw:
|
||||
# # Create a base dictionary for each event's data
|
||||
# event_data = {
|
||||
# 'datetime': event.datetime,
|
||||
# 'user': event.user,
|
||||
# 'event_type_display': event.get_event_type_display(),
|
||||
# 'model_name': event.content_type.model,
|
||||
# 'object_id': event.object_id,
|
||||
# 'object_repr': event.object_repr,
|
||||
# 'field_changes': [] # This will be a list of dicts: [{'field': 'name', 'old': 'A', 'new': 'B'}]
|
||||
# }
|
||||
|
||||
# if event.changed_fields:
|
||||
# try:
|
||||
# # print(f"Debugging CRUDEvent ID: {event.id}, User: {event.user}, Model: {event.content_type.model}")
|
||||
# # print(f"Raw event.changed_fields: '{event.changed_fields}' (Type: {type(event.changed_fields)})")
|
||||
# changes = json.loads(event.changed_fields)
|
||||
# #change_fields returns 'null' for no changes to a field i.e. if the field remains the same
|
||||
# if isinstance(changes, dict): # Check if 'changes' is a dictionary
|
||||
# for field_name, values in changes.items():
|
||||
# old_value = values[0] if isinstance(values, list) and len(values) > 0 else None
|
||||
# new_value = values[1] if isinstance(values, list) and len(values) > 1 else None
|
||||
# event_data['field_changes'].append({
|
||||
# 'field': field_name,
|
||||
# 'old': old_value,
|
||||
# 'new': new_value
|
||||
# })
|
||||
# elif changes is None: # Handle case where JSON was 'null' string like when no changes detected for a field or if it saved without a change
|
||||
|
||||
# event_data['field_changes'].append({
|
||||
# 'field': 'Info',
|
||||
# 'old': '',
|
||||
# 'new': 'No specific field changes recorded (JSON was null)'
|
||||
# })
|
||||
# else: # Handle valid JSON but not a dictionary (e.g., "[]", 123)
|
||||
# event_data['field_changes'].append({
|
||||
# 'field': 'Error',
|
||||
# 'old': '',
|
||||
# 'new': f'Unexpected JSON format: {type(changes).__name__}'
|
||||
# })
|
||||
# except json.JSONDecodeError:
|
||||
# # Handle invalid JSON; you might log this error
|
||||
# event_data['field_changes'].append({
|
||||
# 'field': 'Error',
|
||||
# 'old': '',
|
||||
# 'new': 'Invalid JSON in changed_fields'
|
||||
# })
|
||||
|
||||
# processed_model_events.append(event_data)
|
||||
# paginator=Paginator(processed_model_events,10)
|
||||
# page_obj=paginator.page(page)
|
||||
# context={
|
||||
# 'page_obj':page_obj
|
||||
# }
|
||||
# return render(request,'admin_management/model_logs.html',context)
|
||||
|
||||
# elif(q=='loginEvents'):
|
||||
# auth_events = LoginEvent.objects.all().order_by('-datetime')
|
||||
# paginator=Paginator(auth_events,10)
|
||||
# page_obj=paginator.page(page)
|
||||
# context={
|
||||
# 'page_obj':page_obj
|
||||
# }
|
||||
# return render(request,'admin_management/auth_logs.html',context)
|
||||
# else:
|
||||
# request_events= RequestEvent.objects.all().order_by('-datetime')
|
||||
# paginator=Paginator(request_events,10)
|
||||
# page_obj=paginator.page(page)
|
||||
# context={
|
||||
# 'page_obj':page_obj
|
||||
# }
|
||||
# return render(request,'admin_management/request_logs.html',context)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def AuditLogDashboardView(request):
|
||||
"""
|
||||
Displays audit logs (User Actions, Login Events, Request Events) with pagination.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
{% load static i18n crispy_forms_tags %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container-fluid m-0">
|
||||
<div class="container-fluid mt-4">
|
||||
<form action="" method="post">
|
||||
{% csrf_token %}
|
||||
<div class="form-group">
|
||||
@ -13,11 +13,11 @@
|
||||
<label for="account">Account</label>
|
||||
<select class="form-control" name="account" id="account">
|
||||
{% for account in inventory_accounts %}
|
||||
<option value="{{ account.pk }}">{{ account }}"></option>
|
||||
<option value="{{ account.pk }}">{{ account }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Add New Item To Inventory</button>
|
||||
<button type="submit" class="btn btn-primary mt-2">Add New Item To Inventory</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
Loading…
x
Reference in New Issue
Block a user