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

administration/views.py

@@ -196,7 +196,6 @@ def wsPurchasesPM(request):
                 'storage':storage,
                 'in_process': pending.count(),
             })
-            print (table_data)
         return HttpResponse(json.dumps(table_data))
     else:
         raise Http404

catalog/templates/base_top.html

@@ -187,9 +187,10 @@
 {% block templates %}{% endblock %}
 <!-- T E M P L A T E S -->
 <!-- MODAL 1 -->
-{% block modal1 %}{% endblock %}
+{% block modals %}{% endblock %}
 <!-- MODAL 1 -->
 
+
 <!-- Bootstrap 3.3.7 -->
 <script src="{% static 'catalog/adminlte/bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>
 <!-- AdminLTE App -->
@@ -199,6 +200,7 @@
 <!-- Chartsjs -->
 <script src="{% static 'catalog/js/Chart.min.js' %}" type="text/javascript"></script>
 
+{% block footer %}{% endblock %}
 {% block scripts %}{% endblock %}
 </body>
 </html>

catalog/views.py

@@ -616,7 +616,6 @@ def Pay(request):
 @csrf_exempt
 def IPN(request):
     PATH_USERS = config['PATHS']['PATH_USERS']
-    print()
     f = open(PATH_USERS+"myfile.txt", "w")
     x = request.POST.dict()
     f.write('variables')

reports/static/reports/css/Reports.css

@@ -61,4 +61,4 @@ input:checked + .slider:before {
 
 .slider.round:before {
     border-radius: 50%;
-}
+}
\ No newline at end of file

reports/static/reports/css/scldata.css

@@ -162,3 +162,58 @@ input[type=range]::-webkit-slider-thumb {
     border-radius: 100%;
     cursor: pointer;
 } */
+
+/* Reset Select */
+select {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  -ms-appearance: none;
+  appearance: none;
+  outline: 0;
+  box-shadow: none;
+  border: 0 !important;
+  background: #2c3e50;
+  background-image: none;
+}
+/* Custom Select */
+.select {
+  position: relative;
+  display: block;
+  width: 9em;
+  height: 3em;
+  line-height: 3;
+  background: #2c3e50;
+  overflow: hidden;
+  border-radius: .25em;
+}
+select {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0 0 0 .5em;
+  color: #fff;
+  cursor: pointer;
+}
+select::-ms-expand {
+  display: none;
+}
+/* Arrow */
+.select::after {
+  content: '\25BC';
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  padding: 0 1em;
+  background: #34495e;
+  pointer-events: none;
+}
+/* Transition */
+.select:hover::after {
+  color: #f39c12;
+}
+.select::after {
+  -webkit-transition: .25s all ease;
+  -o-transition: .25s all ease;
+  transition: .25s all ease;
+}

reports/static/reports/js/Reports_scripts.js

@@ -60,27 +60,12 @@ $(function () {
 });
 
 
