merge headers deleted

catalog/urls.py

@@ -11,12 +11,6 @@ urlpatterns = [
     url(r'^imgrequest/$', views.requestToImage, name='img-rqst'),
     url(r'^cartrequest/$', views.saveInCart, name='cart-rqst'),
     url(r'^fromcartrqst/$', views.getFromCart, name='from-cart-rqst'),
-<<<<<<< HEAD
-#    url(r'^scl/$', views.L2ASCL_data, name='L2ASCL-data'),
-
-=======
     url(r'^purchcartrqst/$', views.purchaseProduct, name='purch-prod-rqst'),
     url(r'^scl/$', views.L2ASCL_data, name='L2ASCL-data')
->>>>>>> ad233d589b10f9ad3e86a5f5e5201c7abf763f77
 ]
-

catalog/views.py

@@ -75,7 +75,7 @@ def productList(request):
     # if cloud_percentage.strip():
     #     params['cloudcoverpercentage'] = cloud_percentage
     params['cloudcoverpercentage'] = cloud_percentage
-    
+
     ## getting the bounding box of the polygon
     pol_bbox = polygonToBox.getWKTPolygonBoundingBox(area, True)
 
@@ -90,7 +90,7 @@ def productList(request):
     for p in products:
         # img_link = products[p]['link_icon']
         # img_link = img_link[:img_link.find("/")+2] + "emmhp:geoemm29@" + img_link[img_link.find("/")+2:]
-        
+
         catalog.append({
             'process'          : process,
             'start_date'       : init_date,
@@ -111,7 +111,7 @@ class SearchSubmitView(View):
     def strip_accents(self, s):
         return ''.join((c for c in unicodedata.normalize('NFD', s) if unicodedata.category(c) != 'Mn'))
 
-    
+
     def post(self, request):
         template    = loader.get_template(self.template)
         searchValue = request.POST.get('value', '')
@@ -178,7 +178,7 @@ def saveInCart(request):
                 info      = json.dumps(p_info, indent=3, sort_keys=True, ensure_ascii=True),
                 purchased = False
             )
-            
+
             cartProd.save()
 
 
@@ -202,7 +202,7 @@ def getFromCart(request):
         })
 
     return JsonResponse({'product_list': prod_list})
-<<<<<<< HEAD
+
 ##-------------------------------------------------------------------------------
 #def L2ASCL_data(request):
 #	with open("/home/mario/NAS_MarioCh/mario_repsat_test/T15QZD_sclData.json") as f:
@@ -218,7 +218,8 @@ def getFromCart(request):
 #			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"]
+#		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()
@@ -237,8 +238,7 @@ def getFromCart(request):
 #	return render(request, 'L2ASCL_data.html', {"graphData":json.dumps(graphData).encode("utf-8")})
 #-------------------------------------------------------------------------------
 def wsReportImages(request):
-	print(request.GET)
-=======
+    print(request.GET)
 
 #-------------------------------------------------------------------------------
 def purchaseProduct(request):
@@ -263,15 +263,10 @@ def purchaseProduct(request):
 
 #-------------------------------------------------------------------------------
 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()] })
-
-
-
-
->>>>>>> ad233d589b10f9ad3e86a5f5e5201c7abf763f77
+    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 purchaseProduct(request):
 #     """
@@ -288,7 +283,7 @@ def L2ASCL_data(request):
 #     user             = User.objects.get(id=request.user.id)
 #     prod_purchased = json.loads(request.POST['product_list'])
 #     # prod_purchased   = ['S2B_MSIL1C_20171226T162659_N0206_R040_T16QBJ_20171226T212212', 'S2B_MSIL1C_20180326T161909_N0206_R040_T15QZD_20180326T195757']
-    
+
 #     for p in prod_purchased:
 #         p_uuid         = p['uuid']
 #         p_identifier   = p['identifier']
@@ -297,16 +292,16 @@ def L2ASCL_data(request):
 #         if not PRODUCT_EXISTS:
 #             products_to_download['uuid'].append(p_uuid)
 #             products_to_download['id'].append(p_identifier)
-        
+
 #         # print json.dumps(p, indent=3, sort_keys=True)
-    
+
 #     ## Saves data to DB using populate_products_l1c command ##
 #     management.call_command('populate_products_l1c', file_path=prod_dir, products_list=products_to_download['id'])
 
 #     ## Register of user purchase ##
 #     purch = Purchase(user=user)
 #     purch.save()
-    
+
 #     for p_uuid in products_to_download['uuid']:
 #         prod_l1c = Product_l1c.objects.get(uuid=p_uuid)
 #         purch.prod_list.add(prod_l1c)
@@ -317,7 +312,7 @@ def L2ASCL_data(request):
 
 #     ### TODO: Download products somewhere .. ###
 #     # sentinel.downloadProducts(products, prod_dir)
-    
+
 
 #     ###  After that the code below is executed  ###
 #     # purch = Purchase(user=user)
@@ -331,5 +326,4 @@ def L2ASCL_data(request):
 #     #     purch.prod_list.add(prod_l1c)
 
 
-#     return HttpResponse(status=204)
-
+#    return HttpResponse(status=204)