Skip to content

Commit 411bdf1

Browse files
previprevi
committed
feature parity: maxblocks #73 
1 parent 865d1df commit 411bdf1

File tree

4 files changed

+53
-17
lines changed

4 files changed

+53
-17
lines changed

‎src/components/Activity.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ export default {
508508
// path: 'static/js/blockly/',
509509
// TODO: Use values from fetched configuration!
510510
scrollbars: true,
511-
// MaxBlocks : -1, // -1 as infinite not working FIXME
511+
maxBlocks: this.activity ? this.activity.maxBlocks : -1,
512512
zoom: {
513513
controls: true,
514514
wheel: false,

‎src/components/ActivityEditor.vue

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,26 +94,30 @@
9494
</v-card>
9595
<br><br>
9696
-->
97-
<!--
98-
<h3 class="text-xs-left">Viste disponibilità</h3>
97+
<h3 class="text-xs-left">Programmazione</h3>
9998
<v-card>
10099
<div class="cardContent">
101100
<v-layout row wrap>
101+
<!--
102+
<v-flex>
103+
<v-checkbox v-model="activity.availableViews" label="Programmazione a Blocchi" value="blockly"></v-checkbox>
104+
</v-flex>
102105
<v-flex>
103-
<v-checkbox v-model="availableViews" label="Programmazione a Blocchi" value="blockly"></v-checkbox>
106+
<v-checkbox v-model="activity.availableViews" label="Editor Python" value="python"></v-checkbox>
104107
</v-flex>
105108
<v-flex>
106-
<v-checkbox disabled v-model="availableViews" label="Editor Python" value="python"></v-checkbox>
109+
<v-checkbox v-model="activity.availableViews" label="Visuale di Esecuzione" value="runtime"></v-checkbox>
107110
</v-flex>
108111
<v-flex>
109-
<v-checkbox v-model="availableViews" label="Visuale di Esecuzione" value="runtime"></v-checkbox>
112+
<v-switch v-model="activity.viewSource" label="Permetti di visualizzare il codice generato"></v-switch>
113+
</v-flex>
114+
-->
115+
<v-flex>
116+
<v-text-field v-model="activity.maxBlocks" label="Numero massimo di blocchi"></v-text-field>
110117
</v-flex>
111-
<v-switch :label="`Permetti di visualizzare il codice generato`" v-model="capsSwitch"></v-switch>
112118
</v-layout>
113119
</div>
114120
</v-card>
115-
-->
116-
<br><br>
117121
<!--
118122
<h3 class="text-xs-left">Funzionalità sperimentali</h3>
119123
<v-card>
@@ -372,7 +376,9 @@ export default {
372376
capsSwitch: true,
373377
bodyFont: 'Roboto',
374378
codeFont: 'ubuntumono',
375-
379+
maxBlocks: -1,
380+
availableViews: [],
381+
viewSource: null,
376382
},
377383
colors: ['red', 'pink', 'purple', 'yellow', 'deep-purple', 'indigo', 'blue', 'light-blue', 'cyan', 'teal', 'green', 'light-green', 'lime', 'yellow', 'amber', 'orange', 'deep-orange', 'brown', 'blue-grey', 'black', 'grey', 'black', 'white'],
378384
textColors: [
@@ -436,7 +442,6 @@ export default {
436442
],
437443
uiLang: 'Italiano',
438444
blocklyLang: 'Inglese',
439-
availableViews: [],
440445
editHistory: false,
441446
navHistory: false,
442447
experimental: true,

‎src/components/ActivityList.vue

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,47 @@
2525
Nessuna Attività, perchè non ne <a href="#/activity/new">crei</a> una nuova?
2626
</span>
2727
<template v-for="activity in activityList">
28-
<v-list-item :key="activity.el">
28+
<v-list-item :key="activity.el" link>
2929
<v-list-item-title ripple @click="goToActivity(activity.name)">
3030
<b>{{ activity.name }}</b>
3131
<small> {{activity.description}} </small>
3232
</v-list-item-title>
33-
<v-btn text icon color="grey darken-1" ripple @click="deleteActivity(activity.name)">
33+
<v-btn text icon color="grey darken-1" ripple @click="confirmDeleteDlg = true">
3434
<v-icon>delete</v-icon>
35-
</v-btn>
35+
<template>
36+
<v-row justify="center">
37+
<v-dialog
38+
v-model="confirmDeleteDlg"
39+
persistent
40+
max-width="290"
41+
>
42+
<v-card>
43+
<v-card-title class="text-h5">
44+
Conferma Cancella Attività
45+
</v-card-title>
46+
<v-card-text>Sei sicuro di voler cancellare l'attività?<br/>L'azione non è reversibile</v-card-text>
47+
<v-card-actions>
48+
<v-spacer></v-spacer>
49+
<v-btn
50+
color="green darken-1"
51+
text
52+
@click="confirmDeleteDlg = false"
53+
>
54+
Annulla
55+
</v-btn>
56+
<v-btn
57+
color="green darken-1"
58+
text
59+
@click="confirmDeleteDlg = false; deleteActivity(activity.name)"
60+
>
61+
Ok
62+
</v-btn>
63+
</v-card-actions>
64+
</v-card>
65+
</v-dialog>
66+
</v-row>
67+
</template>
68+
</v-btn>
3669
<v-btn text icon color="grey darken-1" ripple :href="'#/activity/edit/'+activity.name">
3770
<v-icon>edit</v-icon>
3871
</v-btn>
@@ -97,6 +130,7 @@ export default {
97130
activityList: null,
98131
drawer: null,
99132
source: null,
133+
confirmDeleteDlg: null,
100134
};
101135
},
102136
};

‎src/components/Settings.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,6 @@ export default {
842842
data.camera_path_object_size_max = remoteConfig.camera_path_object_size_max;
843843
data.camera_path_object_size_min = remoteConfig.camera_path_object_size_min;
844844
data.cnn_default_model = remoteConfig.cnn_default_model;
845-
data.prog_maxblocks = remoteConfig.prog_maxblocks;
846845
data.btnFun = remoteConfig.button_func;
847846
data.wifiMode = remoteConfig.wifi_mode;
848847
data.wifiSSID = remoteConfig.wifi_ssid;
@@ -887,7 +886,6 @@ export default {
887886
camera_path_object_size_max: data.camera_path_object_size_max,
888887
camera_path_object_size_min: data.camera_path_object_size_min,
889888
cnn_default_model: data.cnn_default_model,
890-
prog_maxblocks: data.prog_maxblocks,
891889
wifi_mode: data.wifiMode,
892890
wifi_ssid: data.wifiSSID,
893891
wifi_psk: data.wifiPsw,
@@ -979,7 +977,6 @@ export default {
979977
camera_path_object_size_max: null,
980978
camera_path_object_size_min: null,
981979
cnn_default_model: null,
982-
prog_maxblocks: null,
983980
984981
cbName: 'CoderBot',
985982
power: [null, null, null],

0 commit comments

Comments
 (0)