reportes, primera etapa

catalog/urls.py

@@ -12,5 +12,4 @@ urlpatterns = [
     url(r'^cartrequest/$', views.saveInCart, name='cart-rqst'),
     url(r'^fromcartrqst/$', views.getFromCart, name='from-cart-rqst'),
     url(r'^purchcartrqst/$', views.purchaseProduct, name='purch-prod-rqst'),
-    url(r'^scl/$', views.L2ASCL_data, name='L2ASCL-data')
 ]

catalog/views.py

@@ -267,11 +267,11 @@ def purchaseProduct(request):
     ## TODO: Add product L1C to Cart DB after product download. ##
 
 #-------------------------------------------------------------------------------
-def L2ASCL_data(request):
-    with open("/home/mchc/data.json") as f:
-    	json_data = json.load(f)
-    	print(json_data)
-    return render(request, 'L2ASCL_data.html', {"labels":",".join([k for k in json_data]), "vegetation":[v["4"] for k,v in json_data.items()] })
+# def L2ASCL_data(request):
+#     with open("/home/ulises/REPSAT_NAS/mario_repsat_test/T15QZD_sclData.json") as f:
+#     	json_data = json.load(f)
+#     	print(json_data)
+#     return render(request, 'L2ASCL_data.html', {"labels":",".join([k for k in json_data]), "vegetation":[v["4"] for k,v in json_data.items()] })
 #-------------------------------------------------------------------------------
 # def purchaseProduct(request):
 #     """

geosentinel

-/home/emmanuelhp/Documentos/GeoSentinel/geosentinel
+/home/ulises/django-apps/GeoSentinel/geosentinel
\ No newline at end of file

reports/urls.py

 from django.conf.urls import url
 
 from . import views
-
+from reports import views
 
 urlpatterns = [
 
-	url(r'^$', views.report_L2ASCL, name='report'),
-	url(r'^(?P<report>\w+)$', views.report_L2ASCL, name='report'),
+    url(r'^(?P<report>[\w\-]+)/$', views.report_L2ASCL, name='report'),
 
 ]
-

reports/views.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import io
+from django.http import FileResponse
+from reportlab.pdfgen import canvas
 from django.shortcuts import render
 
 # Create your views here.
 from collections import OrderedDict
 import json
-#-------------------------------------------------------------------------------
-def report_L2ASCL(request, report=0):
-	with open("/home/mario/NAS_MarioCh/mario_repsat_test/T15QZD_sclData.json") as f:
-		json_data = OrderedDict(json.load(f))
-		graphData = dict()
-		graphData['type']="line"
-
-		data=dict()
-		data['labels'] = [ k for k,v in sorted(json_data.items()) ]
-#		data['click']="chartOnClick"
-		data['datasets'] = list()
-		labels  = set()
-		for d in json_data:
-			labels |= set(json_data[d].keys())
-		labels.remove('date')
-
-		labelNames = ["No Data", "Saturated", "Shadows", "Cloud Shadows", "Vegetation", "Not-Vegetated", "Whater", "Unclassified", "Cloud Medium Probablilty", "Cloud Hight Probablilty", "Thin Cirrus", "Snow"]
-		colors = ["Black", "Red", "DarkGray", "Brown", "Green", "Yellow", "Blue", "Grey", "LightGray", "White", "Aqua", "Pink"]
-		for l in labels:
-			item = dict()
-			item['label'] = labelNames[int(l)]
-			if l == "0":
-				item['hidden'] = "true"
-			item['data'] = [ v[l] * 60*60/1000000. for k,v in sorted(json_data.items()) if l in v]
-			item['backgroundColor']=colors[int(l)]
-			data['datasets'].append(item)
-
-		graphData['data']=data
-
-#		graphData['options']['responsive']=True
-#		graphData['options']['maintainAspectRatio']=False
-		print( json.dumps(graphData).encode("utf-8"))
-	return render(request, 'L2ASCL_data.html', {"graphData":json.dumps(graphData).encode("utf-8")})
+
+
+# -------------------------------------------------------------------------------
+from reportlab.pdfgen import canvas
+
+from GeoInt_SIDT import settings
+
+
+def report_L2ASCL(request, report):
+    with open("/home/ulises/REPSAT_NAS/mario_repsat_test/"+report+".json") as f:
+        json_data = OrderedDict(json.load(f))
+        graphData = dict()
+        graphData['type'] = "line"
+
+        data = dict()
+        data['labels'] = [k for k, v in sorted(json_data.items())]
+        #		data['click']="chartOnClick"
+        data['datasets'] = list()
+        labels = set()
+        for d in json_data:
+            labels |= set(json_data[d].keys())
+        labels.remove('date')
+
+        labelNames = ["No Data", "Saturated", "Shadows", "Cloud Shadows", "Vegetation", "Not-Vegetated", "Whater",
+                      "Unclassified", "Cloud Medium Probablilty", "Cloud Hight Probablilty", "Thin Cirrus", "Snow"]
+        colors = ["Black", "Red", "DarkGray", "Brown", "Green", "Yellow", "Blue", "Grey", "LightGray", "White", "Aqua",
+                  "Pink"]
+        for l in labels:
+            item = dict()
+            item['label'] = labelNames[int(l)]
+            # item['fill'] = "false"
+            if l == "0":
+                item['hidden'] = "true"
+            item['data'] = [v[l] * 60 * 60 / 1000000. for k, v in sorted(json_data.items()) if l in v]
+            item['backgroundColor'] = colors[int(l)]
+            data['datasets'].append(item)
+
+        graphData['data'] = data
+        #print(settings.BASE_URL)
+        #		graphData['options']['responsive']=True
+        #		graphData['options']['maintainAspectRatio']=False
+        #print(json.dumps(graphData).encode("utf-8"))
+
+    return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData), "report_name": report})
+# -------------------------------------------------------------------------------