Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 43a22b7f authored by Ulises Morales Ramírez's avatar Ulises Morales Ramírez
Browse files
Options

descripcion reportes

parent 5e3d27f7
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 24 deletions
reports/static/reports/css/scldata.css
View file @ 43a22b7f
...@@ -335,7 +335,7 @@ select::-ms-expand { ...@@ -335,7 +335,7 @@ select::-ms-expand {
left: 0; left: 0;
top: 40%; top: 40%;
margin-left: 5px; margin-left: 5px;
color: rgba(11, 15, 192, 0.5); color: rgba(11, 15, 192, 0.3);
font-size: 60px; font-size: 60px;
z-index: 100; z-index: 100;
} }
...@@ -345,7 +345,14 @@ select::-ms-expand { ...@@ -345,7 +345,14 @@ select::-ms-expand {
right: 0; right: 0;
top: 40%; top: 40%;
margin-right: 5px; margin-right: 5px;
color: rgba(11, 15, 192, 0.5); color: rgba(11, 15, 192, 0.3);
font-size: 60px; font-size: 60px;
z-index: 100; z-index: 100;
}
.fas.fa-chevron-left:hover{
color: blue;
}
.fas.fa-chevron-right:hover {
color: blue;
} }
\ No newline at end of file
reports/templates/Reports.html
View file @ 43a22b7f
...@@ -25,9 +25,6 @@ ...@@ -25,9 +25,6 @@
<script type="text/javascript"> <script type="text/javascript">
</script> </script>
{% endblock %} {% endblock %}
{% block messages %} {% block messages %}
...@@ -130,7 +127,7 @@ ...@@ -130,7 +127,7 @@
<br> <br>
<ul class="sidebar-menu" data-widget="tree"> <ul class="sidebar-menu" data-widget="tree">
<li> <li>
<a class="treeview " href="{% url 'map' %}"> <a class="treeview " href="{% url 'map' %}">
<i class="fa fa-map"></i> <i class="fa fa-map"></i>
<span>Home</span> <span>Home</span>
<span class="pull-right-container"> <span class="pull-right-container">
...@@ -189,11 +186,14 @@ ...@@ -189,11 +186,14 @@
{% for product in productList %} {% for product in productList %}
<tr> <tr>
<td> <td>
<a href="#" id="title{{ product.purchase_id }}" data-toggle="popover" data-trigger="hover" <a href="#" id="title{{ product.purchase_id }}" data-toggle="popover"
data-content="{% if product.description %}{{ product.description }}{% else %}Without Description{% endif %}" data-trigger="hover"
data-content="
{% if product.description %}{{ product.description }}{% else %}Without Description{% endif %}"
onclick="showMyModalSetTitle('{{ product.search_name }}','{{ product.polygon }}');"> {{ product.search_name }}</a> onclick="showMyModalSetTitle('{{ product.search_name }}','{{ product.polygon }}');"> {{ product.search_name }}</a>
<a href="#" onclick="showEditModal('{{ product.search_name }}','{{ product.description }}','{{ product.purchase_id }}')"><span <a href="#"
onclick="showEditModal('{{ product.search_name }}','{{ product.description }}','{{ product.purchase_id }}')"><span
class="fas fa-pencil-alt" class="fas fa-pencil-alt"
style="margin:3px 0 0 0"></span></a> style="margin:3px 0 0 0"></span></a>
</td> </td>
...@@ -237,14 +237,18 @@ ...@@ -237,14 +237,18 @@
href="../../static/reports/tmpImages/repsat_test_dev/{{ request.user.email }}/{{ product.purchase_id }}/myzip.zip" href="../../static/reports/tmpImages/repsat_test_dev/{{ request.user.email }}/{{ product.purchase_id }}/myzip.zip"
{% else %} {% else %}
href="#" href="#"
{% endif %} class="btn btn-warning btn-sm col-md-4 col-xs-4 col-sm-4 col-lg-4 col-xl-4"> {% endif %}
class="btn btn-warning btn-sm col-md-4 col-xs-4 col-sm-4 col-lg-4 col-xl-4">
<i class="fa fa-file-zip-o"></i> <i class="fa fa-file-zip-o"></i>
</a> </a>
<a title="Download PDF" {% if product.progress == 100 %} <a title="Download PDF" {% if product.progress == 100 %}
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="{{ product.search_name }} ({{ product.purchase_date }}).pdf"> {% 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"
...@@ -263,7 +267,7 @@ ...@@ -263,7 +267,7 @@
<!-- /.content --> <!-- /.content -->
</div> </div>
<!-- Footer --> <!-- Footer -->
<footer class=" page-footer font-small special-color-dark pt-5" > <footer class=" page-footer font-small special-color-dark pt-5">
<!-- Footer Elements --> <!-- Footer Elements -->
<div class="container"> <div class="container">
</div> </div>
...@@ -310,15 +314,16 @@ ...@@ -310,15 +314,16 @@
<div id="map" class="map"></div> <div id="map" class="map"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div align = "left"> <div align="left">
<textarea id ="polygonText" readonly rows="5" style="width: 61em; resize:none; font-size: 7pt;"> <textarea id="polygonText" readonly rows="5" style="width: 61em; resize:none; font-size: 7pt;">
POLYGON POLYGON
</textarea> </textarea>
</div> </div>
<button style="float: left; type="button" class="btn btn-default" onclick="copyPolygonText()">Copy polygon</button> <button style="float: left; type=" button
" class="btn btn-default" onclick="copyPolygonText()">Copy polygon</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div> </div>
</div> </div>
......
reports/templates/sclData.html
View file @ 43a22b7f
...@@ -556,22 +556,26 @@ ...@@ -556,22 +556,26 @@
function next_report(number) { function next_report(number) {
let index = lista_productos.indexOf(number); let index = lista_productos.indexOf(number);
console.log(index);
index++; index++;
console.log(index);
if (index >= lista_productos.length) if (index >= lista_productos.length)
index = 0; index = 0;
console.log(lista_productos[index]); console.log(lista_productos[index]);
window.location.replace("../reports/"+lista_productos[index]); //window.location.replace("../reports/"+lista_productos[index]);
} }
function previus_report(number) { function previus_report(number) {
let index = lista_productos.indexOf(number); let index = lista_productos.indexOf(number);
console.log(index);
index--; index--;
if (index <= lista_productos.length) console.log(index);
index = 0; if (index < 0)
index = lista_productos.length-1;
console.log(lista_productos[index]); console.log(lista_productos[index]);
window.location.replace("../reports/"+lista_productos[index]); //window.location.replace("../reports/"+lista_productos[index]);
} }
......
reports/views.py
View file @ 43a22b7f
...@@ -95,7 +95,6 @@ def report_L2ASCL(request, purchase_id): ...@@ -95,7 +95,6 @@ def report_L2ASCL(request, purchase_id):
product_list = Purchase.objects.values('id').filter( product_list = Purchase.objects.values('id').filter(
user_id__in=[request.user.id], user_id__in=[request.user.id],
purchased=1, purchased=1,
is_public = True,
progress=100 progress=100
) )
else: else:
......
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