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
492f3714
Commit
492f3714
authored
Jun 03, 2019
by
Ulises Morales Ramírez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
descripcion reportes
parent
d54d3266
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
149 additions
and
32 deletions
+149
-32
views.py
catalog/views.py
+0
-3
scldata.css
reports/static/reports/css/scldata.css
+68
-0
minimap.js
reports/static/reports/js/minimap.js
+3
-0
sclData.html
reports/templates/sclData.html
+76
-28
views.py
reports/views.py
+2
-1
No files found.
catalog/views.py
View file @
492f3714
...
@@ -100,7 +100,6 @@ def productList(request):
...
@@ -100,7 +100,6 @@ def productList(request):
end_date
=
req
[
'end'
][
0
][:
10
]
end_date
=
req
[
'end'
][
0
][:
10
]
clouds
=
req
[
'cloudPercentage'
][
0
]
clouds
=
req
[
'cloudPercentage'
][
0
]
search_name
=
req
[
'search_name'
][
0
]
search_name
=
req
[
'search_name'
][
0
]
print
(
search_name
)
description
=
req
[
'area_description'
][
0
]
description
=
req
[
'area_description'
][
0
]
...
@@ -193,8 +192,6 @@ def productList(request):
...
@@ -193,8 +192,6 @@ def productList(request):
description
=
description
,
description
=
description
,
)
)
print
(
"---------------------------"
)
print
(
search_name
)
listSearch
.
save
()
listSearch
.
save
()
return
JsonResponse
({
'catalog'
:
catalog
});
return
JsonResponse
({
'catalog'
:
catalog
});
...
...
reports/static/reports/css/scldata.css
View file @
492f3714
...
@@ -218,6 +218,7 @@ select::-ms-expand {
...
@@ -218,6 +218,7 @@ select::-ms-expand {
transition
:
.25s
all
ease
;
transition
:
.25s
all
ease
;
}
}
/* range normal */
.arrow_box
{
.arrow_box
{
position
:
relative
;
position
:
relative
;
...
@@ -251,3 +252,70 @@ select::-ms-expand {
...
@@ -251,3 +252,70 @@ select::-ms-expand {
}
}
/* range de comparacion */
/* left */
.arrow_box_left
{
position
:
relative
;
background
:
#ffffff
;
border
:
1px
solid
#ffa74f
;
min-height
:
30px
;
bottom
:
10px
;
}
.arrow_box_left
:after
,
.arrow_box_left
:before
{
top
:
100%
;
left
:
50%
;
border
:
solid
transparent
;
content
:
" "
;
height
:
0
;
width
:
0
;
position
:
absolute
;
pointer-events
:
none
;
}
.arrow_box_left
:after
{
border-color
:
rgba
(
255
,
255
,
255
,
0
);
border-top-color
:
#ffffff
;
border-width
:
10px
;
margin-left
:
-10px
;
}
.arrow_box_left
:before
{
border-color
:
rgba
(
255
,
167
,
79
,
0
);
border-top-color
:
#ffa74f
;
border-width
:
11px
;
margin-left
:
-11px
;
}
/* left */
.arrow_box_right
{
position
:
relative
;
background
:
#ffffff
;
border
:
1px
solid
#ffa74f
;
min-height
:
30px
;
bottom
:
10px
;
}
.arrow_box_right
:after
,
.arrow_box_right
:before
{
top
:
100%
;
left
:
50%
;
border
:
solid
transparent
;
content
:
" "
;
height
:
0
;
width
:
0
;
position
:
absolute
;
pointer-events
:
none
;
}
.arrow_box_right
:after
{
border-color
:
rgba
(
255
,
255
,
255
,
0
);
border-top-color
:
#ffffff
;
border-width
:
10px
;
margin-left
:
-10px
;
}
.arrow_box_right
:before
{
border-color
:
rgba
(
255
,
167
,
79
,
0
);
border-top-color
:
#ffa74f
;
border-width
:
11px
;
margin-left
:
-11px
;
}
\ No newline at end of file
reports/static/reports/js/minimap.js
View file @
492f3714
...
@@ -230,6 +230,9 @@ function selectLeft(date) {
...
@@ -230,6 +230,9 @@ function selectLeft(date) {
//selecciona el lado derecho para comparar
//selecciona el lado derecho para comparar
function
selectRight
(
date
){
function
selectRight
(
date
){
console
.
log
(
"---------"
);
console
.
log
(
date
)
console
.
log
(
"---------"
);
var
labelDateRight
=
date
;
var
labelDateRight
=
date
;
var
layer_type
=
'TCI'
;
var
layer_type
=
'TCI'
;
const
right
=
new
ol
.
layer
.
Tile
({
const
right
=
new
ol
.
layer
.
Tile
({
...
...
reports/templates/sclData.html
View file @
492f3714
...
@@ -136,26 +136,34 @@
...
@@ -136,26 +136,34 @@
</div>
</div>
</div>
</div>
<div
id=
"selectLeft"
class=
"container floating-panel"
style=
"position:absolute; display:none; bottom: 50px; left: 30%; width: 300px; z-index: 1000"
>
<div
id=
"selectLeft"
class=
"container floating-panel"
<div
class=
"select"
>
style=
"position:absolute; display:none; bottom: 50px; left: 30%; width: 300px; z-index: 1000"
>
<select
onchange=
"selectLeft(this.value)"
id=
"selectLeftCompare"
>
<div
class=
""
>
<div
id=
"rangecontrol3"
></div>
<!--<select onchange="selectLeft(this.value)" id="selectLeftCompare">
{% for label in labels %}
{% for label in labels %}
<option value="{{label}}" >{{ label|slice:"6:8" }}/{{ label|slice:"4:6" }}/{{label|slice:"0:4" }}</option>
<option value="{{label}}" >{{ label|slice:"6:8" }}/{{ label|slice:"4:6" }}/{{label|slice:"0:4" }}</option>
{% endfor %}
{% endfor %}
</select>
</select>-->
<input
class=
"cross-range"
id=
"selectLeftCompare"
type=
"range"
min=
"0"
max=
"{{ labels|length|add:'-1' }}"
step=
"1"
value=
"0"
data-thumbwidth=
"20"
style=
"background: transparent;"
>
</div>
</div>
</div>
</div>
<div
id=
"selectRight"
class=
"container floating-panel"
style=
"position:absolute; display:none; bottom: 50px; left: 75%; width: 300px; z-index: 1000"
>
<div
id=
"selectRight"
class=
"container floating-panel"
<div
class=
"select"
>
style=
"position:absolute; display:none; bottom: 50px; left: 75%; width: 300px; z-index: 1000"
>
<select
onchange=
"selectRight(this.value)"
id=
"selectRightCompare"
>
<div>
<div
id=
"rangecontrol4"
></div>
<!--<select onchange="selectRight(this.value)" id="selectRightCompare">
{% for label in labels %}
{% for label in labels %}
<option value="{{label}}" >{{ label|slice:"6:8" }}/{{ label|slice:"4:6" }}/{{label|slice:"0:4" }}</option>
<option value="{{label}}" >{{ label|slice:"6:8" }}/{{ label|slice:"4:6" }}/{{label|slice:"0:4" }}</option>
{% endfor %}
{% endfor %}
</select>
</select>-->
<input
class=
"cross-range"
id=
"selectRightCompare"
type=
"range"
min=
"0"
max=
"{{ labels|length|add:'-1' }}"
step=
"1"
value=
"0"
data-thumbwidth=
"20"
style=
"background: transparent;"
>
</div>
</div>
</div>
</div>
<div
class=
"mapControl"
style=
"display: none"
>
<div
class=
"mapControl"
style=
"display: none"
>
<div
class=
"mapControl"
style=
""
>
<div
class=
"mapControl"
style=
""
>
<div
id=
"controlMap"
class=
"controlContainer"
>
<div
id=
"controlMap"
class=
"controlContainer"
>
...
@@ -346,6 +354,7 @@
...
@@ -346,6 +354,7 @@
let
fecha
=
$
(
"option:eq("
+
controlVal
+
")"
).
text
();
let
fecha
=
$
(
"option:eq("
+
controlVal
+
")"
).
text
();
let
valor
=
$
(
"option:eq("
+
controlVal
+
")"
).
val
();
let
valor
=
$
(
"option:eq("
+
controlVal
+
")"
).
val
();
var
slider3
=
$
(
"#inputRange"
)[
0
];
var
slider3
=
$
(
"#inputRange"
)[
0
];
var
sliderPos
=
slider3
.
value
/
slider3
.
max
;
var
sliderPos
=
slider3
.
value
/
slider3
.
max
;
...
@@ -355,31 +364,70 @@
...
@@ -355,31 +364,70 @@
layerDate
:
valor
layerDate
:
valor
});
});
$
(
"#maptitle"
).
empty
();
$
(
"#maptitle"
).
append
(
"Map Date: "
+
fecha
);
$
(
"#tooltiptext"
).
empty
();
$
(
"#tooltiptext"
).
empty
();
$
(
"#tooltiptext"
).
append
(
fecha
);
$
(
"#tooltiptext"
).
append
(
fecha
);
$
(
"#rangecontrol2"
).
empty
();
$
(
"#rangecontrol2"
).
empty
();
$
(
"#rangecontrol2"
).
append
(
'<span class="arrow_box" id="tooltiptext">'
+
fecha
+
'</span>'
);
$
(
"#rangecontrol2"
).
append
(
'<span class="arrow_box" id="tooltiptext">'
+
fecha
+
'</span>'
);
$
(
'.arrow_box'
).
css
({
'left'
:
Math
.
round
(
pixelPostion
-
35
)
+
'px'
})
$
(
'.arrow_box'
).
css
({
'left'
:
Math
.
round
(
pixelPostion
-
35
)
+
'px'
})
});
});
/*
var slider2 = document.getElementById("inputRange");
$
(
'input[id="selectLeftCompare"]'
).
on
(
'input'
,
function
()
{
var sliderOffsetX = slider2.getBoundingClientRect().left ;//- document.documentElement.getBoundingClientRect().left;
let
control
=
$
(
this
);
var sliderOffsetY = slider2.getBoundingClientRect().top ;//- document.documentElement.getBoundingClientRect().top;
let
controlMin
=
control
.
attr
(
'min'
);
var sliderWidth = slider2.offsetWidth ;
let
controlMax
=
control
.
attr
(
'max'
);
let
controlVal
=
control
.
val
();
slider2.addEventListener('mousemove', function (event) {
let
controlThumbWidth
=
control
.
data
(
'thumbwidth'
);
var currentMouseXPos = (event.clientX + window.pageXOffset) - sliderOffsetX;
let
range
=
controlMax
-
controlMin
;
var sliderValAtPos = Math.round(currentMouseXPos / sliderWidth * {{ labels|length }}+1);
let
position
=
(
controlVal
-
controlMin
)
/
range
*
100
;
value = sliderValAtPos - 1;
let
positionOffset
=
Math
.
round
(
controlThumbWidth
*
position
/
100
)
-
controlThumbWidth
/
2
;
var fecha = $("option:eq(" + value + ")").text();
let
fecha
=
$
(
"option:eq("
+
controlVal
+
")"
).
text
();
var valor = $("option:eq(" + value + ")").val();
let
valor
=
$
(
"option:eq("
+
controlVal
+
")"
).
val
();
selectLeft
(
valor
);
//$("#tooltiptext").empty();
//$("#tooltiptext").css({"margin-left": currentMouseXPos + 'px', "margin-top": sliderOffsetY + 'px'});
var
slider3
=
$
(
"#selectLeftCompare"
)[
0
];
//$("#tooltiptext").append(fecha);
var
sliderPos
=
slider3
.
value
/
slider3
.
max
;
});*/
var
pixelPostion
=
slider3
.
clientWidth
*
sliderPos
;
$
(
"#tooltiptext2"
).
empty
();
$
(
"#tooltiptext2"
).
append
(
fecha
);
$
(
"#rangecontrol3"
).
empty
();
$
(
"#rangecontrol3"
).
append
(
'<span class="arrow_box_left" id="tooltiptext2">'
+
fecha
+
'</span>'
);
$
(
'.arrow_box_left'
).
css
({
'left'
:
Math
.
round
(
pixelPostion
-
35
)
+
'px'
})
});
$
(
'input[id="selectRightCompare"]'
).
on
(
'input'
,
function
()
{
let
control
=
$
(
this
);
let
controlMin
=
control
.
attr
(
'min'
);
let
controlMax
=
control
.
attr
(
'max'
);
let
controlVal
=
control
.
val
();
let
controlThumbWidth
=
control
.
data
(
'thumbwidth'
);
let
range
=
controlMax
-
controlMin
;
let
position
=
(
controlVal
-
controlMin
)
/
range
*
100
;
let
positionOffset
=
Math
.
round
(
controlThumbWidth
*
position
/
100
)
-
controlThumbWidth
/
2
;
let
fecha
=
$
(
"option:eq("
+
controlVal
+
")"
).
text
();
let
valor
=
$
(
"option:eq("
+
controlVal
+
")"
).
val
();
selectRight
(
valor
);
var
slider3
=
$
(
"#selectRightCompare"
)[
0
];
var
sliderPos
=
slider3
.
value
/
slider3
.
max
;
var
pixelPostion
=
slider3
.
clientWidth
*
sliderPos
;
$
(
"#tooltiptext3"
).
empty
();
$
(
"#tooltiptext3"
).
append
(
fecha
);
$
(
"#rangecontrol4"
).
empty
();
$
(
"#rangecontrol4"
).
append
(
'<span class="arrow_box_right" id="tooltiptext3">'
+
fecha
+
'</span>'
);
$
(
'.arrow_box_right'
).
css
({
'left'
:
Math
.
round
(
pixelPostion
-
35
)
+
'px'
})
});
</script>
</script>
<!-- page script -->
<!-- page script -->
...
...
reports/views.py
View file @
492f3714
...
@@ -156,7 +156,7 @@ def Reports(request):
...
@@ -156,7 +156,7 @@ def Reports(request):
else
:
else
:
for
files
in
os
.
listdir
(
absolute_path
):
for
files
in
os
.
listdir
(
absolute_path
):
if
files
==
'scl_data.json'
:
if
files
==
'scl_data.json'
:
#
print
(files)
#
+
(files)
initial_folder
=
files
[:
8
]
initial_folder
=
files
[:
8
]
break
break
elif
files
.
endswith
(
'_sclData.json'
):
elif
files
.
endswith
(
'_sclData.json'
):
...
@@ -266,6 +266,7 @@ def wsProcessProgress(request):
...
@@ -266,6 +266,7 @@ def wsProcessProgress(request):
})
})
progress
=
0
progress
=
0
progress_text
=
""
log_info
=
""
log_info
=
""
# productList2 = []
# productList2 = []
...
...
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