Merge branch 'master' of https://gitlab.univ-artois.fr/ili-2019-2020/microfolielens

WebContent/index.html

@@ -55,6 +55,21 @@
          <div id="data-container" class="container">
             <canvas id="myChart"></canvas>
          </div>
+         
+         <header>
+
+         <h4>Fréquentation de microfolie pour cette semaine</h4>
+
+      </header>
+      
+         <canvas id="mixChart"></canvas>
+         
+         <div class="container">
+           
+            <div id="data-container">
+
+            </div>
+         </div>
        
 
       </main>
@@ -67,6 +82,7 @@
  <script src="js/Chart.min.js" type="text/javascript"></script>
       <script src="js/index.js" type="text/javascript"></script>
       <script src="js/chart.js" type="text/javascript"></script>
+       <script src="js/mixChart.js" type="text/javascript"></script>
 </body>
 
 </html>

WebContent/js/chart.js

@@ -7,14 +7,7 @@ function displayfileData(allData) {
       let espace = usager.espace;   
       let telephone = usager.telephone;    
 
-      document.querySelector("#data-container").innerHTML +=
-      "<div class='usager'>" +
-      "<h3 class='usager-identite'>" + identite + "</h3>" +
-      "<p class='frequentation'> à visité " + frequentation + " fois </p>" +
-      "<p class='situation'>Situation: " + situation + "</p>" +
-      "<p class='espace'>Espace: " + espace + "</p>" +
-      "<p class='telephone'>Telephone: " + telephone + "</p>" +
-      "<div>";
+     
    });
 }
 
