Merge branch 'dev' of http://gitlab.geoint.mx/mario.chirinos/GeoInt_SIDT into dev

reports/static/reports/css/scldata.css

@@ -75,7 +75,7 @@ body
 	border-radius: 50%;
 }
 
-#draggable {
+.draggable {
   padding: 0px;
   position: absolute;
   z-index: -1;
@@ -84,6 +84,33 @@ body
   opacity: .5;
 }
 
-#draggable:hover {
+.draggable:hover {
   opacity: 1;
+}
+
+.title{
+	position: absolute;
+	top: 2%; 
+	left: 6%;
+	width:100%;
+	height: 100%;
+}
+
+.title .info {
+	opacity: 0.5;
+}
+.title .info:hover{
+	opacity: 1;
+}
+
+#minimap{
+	width:100%;
+	height:100%;
+	margin:0;
+	padding:0;
+	position:fixed;
+}
+
+#reportPage{
+	height: 940px !important;
 }
\ No newline at end of file

reports/static/reports/js/draggable.js

@@ -41,14 +41,27 @@ function dragElement(elmnt) {
 
 function showGraph(){
     if ($('.showChart').is(':visible')){
-        $("#draggable").css('z-index', 10);
+        $("#draggableChart").css('z-index', 10);
         $(".showChart").hide();
         $(".hideChart").show();
     }else{
-        $("#draggable").css('z-index', -1);
+        $("#draggableChart").css('z-index', -1);
         $(".showChart").show();
         $(".hideChart").hide();
     }
 }
 
-dragElement(document.getElementById("draggable"));
\ No newline at end of file
+function showComparisons() {
+    if ($('.showImage').is(':visible')) {
+        $("#draggableImage").css('z-index', 10);
+        $(".showImage").hide();
+        $(".hideImage").show();
+    } else {
+        $("#draggableImage").css('z-index', -1);
+        $(".showImage").show();
+        $(".hideImage").hide();
+    }
+}
+
+dragElement(document.getElementById("draggableChart"));
+dragElement(document.getElementById("draggableImage"));
\ No newline at end of file

reports/static/reports/js/minimap.js

@@ -16,8 +16,7 @@ var map = new ol.Map({
   view: new ol.View({
     center: ol.proj.fromLonLat([-99.19, 19.61]),
     zoom: 4,
-    minZoom:4,
-    maxZoom: 14
+    minZoom:4
   })
 });
 
@@ -37,8 +36,8 @@ function addImageLayer(labelDate) {
           projection: 'EPSG:3857',
           url: getURL(purchase_id, zone, labelDate),
           tilePixelRatio: 2,
-          minZoom: 9,
-          maxZoom: 14
+          minZoom: data.zoom.min,
+          maxZoom: data.zoom.max
         })
       });
 
@@ -47,6 +46,8 @@ function addImageLayer(labelDate) {
 
       var extent = ol.proj.transformExtent(data.boundingBox, 'EPSG:4326', 'EPSG:3857');
       map.getView().fit(extent, {duration: 800})
+      map.getView().setMinZoom(data.zoom.min);
+      map.getView().setMaxZoom(data.zoom.max);
     }
   });
 }

reports/templates/aside.html

@@ -166,5 +166,16 @@
                 </span>
             </a>
         </li>
+        <li>
+            <a class="treeview " href="#" onclick="showComparisons()">
+                <i class="fa fa-eye showImage"></i>
+                <i class="fa fa-eye-slash hideImage" style="display:none"></i>
+                <span class="showImage">Show Images</span>
+                <span class="hideImage" style="display:none">Hidden Images</span>
+                <span class="pull-right-container">
+                    <span class="label label-primary pull-right"></span>
+                </span>
+            </a>
+        </li>
     </ul>
 </div>
\ No newline at end of file