Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GeoInt_SIDT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mario Chirinos Colunga
GeoInt_SIDT
Commits
91b71418
Commit
91b71418
authored
Feb 22, 2019
by
Ulises Morales Ramírez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parchado de errores
parent
ac0a5e60
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
240 additions
and
220 deletions
+240
-220
aside.html
administration/templates/aside.html
+2
-2
users_table.html
administration/templates/users_table.html
+2
-2
repsat_test_dev
reports/static/reports/tmpImages/repsat_test_dev
+1
-1
L2ASCL_data.html
reports/templates/L2ASCL_data.html
+77
-208
Reports.html
reports/templates/Reports.html
+6
-7
aside.html
reports/templates/aside.html
+140
-0
views.py
reports/views.py
+12
-0
No files found.
administration/templates/aside.html
View file @
91b71418
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<br>
<br>
<ul
class=
"sidebar-menu"
data-widget=
"tree"
>
<ul
class=
"sidebar-menu"
data-widget=
"tree"
>
<li>
<li>
<a
class=
"treeview "
href=
"{{ BASE_URL }}/
catalog
"
>
<a
class=
"treeview "
href=
"{{ BASE_URL }}/
administration
"
>
<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"
>
...
...
administration/templates/users_table.html
View file @
91b71418
...
@@ -160,8 +160,8 @@
...
@@ -160,8 +160,8 @@
{%
if
user
.
superuser =
=
True
%}
checked
{%
endif
%}
>
{%
if
user
.
superuser =
=
True
%}
checked
{%
endif
%}
>
</td>
</td>
<td>
<td>
<button
type=
"submit"
class=
"btn btn-success"
><i
class=
"fa fa-save"
></i></button>
<button
t
itle=
"save"
t
ype=
"submit"
class=
"btn btn-success"
><i
class=
"fa fa-save"
></i></button>
<
a
href=
"#"
class=
"btn btn-danger"
><i
class=
"fa fa-trash"
></i></a
>
<
!--a href="#" class="btn btn-danger"><i class="fa fa-trash"></i></a--
>
</td>
</td>
</form>
</form>
</tr>
</tr>
...
...
reports/static/reports/tmpImages/repsat_test_dev
View file @
91b71418
/home/emmanuelhp/NAS/repsat_test_dev
/home/ulises/NAS/repsat_test_dev
\ No newline at end of file
\ No newline at end of file
reports/templates/L2ASCL_data.html
View file @
91b71418
This diff is collapsed.
Click to expand it.
reports/templates/Reports.html
View file @
91b71418
...
@@ -173,11 +173,9 @@
...
@@ -173,11 +173,9 @@
<i
class=
"fa fa-eye"
></i>
<i
class=
"fa fa-eye"
></i>
</a>
</a>
<a
title=
"Download zip"
{%
if
product
.
progress =
=
100
%}
<a
title=
"Download zip"
{%
if
product
.
progress =
=
100
%}
href=
"#"
href=
"../../static/reports/tmpImages/repsat_test_dev/{{ request.user.email }}/{{ product.purchase_id }}/myzip.zip"
disabled
{%
else
%}
{%
else
%}
href=
"#"
href=
"#"
disabled
{%
endif
%}
class=
"btn btn-warning"
>
{%
endif
%}
class=
"btn btn-warning"
>
<i
class=
"fa fa-file-zip-o"
></i>
<i
class=
"fa fa-file-zip-o"
></i>
</a>
</a>
...
@@ -233,5 +231,6 @@
...
@@ -233,5 +231,6 @@
<!-- /.modals -->
<!-- /.modals -->
{% endblock %}
{% endblock %}
{% block scripts %}
{% block scripts %}
<script
src=
"{% static 'reports/js/Reports_scripts.js' %}"
></script>
<script
src=
"{% static 'reports/js/Reports_scripts.js' %}"
>
</script>
{% endblock %}
{% endblock %}
reports/templates/aside.html
0 → 100644
View file @
91b71418
<div
class=
"form-group"
>
<br>
<ul
class=
"sidebar-menu"
data-widget=
"tree"
>
<li>
<a
class=
"treeview "
href=
"{{ BASE_URL }}/reports"
>
<i
class=
"fa fa-map"
></i>
<span>
Home
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li
class=
"treeview"
>
<a
href=
"#"
>
<i
class=
"fa fa-file-archive-o"
></i>
<span>
Report
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
<ul
class=
"treeview-menu sidebar-form"
>
{% for folder in folders %}
<li>
<a
class=
"treeview submenu"
href=
"{{ folder }}_sclData"
>
<i
class=
"fa fa-pie-chart"
></i>
<span>
{{ folder }}
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
{% endfor %}
</ul>
</li>
<li
class=
"treeview"
>
<a
href=
"#"
>
<i
class=
"fa fa-area-chart"
></i>
<span>
Chart Type
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
<ul
class=
"treeview-menu sidebar-form"
>
<li>
<a
class=
"treeview submenu"
href=
"#"
onclick=
"change('line')"
>
<i
class=
"fa fa-bar-chart"
></i>
<span>
Line Chart
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview submenu"
href=
"#"
onclick=
"change('bar')"
>
<i
class=
"fa fa-bar-chart"
></i>
<span>
Bar Chart
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview submenu"
href=
"#"
onclick=
"change('bubble')"
>
<i
class=
"fa fa-bar-chart"
></i>
<span>
Bubble Chart
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview submenu"
href=
"#"
onclick=
"change('polarArea')"
>
<i
class=
"fa fa-bar-chart"
></i>
<span>
Polar Area Chart
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview submenu"
href=
"#"
onclick=
"change('doughnut')"
>
<i
class=
"fa fa-bar-chart"
></i>
<span>
Doughnut Chart
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview submenu"
href=
"#"
onclick=
"change('pie')"
>
<i
class=
"fa fa-bar-chart"
></i>
<span>
Pie Chart
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview submenu"
href=
"#"
onclick=
"change('radar')"
>
<i
class=
"fa fa-bar-chart"
></i>
<span>
Radar Chart
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
</ul>
</li>
<li
class=
"treeview"
>
<a
href=
"#"
>
<i
class=
"fa fa-download"
></i>
<span>
Download as
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
<ul
class=
"treeview-menu sidebar-form"
>
<li>
<a
class=
"treeview submenu"
href=
"#"
>
<i
class=
"fa fa-file-code-o"
></i>
<span>
Export to JSON
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview submenu"
href=
"#"
id=
"downloadPdf"
>
<i
class=
"fa fa-file-pdf-o"
></i>
<span>
Export to PDF
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
</ul>
</li>
</ul>
</div>
\ No newline at end of file
reports/views.py
View file @
91b71418
...
@@ -115,6 +115,7 @@ def Reports(request):
...
@@ -115,6 +115,7 @@ def Reports(request):
productList
=
[]
productList
=
[]
size
=
0
size
=
0
folders
=
[]
folders
=
[]
zip
=
""
product_list
=
Purchase
.
objects
.
values
(
'id'
,
'productList'
,
'aggreg_date'
,
'search__clouds'
,
'search__startDate'
,
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'
)
.
filter
(
user_id
=
request
.
user
.
id
,
purchased
=
1
)
user_id
=
request
.
user
.
id
,
purchased
=
1
)
...
@@ -160,7 +161,16 @@ def Reports(request):
...
@@ -160,7 +161,16 @@ def Reports(request):
else
:
else
:
initial_folder
=
folders
.
pop
(
0
)
+
"_sclData"
initial_folder
=
folders
.
pop
(
0
)
+
"_sclData"
zip_path
=
USERS_PATH
+
request
.
user
.
email
+
"/"
+
str
(
producto
[
'id'
])
#print(zip_path)
#"../ static / reports / tmpImages / repsat_test_dev / umorales @ centrogeo.edu.mx / "+str(producto['id']) / myzip.zip"
for
file
in
os
.
listdir
(
path
=
zip_path
):
if
file
.
endswith
(
".zip"
):
print
(
file
)
zip
=
zip_path
+
"/"
+
file
print
(
zip
)
productList
.
append
({
productList
.
append
({
"process"
:
producto
[
'search__process_id__name'
],
"process"
:
producto
[
'search__process_id__name'
],
"purchase_date"
:
producto
[
'aggreg_date'
],
"purchase_date"
:
producto
[
'aggreg_date'
],
...
@@ -172,12 +182,14 @@ def Reports(request):
...
@@ -172,12 +182,14 @@ def Reports(request):
"progress"
:
progress
,
"progress"
:
progress
,
"log_info"
:
log
,
"log_info"
:
log
,
"initial_folder"
:
initial_folder
,
"initial_folder"
:
initial_folder
,
"zip"
:
zip
,
})
})
size
=
0
size
=
0
final_size
=
0
final_size
=
0
log_info
=
""
log_info
=
""
progress
=
0
progress
=
0
initial_folder
=
""
initial_folder
=
""
zip
=
""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment