Changeset f8f2094 in ecoalba

Timestamp:

Jan 25, 2016, 5:06:52 PM (8 years ago)

Author:

eparedes <eparedes@…>

Branches:

master

Children:

8c55734

Parents:

c7b411c

Message:

funcionalidad aranceles

Files:

• apps/aranceles/models.py (modified) (1 diff)
• apps/aranceles/urls.py (modified) (2 diffs)
• apps/aranceles/views.py (modified) (4 diffs)
• templates/aranceles/aranceles_consulta.html (modified) (1 diff)
• templates/aranceles/aranceles_resultados.html (added)

apps/aranceles/models.py

@@ -1 +1 @@
 from django.db import models
+from comun.models import Pais
 
-# Create your models here.
+
+class consolidados(models.Model):
+    pais = models.ForeignKey(Pais)
+    HS_code_level = models.IntegerField()
+    Base_nomenclature = models.CharField(max_length=10)
+    Product = models.IntegerField()
+    Number_of_subheadings =  models.IntegerField()
+    Binding = models.CharField(max_length=2)
+    Number_of_lines = models.IntegerField()
+    Number_of_AVDuties = models.IntegerField()
+    AVDuty_average = models.DecimalField(max_digits=25, decimal_places=16)
+    AVDuty_minimum = models.IntegerField()
+    AVDuty_maximum = models.IntegerField()
+    Percent_duty_free = models.IntegerField()
+    Number_of_non_AVDuties = models.IntegerField()
+    List_of_non_AVDuties = models.CharField(max_length=20)
+    SSG = models.IntegerField()
+    ODC_Number_of_lines_dutiable = models.IntegerField()
+    ODC_AVDuty_average = models.IntegerField()
+    ODC_Number_of_non_AV_duties = models.IntegerField()
+    ODC_List_of_non_AV_duties = models.CharField(max_length=20,null=True)
+    List_of_present_instruments = models.CharField(max_length=100)
+    Implementation_year = models.CharField(max_length=100)
+    List_of_INRs = models.CharField(max_length=100)
+    Description = models.CharField(max_length=1000)
+
+    class meta:
+        db_table = 'aranceles_consolidados'
+
+
+

apps/aranceles/urls.py

@@ -6 +6 @@
     url(r'^aranceles/?$', 'aranceles.views.aranceles', name='aranceles'),
     url(r'^aranceles_consulta/?$', 'aranceles.views.aranceles_consulta', name='aranceles_consulta'),
+    url(r'^aranceles_resultados/?$', 'aranceles.views.aranceles_resultados', name='aranceles_resultados'),
     url(r'^codigos_arancelarios/?$', 'aranceles.views.codigos_arancelarios', name='codigos_arancelarios'),    
 #    url(r'^aranceles_ue/detalle/(?P<id>\d+)/$', 'aranceles.views.aranceles_ue_detalle', name='aranceles_ue_detalle'),
@@ -11 +12 @@
 #    url(r'^aranceles_prod_consulta/?$', 'aranceles.views.aranceles_prod_consulta', name='aranceles_prod_consulta'),
 #    url(r'^arancelesjson/?$', 'aranceles.views.arancelesjson', name='arancelesjson'),
+    url(r'^consolidadosjson/?$', 'aranceles.views.consolidadosjson', name='consolidadosjson'),    
     url(r'^paisesjson/?$', 'aranceles.views.paisesjson', name='paisesjson'),    
     )

apps/aranceles/views.py

@@ -9 +9 @@
 from comun.models import Pais
 from django.utils.translation import ugettext_lazy as _l, ugettext as _
+from aranceles.models import consolidados
 
 import os
@@ -25 +26 @@
         micuro = connection.cursor()
         micuro.execute("select id,iso3166_2,iso3166_3 from comun_pais where anyo_inclusion is not null")
+        return dictfetchall(micuro)
+
+def miCursorSql2():
+        from django.db import  connection
+        micuro = connection.cursor()
+        micuro.execute("select * from aranceles_consolidados")
         return dictfetchall(micuro)
         
@@ -53 +60 @@
     
     return HttpResponse(json.dumps(jsota),content_type="application/json")
+
+from decimal import Decimal
+
+class fakefloat(float):
+    def __init__(self, value):
+        self._value = value
+    def __repr__(self):
+        return str(self._value)
+
+def defaultencode(o):
+    if isinstance(o, Decimal):
+        # Subclass float with custom repr?
+        return fakefloat(o)
+    raise TypeError(repr(o) + " is not JSON serializable")
+
+
+def consolidadosjson(request):
+    start = int(request.GET['jtStartIndex'])
+    end = int(request.GET['jtStartIndex']) + int(request.GET['jtPageSize'])
+    idpaises = [1]
+#    ttarea = consolidados.objects.filter(pais__in =  idpaises)
+ 
+    ttarea = miCursorSql2()
+
+#    for row in ttarea:
+#       row['iso3166_3']=_(row['iso3166_3'])
+        
+    cuantos = ttarea.__len__()
+
+    ltarea = ttarea[start:end]
+    
+    jsota = {}
+    registros = []
+    if (cuantos/10>1):
+        proximo = True
+    else: 
+        proximo = None
+    
+    jsota["meta"]= {"limit": 10, "next": proximo, "offset": 0, "previous": None, "total_count": cuantos}
+    jsota["Result"]= "OK"
+    jsota["TotalRecordCount"] = cuantos
+    
+    
+    jsota["Records"]=ltarea
+    print jsota
+    return HttpResponse(json.dumps(jsota, default=defaultencode),content_type="application/json")
     
 
 def codigos_arancelarios(request):
-        paises = request.POST['paises']
-        if paises == '':
-                return render_to_response('aranceles/aranceles_consulta.html', context_instance=RequestContext(request))
+    paises = request.POST['paises']
+    if paises == '':          
+        return render_to_response('aranceles/aranceles_consulta.html', context_instance=RequestContext(request))
                 
-        paises = paises.split(",")[:-1]
-        dpaises = Pais.objects.filter(iso3166_2__in = paises)
-        
-        return render_to_response('aranceles/aranceles.html', context_instance=RequestContext(request))
+    paises = paises.split(",")[:-1]
+    dpaises = Pais.objects.filter(iso3166_2__in = paises)
+    idpaises = [e.id for e in dpaises]
+    return render_to_response('aranceles/aranceles.html', context_instance=RequestContext(request))
         
         
@@ -81 +134 @@
     
     return render_to_response('aranceles/aranceles_consulta.html', context_instance=RequestContext(request))
+
+@login_required
+def aranceles_resultados(request):
+    """
+    Vista inicial para filtros consulta de aranceles
+    """
+    
+    return render_to_response('aranceles/aranceles_resultados.html', context_instance=RequestContext(request))

templates/aranceles/aranceles_consulta.html

@@ -107 +107 @@
    <div id="flotante"></div>
    <br />
-   <form id="forma" class="formulario" action={% url "codigos_arancelarios" %} method="post">
+   <form id="forma" class="formulario" action={% url "aranceles_resultados" %} method="post">
    <input type="hidden" id="paises" name="paises" value="">
    <button type="submit">Consultar</button>