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
c65082e0
Commit
c65082e0
authored
May 25, 2018
by
Renán Sosa Guillen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
left bar menu updated
parent
90d4d639
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
98 additions
and
88 deletions
+98
-88
forms.py
catalog/forms.py
+10
-6
body.css
catalog/static/css/body.css
+1
-3
dataRetrieval.js
catalog/static/js/dataRetrieval.js
+1
-1
base_top.html
catalog/templates/base_top.html
+1
-0
map.html
catalog/templates/map.html
+82
-76
views.py
catalog/views.py
+3
-2
No files found.
catalog/forms.py
View file @
c65082e0
...
@@ -3,12 +3,16 @@ from django import forms
...
@@ -3,12 +3,16 @@ from django import forms
#from django.contrib.auth.forms import UserCreationForm
#from django.contrib.auth.forms import UserCreationForm
#from django.contrib.auth.models import User
#from django.contrib.auth.models import User
#from buscador.models import Investigador, Reto
#from buscador.models import Investigador, Reto
platforms
=
[(
"ALOS"
,
"ALOS"
),(
"A3"
,
"A3"
),(
"AIRSAR"
,
"AIRSAR"
)]
platforms
=
[
(
"vegIndex"
,
"Vegetation index"
),
(
"waterBodies"
,
"Water bodies"
),
(
"urbanSprawl"
,
"Urban sprawl"
)
]
#ALOS, A3, AIRSAR, AS, ERS-1, E1, ERS-2, E2, JERS-1, J1, RADARSAT-1, R1, SEASAT, SS, Sentinel-1A, SA, Sentinel-1B, SB, SMAP, SP, UAVSAR, UA.
#ALOS, A3, AIRSAR, AS, ERS-1, E1, ERS-2, E2, JERS-1, J1, RADARSAT-1, R1, SEASAT, SS, Sentinel-1A, SA, Sentinel-1B, SB, SMAP, SP, UAVSAR, UA.
class
ASFSearchForm
(
forms
.
Form
):
class
ASFSearchForm
(
forms
.
Form
):
polygon
=
forms
.
CharField
(
widget
=
forms
.
TextInput
(
attrs
=
{
'class'
:
"form-control"
}))
polygon
=
forms
.
CharField
(
widget
=
forms
.
TextInput
(
attrs
=
{
'class'
:
"form-control"
}))
platform
=
forms
.
ChoiceField
(
choices
=
platforms
,
widget
=
forms
.
Select
(
attrs
=
{
'class'
:
"form-control"
}))
platform
=
forms
.
ChoiceField
(
choices
=
platforms
,
widget
=
forms
.
Select
(
attrs
=
{
'class'
:
"form-control"
}))
start
=
forms
.
DateField
(
widget
=
forms
.
DateTimeInput
(
attrs
=
{
'type'
:
'datetime-local'
}),
required
=
False
)
start
=
forms
.
DateField
(
widget
=
forms
.
DateTimeInput
(
attrs
=
{
'type'
:
'datetime-local'
}),
required
=
False
)
end
=
forms
.
DateField
(
widget
=
forms
.
DateTimeInput
(
attrs
=
{
'type'
:
'datetime-local'
}),
required
=
False
)
end
=
forms
.
DateField
(
widget
=
forms
.
DateTimeInput
(
attrs
=
{
'type'
:
'datetime-local'
}),
required
=
False
)
maxResults
=
forms
.
IntegerField
()
maxResults
=
forms
.
IntegerField
()
catalog/static/css/body.css
View file @
c65082e0
...
@@ -25,13 +25,11 @@ body
...
@@ -25,13 +25,11 @@ body
/*--------option list classes--------*/
/*--------option list classes--------*/
#option-list
{
#option-list
{
margin-top
:
3
px
;
margin-top
:
8
px
;
display
:
none
;
display
:
none
;
position
:
absolute
;
position
:
absolute
;
border-radius
:
3px
;
border-radius
:
3px
;
background-color
:
white
;
background-color
:
white
;
/*width: 208px;*/
/*max-height: 173px;*/
width
:
400px
;
width
:
400px
;
max-height
:
541px
;
max-height
:
541px
;
overflow
:
auto
;
overflow
:
auto
;
...
...
catalog/static/js/dataRetrieval.js
View file @
c65082e0
...
@@ -48,7 +48,7 @@ var makeRequest = function (value) {
...
@@ -48,7 +48,7 @@ var makeRequest = function (value) {
$
.
ajax
({
$
.
ajax
({
type
:
"POST"
,
type
:
"POST"
,
url
:
"http://localhost:8080/catalog/searchsubmit/"
,
url
:
req_url
,
data
:
{
data
:
{
'csrfmiddlewaretoken'
:
document
.
getElementsByName
(
'csrfmiddlewaretoken'
)[
0
].
value
,
'csrfmiddlewaretoken'
:
document
.
getElementsByName
(
'csrfmiddlewaretoken'
)[
0
].
value
,
'value'
:
value
'value'
:
value
...
...
catalog/templates/base_top.html
View file @
c65082e0
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
<link
rel=
"stylesheet"
href=
"{% static 'adminlte/bower_components/bootstrap/dist/css/bootstrap.min.css' %}"
>
<link
rel=
"stylesheet"
href=
"{% static 'adminlte/bower_components/bootstrap/dist/css/bootstrap.min.css' %}"
>
<!-- Font Awesome -->
<!-- Font Awesome -->
<link
rel=
"stylesheet"
href=
"{% static 'adminlte/bower_components/font-awesome/css/font-awesome.min.css' %}"
>
<link
rel=
"stylesheet"
href=
"{% static 'adminlte/bower_components/font-awesome/css/font-awesome.min.css' %}"
>
<link
rel=
"stylesheet"
href=
"https://use.fontawesome.com/releases/v5.0.13/css/all.css"
integrity=
"sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp"
crossorigin=
"anonymous"
>
<!-- Theme style -->
<!-- Theme style -->
<link
rel=
"stylesheet"
href=
"{% static 'adminlte/dist/css/AdminLTE.css' %}"
>
<link
rel=
"stylesheet"
href=
"{% static 'adminlte/dist/css/AdminLTE.css' %}"
>
<!-- AdminLTE Skins. Choose a skin from the css/skins folder instead of downloading all of them to reduce the load. -->
<!-- AdminLTE Skins. Choose a skin from the css/skins folder instead of downloading all of them to reduce the load. -->
...
...
catalog/templates/map.html
View file @
c65082e0
...
@@ -2,15 +2,15 @@
...
@@ -2,15 +2,15 @@
{% load staticfiles %}
{% load staticfiles %}
{% block headMedia %}
{% block headMedia %}
<link
rel=
"stylesheet"
href=
"{% static 'css/map.css'%}"
type=
"text/css"
>
<link
rel=
"stylesheet"
href=
"{% static 'css/map.css'%}"
type=
"text/css"
>
<link
rel=
"stylesheet"
href=
"{% static 'css/body.css'%}"
type=
"text/css"
>
<link
rel=
"stylesheet"
href=
"{% static 'css/body.css'%}"
type=
"text/css"
>
<link
rel=
"stylesheet"
href=
"https://openlayers.org/en/v4.6.4/css/ol.css"
type=
"text/css"
>
<link
rel=
"stylesheet"
href=
"https://openlayers.org/en/v4.6.4/css/ol.css"
type=
"text/css"
>
<script
src=
"https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"
></script>
<script
src=
"https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"
></script>
<script
src=
"https://openlayers.org/en/v4.6.4/build/ol.js"
></script>
<script
src=
"https://openlayers.org/en/v4.6.4/build/ol.js"
></script>
<script
src=
"{% static 'js/openLayers4.js'%}"
></script>
<script
src=
"{% static 'js/openLayers4.js'%}"
></script>
<script
src=
"{% static 'js/sidtMap.js'%}"
></script>
<script
src=
"{% static 'js/sidtMap.js'%}"
></script>
{% endblock %}
{% endblock %}
{% block messages %}
{% block messages %}
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
...
@@ -118,16 +118,11 @@
...
@@ -118,16 +118,11 @@
{% endblock %}
{% endblock %}
{% block sidebar %}
{% block sidebar %}
<div
class=
"form-group "
>
<div
class=
"form-group "
>
<!-- search form -->
<!-- search form -->
<form
role=
"form"
action=
"{% url 'search-submit' %}"
method=
"post"
class=
"sidebar-form"
>
<form
role=
"form"
action=
"{% url 'search-submit' %}"
method=
"post"
class=
"sidebar-form"
>
{% csrf_token %}
{% csrf_token %}
<div
class=
"input-group"
>
<div
class=
"input-group"
>
<input
type=
"text"
id=
"ajax-input"
list=
"polygon-list"
name=
"value"
class=
"form-control"
placeholder=
"Search..."
>
<input
type=
"text"
id=
"ajax-input"
list=
"polygon-list"
name=
"value"
class=
"form-control"
placeholder=
"Search..."
>
{#
<datalist
id=
"polygon-list"
>
#}
{#
<option
value=
"merida"
>
#}
{#
<option
value=
"otro"
>
#}
{#
</datalist>
#}
<span
class=
"input-group-btn"
>
<span
class=
"input-group-btn"
>
<button
type=
"submit"
name=
"search"
id=
"search-btn"
class=
"btn btn-flat"
><i
class=
"fa fa-search"
></i>
<button
type=
"submit"
name=
"search"
id=
"search-btn"
class=
"btn btn-flat"
><i
class=
"fa fa-search"
></i>
</button>
</button>
...
@@ -141,68 +136,78 @@
...
@@ -141,68 +136,78 @@
</form>
</form>
<!-- /search form -->
<!-- /search form -->
<!-- sidebar menu: : style can be found in sidebar.less -->
<!-- sidebar menu: : style can be found in sidebar.less -->
<form
role=
"form"
target=
"catalogFrame"
action=
"{% url 'productList' %}"
>
<form
role=
"form"
target=
"catalogFrame"
action=
"{% url 'productList' %}"
method=
"post"
>
<ul
class=
"sidebar-menu"
data-widget=
"tree"
>
{% csrf_token %}
<!-- <li class="header">Filters</li>-->
<ul
class=
"sidebar-menu"
data-widget=
"tree"
>
<li
class=
"active treeview"
>
<li
class=
"active treeview"
>
<a
href=
"#"
>
<a
href=
"#"
>
<i
class=
"fa fa-rocket"
></i>
<i
class=
"fa fa-sync-alt"
></i>
<span>
Mission
</span>
<span>
Process
</span>
<span
class=
"pull-right-container"
>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
<span
class=
"label label-primary pull-right"
></span>
</span>
</span>
</a>
</a>
<ul
class=
"treeview-menu sidebar-form"
>
<ul
class=
"treeview-menu sidebar-form"
>
<li
class=
"col-xs-12"
>
{{searchForm.platform}}
</li>
<li
class=
"col-xs-12"
>
{{searchForm.platform}}
</li>
</ul>
</ul>
</li>
</li>
<li
class=
"treeview"
>
<li
class=
"treeview"
>
<a
href=
"#"
>
<a
href=
"#"
>
<i
class=
"fa fa-calendar"
></i>
<i
class=
"fa fa-calendar-alt"
></i>
<span>
Date Range
</span>
<span>
Date Range
</span>
<span
class=
"pull-right-container"
>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
<span
class=
"label label-primary pull-right"
></span>
</span>
</span>
</a>
</a>
<ul
class=
"treeview-menu sidebar-form"
>
<ul
class=
"treeview-menu sidebar-form"
>
<li>
{{searchForm.start}}
</li>
<li>
{{searchForm.start}}
</li>
<li>
{{searchForm.end}}
</li>
<li>
{{searchForm.end}}
</li>
</ul>
</ul>
</li>
</li>
<li
class=
"treeview "
>
<li
class=
"treeview "
>
<a
href=
"#"
>
<a
href=
"#"
>
<i
class=
"fa fa-map-o"
></i>
<i
class=
"fa fa-map"
></i>
<span>
Polygon
</span>
<span>
Polygon
</span>
<span
class=
"pull-right-container"
>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
<span
class=
"label label-primary pull-right"
></span>
</span>
</span>
</a>
</a>
<ul
class=
"treeview-menu sidebar-form"
>
<ul
class=
"treeview-menu sidebar-form"
>
<li>
{{searchForm.polygon}}
</li>
<li>
{{searchForm.polygon}}
</li>
</ul>
</ul>
</li>
</li>
<li><a
href=
"#"
><i
class=
"fa fa-search"
></i>
<li
class=
"treeview "
>
<span>
<a
href=
"#"
>
<button
type=
"submit"
name=
"search"
id=
"search-btn"
class=
"btn btn-primary"
>
Search
</button>
<i
class=
"fa fa-cloud"
></i>
</span>
<span>
Cloud percentage
</span>
</a></li>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
<li>
</span>
</a>
<iframe
id=
"catalogFrame"
name=
"catalogFrame"
>
my frame
</iframe>
<input
class=
"treeview-menu sidebar-form"
type=
"text"
name=
"cloudPercentage"
>
</ul>
</li>
</li>
<li>
</ul>
<a
href=
"#"
><i
class=
"fa fa-search"
></i>
</form>
<span>
</div>
<!-- form-group-->
<button
type=
"submit"
name=
"search"
id=
"search-btn"
class=
"btn btn-primary"
>
Search
</button>
</span>
</a>
</li>
<li>
<iframe
id=
"catalogFrame"
name=
"catalogFrame"
>
my frame
</iframe>
</li>
</ul>
</form>
</div>
<!-- form-group-->
{% endblock %}
{% endblock %}
{% block user %}
{% block user %}
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
<i
class=
"fa fa-user"
></i>
<i
class=
"fa fa-user"
></i>
<!-- <img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image">-->
<!-- <img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image">-->
<!-- <span class="hidden-xs">Alexander Pierce</span>-->
<!-- <span class="hidden-xs">Alexander Pierce</span>-->
</a>
</a>
...
@@ -212,7 +217,7 @@
...
@@ -212,7 +217,7 @@
<!-- <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">-->
<!-- <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">-->
<p>
<p>
{{ user.get_full_name }}
{{ user.get_full_name }}
<small>
{{ user.get_username }}
</small>
<small>
{{ user.get_username }}
</small>
</p>
</p>
</li>
</li>
...
@@ -235,7 +240,7 @@
...
@@ -235,7 +240,7 @@
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
<div
id=
"map"
class=
"map"
tabindex=
"0"
>
</div>
<div
id=
"map"
class=
"map"
tabindex=
"0"
>
</div>
<footer
class=
"my-footer"
>
<footer
class=
"my-footer"
>
<strong>
<strong>
...
@@ -245,10 +250,11 @@
...
@@ -245,10 +250,11 @@
{% endblock %}
{% endblock %}
{% block scripts %}
{% block scripts %}
<script>
<script>
//var osmap = new OpenStreetMapsClass("map", -99.145556,19.419444, 10);
//var osmap = new OpenStreetMapsClass("map", -99.145556,19.419444, 10);
var
osmap
=
new
sidtMap
(
"map"
,
-
89.63873079999999
,
21.0404457
,
7
);
var
osmap
=
new
sidtMap
(
"map"
,
-
89.63873079999999
,
21.0404457
,
7
);
osmap
.
geolocation
();
osmap
.
geolocation
();
osmap
.
addInteraction
();
osmap
.
addInteraction
();
</script>
var
req_url
=
"{% url 'search-submit' %}"
;
// url for requesting polygon data
</script>
{% endblock %}
{% endblock %}
catalog/views.py
View file @
c65082e0
...
@@ -38,10 +38,11 @@ def productList(request):
...
@@ -38,10 +38,11 @@ def productList(request):
View function for home page of site.
View function for home page of site.
"""
"""
r2
=
dict
(
request
.
POST
)
r2
=
dict
(
request
.
POST
)
print
r2
r2
.
pop
(
'csrfmiddlewaretoken'
,
None
)
r2
.
pop
(
'csrfmiddlewaretoken'
,
None
)
url
=
'https://api.daac.asf.alaska.edu/services/search/param?'
+
urlencode
(
r2
,
'utf-8'
)
+
"&output=JSON"
url
=
'https://api.daac.asf.alaska.edu/services/search/param?'
+
urlencode
(
r2
,
'utf-8'
)
+
"&output=JSON"
print
url
#
print url
# response = requests.get(url)
# response = requests.get(url)
...
@@ -106,7 +107,7 @@ class SearchSubmitView(View):
...
@@ -106,7 +107,7 @@ class SearchSubmitView(View):
}
}
# rendered_template = template.render(context, request)
# rendered_template = template.render(context, request)
print
(
"DATA:"
,
data
)
#
print("DATA:", data)
# return HttpResponse(rendered_template, content_type='application/json')
# return HttpResponse(rendered_template, content_type='application/json')
# return HttpResponse(json.dumps(data, ensure_ascii=True), content_type='application/json')
# return HttpResponse(json.dumps(data, ensure_ascii=True), content_type='application/json')
return
JsonResponse
(
data
)
return
JsonResponse
(
data
)
...
...
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