Filter year index view
This commit is contained in:
@@ -162,9 +162,10 @@ def send_timbres_Email(request):
|
||||
def index(request):
|
||||
#read_env_file()
|
||||
clientes_list = Clientes.objects.all()
|
||||
PAC = request.GET.get('PAC',None)
|
||||
mes = request.GET.get('mes', None)
|
||||
today = datetime.date.today()
|
||||
|
||||
|
||||
year = request.GET.get('year',None)
|
||||
if year is None or year =='None':
|
||||
year= today.year
|
||||
@@ -173,28 +174,29 @@ def index(request):
|
||||
page = request.GET.get('page', 1)
|
||||
search = request.GET.get('search',None)
|
||||
rfcc = request.GET.get('rfcc', None)
|
||||
filters = {key:value[0] for (key,value) in dict(request.GET).items() if value !=[""]}
|
||||
filters = {key:value[0] for (key,value) in dict(request.GET).items() if value !=[""] or value!=None}
|
||||
filters.pop('page', '')
|
||||
filters.pop('datepicker','')
|
||||
filters.pop('datepickerFin','')
|
||||
filters.pop('mes','')
|
||||
filters.pop('year','')
|
||||
|
||||
if PAC=='00':
|
||||
filters.pop('PAC')
|
||||
PAC=None
|
||||
|
||||
if rfcc and search:
|
||||
clientes_list = Clientes.objects.filter(Q(RFC__icontains=search))
|
||||
|
||||
# for i,ii in enumerate(clientes_list):
|
||||
# ii.timbres_X_MES(mes=mes)
|
||||
|
||||
met = iter(clientes_list)
|
||||
while met:
|
||||
try:
|
||||
c = next(met)
|
||||
c.timbres_X_MES(mes=mes,year=year)
|
||||
c.timbres_X_MES(mes=mes,year=year, PAC=PAC)
|
||||
except StopIteration:
|
||||
break
|
||||
|
||||
clientes_list =pageFunc(page,clientes_list,20)
|
||||
|
||||
|
||||
context = {
|
||||
'lista':clientes_list,
|
||||
'mes':mes,
|
||||
|
||||
Reference in New Issue
Block a user