updata

.gitignore

@@ -3,3 +3,4 @@
 *.pyc
 .idea/
 __pycache__/
+geosentinel/

catalog/models.py

@@ -42,8 +42,8 @@ class Product_l2a(models.Model):
 
 class CartProduct(models.Model):
     user        = models.ForeignKey(User, on_delete=models.CASCADE)
-    aggreg_date = models.DateTimeField(auto_now=True)                  ## date of product aggregation
     uuid        = models.CharField(max_length=50)
+    aggreg_date = models.DateTimeField(auto_now=True)  ## date of product aggregation
     info        = models.TextField(null=True)
     purchased   = models.NullBooleanField()
 

catalog/static/catalog/js/dataRetrieval.js

@@ -14,8 +14,8 @@ var polygonList;
 var makeRequest = function (value) {
     var pol_element = document.getElementById('polygon-list');
 
-    // petición de municipios a base de datos
-    // variable req_url en map.html
+    // city request to DB
+    // variable req_url in map.html
     $.ajax({
         type : "POST",
         url  : req_url,
@@ -112,6 +112,7 @@ $("#id_polygon").on('keyup', function (e) {
 });
 
 
+// this function cleans list of available products
 function erase_product_list_globe() {
     prevfeature = null;
     var pol_element = document.getElementById('product-list-globe');
@@ -121,6 +122,7 @@ function erase_product_list_globe() {
 }
 
 
+// this function cleans list of available products by ID
 function erase_product_list_globe_by_id(element_id) {
     var $div_element = $('div#' + element_id + "-div");
     var $li_element = $('li#' + element_id + "-li");
@@ -129,6 +131,15 @@ function erase_product_list_globe_by_id(element_id) {
 }
 
 
+// this function cleans list of products in cart
+function erase_product_list_cart() {
+    var item_element = document.getElementById('product-list-cart');
+    while (item_element.firstChild) {
+        item_element.removeChild(item_element.firstChild);
+    }
+}
+
+
 var prevfeature = null;
 function drawApiResponse(element) {
     var list_globe = document.getElementById('product-list-globe').children;
@@ -217,9 +228,10 @@ $(document).ready(function () {
     var pol_element = document.getElementById('polygon-list');
 
     var typingTimer;
-    var typingInterval      = 800; //milliseconds
+    var typingInterval      = 800;  //milliseconds
     var productListGlobe    = [];
     var cartProductList     = [];   // this array represent DB where products will be stored
+    var productsToObtain    = [];
     var productUUIDListCart = [];
 
     // On keyup, start the contdown
@@ -250,8 +262,8 @@ $(document).ready(function () {
         erase_product_list_globe();
         var submit_data = $('#product-form').serialize();
 
-        // petición de producto a base de datos
-        // variable prod_req_url en map.html
+        // product request to DB
+        // variable prod_req_url in map.html
         $.ajax({
             type     : "POST",
             url      : prod_req_url,
@@ -268,7 +280,8 @@ $(document).ready(function () {
                     console.log("DEFS: ahora crea producto");
                     data.catalog.forEach(function (data) {
 
-                        // petición de imagen a webservice
+                        // image request to webservice
+                        // variable img_req_url in map.html
                         $.ajax({
                             type : "GET",
                             url  : img_req_url,
@@ -315,7 +328,7 @@ $(document).ready(function () {
     });
 
 
-    // agrega producto al carrito
+    // adds product to cart
     $('#product-to-cart-form').submit(function (event) {
         event.preventDefault();
         var ul_element = document.getElementById('product-list-globe');
@@ -332,7 +345,7 @@ $(document).ready(function () {
                 if (submit_data_array.indexOf(data.uuid) > -1) {
                     console.log("DATA sí esta: ", data.uuid);
                     console.log("SS: ", data.product.size);
-                    productUUIDListCart.push(data.uuid);
+                    productsToObtain.push(data.uuid);
                     erase_product_list_globe_by_id(data.uuid);
 
                     cartProductList.push({
@@ -351,8 +364,8 @@ $(document).ready(function () {
             });
 
             if (cartProductList.length > 0) {
-                // request para guardado de producto en carrito
-                // variable prod_cart_url en map.html
+                // request for saving product in cart DB
+                // variable prod_cart_url in map.html
                 $.ajax({
                     type : 'POST',
                     url  : prod_cart_url,
@@ -362,35 +375,26 @@ $(document).ready(function () {
                     },
                     success: function () {
                         cartProductList = [];
-                        // PRODUCT_COUNTER += 1; // this variable counts the number of products in shopping cart
-                        // PRODUCT_COUNTER_STR = PRODUCT_COUNTER.toString();
-
-                        // var temp_1  = document.querySelector('#product_cart_1');
-                        // var prod_id = temp_1.content.querySelectorAll('ul')[1].id + "-" + PRODUCT_COUNTER_STR;
-                        
-                        // // filling template
-                        // temp_1.content.querySelector('span').textContent = "Product " + PRODUCT_COUNTER_STR;
-                        // temp_1.content.querySelectorAll('ul')[1].id      = prod_id;
-
-                        // var clone_1 = document.importNode(temp_1.content, true);
-                        // document.querySelector('#product-list-cart').appendChild(clone_1);
+                        productUUIDListCart.push.apply(productUUIDListCart, productsToObtain);
+
                         if (!IS_PRODUCT_CONTAINER) {
+                            // building product container
                             createProductContainer();
-                            IS_PRODUCT_CONTAINER = true;
+                            IS_PRODUCT_CONTAINER = true; // this flag is set to false when products are purchased
                         }
 
-                        // request a DB para mostrar los productos en el carrito
-                        // variable prod_from_cartDB_url en map.html
+                        // request to DB for showing the products in cart
+                        // variable prod_from_cartDB_url in map.html
                         $.ajax({
                             type : 'POST',
                             url  : prod_from_cartDB_url,
                             data : {
                                 'csrfmiddlewaretoken' : document.getElementsByName('csrfmiddlewaretoken')[0].value,
-                                'product_uuid_list'   : productUUIDListCart.toString()
+                                'product_uuid_list'   : productsToObtain.toString()
                             },
                             dataType : 'json',
                             success  : function (data) {
-                                productUUIDListCart = [];
+                                productsToObtain = [];
                                 data.product_list.forEach(function (product) {
                                     var temp_2 = document.querySelector('#product_cart_2');
                                     
@@ -406,7 +410,6 @@ $(document).ready(function () {
 
                                     var clone_2 = document.importNode(temp_2.content, true);
                                     document.querySelector('#product-list-cart-items').appendChild(clone_2);
-                                    // document.querySelector('#' + prod_id).appendChild(clone_2);
                                 });
                             }
                         });
@@ -420,4 +423,43 @@ $(document).ready(function () {
             }
         }
     });
+
+    
+    // purchasing products in cart
+    $('#purchased-product-form').submit(function (event) {
+        event.preventDefault();
+        var ul_element = document.getElementById('product-list-cart');
+
+        if (ul_element.firstChild) {
+            console.log("productUUIDListCart: ", productUUIDListCart);
+            var productObject = {};
+
+            productListGlobe.forEach(function (data) {
+                if (productUUIDListCart.indexOf(data.uuid) > -1) {
+                    productObject[data.uuid] = data.product;
+                }
+            });
+
+            // L1C product download request
+            // variable purch_prod_url in map.html
+            $.ajax({
+                type : "POST",
+                url  : purch_prod_url,
+                data : {
+                    'csrfmiddlewaretoken' : document.getElementsByName('csrfmiddlewaretoken')[0].value,
+                    'product_objects'     : JSON.stringify(productObject)
+                },
+                dataType : 'json'
+            });
+
+            erase_product_list_cart();
+            IS_PRODUCT_CONTAINER = false;
+            productUUIDListCart = [];
+        } else {
+            mssgModal({
+                title : "No products available!",
+                body  : "There are no products charged in cart yet."
+            });
+        }
+    });
 });

catalog/templates/map.html

@@ -255,10 +255,11 @@
     osmap.geolocation();
     osmap.addInteraction();
 
-    var req_url              = "{% url 'search-submit' %}";  // url for requesting polygon data
-    var prod_req_url         = "{% url 'productList' %}"     // url for requesting product data
-    var img_req_url          = "{% url 'img-rqst' %}"        // url for requesting preview image
-    var prod_cart_url        = "{% url 'cart-rqst' %}"       // url for requesting product saving in cart
-    var prod_from_cartDB_url = "{% url 'from-cart-rqst' %}"  // url for requesting product from cart table in DB
+    var req_url              = "{% url 'search-submit' %}";   // url for requesting polygon data
+    var prod_req_url         = "{% url 'productList' %}";     // url for requesting product data
+    var img_req_url          = "{% url 'img-rqst' %}";        // url for requesting preview image
+    var prod_cart_url        = "{% url 'cart-rqst' %}";       // url for requesting product saving in cart
+    var prod_from_cartDB_url = "{% url 'from-cart-rqst' %}";  // url for requesting product from cart table in DB
+    var purch_prod_url       = "{% url 'purch-prod-rqst' %}";
   </script>
 {% endblock %}

catalog/urls.py

@@ -11,7 +11,12 @@ 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

@@ -202,6 +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:
@@ -237,6 +238,40 @@ def getFromCart(request):
 #-------------------------------------------------------------------------------
 def wsReportImages(request):
 	print(request.GET)
+=======
+
+#-------------------------------------------------------------------------------
+def purchaseProduct(request):
+    """
+    For now to purchase a product consists in verifying whether L1C products in cart already exist in DB.
+    """
+
+    products = json.loads(request.POST['product_objects'])
+    orderedProducts = OrderedDict()
+
+    for p_uuid in products.keys():
+        PRODUCT_EXISTS = Product_l1c.objects.filter(uuid=p_uuid).exists()
+
+        if not PRODUCT_EXISTS:
+            orderedProducts[p_uuid] = products[p_uuid]
+
+    print orderedProducts
+    return HttpResponse(status=204)
+
+    ## TODO: Implement a webservice in server for downloading those non-existing L1C products. ##
+    ## 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()] })
+
+
+
+
+>>>>>>> ad233d589b10f9ad3e86a5f5e5201c7abf763f77
 #-------------------------------------------------------------------------------
 # def purchaseProduct(request):
 #     """

geosentinel

-/home/mchc/git/GeoSentinel/geosentinel/
+/home/geointdev/sidt-env/GeoSentinel/geosentinel/
\ No newline at end of file