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
ce282281
Commit
ce282281
authored
May 03, 2019
by
José Luis Uc
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of gitlab.geoint.mx:mario.chirinos/GeoInt_SIDT into dev
parents
0eafbbe9
478665c6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
11 deletions
+41
-11
map.html
catalog/templates/map.html
+19
-10
reportImg.js
reports/static/reports/js/reportImg.js
+22
-1
No files found.
catalog/templates/map.html
View file @
ce282281
...
...
@@ -192,8 +192,16 @@
</a>
<ul
class=
"treeview-menu sidebar-form"
>
<li>
<input
class=
"form-text"
id=
"clouds"
value=
"5"
oninput=
"setCloudPercentageSlider(this.value)"
name=
"cloudPercentage"
disabled
>
<input
class=
"cross-range"
type=
"range"
min=
"0"
max=
"100"
step=
"1"
value=
"5"
oninput=
"setCloudPercentage(this.value)"
id=
"cloudPercentageSelector"
name=
cloudPercentage
>
<div
class=
"row"
>
<div
class=
"col-lg-9"
style=
"padding-top: 5px;"
>
<input
class=
"cross-range"
type=
"range"
min=
"0"
max=
"100"
step=
"1"
value=
"5"
oninput=
"setCloudPercentage(this.value)"
id=
"cloudPercentageSelector"
name=
"cloudPercentage"
>
</div>
<div
class=
"col-lg-3"
style=
"padding-left:0px;padding-top: 5px;"
>
<!-- <input class="form-text" id="clouds" value="5" oninput="setCloudPercentageSlider(this.value)" name="cloudPercentage" disabled> -->
<span
id=
"clouds"
>
5
</span>
</div>
</div>
</li>
</ul>
</li>
...
...
@@ -328,7 +336,8 @@
function
setCloudPercentage
(
clouds
)
{
//console.log(clouds)
document
.
getElementById
(
"clouds"
).
value
=
clouds
;
//document.getElementById("clouds").value = clouds;
document
.
getElementById
(
"clouds"
).
innerHTML
=
clouds
;
}
function
setCloudPercentageSlider
(
clouds
)
{
//console.log(clouds)
...
...
reports/static/reports/js/reportImg.js
View file @
ce282281
...
...
@@ -145,11 +145,32 @@ function change(newType) {
// Remove the old chart and all its event handles
if
(
myChart
)
{
myChart
.
destroy
();
}
// Chart.js modifies the object you pass in. Pass a copy of the object so we can use the original object later
// -------------- set last values when the chart was destroyed ------
let
selectedLayers
=
getSelectedLayersName
().
map
(
layerName
=>
{
const
layerCheckbox
=
$
(
':checkbox[value='
+
layerName
+
']'
);
return
layerCheckbox
.
parent
().
attr
(
'id'
)
});
selectedLayers
=
selectedLayers
.
filter
(
layerId
=>
layerId
!=
null
);
selectedLayers
=
selectedLayers
.
map
(
layerId
=>
layerId
.
replace
(
'sclcheck-'
,
''
).
replace
(
'-'
,
' '
));
config
.
data
.
datasets
.
forEach
(
data
=>
{
const
label
=
data
.
label
.
toLowerCase
().
replace
(
'-'
,
' '
);
data
.
hidden
=
true
;
if
(
selectedLayers
.
includes
(
label
))
{
data
.
hidden
=
false
;
}
})
// -------------------------------------------------------------------
var
temp
=
jQuery
.
extend
(
true
,
{},
config
);
if
(
newType
==
"stackedBar"
){
temp
.
type
=
"bar"
;
...
...
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