-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #88 from MatsMoll/develop
[fix][Redis] session middleware lifecycle mismatch
- Loading branch information
Showing
4 changed files
with
262 additions
and
235 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,83 @@ | ||
| var xhr = new XMLHttpRequest(); | ||
| var url = "/api/practice-sessions/histogram?numberOfWeeks=7"; | ||
| xhr.open("GET", url, true); | ||
| xhr.setRequestHeader("Content-Type", "application/json"); | ||
| xhr.onreadystatechange = function () { | ||
| if (this.readyState != 4) return; | ||
| function fetchHistogram() { | ||
| var xhr = new XMLHttpRequest(); | ||
| var url = "/api/practice-sessions/histogram?numberOfWeeks=7"; | ||
| xhr.open("GET", url, true); | ||
| xhr.setRequestHeader("Content-Type", "application/json"); | ||
| xhr.onreadystatechange = function () { | ||
| if (this.readyState != 4) return; | ||
|
|
||
| if (this.status == 200) { | ||
| var response = JSON.parse(this.responseText); | ||
| let data = response.map(x => x["numberOfTasksCompleted"]); | ||
| let labels = response.map(x => x["week"]); | ||
| var ctx = document.getElementById("practice-time-histogram").getContext('2d'); | ||
| ctx.height = 200; | ||
| var myChart = new Chart(ctx, { | ||
| type: 'bar', | ||
| data: { | ||
| labels: labels, | ||
| datasets: [{ | ||
| label: 'Antall oppgaver fullført', | ||
| data: data, | ||
| backgroundColor: | ||
| 'rgba(10,207,151,0.4)', | ||
| borderColor: | ||
| 'rgba(10,207,151,1)', | ||
| borderWidth: 2 | ||
| }] | ||
| }, | ||
| options: { | ||
| aspectRatio: 4, | ||
| maintainAspectRatio: true, | ||
| legend: { | ||
| display: !1 | ||
| }, | ||
| tooltips: { | ||
| intersect: !1 | ||
| }, | ||
| hover: { | ||
| intersect: !0 | ||
| }, | ||
| plugins: { | ||
| filler: { | ||
| propagate: !1 | ||
| } | ||
| if (this.status == 200) { | ||
| var response = JSON.parse(this.responseText); | ||
| let data = response.map(x => x["numberOfTasksCompleted"]); | ||
| let labels = response.map(x => x["week"]); | ||
| var ctx = document.getElementById("practice-time-histogram").getContext('2d'); | ||
| ctx.height = 200; | ||
| var myChart = new Chart(ctx, { | ||
| type: 'bar', | ||
| data: { | ||
| labels: labels, | ||
| datasets: [{ | ||
| label: 'Antall oppgaver fullført', | ||
| data: data, | ||
| backgroundColor: | ||
| 'rgba(10,207,151,0.4)', | ||
| borderColor: | ||
| 'rgba(10,207,151,1)', | ||
| borderWidth: 2 | ||
| }] | ||
| }, | ||
| scales: { | ||
| xAxes: [{ | ||
| reverse: !0, | ||
| gridLines: { | ||
| color: "rgba(0,0,0,0.05)" | ||
| }, | ||
| scaleLabel: { | ||
| display: true, | ||
| labelString: 'Uke' | ||
| options: { | ||
| aspectRatio: 4, | ||
| maintainAspectRatio: true, | ||
| legend: { | ||
| display: !1 | ||
| }, | ||
| tooltips: { | ||
| intersect: !1 | ||
| }, | ||
| hover: { | ||
| intersect: !0 | ||
| }, | ||
| plugins: { | ||
| filler: { | ||
| propagate: !1 | ||
| } | ||
| }], | ||
| yAxes: [{ | ||
| ticks: { | ||
| stepSize: 10, | ||
| display: !1 | ||
| }, | ||
| min: 10, | ||
| max: 100, | ||
| display: !0, | ||
| borderDash: [5, 5], | ||
| gridLines: { | ||
| color: "rgba(0,0,0,0)", | ||
| fontColor: "#fff" | ||
| }, | ||
| scaleLabel: { | ||
| display: true, | ||
| labelString: 'Oppgaver' | ||
| } | ||
| }] | ||
| }, | ||
| scales: { | ||
| xAxes: [{ | ||
| reverse: !0, | ||
| gridLines: { | ||
| color: "rgba(0,0,0,0.05)" | ||
| }, | ||
| scaleLabel: { | ||
| display: true, | ||
| labelString: 'Uke' | ||
| } | ||
| }], | ||
| yAxes: [{ | ||
| ticks: { | ||
| stepSize: 10, | ||
| display: !1 | ||
| }, | ||
| min: 10, | ||
| max: 100, | ||
| display: !0, | ||
| borderDash: [5, 5], | ||
| gridLines: { | ||
| color: "rgba(0,0,0,0)", | ||
| fontColor: "#fff" | ||
| }, | ||
| scaleLabel: { | ||
| display: true, | ||
| labelString: 'Oppgaver' | ||
| } | ||
| }] | ||
| } | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| }; | ||
| xhr.send(); | ||
| }); | ||
| } | ||
| }; | ||
| xhr.send(); | ||
| } | ||
|
|
||
| fetchHistogram(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,78 @@ | ||
| let subjectId = parseInt(window.location.pathname.split("/")[2]); | ||
| if (subjectId > 0) { | ||
| var xhr = new XMLHttpRequest(); | ||
| var url = "/api/practice-sessions/histogram?subjectId=" + subjectId; | ||
| xhr.open("GET", url, true); | ||
| xhr.setRequestHeader("Content-Type", "application/json"); | ||
| xhr.onreadystatechange = function () { | ||
| if (this.readyState != 4) return; | ||
| function fetchHistogram() { | ||
| let subjectId = parseInt(window.location.pathname.split("/")[2]); | ||
| if (subjectId > 0) { | ||
| var xhr = new XMLHttpRequest(); | ||
| var url = "/api/practice-sessions/histogram?subjectId=" + subjectId; | ||
| xhr.open("GET", url, true); | ||
| xhr.setRequestHeader("Content-Type", "application/json"); | ||
| xhr.onreadystatechange = function () { | ||
| if (this.readyState != 4) return; | ||
|
|
||
| if (this.status == 200) { | ||
| var response = JSON.parse(this.responseText); | ||
| let data = response.map(x => x["numberOfTasksCompleted"]); | ||
| let labels = response.map(x => x["week"]); | ||
| var ctx = document.getElementById("practice-time-histogram").getContext('2d'); | ||
| ctx.height = 200; | ||
| var myChart = new Chart(ctx, { | ||
| type: 'bar', | ||
| data: { | ||
| labels: labels, | ||
| datasets: [{ | ||
| label: 'Antall oppgaver fullført', | ||
| data: data, | ||
| backgroundColor: | ||
| 'rgba(10,207,151,0.4)', | ||
| borderColor: | ||
| 'rgba(10,207,151,1)', | ||
| borderWidth: 2 | ||
| }] | ||
| }, | ||
| options: { | ||
| aspectRatio: 1.5, | ||
| maintainAspectRatio: true, | ||
| legend: { | ||
| display: !1 | ||
| }, | ||
| tooltips: { | ||
| intersect: !1 | ||
| }, | ||
| hover: { | ||
| intersect: !0 | ||
| }, | ||
| plugins: { | ||
| filler: { | ||
| propagate: !1 | ||
| } | ||
| if (this.status == 200) { | ||
| var response = JSON.parse(this.responseText); | ||
| let data = response.map(x => x["numberOfTasksCompleted"]); | ||
| let labels = response.map(x => x["week"]); | ||
| var ctx = document.getElementById("practice-time-histogram").getContext('2d'); | ||
| ctx.height = 200; | ||
| var myChart = new Chart(ctx, { | ||
| type: 'bar', | ||
| data: { | ||
| labels: labels, | ||
| datasets: [{ | ||
| label: 'Antall oppgaver fullført', | ||
| data: data, | ||
| backgroundColor: | ||
| 'rgba(10,207,151,0.4)', | ||
| borderColor: | ||
| 'rgba(10,207,151,1)', | ||
| borderWidth: 2 | ||
| }] | ||
| }, | ||
| scales: { | ||
| xAxes: [{ | ||
| reverse: !0, | ||
| gridLines: { | ||
| color: "rgba(0,0,0,0.05)" | ||
| options: { | ||
| aspectRatio: 1.5, | ||
| maintainAspectRatio: true, | ||
| legend: { | ||
| display: !1 | ||
| }, | ||
| tooltips: { | ||
| intersect: !1 | ||
| }, | ||
| hover: { | ||
| intersect: !0 | ||
| }, | ||
| plugins: { | ||
| filler: { | ||
| propagate: !1 | ||
| } | ||
| }], | ||
| yAxes: [{ | ||
| ticks: { | ||
| stepSize: 10, | ||
| display: !1 | ||
| }, | ||
| min: 10, | ||
| max: 100, | ||
| display: !0, | ||
| borderDash: [5, 5], | ||
| gridLines: { | ||
| color: "rgba(0,0,0,0)", | ||
| fontColor: "#fff" | ||
| } | ||
| }] | ||
| }, | ||
| scales: { | ||
| xAxes: [{ | ||
| reverse: !0, | ||
| gridLines: { | ||
| color: "rgba(0,0,0,0.05)" | ||
| } | ||
| }], | ||
| yAxes: [{ | ||
| ticks: { | ||
| stepSize: 10, | ||
| display: !1 | ||
| }, | ||
| min: 10, | ||
| max: 100, | ||
| display: !0, | ||
| borderDash: [5, 5], | ||
| gridLines: { | ||
| color: "rgba(0,0,0,0)", | ||
| fontColor: "#fff" | ||
| } | ||
| }] | ||
| } | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| }; | ||
| xhr.send(); | ||
| } | ||
| }); | ||
| } | ||
| }; | ||
| xhr.send(); | ||
| } | ||
| } | ||
|
|
||
| fetchHistogram(); |
Oops, something went wrong.