Skip to content
This repository was archived by the owner on Jan 12, 2021. It is now read-only.

Commit bee9296

Browse files
author
root
committed
release 1
1 parent d619ff8 commit bee9296

File tree

6 files changed

+49
-42
lines changed

6 files changed

+49
-42
lines changed

‎Wellcheck/Webapps/dashboard.wellcheck/front/js/map/map.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ let vm = new Vue({
106106
Last report: ` + (this.markers['proprietary'][i]['data'].length > 0 ? this.datestr(this.markers['proprietary'][i]['data'][0]["date"]) : '/' ) + `
107107
</div>
108108
<div class="col-12 col-sm-12" style="text-align: center; margin-top: 5px;">
109-
Note: ` + (this.markers['proprietary'][i]["data"][0]["data"]["data"]['note'] != void 0 ? this.markers['proprietary'][i]["data"][0]["data"]["data"]['note'] / 2 : '_' ) + ` / 10
109+
Score: ` + (this.markers['proprietary'][i]["data"][0]["data"]["data"]['note'] != void 0 ? this.markers['proprietary'][i]["data"][0]["data"]["data"]['note'] / 2 : '_' ) + ` / 10
110110
<div class="notebarholder">
111111
<div class="notebar" style=" ` + (
112112
this.markers['proprietary'][i]["data"][0]["data"]["data"]['note'] != void 0 ?

‎Wellcheck/Webapps/dashboard.wellcheck/front/js/profil/comp_profile.js

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ let profile = {
2626

2727
updatevisend: function(save) {
2828
clearInterval(this.interval);
29-
this.updatevisend(
30-
[
31-
{ label: "test3", value: 31, color: "#1C94FE"},
32-
{ label: "test4", value: 21, color: "#211267" }
33-
]
34-
);
3529
this.angle = 0;
36-
this.data.sections = save;
30+
this.data.sections = [
31+
{ label: "Subscription", value: 3, color: "#1C94FE"},
32+
{ label: "Purchase", value: 3, color: "#211267" }
33+
];
3734

3835
},
3936

4037
updatevis: function () {
38+
if (this.interval != void 0){
39+
return;
40+
}
4141
var value = 0;
4242
var sections = JSON.parse(JSON.stringify(this.data.sections));
4343

@@ -48,6 +48,7 @@ let profile = {
4848

4949
this.data.sections = sections
5050
this.interval = setInterval(this.animevis, 6);
51+
setTimeout(this.updatevisend, 4000);
5152
},
5253

5354
editProfile: function () {
@@ -81,7 +82,15 @@ let profile = {
8182
data['note'] = "These informations are privates and will not be shared";
8283

8384
vm.$refs.modal.loaddata(data);
84-
}
85+
},
86+
price: function (str) {
87+
if (str == void 0){
88+
str = 0;
89+
}
90+
let price = parseFloat(str).toFixed(2) + ""
91+
let pricehtml = "<b>" + price.split(".")[0] + ".<span style='font-size: 60%;'>" + price.split(".")[1] + "</span>$</b>";
92+
return pricehtml;
93+
},
8594
},
8695

8796
watch: {
@@ -93,13 +102,6 @@ let profile = {
93102
}
94103
},
95104
filters: {
96-
price: function (str) {
97-
let len = str.length;
98-
let price = str;
99-
if (price[len - 2] != '.')
100-
price = str.slice(0, len - 2) + '.' + str.slice(len - 2, len - 1);
101-
return price + " $";
102-
},
103105
exist: function(str){
104106
if (str == "" || str == void 0 )
105107
return "____";
@@ -148,7 +150,8 @@ let profile = {
148150
</div>
149151
<br>
150152
<div class="row">
151-
<div class="col-lg-4 col-sm-8">
153+
<div class="row col-lg-4 col-md-12">
154+
<div class="col-lg-12 col-md-6 col-sm-12" style="margin-bottom: 30px">
152155
<container name="Infos" hover=true :warning=infos>
153156
<div class="container">
154157
<div class="row">
@@ -187,10 +190,18 @@ let profile = {
187190
<div class="wc-button" v-on:click=editProfile> update </div>
188191
</container>
189192
</div>
193+
<div class="col-lg-12 col-md-6 col-sm-12" style="margin-bottom: 30px">
194+
<container name="Password" hover=true>
195+
<br>
196+
<div class="wc-button" style="width: 100%" v-on:click=changePassword> Change your password </div>
197+
</container>
198+
</div>
199+
</div>
190200
<div class="col-lg-1 col-sm-12">
191201
<br>
192202
</div>
193-
<div class="col-lg-7 col-sm-12">
203+
<div class="row col-lg-7 col-sm-12">
204+
<div class="col-12">
194205
<container note="Your consomption for this month, it may take up to 10 hours to update" name="Current Consumption" hover=true :warning="(data == void 0 || data.totalpaid == void 0 )">
195206
<vc-donut ref='donut'
196207
:background=background
@@ -200,22 +211,15 @@ let profile = {
200211
:sections=data.sections
201212
:start-angle=angle
202213
>
203-
<h3>{{ data.totalpaid | exist | price }}</h3>
214+
<h3 v-html="price(data.totalpaid)" style="margin-bottom: 0;"></h3>
204215
<span>excl. taxes</span>
205216
</vc-donut>
206217
<br>
207218
<div class="wc-button" v-on:click="updatevis()"> update </div>
208219
</container>
209220
</div>
210-
<div class="col-lg-1 col-sm-12 hidelg">
211-
<br>
212-
</div>
213-
<div class="col-lg-4 col-sm-8">
214-
<container name="Password" hover=true>
215-
<br>
216-
<div class="wc-button" style="width: 100%" v-on:click=changePassword> Change your password </div>
217-
</container>
218221
</div>
222+
</div>
219223
</div>
220224
</div>
221225
</div>

‎Wellcheck/Webapps/dashboard.wellcheck/front/js/profil/profile.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ let vm = new Vue({
2626
this.data = JSON.parse(JSON.stringify(data));
2727
if (this.data.sections == void 0)
2828
this.data.sections = [
29-
{ label: "test", value: 25, color: "#1C94FE"},
30-
{ label: "test2", value: 25, color: "#211267" }
29+
{ label: "Subscription", value: 3, color: "#1C94FE"},
30+
{ label: "Purchase", value: 3, color: "#211267" }
3131
]
32+
this.data.totalpaid = "0";
3233
}
3334
},
3435
mounted(){

‎Wellcheck/Webapps/dashboard.wellcheck/front/js/stats/comp_stats.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ methods: {
147147
}],
148148
yAxes: [{
149149
ticks: {
150-
min: 0
150+
min: 0,
151+
max: 5,
152+
stepSize: 1
151153
},
152154
stacked: true
153155
}]
@@ -414,9 +416,9 @@ methods: {
414416
store: function(data) {
415417
if (data != '') {
416418
if ( this.charts["chart1"] != void 0) {
417-
this.charts["chart0"].config.data.datasets[0] = data["chart0"]["Test"]
418-
this.charts["chart0"].config.data.datasets[1] = data["chart0"]["Your\'s"]
419-
this.charts["chart0"].config.data.datasets[2] = data["chart0"]["Shared with you"]
419+
this.charts["chart0"].config.data.datasets[0]["data"] = data["chart0"]["Test"]
420+
this.charts["chart0"].config.data.datasets[1]["data"] = data["chart0"]["Your\'s"]
421+
this.charts["chart0"].config.data.datasets[2]["data"] = data["chart0"]["Shared with you"]
420422
this.charts["chart0"].update();
421423

422424
this.charts["chart1"].config.data.labels = data["chart1"]["data"]["label"];
@@ -493,7 +495,7 @@ template: `
493495
</div>
494496
<div :style="'display: ' + (request == 1 && selected != void 0 && selected.length > 0 ? 'flex' : 'none') + ';'" class="row">
495497
<div class="col-xl-7 col-lg-12 col-sm-12 marge" style="height: inherit;">
496-
<container note="Repartition of your devices by mark. Good > Medium > Bad, one step every 3.33 point"
498+
<container note="Repartition of your devices by score. Good > Medium > Bad, one step every 6.66 points."
497499
name="Global stats"
498500
hover=true
499501
fullscreen=true
@@ -517,20 +519,20 @@ template: `
517519
</div>
518520
519521
<div class="col-xl-5 col-lg-7 col-sm-12 marge" style="height: inherit;">
520-
<container note="Your consomption for this month, it may take up to 10 hours to update"
522+
<container note="Scoreboards for the last 24 hours based on the average score of your device over a period of 2 hours."
521523
:name="'24H - ' + (selected != void 0 && selected.length > 0 ? selected[1] : '') + ' score'"
522524
hover=true style="height: 100%">
523525
<canvas class="marge" id="chart1" width="5" height="3" style="display: block; height: 300px; width: 1000px;" class="chartjs-render-monitor"></canvas>
524526
</container>
525527
</div>
526528
<div v-if="selected != void 0 && selected.length > 0" class="col-xl-7 col-sm-12 marge" style="height: inherit;">
527-
<container note="Your consomption for this month, it may take up to 10 hours to update"
528-
name="Current Consumption"
529+
<container note="Contains the last 5 measurement series transmitted by your device."
530+
name="Measurement series"
529531
hover=true style="height: 100%">
530532
<table style="width:100%">
531533
<tr style="margin-bottom: 5px;">
532534
<th>Time</th>
533-
<th>Note</th>
535+
<th>Score</th>
534536
<th>PH</th>
535537
<th>Temperature</th>
536538
<th>Redox</th>
@@ -572,7 +574,7 @@ template: `
572574
</container>
573575
</div>
574576
<div class="col-lg-12 col-sm-12 marge">
575-
<container note="Your consomption for this month, it may take up to 10 hours to update"
577+
<container :note="'Evolution of ' + received[0] + ' for the last 24 hours based on the average ' + received[0] + ' measures of your device over a period of 2 hours'"
576578
:name="'24H - ' + (selected != void 0 && selected.length > 0 ? selected[1] : '') + ' - ' + cap(received[0])"
577579
hover=false
578580
border=false
@@ -583,7 +585,7 @@ template: `
583585
</container>
584586
</div>
585587
<div class="col-lg-12 col-sm-12 marge">
586-
<container note="Your consomption for this month, it may take up to 10 hours to update"
588+
<container :note="'Evolution of ' + received[0] + ' since its inception based on the average ' + received[0] + ' measures of your device over a period of 12 hours'"
587589
:name="'ALL - ' + (selected != void 0 && selected.length > 0 ? selected[1] : '') + ' - ' + cap(received[0])"
588590
hover=false
589591
border=false

‎Wellcheck/Webapps/dashboard.wellcheck/front/login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<p>Don't have an account ? <a href="./index.html"> Register Now!</a></p>
3232
</div>
3333
</div>
34-
<div style="" class="test wc-button logintest" v-on:click="logintest">Test the app</div>
34+
<!-- <div style="" class="test wc-button logintest" v-on:click="logintest">Test the app</div> -->
3535
<br>
3636
<!-- copyright -->
3737
<msg usualcenter=false ref="extern"></msg>

‎Wellcheck/Webapps/wellcheck/front/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<li class="nav-item"><a class="nav-link" href="#contact">Contact</a></li>
4444
</ul>
4545
<form class="form-inline my-2 my-lg-0">
46-
<a href="https://wellcheck.fr/soon"
46+
<a href="https://dashboard.wellcheck.fr/"
4747
class="btn btn-outline-dark my-2 my-sm-0 mr-3 text-uppercase">Early acces</a>
4848
</form>
4949
</div>

0 commit comments

Comments
 (0)