Moved docs, added screenshots + fixed merge error

2017-04-03 19:34:06 +02:00 · 2017-04-03 19:34:06 +02:00 · d6511f3eb7
commit d6511f3eb7
parent 5618e147f3
10 changed files with 4 additions and 5 deletions
--- a/docs/Documentatie_Eindopdracht_Informatica.docx
+++ b/docs/Documentatie_Eindopdracht_Informatica.docx
--- a/docs/Eindopdracht.pdf
+++ b/docs/Eindopdracht.pdf
--- a/docs/Screenshot
+++ b/docs/Screenshot
--- a/docs/Screenshot
+++ b/docs/Screenshot
--- a/docs/Screenshot
+++ b/docs/Screenshot
--- a/docs/Screenshot
+++ b/docs/Screenshot
--- a/docs/Screenshot
+++ b/docs/Screenshot
--- a/docs/Screenshot
+++ b/docs/Screenshot
--- a/docs/Testrapport.pdf
+++ b/docs/Testrapport.pdf
--- a/templates/statistieken.phtml
+++ b/templates/statistieken.phtml
@ -1,6 +1,4 @@
 <?php include '__header.phtml'; ?>
-<a class="btn btn-default pull-left" href="rekeningen/<?= $rekeningnr ?>" role="button">Terug</a>
-<canvas id="grafiek" height="100"></canvas>
 <?php
 if (!$statistieken) {
    ?>
@ -11,8 +9,8 @@ if (!$statistieken) {
 } else {
    ?>

-<a class="btn btn-default pull-left" href="rekeningen/<?= $rekeningnr?>" role="button">Terug</a>
-<canvas id="myChart" height="100"></canvas>
+<a class="btn btn-default pull-left" href="rekeningen/<?= $rekeningnr ?>" role="button">Terug</a>
+<canvas id="grafiek" height="100"></canvas>
 <script>
    Chart.defaults.global.legend.display = false;//Geen legenda
    var grafiek = document.getElementById("grafiek");
@ -61,6 +59,7 @@ if (!$statistieken) {
    });

 <?php
+
 } ?>
 </script>
 <?php include '__footer.phtml'; ?>