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

catalog/forms.py

@@ -12,7 +12,7 @@ from .widgets import FengyuanChenDatePickerInput
 
 all_process = Process.objects.filter(status=True)
 
-platforms = [ ]
+platforms = []
 
 for each_process in all_process:
     platforms.append((each_process.platform_id,each_process.name))

catalog/static/catalog/js/dataRetrieval.js

@@ -178,6 +178,12 @@ function drawPolygon(element) {
             $("#area_description").val(polygon.description)
         }
     });
+
+    let processTreeview = $('li.processTreeview a');
+    let parentClassList = processTreeview[0].parentElement.classList;
+    if(!parentClassList.contains('menu-open')){
+        processTreeview.click();
+    }
 }
 
 function erase_input() {

catalog/static/catalog/js/sidtMap.js

@@ -121,6 +121,11 @@ sidtMap.prototype.addInteraction = function()
 
 	this.interaction.on("drawend",function(e){
 		self.showCoords(e.feature.getGeometry());
+		let processTreeview = $('li.processTreeview a');
+    	let parentClassList = processTreeview[0].parentElement.classList;
+    	if(!parentClassList.contains('menu-open')){
+        	processTreeview.click();
+    	}
 	});
 
 	this.interaction.on("drawstart",function(e){

catalog/templates/map.html

@@ -144,7 +144,7 @@
             <input type="hidden" id="search_name" name="search_name" value="Drawn Polygon">
             <input type="hidden" id="area_description" name="area_description" value="Without Description">
             <ul class="sidebar-menu" data-widget="tree">
-                <li class="treeview" id="searchProcess">
+                <li class="processTreeview treeview" id="searchProcess">
                     <a href="#">
                         <i class="fa fa-sync-alt"></i>
                         <span>Process</span>
@@ -156,7 +156,7 @@
                         <li class="col-xs-12">{{ searchForm.platform }}</li>
                     </ul>
                 </li>
-                <li class="treeview" id="searchDate">
+                <li class="dateTreeview treeview" id="searchDate">
                     <a href="#">
                         <i class="fa fa-calendar-alt"></i>
                         <span>Date range</span>
@@ -184,7 +184,7 @@
                         <li>{{ searchForm.polygon }}</li>
                     </ul>
                 </li>
-                <li class="treeview " id="searchCloud">
+                <li class="cloudTreeview treeview" id="searchCloud">
                     <a href="#">
                         <i class="fa fa-cloud"></i>
                         <span>Cloud percentage</span>
@@ -267,7 +267,7 @@
                     </a>
                 </li>
             </ul>
-            <!-- Social buttons -->
+            Social buttons -->
 
         </div>
         <!-- Footer Elements -->
@@ -369,4 +369,18 @@
         var purch_prod_url = "{% url 'purch-prod-rqst' %}";
         var del_prod_cartDB_url = "{% url 'del-cart-rqst' %}";
     </script>
+
+    <script>
+        $('#id_platform').click(function () {
+            let dateTreeview = $('li.dateTreeview a');
+            dateTreeview.click();
+        });
+
+        $('#id_end').on('hide.datepicker', function (e) {
+            setTimeout(function () {
+                let cloudTreeview = $('li.cloudTreeview a');
+                cloudTreeview.click();
+            }, 500);
+        });
+    </script>
 {% endblock %}

users/views.py

@@ -27,6 +27,19 @@ size_repsat = 0
 
 # -------------------------------------------
 def Users(request):
+    month_lst = [
+        {'quantity': 0, 'date': 'January'},
+        {'quantity': 0, 'date': 'February'},
+        {'quantity': 0, 'date': 'March'},
+        {'quantity': 0, 'date': 'April'},
+        {'quantity': 0, 'date': 'May'},
+        {'quantity': 0, 'date': 'June'},
+        {'quantity': 0, 'date': 'July'},
+        {'quantity': 0, 'date': 'August'},
+        {'quantity': 0, 'date': 'September'},
+        {'quantity': 0, 'date': 'October'},
+        {'quantity': 0, 'date': 'November'},
+        {'quantity': 0, 'date': 'December'}]
     user_data = []
     user_searches = []
     user = User.objects.get(pk=request.user.id)
@@ -125,19 +138,6 @@ def Users(request):
         progress = 0
 
         # lista de meses #
-        month_lst = [
-            {'quantity': 0, 'date': 'January'},
-            {'quantity': 0, 'date': 'February'},
-            {'quantity': 0, 'date': 'March'},
-            {'quantity': 0, 'date': 'April'},
-            {'quantity': 0, 'date': 'May'},
-            {'quantity': 0, 'date': 'June'},
-            {'quantity': 0, 'date': 'July'},
-            {'quantity': 0, 'date': 'August'},
-            {'quantity': 0, 'date': 'September'},
-            {'quantity': 0, 'date': 'October'},
-            {'quantity': 0, 'date': 'November'},
-            {'quantity': 0, 'date': 'December'}]
 
     for date in Purchase.objects.filter(purchased=True, user_id=user.id).extra(
             {'month': "Extract(month from aggreg_date)"}).values_list(
@@ -155,6 +155,20 @@ def Users(request):
 
 # ----------------------------------------------------------------------
 def User_id(request, user_id):
+    # lista de meses #
+    month_lst = [
+        {'quantity': 0, 'date': 'January'},
+        {'quantity': 0, 'date': 'February'},
+        {'quantity': 0, 'date': 'March'},
+        {'quantity': 0, 'date': 'April'},
+        {'quantity': 0, 'date': 'May'},
+        {'quantity': 0, 'date': 'June'},
+        {'quantity': 0, 'date': 'July'},
+        {'quantity': 0, 'date': 'August'},
+        {'quantity': 0, 'date': 'September'},
+        {'quantity': 0, 'date': 'October'},
+        {'quantity': 0, 'date': 'November'},
+        {'quantity': 0, 'date': 'December'}]
     user_data = []
     user_searches = []
     user = User.objects.get(pk=user_id)
@@ -243,20 +257,6 @@ def User_id(request, user_id):
         log_info = ""
         progress = 0
 
-        # lista de meses #
-        month_lst = [
-            {'quantity': 0, 'date': 'January'},
-            {'quantity': 0, 'date': 'February'},
-            {'quantity': 0, 'date': 'March'},
-            {'quantity': 0, 'date': 'April'},
-            {'quantity': 0, 'date': 'May'},
-            {'quantity': 0, 'date': 'June'},
-            {'quantity': 0, 'date': 'July'},
-            {'quantity': 0, 'date': 'August'},
-            {'quantity': 0, 'date': 'September'},
-            {'quantity': 0, 'date': 'October'},
-            {'quantity': 0, 'date': 'November'},
-            {'quantity': 0, 'date': 'December'}]
 
     for date in Purchase.objects.filter(purchased=True, user_id=user.id).extra(
             {'month': "Extract(month from aggreg_date)"}).values_list(