Bugs fixed in L2ASCL

parent b1ab42ec
...@@ -105,7 +105,7 @@ body ...@@ -105,7 +105,7 @@ body
opacity: 1; opacity: 1;
} }
#minimap{ .minimap{
width:100%; width:100%;
height:100%; height:100%;
margin:0; margin:0;
...@@ -113,6 +113,13 @@ body ...@@ -113,6 +113,13 @@ body
position:fixed; position:fixed;
} }
.minimaptabs{
width:100%;
height:100%;
margin:0;
padding:0;
}
#reportPage{ #reportPage{
height: 940px !important; height: 940px !important;
} }
......
...@@ -302,17 +302,9 @@ ...@@ -302,17 +302,9 @@
width="375" width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_unclassified.png" height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_unclassified.png"
style="position: absolute; top: 0; z-index:1;"> style="position: absolute; top: 0; z-index:1;">
<img onclick="window.open(this.src)" class="img-responsive" id="scl_cloud_medium_probability" <img onclick="window.open(this.src)" class="img-responsive" id="scl_clouds"
width="375" width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_cloud_medium_probability.png" height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_clouds.png"
style="position: absolute; top: 0; z-index:1;">
<img onclick="window.open(this.src)" class="img-responsive" id="scl_cloud_high_probability"
width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_cloud_high_probability.png"
style="position: absolute; top: 0; z-index:1;">
<img onclick="window.open(this.src)" class="img-responsive" id="scl_thin_cirrus"
width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_thin_cirrus.png"
style="position: absolute; top: 0; z-index:1;"> style="position: absolute; top: 0; z-index:1;">
<img onclick="window.open(this.src)" class="img-responsive" id="scl_snow" <img onclick="window.open(this.src)" class="img-responsive" id="scl_snow"
width="375" width="375"
...@@ -332,7 +324,7 @@ ...@@ -332,7 +324,7 @@
<h3 class="box-title">Map</h3> <h3 class="box-title">Map</h3>
</div> </div>
<div class="box-body" style="max-height: 550px;"> <div class="box-body" style="max-height: 550px;">
<div id="minimap" style="height: 550px"></div> <div id="minimap" class="minimaptabs" style="height: 547px"></div>
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
...@@ -431,14 +423,8 @@ ...@@ -431,14 +423,8 @@
SCLlayers.splice(SCLlayers.indexOf(layer), 1); SCLlayers.splice(SCLlayers.indexOf(layer), 1);
document.getElementById("scl_"+layer).src = "" document.getElementById("scl_"+layer).src = ""
} }
//if (index > 1) {
// Do the original logic
//console.log("wooooo")
//defaultLegendClickHandler(e, legendItem);
defaultLegendClickHandler.call(this, e, legendItem); defaultLegendClickHandler.call(this, e, legendItem);
//} else {
// console.log("holaaaa")
//}
}; };
var label; var label;
...@@ -454,6 +440,7 @@ ...@@ -454,6 +440,7 @@
let endDate = "{{ endDate }}"; let endDate = "{{ endDate }}";
let clouds= "{{ clouds }}"; let clouds= "{{ clouds }}";
let oldLabel = "{{defaultDataSet}}"; let oldLabel = "{{defaultDataSet}}";
let labels = {{ labels }};
var config = {{graphData}} var config = {{graphData}}
config.options = { config.options = {
responsive: true, responsive: true,
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<!-- Content Wrapper. Contains page content --> <!-- Content Wrapper. Contains page content -->
<!-- Main content --> <!-- Main content -->
<div id="reportPage" class="wrapper" style="background-color: #ecf0f5"> <div id="reportPage" class="wrapper" style="background-color: #ecf0f5">
<div id="minimap"></div> <div id="minimap" class="minimap"></div>
<section class="content"> <section class="content">
<div class="row col-lg-11 title"> <div class="row col-lg-11 title">
...@@ -129,10 +129,7 @@ ...@@ -129,10 +129,7 @@
<div class="box box-success"> <div class="box box-success">
<div class="box-body with-border"> <div class="box-body with-border">
<div class="row"> <div class="row">
<div class="col-lg-2 text-center"> <div class="col-lg-2 text-center col-lg-offset-1">
<h4>Zone: {{ zone }}</h4>
</div>
<div class="col-lg-2 text-center">
<h4>Platform: {{ platform }}</h4> <h4>Platform: {{ platform }}</h4>
</div> </div>
<div class="col-lg-2 text-center"> <div class="col-lg-2 text-center">
......
...@@ -63,6 +63,7 @@ def report_L2ASCL(request, report, purchase_id): ...@@ -63,6 +63,7 @@ def report_L2ASCL(request, report, purchase_id):
template = "L2ASCL_data.html" template = "L2ASCL_data.html"
reporteDir = report.replace('_sclData', '') reporteDir = report.replace('_sclData', '')
reporteDir += "/mask"
absolute_path = USERS_PATH + request.user.email + "/" + purchase_id + "/out" absolute_path = USERS_PATH + request.user.email + "/" + purchase_id + "/out"
folders = os.listdir(absolute_path) folders = os.listdir(absolute_path)
......
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