-$(document).ready(function () {
-    $('#example').DataTable
-    ({
-
-        responsive:
-            {
-                details:
-                    {
-                        type: 'column',
-                        target: 'tr'
-                    }
-            },
-        columnDefs:
-            [{
-                className: 'control',
-                orderable: false,
-                targets: 0
-            }],
-        order: [1, 'asc']
-    });
-});
+ $(document).ready(function () {
+            var table = $('#example').DataTable({
+                responsive: true
+            });
+
+        });
 
 
 $(function () {

reports/static/reports/js/reportImg.js

@@ -25,10 +25,13 @@ document.getElementById("myChart").onclick = function (evt) {
     if(activePoint.length>0){
 
         var firstPoint = activePoint[0];
-        //console.log(firstPoint)
-        //console.log(firstPoint._datasetIndex)    //indice de la clase a la que pertenece (vegetación, agua, etc.)
         var label = myChart.data.labels[firstPoint._index];
-        addImageLayer(label)
+        //console.log(firstPoint._datasetIndex)    //indice de la clase a la que pertenece (vegetación, agua, etc.)
+
+        addImageLayer({
+          layerDate: label
+        });
+
         //console.log(myChart.legend.legendItems[firstPoint._datasetIndex].text) //nombre de la capa a la que pertenece (vegetación, agua, etc.)
         //if (!firstPoint) return;
         activePoints.forEach(function (value, index) {

reports/templates/Reports.html

@@ -2,9 +2,7 @@
 {% load staticfiles %}
 {% block headMedia %}
     <link rel="stylesheet" href="{% static 'catalog/css/body.css' %}" type="text/css">
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
     <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css"/>
-    <script type="text/javascript" src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script>
 
     <link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/css/ol.css"
           type="text/css">
@@ -13,6 +11,24 @@
     <link rel="stylesheet" href="https://openlayers.org/en/v5.3.0/css/ol.css" type="text/css">
     <!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
     <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
+
+    <!-- nose-->
+    <link rel="stylesheet" type="text/css"
+          href="https://cdn.datatables.net/responsive/2.2.3/css/responsive.bootstrap.min.css">
+
+
+    <script type="text/javascript" language="javascript" src="https://code.jquery.com/jquery-3.3.1.js"></script>
+    <script type="text/javascript" language="javascript"
+            src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script>
+    <script type="text/javascript" language="javascript"
+            src="https://cdn.datatables.net/responsive/2.2.3/js/dataTables.responsive.min.js"></script>
+    <script type="text/javascript">
+
+
+
+
+
+    </script>
 {% endblock %}
 {% block messages %}
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -155,15 +171,15 @@
                     <table data-toggle="table" id="example" class="table table-striped table-bordered"
                            style="width:100%">
                         <thead>
-                        <th>Title</th>
-                        <th>Process</th>
-                        <th>Purchase date</th>
-                        <th>Start Date</th>
-                        <th>End Date</th>
+                        <th width="16%" class="all">Title</th>
+                        <th width="12%">Process</th>
+                        <th width="12%">Purchase date</th>
+                        <th width="12%">Start Date</th>
+                        <th width="12%">End Date</th>
                         <!--th>Clouds %</th-->
-                        <th>Estimated Size</th>
-                        <th>Public</th>
-                        <th>Actions</th>
+                        <th width="12%">Estimated Size</th>
+                        <th width="6%">Public</th>
+                        <th width="12%" class="all">Actions</th>
                         </thead>
                         <tbody id="table_body">
                         {% for product in productList %}
@@ -210,14 +226,14 @@
                                                 {% if product.initial_folder %}
                                            href="../reports/{{ product.purchase_id }}"
                                                 {% endif %}
-                                           class="btn btn-success">
+                                           class="btn btn-success btn-sm col-md-6 col-xs-6 col-sm-6 col-lg-6 col-xl-6">
                                             <i class="fa fa-eye"></i>
                                         </a>
                                         <a title="Download zip" {% if product.progress == 100 %}
                                            href="../../static/reports/tmpImages/repsat_test_dev/{{ request.user.email }}/{{ product.purchase_id }}/myzip.zip"
                                         {% else %}
                                            href="#"
-                                        {% endif %} class="btn btn-warning">
+                                        {% endif %} class="btn btn-warning btn-sm col-md-6 col-xs-6 col-sm-6 col-lg-6 col-xl-6">
                                             <i class="fa fa-file-zip-o"></i>
                                         </a>
                                         <!--a title="View Log" href="#" class="btn btn-info"
@@ -236,7 +252,7 @@
         <!-- /.content -->
     </div>
     <!-- Footer -->
-    <footer class=" page-footer font-small special-color-dark pt-5" style="bottom: 0; position: absolute">
+    <footer class=" page-footer font-small special-color-dark pt-5" >
         <!-- Footer Elements -->
         <div class="container">
         </div>

reports/templates/aside.html

@@ -35,6 +35,44 @@
                     <span class="label label-primary pull-right"></span>
                 </span>
             </a>
+            
+        <li class="treeview" id="compare">
+            <a href="#" onclick="compare(labels)">
+                <i class="fas fa-columns"></i>
+                <span>Compare</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+            <ul class="treeview-menu sidebar-form" id="compareOptions">
+                <li>
+                    <a class="treeview submenu" href="#" onclick="setCompareDirection('vertical')" id="compvertical">
+                        <i class="fas fa-arrows-alt-v"></i>
+                        <span>Vertical</span>
+                    </span>
+                    </a>
+                </li>
+                <li>
+                    <a class="treeview submenu" href="#" onclick="setCompareDirection('horizontal')" id="comphorizontal">
+                        <i class="fas fa-arrows-alt-h"></i>
+                        <span>Horizontal</span>
+                    </span>
+                    </a>
+                </li>
+            </ul>
+        </li>            
+ 
+<!-- 
+            <a class="treeview " href="#" onclick="compare(labels)">
+                <i class="fas fa-columns"></i></i>
+                <i class="fa fa-eye-slash hideChart" style="display:none"></i>
+                <span class="showChart">Compare</span>
+                <span class="hideChart" style="display:none">Not compare</span>
+                <span class="pull-right-container">
+                    <span class="label label-primary pull-right"></span>
+                </span>
+            </a>            
+ -->           
         </li>
         {% endif %}
         <li class="treeview">