diff --git a/Admin/settings.py b/Admin/settings.py index c9bcd46..1c67aa5 100644 --- a/Admin/settings.py +++ b/Admin/settings.py @@ -18,7 +18,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = 'django-insecure-5*mm&uf5zq@t6nrs_5z8-_qtyapm^3&yz^wqqkc_a!v(!ulj-^' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False ALLOWED_HOSTS = ['*'] diff --git a/Clientes/saldo_context_proc.py b/Clientes/saldo_context_proc.py index 6589c9f..ae21c20 100644 --- a/Clientes/saldo_context_proc.py +++ b/Clientes/saldo_context_proc.py @@ -2,6 +2,7 @@ import requests from asgiref.sync import sync_to_async from .models import saldoModel import datetime + async def req(): results = await sync_to_async(get_saldo, thread_sensitive=True) @@ -19,6 +20,4 @@ def get_saldo(request): return { 'saldo':Saldo, 'fecha': datetime.date.today() - } - - + } \ No newline at end of file diff --git a/Clientes/urls.py b/Clientes/urls.py index d487e29..7745e57 100644 --- a/Clientes/urls.py +++ b/Clientes/urls.py @@ -1,10 +1,13 @@ from django.urls import path,include from .views import index,add_timbre, timbres_cliente,saldo_funct,ClientesUpdateView, export_Excel + urlpatterns = [ path('', index, name='index'), path('add_timbre/', add_timbre, name='add_timbre'), path('timbres_cliente//', timbres_cliente, name='timbres_cliente'), path('get_saldo/', saldo_funct, name='saldo_funct'), path('cliente/update//',ClientesUpdateView.as_view(),name='update_cliente'), + path('get_timbres_xls/', export_Excel, name='export_Excel'), + ] \ No newline at end of file diff --git a/Clientes/views.py b/Clientes/views.py index ffafd48..47c93e9 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -10,7 +10,7 @@ from django.views.generic.edit import UpdateView from .forms import ClienteForm from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.mixins import UserPassesTestMixin - +from asgiref.sync import sync_to_async #EXCEL from openpyxl import Workbook @@ -18,12 +18,9 @@ from openpyxl.styles import Alignment, Border, Font, PatternFill, Side @login_required def index(request): - + clientes_list = Clientes.objects.all() - - page = request.GET.get('page', 1) - search = request.GET.get('search',None) rfcc = request.GET.get('rfcc', None) if rfcc: @@ -156,7 +153,10 @@ class ClientesUpdateView(UserPassesTestMixin,LoginRequiredMixin,UpdateView): return self.request.user.groups.filter(name= 'admin_soft') +#@login_required +@sync_to_async(thread_sensitive=False) def export_Excel(request): + RFC = request.GET.get('RFC', '') today = datetime.date.today() @@ -172,18 +172,17 @@ def export_Excel(request): ws['C1']='Fecha' contador =2 - for q in objeto_a_trabajar: - column = str(contador) - - ws['A' + column] = q.uuid - ws['B'+ column] = q.rfcc - ws['C'+ column] = q.fecha + for q in range(0,100000):#objeto_a_trabajar: + column = str(contador) + ws['A' + column] = q#.uuid + ws['B'+ column] = q#.rfcc + ws['C'+ column] = q#.fecha contador += 1 - - - nombre_archivo = "ListadoObjeto.xlsx" + + nombre_archivo = f"Timbres_{RFC}_{str(year)}_{str(month)}.xlsx" response = HttpResponse(content_type="application/ms-excel") contenido = "attachment; filename = {0}".format(nombre_archivo) response["Content-Disposition"] = contenido - wb.save(response) - return response \ No newline at end of file + wb.save( response) + + return response \ No newline at end of file diff --git a/Templates/Clientes/index.html b/Templates/Clientes/index.html index 2f7eabb..c836dc6 100644 --- a/Templates/Clientes/index.html +++ b/Templates/Clientes/index.html @@ -46,7 +46,7 @@ Timbres disponibles Comercio Digital: {{saldo.saldo}} Ver Timbres {% endif %} - Excel + Excel {% endfor %}