Changeset 99ea6e7 in observatorio

Timestamp:

Jul 25, 2014, 1:48:53 PM (10 years ago)

Author:

Ing. Roldan Vargas <rvargas@…>

Branches:

master

Children:

e29b474

Parents:

ae41c89

Message:

sustitución de simplejson de django por json de python

File:

• procesos/apps/reportes/json_views.py (modified) (11 diffs)

procesos/apps/reportes/json_views.py

@@ -2 +2 @@
 import datetime
 from django.shortcuts import render_to_response, get_object_or_404
-from django.template import Template,  Context
+from django.template import Template, Context
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from nokia.tt.models import *
@@ -9 +9 @@
 from nokia.reporting.helpers import *
 from django import newforms as forms
-from django.utils import simplejson
+import json
 
 
@@ -20 +20 @@
         'DecimalField',
         'PositiveIntegerField'
-        ],
+    ],
     'time': [
         'DateField',
         'DateTimeField',
         'TimeField'
-        ],
+    ],
     'text': [
         'CharField',
@@ -36 +36 @@
         'XMLField',
         'URLField',
-        ],
+    ],
     'bool': [
         'BooleanField'
-        ],
+    ],
     'related': [
         'ForeignKey',
         'ManyToManyField'
-        ]
+    ]
 }
 
@@ -54 +54 @@
         'lte',
         'range',
-        ],
+    ],
     'time': [
         'gt',
@@ -65 +65 @@
         'month',
         'day',
-        ],
+    ],
     'text': [
         'contains',
@@ -73 +73 @@
         'in',
         'isnull',
-        ],
+    ],
     'bool': [
-        ],
+    ],
     'related': [
-        ]
-}  
+    ]
+}
 QUERY_TERMS = {
     'contains': 'Contains',
@@ -97 +97 @@
 }
 
+
 def get_field_type(fld_type):
     """Search through FLD_TYPES and return the key for the type of field"""
-    for k,v in FLD_TYPES.items():
+    for k, v in FLD_TYPES.items():
         if fld_type in v:
             return k
 
+
 def get_poss_lookup_types(fld_type):
-    return LOOKUP_TYPES.get(get_field_type(fld_type),None)
+    return LOOKUP_TYPES.get(get_field_type(fld_type), None)
+
 
 def fields_for_model(request):
@@ -110 +113 @@
     template = Template("""{% for o in options %}<option {% if o.selected %}
     selected="selected"{% endif %} value="{{ o.value }}">{{ o.text }}</option>{% endfor %}""")
-    output = request.GET.get('format','html')
+    output = request.GET.get('format', 'html')
     id = request.GET.get('id', None)
     if id:
@@ -118 +121 @@
         options = []
         for o in opts:
-            dikt = {'value':o[0], 'text':o[1]}
+            dikt = {'value': o[0], 'text': o[1]}
             if o[0] in field_ids:
                 dikt['selected'] = True
@@ -124 +127 @@
     else:
         ct_id = request.GET['model']
-        model = ContentType.objects.get(pk=ct_id).model
+        model = ContentType.objects.get(pk=ct_id).model
         fields = possible_fields(model)
-        options = [{'value':f[0], 'text':f[1]} for f in fields]
-        print options
-    if output == 'json': #not sure if I'm gonna need this
-            return HttpResponse(simplejson.dumps(options))
+        options = [{'value': f[0], 'text': f[1]} for f in fields]
+        print options
+    if output == 'json':  # not sure if I'm gonna need this
+        return HttpResponse(json.dumps(options))
     return HttpResponse(template.render(Context({'options': options})))
 
-def get_field_and_type(class_reg,fld_name):
-        try:
-                fld = class_reg.dj_model._meta.get_field(fld_name)
-        except:
-                pass
+
+def get_field_and_type(class_reg, fld_name):
+    try:
+        fld = class_reg.dj_model._meta.get_field(fld_name)
+    except:
+        pass
 
 
-def filter_fields(request,id):
-        """Given the report id, return a list of fields to put in a select"""
-        reporter = Report.objects.get(pk=id).get_report()
-        class_reg = getattr(reporter.register,reporter.model.__name__)
-        field_choices = [(f.name, prettify_string(f.name)) \
-                                                for f in class_reg._fields + class_reg._m2ms]
-        f = forms.Form()
-        f.fields['fields'] = forms.ChoiceField(choices=field_choices,
-                                                        help_text="Choose a field to filter on")
-        return HttpResponse(f.as_p())
+def filter_fields(request, id):
+    """Given the report id, return a list of fields to put in a select"""
+    reporter = Report.objects.get(pk=id).get_report()
+    class_reg = getattr(reporter.register, reporter.model.__name__)
+    field_choices = [(f.name, prettify_string(f.name)) \
+                     for f in class_reg._fields + class_reg._m2ms]
+    f = forms.Form()
+    f.fields['fields'] = forms.ChoiceField(choices=field_choices,
+                                           help_text="Choose a field to filter on")
+    return HttpResponse(f.as_p())