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

reports/templates/Reports.html

@@ -150,7 +150,7 @@
                     <table data-toggle="table" id="example" class="table table-striped table-bordered"
                            style="width:100%">
                         <thead>
-                        <th>Zone</th>
+                        <th>Title</th>
                         <th>Process</th>
                         <th>Purchase date</th>
                         <th>Start Date</th>

reports/templates/sclData.html

@@ -139,26 +139,24 @@
             <div class="row col-lg-11 title">
                 <div class="box box-success box-solid info">
                     <div class="box-header with-border">
-                        <h3 sytle="font-size: 30px !important;">{{ report_name }}</h3>
+                        <h3>{{ searchInfo.title }} {{ searchInfo.startDate }} to {{ searchInfo.endDate}}</h3>
+                        <h6>{{ searchInfo.report_name }}</h6>
                         <!-- /.box-tools -->
                     </div>
                     <!-- /.box-header -->
                     <div class="box-body">
                         <div class="row">
-                            <div class="col-lg-2 text-center col-lg-offset-1">
-                                <h4>Platform: {{ platform }}</h4>
+                            <div class="col-lg-3 text-center">
+                                <h4>Platform: {{ searchInfo.platform }}</h4>
                             </div>
-                            <div class="col-lg-2 text-center">
-                                <h4>Product level: {{ productLevel }}</h4>
+                            <div class="col-lg-3 text-center">
+                                <h4>Product level: {{ searchInfo.productLevel }}</h4>
                             </div>
-                            <div class="col-lg-2 text-center">
-                                <h4>Start date: {{ startDate }}</h4>
+                            <div class="col-lg-3 text-center">
+                                <h4>Process: {{ searchInfo.process }}</h4>
                             </div>
-                            <div class="col-lg-2 text-center">
-                                <h4>End date: {{ endDate }}</h4>
-                            </div>
-                            <div class="col-lg-2 text-center">
-                                <h4>Clouds: {{ clouds }} %</h4>
+                            <div class="col-lg-3 text-center">
+                                <h4>Clouds: {{ searchInfo.clouds }} %</h4>
                             </div>
                         </div>
                     </div>
@@ -359,15 +357,15 @@
             let scl_path = "{{SCL_PATH}}";
             let zone = "{{ zone }}"
             let purchase_id = "{{ purchaseID }}"
-            let platform = "{{ platform }}";
-            let productLevel = "{{ productLevel }}";
-            let startDate = "{{ startDate }}";
-            let endDate = "{{ endDate }}";
-            let clouds = "{{ clouds }}";
+            let platform = "{{ searchInfo.platform }}";
+            let productLevel = "{{ searchInfo.productLevel }}";
+            let startDate = "{{ searchInfo.startDate }}";
+            let endDate = "{{ searchInfo.endDate }}";
+            let clouds = "{{ searchInfo.clouds }}";
             let oldLabel = "{{defaultDataSet}}";
             let labels = {{labels}};
             var config = {{graphData}};
-            let polygon = "{{polygon}}"
+            let polygon = "{{searchInfo.polygon}}"
 
             config.options = {
                 responsive: true,

reports/views.py

@@ -46,8 +46,9 @@ def report_L2ASCL(request, purchase_id):
     template = "sclData.html"
     reporteDir = 'mask'
     folders = ""
-    purchase = Purchase.objects.values('user__email', 'is_public').filter(pk=purchase_id)
-    email = purchase[0]['user__email']
+    purchase = Purchase.objects.values('user__email', 'is_public', 'search__search_name', 
+                                        'search__process_id__name').get(pk=purchase_id)
+    email = purchase['user__email']
     path = USERS_PATH + email + '/' + purchase_id + '/'
     scl_data_path = USERS_PATH + email + "/" + purchase_id + "/scl_data.json"
 
@@ -68,16 +69,25 @@ def report_L2ASCL(request, purchase_id):
     else:
         PDFGenerator(request, path, reporteDir, datasets)
 
+    searchInfo = {
+        "title": purchase['search__search_name'],
+        "process": purchase['search__process_id__name'],
+        "startDate": startDate,
+        "endDate": endDate,
+        "clouds": dataProduct['clouds'], 
+        "platform": dataProduct['platform'],
+        "productLevel": dataProduct['productLevel'],
+        "polygon": dataProduct['wkt'],
+        "report_name": "SCL Image Classification Data(Km²)"
+    }
+
     return render(request, template, {"graphData": json.dumps(graphData),
-                                      "report_name": "SCL Image Classification Data(Km²)",
-                                      "startDate": startDate, "endDate": endDate,
-                                      "clouds": dataProduct['clouds'], "platform": dataProduct['platform'],
-                                      "productLevel": dataProduct['productLevel'], "IMAGE_PATH": image_path,
+                                      "searchInfo": searchInfo, "IMAGE_PATH": image_path,
                                       "SCL_PATH": SCL_path, 'dafaultLabel': defaultLabel,
                                       'defaultDataSet': defaultDataset, "folders": folders,
                                       "zone": reporteDir, "purchaseID": purchase_id,
                                       "labels": graphData['data']['labels'],
-                                      "polygon": dataProduct['wkt'], "email": email})
+                                      "email": email})
 
 
     # -------------------------------------------------------------------------------def Reports(request):