Merge branch 'dev' of http://gitlab.geoint.mx/mario.chirinos/GeoInt_SIDT into dev

catalog/static/catalog/js/dataRetrieval.js

@@ -490,9 +490,10 @@ $(document).ready(function () {
                     'csrfmiddlewaretoken' : document.getElementsByName('csrfmiddlewaretoken')[0].value,
                     'product_objects'     : JSON.stringify(productObject),
                     'wkt'                 : $("#product-form input[name=polygon]").val(),
-                    'startDate'                 : $("#product-form input[name=start]").val(),
-                    'endDate'                 : $("#product-form input[name=end]").val(),
-                    'clouds'                 : $("#product-form input[name=cloudPercentage]").val(),
+                    'startDate'           : $("#product-form input[name=start]").val(),
+                    'endDate'             : $("#product-form input[name=end]").val(),
+                    'clouds'              : $("#product-form input[name=cloudPercentage]").val(),
+                    'usuario'             : $("#product-form input[name=user_name]").val()
                 },
                 dataType : 'json'
             });

catalog/templates/map.html

@@ -137,6 +137,7 @@
         <!-- <form role="form" target="catalogFrame" action="{% url 'productList' %}" method="post"> -->
         <form id='product-form' role="form" method="post">
             {% csrf_token %}
+            <input type="hidden" id="user_name" name="user_name" value={{user.get_username}}>
             <ul class="sidebar-menu" data-widget="tree">
                 <li class="treeview">
                     <a href="#">

catalog/views.py

@@ -12,12 +12,14 @@ from django.core import management
 #from urllib import urlencode
 #from collections import OrderedDict
 import requests, json, unicodedata, sys, base64
+import os
 
 import sys
 sys.path.append('../GeoSentinel/')
 from geosentinel import APISentinel, polygonToBox
 
 sentinel = APISentinel.APISentinel('emmhp',  'geoemm29')
+NAS_PATH = '/home/david/NAS/'
 
 
 # Create your views here.
@@ -268,17 +270,36 @@ def purchaseProduct(request):
     print(request.POST['startDate'])
     print(request.POST['endDate'])
     print(request.POST['clouds'])
+    print(request.POST['usuario'])
+    
+    username = request.POST['usuario']
+    fecha_inicio = request.POST['startDate']
+    fecha_fin = request.POST['endDate']
+    
+    print(fecha_inicio.replace("-", ""))
+    print(fecha_fin.replace("-", ""))
+    
+    userdir = NAS_PATH + "repsat_test_dev/"+username   ##crea el directorio del usuario
+    if not os.path.exists(userdir):
+        os.makedirs(userdir)
+        
+    products_dir = NAS_PATH + "sentinelImages/L2A/"
+    linksDir = userdir+"/L2A/"
     
     #obtiene los datos para el json
     data = {}
     data['wkt'] = request.POST['wkt']
     data['platform'] = 'Sentinel-2'
     data['productLevel'] = 'L2A'
-    data['startDate'] = request.POST['startDate']
-    data['endDate'] = request.POST['endDate']
+    data['startDate'] = fecha_inicio.replace("-", "")  #quita los guiones de la fecha
+    data['endDate'] = fecha_fin.replace("-", "")       #quita los guiones de la fecha
+    #~ data['startDate'] = request.POST['startDate']
+    #~ data['endDate'] = request.POST['endDate']    
     data['clouds'] = request.POST['clouds']
-    data['productsDir'] = '/home/david/NAS/sentinelImages/L2A/'
-    data['linksDir'] = '/home/david/centroGEO/repsat/tests/L2A/'
+    #~ data['productsDir'] = '/home/david/NAS/sentinelImages/L2A/'
+    #~ data['linksDir'] = '/home/david/centroGEO/repsat/tests/L2A/'
+    data['productsDir'] = products_dir
+    data['linksDir'] = linksDir 
     data['username'] = 'mario-chirinos'
     data['password'] = 'r4nc0r4u'
 
@@ -287,7 +308,7 @@ def purchaseProduct(request):
     json_data = json.dumps(data, indent=4)
     print(json_data)
     #escribe el json en el archivo
-    fidProductsFile = open("/home/david/centroGEO/repsat/GeoInt_SIDT/findProducts.json", "w")    
+    fidProductsFile = open(userdir+"/findProducts.json", "w")    
     fidProductsFile.write(json_data)
     fidProductsFile.close()