Add labels

pages/channelsstats.md

@@ -15,9 +15,11 @@ Statistiques du <a href="https://coa.crapaud-fou.org">chat</a> (aussi connu sous
 <canvas id="usersByChannel"></canvas>
 <script>
 updated = "updated 02/05/2019"
-labels = ["mai 2018","juin 2018","juillet 2018","août 2018","septembre 2018","octobre 2018","novembre 2018","décembre 2018","janvier 2019","février 2019","mars 2019","avril 2019"];
+
 
 $.getJSON("{{ site.baseurl }}/public/data/messagesByChannel.json", function (datas){
+    labels = datas['labels'];
+
     var ctx = document.getElementById('byChannel').getContext('2d');
     var chart = new Chart(ctx, {
         // The type of chart we want to create
@@ -26,7 +28,7 @@ $.getJSON("{{ site.baseurl }}/public/data/messagesByChannel.json", function (dat
         // The data for our dataset
         data: {
             labels: labels,
-            datasets: datas,
+            datasets: datas['messagesByChannel'],
         },
 
         // Configuration options go here

script/getstats.py

@@ -21,6 +21,7 @@ def getColor():
 rocket = RocketChat(cfg.rocket['user'], cfg.rocket['password'],
                     server_url='https://coa.crapaud-fou.org')
 index = 0
+labels = [None] * 12
 messagesByChannel = []
 
 now = datetime.now()
@@ -36,6 +37,7 @@ while True:
     begin = date - monthdelta(12)
     end = begin + monthdelta(1)
     for id in range(0, 12):
+      labels[id] = begin.strftime("%b %Y")
       begindate =  begin.isoformat()
       enddate = end.isoformat()
       resultMess = rocket.channels_history(channel['_id'], oldest= begindate, latest=enddate, count= 10000).json()
@@ -60,8 +62,13 @@ rootFolder = os.path.join(os.path.dirname(__file__), '..')
 # Répertoire pour stocker le fichier de sortie
 dataFolder = os.path.join(rootFolder, 'public', 'data')
 
+info = {
+  "labels": labels,
+  "messagesByChannel": messagesByChannel
+}
+
 statsFilePath = os.path.abspath(
     os.path.join(dataFolder, 'messagesByChannel.json'))
 with open(statsFilePath, "w") as file_write:
-  json.dump(messagesByChannel, file_write)
+  json.dump(info, file_write)