Skip to content

Commit 523daa1

Browse files
previprevi
committed
add demo scientist program
1 parent 4ab70e6 commit 523daa1

File tree

3 files changed

+27
-20
lines changed

3 files changed

+27
-20
lines changed

‎src/components/Activity.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<!-- When the selection is completed, the result is then handled by importProgram -->
4747
<!-- Dialogs -->
4848
<!-- Runtime -->
49-
<v-dialog v-model="runtimeDialog" width="480">
49+
<v-dialog v-model="runtimeDialog" width="480" persistent>
5050
<v-card id="card_program_runtime">
5151
<v-card-title class="headline grey lighten-2" primary-title>
5252
{{ $t("message.program_status_title") }}

‎src/components/Settings.vue‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
<v-btn color="info" @click="dialog_shutdown=true">
3535
<v-icon icon="mdi-power"></v-icon> {{ $t('message.settings_actions_halt') }}
3636
</v-btn>
37-
<v-btn color="info" @click="dialog_reboot=true">
38-
<v-icon icon="mdi-restart"></v-icon> {{ $t('message.settings_actions_reboot') }}
39-
</v-btn>
4037
<v-btn color="info" @click="dialog_restart=true">
4138
<v-icon icon="mdi-restart"></v-icon> {{ $t('message.settings_actions_restart') }}
4239
</v-btn>
40+
<v-btn color="info" @click="dialog_reboot=true">
41+
<v-icon icon="mdi-restart"></v-icon> {{ $t('message.settings_actions_reboot') }}
42+
</v-btn>
4343
<v-btn color="warning" @click="dialog_restore=true">
4444
<v-icon icon="mdi-restore"></v-icon> {{ $t('message.settings_actions_restore') }}
4545
</v-btn>
@@ -54,6 +54,7 @@
5454
</v-card-title>
5555
<v-card-text>
5656
{{ $t('message.settings_actions_halt_text_1') }}
57+
{{ $t('message.settings_actions_halt_text_2') }}
5758
</v-card-text>
5859
<v-divider></v-divider>
5960
<v-card-actions>
@@ -62,7 +63,7 @@
6263
{{ $t('message.cancel') }}
6364
</v-btn>
6465
<v-btn color="error" @click="reboot">
65-
<b>{{ $t('message.settings_actions_halt') }}</b>
66+
{{ $t('message.settings_actions_halt') }}
6667
</v-btn>
6768
</v-card-actions>
6869
</v-card>
@@ -74,6 +75,7 @@
7475
</v-card-title>
7576
<v-card-text>
7677
{{ $t('message.settings_actions_restart_text_1') }}
78+
{{ $t('message.settings_actions_restart_text_2') }}
7779
</v-card-text>
7880
<v-divider></v-divider>
7981
<v-card-actions>
@@ -94,6 +96,7 @@
9496
</v-card-title>
9597
<v-card-text>
9698
{{ $t('message.settings_actions_reboot_text_1') }}
99+
{{ $t('message.settings_actions_reboot_text_2') }}
97100
</v-card-text>
98101
<v-divider></v-divider>
99102
<v-card-actions>
@@ -114,14 +117,15 @@
114117
</v-card-title>
115118
<v-card-text>
116119
{{ $t('message.settings_actions_restore_text_1') }}
120+
{{ $t('message.settings_actions_restore_text_2') }}
117121
</v-card-text>
118122
<v-divider></v-divider>
119123
<v-card-actions>
120124
<v-spacer></v-spacer>
121125
<v-btn color="primary" @click="dialog_restore = false">
122126
{{ $t('message.cancel') }}
123127
</v-btn>
124-
<v-btn color="error" @click="reset">
128+
<v-btn color="error" @click="restoreSettings">
125129
<b>{{ $t('message.settings_actions_restore') }}</b>
126130
</v-btn>
127131
</v-card-actions>
@@ -134,6 +138,7 @@
134138
</v-card-title>
135139
<v-card-text>
136140
{{ $t('message.settings_actions_reset_text_1') }}
141+
{{ $t('message.settings_actions_reset_text_2') }}
137142
</v-card-text>
138143
<v-divider></v-divider>
139144
<v-card-actions>
@@ -985,20 +990,22 @@ export default {
985990
reset() {
986991
this.$coderbot.reset()
987992
.then(() => {
993+
this.dialog_restore = false;
988994
this.snackText = this.$i18n.t('message.settings_packages_reset_text_1');
989995
this.snackbar = true;
990996
this.prepopulate();
991-
this.dialog = false;
992997
});
993998
},
994999
shutdown() {
9951000
this.$coderbot.halt().then(function success() {
1001+
this.dialog_shutdown = false;
9961002
this.snackText = this.$i18n.t('message.coderbot_status_shutting_down');
9971003
this.snackbar = true;
9981004
});
9991005
},
10001006
reboot() {
10011007
this.$coderbot.reboot().then(function success() {
1008+
this.dialog_reboot = false;
10021009
this.snackText = this.$i18n.t('message.coderbot_status_restart_start');
10031010
this.snackbar = true;
10041011
});

‎src/i18n/locales/it/messages.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -160,24 +160,24 @@
160160
"settings_actions_update_title": "Aggiorna CoderBot",
161161
"settings_actions": "Azioni",
162162
"settings_actions_halt": "Ferma",
163-
"settings_actions_halt_title": "Ripristina",
163+
"settings_actions_halt_title": "Ferma",
164164
"settings_actions_halt_text_1": "Sei sicuro di voler fermare il CoderBot?",
165-
"settings_actions_halt_text_2": "CoderBot verrà fermato, per spegnerlo definitivamente, togli l'alimentazione.",
165+
"settings_actions_halt_text_2": "CoderBot verrà fermato attendi qualche minuto e, per spegnerlo definitivamente, togli l'alimentazione.",
166166
"settings_actions_halt_do": "Ferma",
167-
"settings_actions_reboot": "Riavvia",
168-
"settings_actions_reboot_title": "Riavvia",
169-
"settings_actions_reboot_text_1": "Sei sicuro di voler riavviare il CoderBot?",
170-
"settings_actions_reboot_text_2": "CoderBot verrà riavviato. L'attività richiederà qualche minuto.",
171-
"settings_actions_reboot_do": "Riavvia",
172-
"settings_actions_restart": "Reboot",
173-
"settings_actions_restart_title": "Reboot",
174-
"settings_actions_restart_text_1": "Sei sicuro di voler riavviare completamente il CoderBot?",
175-
"settings_actions_restart_text_2": "CoderBot verrà riavviato completament. L'attività richiederà qualche minuto.",
167+
"settings_actions_reboot": "Reboot",
168+
"settings_actions_reboot_title": "Riavvio completo (Reboot)",
169+
"settings_actions_reboot_text_1": "Sei sicuro di voler riavviare completamente (reboot) il CoderBot?",
170+
"settings_actions_reboot_text_2": "L'attività richiederà qualche minuto.",
171+
"settings_actions_reboot_do": "Reboot",
172+
"settings_actions_restart": "Riavvia",
173+
"settings_actions_restart_title": "Riavvia",
174+
"settings_actions_restart_text_1": "Sei sicuro di voler riavviare il CoderBot?",
175+
"settings_actions_restart_text_2": "L'attività richiederà qualche minuto.",
176176
"settings_actions_restart_do": "Reboot",
177177
"settings_actions_restore": "Ripristina Impostazioni",
178178
"settings_actions_restore_title": "Ripristina",
179-
"settings_actions_restore_text_1": "Sei sicuro di voler ripristinare il CoderBot?",
180-
"settings_actions_restore_text_2": "Le impostazioni verranno ripristinate ai valori di default",
179+
"settings_actions_restore_text_1": "Sei sicuro di voler ripristinare le impostazioni di CoderBot?",
180+
"settings_actions_restore_text_2": "Le impostazioni verranno ripristinate ai valori di default, i programmi e gli altri dati saranno preservati.",
181181
"settings_actions_restore_do": "Ripristina",
182182
"settings_actions_reset": "Ripristina ad impostazioni di fabbrica",
183183
"settings_actions_reset_title": "Ripristina",

0 commit comments

Comments
 (0)