Skip to content

Commit 7c90cb3

Browse files
authored
Merge branch 'develop' into connectTextFeatureWithBackEnd
2 parents 0bc014e + ce80732 commit 7c90cb3

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

frontend/src/images/ui/Image.vue

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
</h3>
66
<p>
77
<span>Step:</span>
8-
<span>{{imgData.step}};</span>
9-
<span>{{imgData.wall_time | formatTime}}</span>
8+
<span>{{imgData.step}}</span>
9+
<span class="visual-del-image-time">{{imgData.wall_time | formatTime}}</span>
1010
</p>
11-
<v-slider label="step"
12-
:max="steps"
11+
<v-slider :max="steps"
1312
:min="slider.min"
1413
:step="1"
1514
v-model="currentIndex"
16-
dark></v-slider>
15+
></v-slider>
1716

1817
<img :width="imageWidth" :height="imageHeight" :src="imgData.imgSrc" />
1918
</v-card>
@@ -45,9 +44,13 @@ export default {
4544
if (!value) {
4645
return;
4746
}
48-
let time = new Date();
49-
time.setTime(value.toString().split('.')[0]);
50-
return time;
47+
// The value was made in seconds, must convert it to milliseconds
48+
let time = new Date(value * 1000);
49+
var options = {
50+
weekday: "short", year: "numeric", month: "short",
51+
day: "numeric", hour: "2-digit", minute: "2-digit", second: "2-digit"
52+
};
53+
return time.toLocaleDateString("en-US", options);
5154
}
5255
},
5356
data() {
@@ -154,5 +157,7 @@ export default {
154157
.sm-form-item
155158
width 300px
156159
display inline-block
160+
.visual-del-image-time
161+
float right
157162
</style>
158163

frontend/src/texts/ui/Chart.vue

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
</h3>
66
<p>
77
<span>Step:</span>
8-
<span>{{textData.step}};</span>
9-
<span>{{textData.wall_time | formatTime}}</span>
8+
<span>{{textData.step}}</span>
9+
<span class="visual-del-text-time">{{textData.wall_time | formatTime}}</span>
1010
</p>
11-
<v-slider label="step"
12-
:max="steps"
11+
<v-slider :max="steps"
1312
:min="slider.min"
1413
:step="1"
1514
v-model="currentIndex"
16-
dark></v-slider>
15+
></v-slider>
1716

1817
<p> {{textData.message}} </p>
1918
</v-card>
@@ -38,9 +37,13 @@ export default {
3837
if (!value) {
3938
return;
4039
}
41-
let time = new Date();
42-
time.setTime(value.toString().split('.')[0]);
43-
return time;
40+
// The value was made in seconds, must convert it to milliseconds
41+
let time = new Date(value * 1000);
42+
var options = {
43+
weekday: "short", year: "numeric", month: "short",
44+
day: "numeric", hour: "2-digit", minute: "2-digit", second: "2-digit",
45+
};
46+
return time.toLocaleDateString("en-US", options);
4447
}
4548
},
4649
data() {
@@ -142,5 +145,7 @@ export default {
142145
.sm-form-item
143146
width 300px
144147
display inline-block
148+
.visual-del-text-time
149+
float right
145150
</style>
146151

0 commit comments

Comments
 (0)