@@ -23,22 +16,42 @@ function freqBySpace(allData) {
    var accueilArr = [];
    var espace1Arr = [];
    var espace2Arr = [];
-
+   var espace3Arr = [];
+   var espace4Arr = [];
+   var espace5Arr = [];
+   var espace6Arr = [];
+   
    allData.forEach( (usager) => {
       //console.log(book.format);
       switch (usager.espace) {
-         case "Accueil":
+         case "Espace accueil":
             //console.log("in E!");
             accueilArr.push(usager.frequentation);
             break;
-         case "Espace 1":
+         case "realite virtuelle":
             //console.log("in H!");
             espace1Arr.push(usager.frequentation);
             break;
-         case "Espace 2":
+         case "musee numerique":
             //console.log("in P!");
             espace2Arr.push(usager.frequentation);
             break;
+         case "cyber base":
+             //console.log("in H!");
+             espace3Arr.push(usager.frequentation);
+             break;
+          case "shooting photo":
+             //console.log("in P!");
+             espace4Arr.push(usager.frequentation);
+             break;
+          case "jeux videos":
+              //console.log("in H!");
+              espace5Arr.push(usager.frequentation);
+              break;
+           case "espace scenique":
+              //console.log("in P!");
+              espace6Arr.push(usager.frequentation);
+              break;
          default:
             break;
       }
@@ -49,14 +62,18 @@ function freqBySpace(allData) {
    var sumAccueilFreq = getArrayAverage(accueilArr);
    var sumEspace1Freq = getArrayAverage(espace1Arr);
    var sumEspace2Freq = getArrayAverage(espace2Arr);
+   var sumEspace3Freq = getArrayAverage(espace3Arr);
+   var sumEspace4Freq = getArrayAverage(espace4Arr);
+   var sumEspace5Freq = getArrayAverage(espace5Arr);
+   var sumEspace6Freq = getArrayAverage(espace6Arr);
 
-   console.log(sumAccueilFreq, sumEspace1Freq, sumEspace2Freq);
+   console.log(sumAccueilFreq, sumEspace1Freq, sumEspace2Freq,sumEspace3Freq,sumEspace4Freq,sumEspace5Freq,sumEspace6Freq);
 
    return {
       "title": "Fréquentation des espaces de microfolies",
       "key": "Total fréquentation",
-      "espaceFormat": ["Accueil", "Espace 1", "Espace 2"],
-      "avePrice": [sumAccueilFreq, sumEspace1Freq, sumEspace2Freq]
+      "espaceFormat": ["Espace accueil", "realite virtuelle", "musee numerique", "cyber base", "shooting photo", "jeux videos", "espace scenique"],
+      "avePrice": [sumAccueilFreq, sumEspace1Freq, sumEspace2Freq, sumEspace3Freq, sumEspace4Freq, sumEspace5Freq, sumEspace6Freq]
    };
 }
 

WebContent/js/index.js

@@ -1,6 +1,6 @@
 window.onload = function() {
    const xmlhttp = new XMLHttpRequest();
-   const formats = ["Accueil", "Espace 1", "Espace 2"]
+   const formats = ["Espace accueil", "realite virtuelle", "musee numerique", "cyber base", "shooting photo", "jeux videos", "espace scenique"]
 
    // Get JSON File
    xmlhttp.onreadystatechange = function() {

WebContent/js/mixChart.js

@@ -0,0 +1,68 @@
+var labels = [
+    "sunday",
+    "monday",
+    "tuesday",
+    "wednesday",
+    "thursday",
+    "friday",
+    "saturday"
+];
+var frequentations = [
+    20,
+    14,
+    12,
+    15,
+    18,
+    19,
+    22
+];
+var moyennes = [
+    15,
+    17,
+    17,
+    19,
+    18,
+    26,
+    31
+];
+var mix = document.getElementById("mixChart").getContext('2d');
+var mixChart = new Chart(mix, {
+    type: 'bar',
+    data: {
+        labels: labels,
+        datasets: [
+            {
+                type: 'line',
+                label: "monthly average",
+                data: moyennes,
+                borderColor: 'rgba(75, 192, 192, 1)',
+                backgroundColor: 'rgba(0, 0, 0, 0)',
+                yAxisID: 'frequentations',
+            },
+            {
+                label: "This week",
+                data: frequentations,
+                borderColor: 'rgba(0, 0, 0, 0)',
+                backgroundColor: 'rgba(192, 75, 192, 0.5)',
+                yAxisID: 'frequentations',
+            }
+        ]
+    },
+    options: {
+        scales: {
+            yAxes: [
+                {
+                    id: "frequentations",
+                    ticks: {
+                        beginAtZero: true,
+                    },
+                    scaleLabel: {
+                        display: true,
+                        labelString: 'Frequentation '
+                      }
+                },
+                
+            ]
+        },
+    }
+});

WebContent/js/usagers.json

@@ -1,112 +1,116 @@
 {
    "usagers": [
      {
-       "identite": "Ducharme Céline",
+       "identite": "Ducharme Céline",
        "situation": "Etudiant",
        "frequentation": 16,
-       "espace": "Espace 1",
+       "espace": "Espace accueil",
        "telephone": "+33676357533"
      },
+     
+   
+     
+     
      {
        "identite": "Leclair jeanne",
-       "situation": "Salarié",
+       "situation": "Salarié",
        "frequentation": 16,
-       "espace": "Espace 2",
+       "espace": "realite virtuelle",
        "telephone": "+33633527679"
      },
      {
        "identite": "Brian Antoine",
        "situation": "Etudianr",
        "frequentation": 30,
-       "espace": "Accueil",
+       "espace": "musee numerique",
        "telephone": "+33764536869"
      },
      {
        "identite": "Gregoire martin",
        "situation": "Etudiant",
        "frequentation": 17,
-       "espace": "Espace 2",
+       "espace": "cyber base",
        "telephone": "0633527679"
      },
      {
        "identite": "dupond antoine ",
-       "situation": "Lycéen",
+       "situation": "Lycéen",
        "frequentation": 12,
-       "espace": "Espace 2",
+       "espace": "shooting photo",
        "telephone": "0633527679"
      },
      {
        "identite": "Chevalier micheal",
-       "situation": "Salarié",
+       "situation": "Salarié",
        "frequentation": 22,
-       "espace": "Accueil",
+       "espace": "Espace accueil",
        "telephone": "0633527679"
      },
      {
        "identite": "Lesage Chloe",
        "situation": "Etudiant",
        "frequentation": 11,
-       "espace": "Espace 1",
+       "espace": "cyber base",
        "telephone": "0633527679"
      },
      {
        "identite": "Douffet Paul",
-       "situation": "Salarié",
+       "situation": "Salarié",
        "frequentation": 20,
-       "espace": "Espace 2",
+       "espace": "realite virtuelle",
        "telephone": "0633527679"
      },
      {
        "identite": "Mamadou Caira",
-       "situation": "Lycéen",
+       "situation": "Lycéen",
        "frequentation": 10,
-       "espace": "Espace 1",
+       "espace": "shooting photo",
        "telephone": "+33633527679"
      },
      {
        "identite": "Sarah boufkir",
        "situation": "Etudiant",
        "frequentation": 9,
-       "espace": "Espace 1",
+       "espace": "Espace accueil",
        "telephone": "+33633527679"
      },
      {
        "identite": "Bousquet Lucas",
-       "situation": "Salarié",
+       "situation": "Salarié",
        "frequentation": 13,
-       "espace": "Accueil",
+       "espace": "Espace accueil",
        "telephone": "+33633527679"
      },
      {
        "identite": "Chauvet Emma",
        "situation": "Etudiant",
        "frequentation": 10,
-       "espace": "Accueil",
+       "espace": "realite virtuelle",
        "telephone": "+33633527679"
      },
      {
        "identite": "Bon patrick",
        "situation": "Etudiant",
        "frequentation": 13,
-       "espace": "Espace 1",
+       "espace": "jeux videos",
        "telephone": "06456786842"
      },
      
      
      {
        "identite": "Robitaille Julie",
-       "situation": "Lycéen",
+       "situation": "Lycéen",
        "frequentation": 9,
-       "espace": "Espace 2",
-       "telephone": "non assigné"
+       "espace": "espace scenique",
+       "telephone": "non assigné"
      },
      
   
      {
        "identite": "mehdi habti",
-       "situation": "Salarié,",
+       "situation": "Salarié,",
        "frequentation": 22,
-       "espace": "Accueil",
+       "espace": "jeux videos",
        "telephone": "0745863211"
      }
    ]