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

catalog/migrations/0013_auto_20190227_1926.py

+# Generated by Django 2.1.5 on 2019-02-27 19:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0012_search_process'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='purchase',
+            name='progress',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='search',
+            name='search_name',
+            field=models.TextField(null=True),
+        ),
+    ]

catalog/migrations/0014_auto_20190227_1943.py

+# Generated by Django 2.1.5 on 2019-02-27 19:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0013_auto_20190227_1926'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='search',
+            name='search_name',
+            field=models.TextField(default='Drawn polygon'),
+        ),
+    ]

catalog/migrations/0015_auto_20190227_2140.py

+# Generated by Django 2.1.5 on 2019-02-27 21:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0014_auto_20190227_1943'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='search',
+            name='search_name',
+            field=models.TextField(default='Drawn polygon '),
+        ),
+    ]

reports/static/reports/js/Reports_scripts.js

@@ -11,7 +11,7 @@ function refresh() {
         success: function (data) {
 
             $.each(data, function (key, val) {
-                console.log(key+ " purchase_id:"+val.purchase_id+", progress: "+val.progress);
+                //console.log(key+ " purchase_id:"+val.purchase_id+", progress: "+val.progress);
                 if (val.progress != 100) {
                     $('#progress_bar' + val.purchase_id).attr("aria-valuenow", val.progress);
                     $('#progress_bar' + val.purchase_id).attr('style', 'width:' + val.progress + '%');

reports/templates/Reports.html

@@ -4,6 +4,16 @@
     <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">
+    <style>
+      .map {
+        height: 400px;
+        width: 100%;
+      }
+    </style>
+    <script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/build/ol.js"></script>
+
 {% endblock %}
 {% block messages %}
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -55,7 +65,7 @@
         <li>
             <!-- inner menu: contains the actual data -->
             <ul class="menu">
-                <li>
+                <li> 
                     <a href="#">
                         <i class="fa fa-productList text-aqua"></i> 5 new members joined today
                     </a>
@@ -123,7 +133,7 @@
 {% block content %}
     <!-- Content Wrapper. Contains page content -->
     <!-- Main content -->
-    <div id="reportPage" class="wrapper" style="background-color: #ecf0f5; display: none">
+    <div id="reportPage" class="wrapper" style="background-color: #ecf0f5;">
         <!-- Content Wrapper. Contains page content -->
         <!-- Main content -->
         <section class="content">
@@ -133,6 +143,7 @@
                     <table data-toggle="table" id="example" class="table table-striped table-bordered"
                            style="width:100%">
                         <thead>
+                        <th>Zone</th>
                         <th>Process</th>
                         <th>Purchase date</th>
                         <th>Start Date</th>
@@ -144,6 +155,9 @@
                         <tbody id="table_body">
                         {% for product in productList %}
                             <tr>
+                                <td><a href="#"
+                                       onclick="showMyModalSetTitle('{{ product.search_name }}', 'Some body txt')"> {{ product.search_name }}</a>
+                                </td>
                                 <td>{{ product.process }}</td>
                                 <td>{{ product.purchase_date }}</td>
                                 <td>{{ product.startDate }}</td>
@@ -228,9 +242,54 @@
 
         </div>
     </div>
+
+    <div id="mapmodal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+         aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title" id="myModalTitle"></h4>
+                </div>
+                <div class="modal-body">
+                    <div id="map" class="map"></div>
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
     <!-- /.modals -->
 {% endblock %}
 {% block scripts %}
-    <script src="{% static 'reports/js/Reports_scripts.js' %}">
+    <script src="{% static 'reports/js/Reports_scripts.js' %}"></script>
+    <script type="text/javascript">
+
+        function showMyModalSetTitle(name,data) {
+            $('#map').empty();
+            $('#myModalTitle').val(name);
+            $("#mapmodal").modal();
+            setTimeout(function(){ createmap(); }, 1000);
+
+        }
+
+        function createmap() {
+            var map = new ol.Map({
+                target: 'map',
+                layers: [
+                    new ol.layer.Tile({
+                        source: new ol.source.OSM()
+                    })
+                ],
+                view: new ol.View({
+                    center: ol.proj.fromLonLat([-89.63873079999999,21.0404457]),
+                    zoom: 5
+                })
+            });
+        }
     </script>
 {% endblock %}

reports/views.py

@@ -120,7 +120,7 @@ def Reports(request):
     folders=[]
     zip =""
     product_list = Purchase.objects.values('id', 'productList', 'aggreg_date', 'search__clouds', 'search__startDate',
-                                           'search__endDate', 'search__process_id__name').filter(
+                                           'search__endDate', 'search__process_id__name', 'search__search_name').filter(
         user_id=request.user.id, purchased=1)
     for producto in product_list:
         log_info = USERS_PATH + request.user.email + "/" + str(producto['id']) + "/L2ASCL_AreaProcessing.log"
@@ -163,6 +163,7 @@ def Reports(request):
             print("folder out noes not exists")
         else:
             folders = os.listdir(path=absolute_path)
+            print(folders)
             if len(folders)==0:
                 initial_folder="../#"
             else:
@@ -179,6 +180,7 @@ def Reports(request):
                 zip = zip_path+"/"+file
                 print(zip)
         productList.append({
+            "search_name": producto['search__search_name'],
             "process": producto['search__process_id__name'],
             "purchase_date": producto['aggreg_date'],
             "startDate": producto['search__startDate'],