descripcion reportes

parent 424ae8a4
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
href="{% url 'PDF' product.purchase_id %}" href="{% url 'PDF' product.purchase_id %}"
{% else %} {% else %}
href="#" href="#"
{% endif %} class="btn btn-info btn-sm col-md-4 col-xs-4 col-sm-4 col-lg-4 col-xl-4" target="_blank" download="Report"> {% endif %} class="btn btn-info btn-sm col-md-4 col-xs-4 col-sm-4 col-lg-4 col-xl-4" target="_blank" download="{{ product.search_name }} ({{ product.purchase_date }}).pdf">
<i class="fa fa-file-pdf-o"></i> <i class="fa fa-file-pdf-o"></i>
</a> </a>
<!--a title="View Log" href="#" class="btn btn-info" <!--a title="View Log" href="#" class="btn btn-info"
......
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
</a> </a>
</li> </li>
<li> <li>
<a class="treeview submenu" href="{% url 'PDF' purchaseID %}" target="_blank" download="Report"> <a class="treeview submenu" href="{% url 'PDF' purchaseID %}" target="_blank" download="{{ searchInfo.title }} ({{ searchInfo.purchase_date }}).pdf">
<i class="fa fa-file-pdf-o"></i> <i class="fa fa-file-pdf-o"></i>
<span>Export to PDF</span> <span>Export to PDF</span>
<span class="pull-right-container"> <span class="pull-right-container">
......
...@@ -48,7 +48,7 @@ def report_L2ASCL(request, purchase_id): ...@@ -48,7 +48,7 @@ def report_L2ASCL(request, purchase_id):
reporteDir = 'mask' reporteDir = 'mask'
folders = "" folders = ""
purchase = Purchase.objects.values('user__email', 'is_public', 'name', 'search__search_name', purchase = Purchase.objects.values('user__email', 'is_public', 'name', 'search__search_name',
'search__process_id__name','description').get(pk=purchase_id) 'search__process_id__name','description','aggreg_date').get(pk=purchase_id)
email = purchase['user__email'] email = purchase['user__email']
path = USERS_PATH + email + '/' + purchase_id + '/' path = USERS_PATH + email + '/' + purchase_id + '/'
scl_data_path = USERS_PATH + email + "/" + purchase_id + "/scl_data.json" scl_data_path = USERS_PATH + email + "/" + purchase_id + "/scl_data.json"
...@@ -71,6 +71,7 @@ def report_L2ASCL(request, purchase_id): ...@@ -71,6 +71,7 @@ def report_L2ASCL(request, purchase_id):
"title": purchase['name'], "title": purchase['name'],
#"title": purchase['search__search_name'], #"title": purchase['search__search_name'],
"process": purchase['search__process_id__name'], "process": purchase['search__process_id__name'],
"purchase_date": purchase['aggreg_date'],
"startDate": startDate, "startDate": startDate,
"endDate": endDate, "endDate": endDate,
"clouds": dataProduct['clouds'], "clouds": dataProduct['clouds'],
...@@ -595,8 +596,7 @@ def PDFGenerator(request,purchase_id): ...@@ -595,8 +596,7 @@ def PDFGenerator(request,purchase_id):
story.append(PageBreak()) story.append(PageBreak())
# build our document with the list of flowables we put together # build our document with the list of flowables we put together
doc = SimpleDocTemplate(ruta + reporteDir + ".pdf", pagesize=letter, topMargin=5 doc = SimpleDocTemplate(ruta + reporteDir + ".pdf", pagesize=letter, topMargin=5, title=searchInfo['report_name']+" "+searchInfo['title'],)
)
doc.build(story) doc.build(story)
#return HttpResponse (request.POST.get('ruta')) #return HttpResponse (request.POST.get('ruta'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment