diff --git a/application/views/monpas/pages/ijkpunten.php b/application/views/monpas/pages/ijkpunten.php index 8b7141f..40e4e5f 100644 --- a/application/views/monpas/pages/ijkpunten.php +++ b/application/views/monpas/pages/ijkpunten.php @@ -199,17 +199,6 @@ - - - - - - - - - - -
@@ -218,14 +207,19 @@ + + + + - @@ -264,6 +258,10 @@
-
nr
+
+
nr
+ style="border-right: 1px solid white; border-bottom: 1px solid #a07b8e;padding-left: 4px;">
+ + + +
@@ -317,6 +315,10 @@ + + + +
@@ -367,6 +369,10 @@ + + + +
@@ -399,6 +405,10 @@ + + + +
@@ -437,9 +447,9 @@
-
-
- +
+
+
@@ -467,13 +477,14 @@
-
+

Ambities

- + +

@@ -496,7 +507,7 @@
-
+

diff --git a/application/views/monpas/reports/ijkpuntenchart.php b/application/views/monpas/reports/ijkpuntenchart.php index b1acd0d..9ba43e4 100644 --- a/application/views/monpas/reports/ijkpuntenchart.php +++ b/application/views/monpas/reports/ijkpuntenchart.php @@ -27,15 +27,7 @@ - .blokjesitempdf{ - margin 2px; - padding: 10px 5px 5px 10px; - height: 125px !important; - width: 22%; - font-size:0.8em; - background-color:#f5f0f2 !important; - border-radius: 2px; - } + .h4koppdf{ font-size: 1.5em !important; @@ -45,6 +37,9 @@ margin-left: 0; padding-left: 0; } + .blokjescontainer{ + width: 100%; + } .blokjesitem{ background-color:#f5f0f2 !important; @@ -59,6 +54,24 @@ font-family: Verdana, Geneva, sans-serif !important; } + .blokjesitempdf{ + background-color:#f5f0f2 !important; + float:left; + width:22%; + margin 2px; + margin-right:15px; + padding: 10px 5px 5px 10px; + border-radius: 2px; + height: 215px; + font-size:0.8em; + font-weight: normal; + font-family: Verdana, Geneva, sans-serif !important; + } + + .tabelcontainer{ + width: 100%; + } + .tabelitem{ float: left; font-size:0.8em; @@ -77,13 +90,27 @@ } .pdflegenda{ - font-size:0.8em; + font-size:0.7em; font-family: Verdana, Geneva, sans-serif !important; width:35%; height: 150px!important; + margin-top: 30px; - margin-top: 5px; + } + .ijkpuntthdiv{ + height: 50px; + overflow:hidden; + font-weight: normal; + font-size:0.8em; + } + .ijkpuntth { + vertical-align:top; + padding: 2px; + } + .ijkpuntkopje{ + font-weight: 500; + margin-bottom: 10px; } @@ -93,10 +120,10 @@ -
+
-
+
-
+


-

legenda

-
+ +
-
-
+ +
- -
+ +
diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index 994b0f3..8bb8f60 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -1313,6 +1313,12 @@ z-index: 50; padding-left: 10px; border-radius: 2px; } +.blokjesitempdf{ + background-color:#f5f0f2 !important; + padding: 5px; + padding-left: 10px; + border-radius: 2px; +} .tabelcontainer{ display: grid; grid-template-columns: 400px 150px 150px 150px 150px; @@ -1335,4 +1341,8 @@ z-index: 50; .ijkpuntth { vertical-align:top; padding: 2px; +} +.ijkpuntkopje{ + font-weight: bold!important; + margin-bottom: 10px; } \ No newline at end of file diff --git a/public/js/monpas/models/ijkpuntenmodel.js b/public/js/monpas/models/ijkpuntenmodel.js index eb56246..a22089e 100644 --- a/public/js/monpas/models/ijkpuntenmodel.js +++ b/public/js/monpas/models/ijkpuntenmodel.js @@ -858,7 +858,7 @@ ls.initIJkpuntenModel = function(){ var resultaten = document.getElementById("ijkresultaten").outerHTML; var sd = { - chart: chart, + chart: GrafiekInfo, tabellen: tabellen, legenda: legenda, ambities: ambities,