Skip to content

Commit aa167c1

Browse files
committed
Remove tentative open Activity modal in sidebar. Layout things on activity list. Implement Activity delete and reactive activity list
1 parent 83fd36a commit aa167c1

File tree

2 files changed

+45
-56
lines changed

2 files changed

+45
-56
lines changed

src/components/ActivityList.vue

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,31 @@
77
<v-toolbar-title>CoderBot</v-toolbar-title>
88
</v-toolbar>
99
<v-content>
10+
<v-container grid-list-md text-xs-center>
11+
<v-layout row wrap>
12+
<!-- Column A -->
13+
<v-flex xs12 md6 offset-md3>
14+
<h3 class="text-xs-left">Lista Attività</h3>
15+
<v-card>
1016
<v-list>
11-
<span v-if="activityList == null">
17+
<span v-if="activityList == null || activityList == [] || activityList.length == 0">
1218
Nessuna Attività, perchè non ne <a href="#/activity/new">crei</a> una nuova?
1319
</span>
14-
<v-list-tile v-for="activity in activityList" :key="activity.el" avatar @click="">
15-
<v-list-tile-title ripple @click="loadProgram(activity.name)">
16-
{{ activity.name }}
17-
</v-list-tile-title>
18-
<v-btn flat icon color="grey darken-1" ripple @click="deleteActivityDlg(activity.name)">
19-
<v-icon>delete</v-icon>
20-
</v-btn>
21-
</v-list-tile>
22-
</v-list>
20+
<v-list-tile v-for="activity in activityList" :key="activity.el" avatar @click="">
21+
<v-list-tile-title ripple @click="loadProgram(activity.name)">
22+
<b>{{ activity.name }}</b>
23+
<small> {{activity.description}} </small>
24+
</v-list-tile-title>
25+
26+
<v-btn flat icon color="grey darken-1" ripple @click="deleteActivity(activity.name)">
27+
<v-icon>delete</v-icon>
28+
</v-btn>
29+
<v-btn flat icon color="grey darken-1" ripple :href="'/#/activity/edit/'+activity.name">
30+
<v-icon>edit</v-icon>
31+
</v-btn>
32+
</v-list-tile>
33+
</v-list>
34+
</v-card></v-flex></v-layout></v-container>
2335
</v-content>
2436
</v-app>
2537
</div>
@@ -31,15 +43,31 @@ export default {
3143
components: { sidebar },
3244
name: 'CoderBot',
3345
mounted() {
34-
let axios = this.$axios
35-
let CB = this.$data.CB
36-
//let programList = this.$data.programList
37-
axios.get(CB + '/listActivities')
38-
.then(function(response) {
39-
this.$data.activityList = response.data;
40-
}.bind(this))
46+
this.getActivities();
4147
},
4248
methods: {
49+
getActivities: function() {
50+
let axios = this.$axios
51+
let CB = this.$data.CB
52+
//let programList = this.$data.programList
53+
axios.get(CB + '/listActivities')
54+
.then(function(response) {
55+
this.$data.activityList = response.data;
56+
console.log(this.$data.activityList)
57+
}.bind(this))
58+
},
59+
deleteActivity: function(name) {
60+
let axios = this.$axios
61+
let CB = this.$data.CB
62+
//let programList = this.$data.programList
63+
axios.post(CB + '/deleteActivity', {
64+
name: name
65+
})
66+
.then(function(response) {
67+
this.getActivities();
68+
}.bind(this))
69+
},
70+
4371
toggleSidebar: function() {
4472
let currentStatus = this.$store.getters.drawerStatus
4573
this.$store.commit('toggleDrawer', !currentStatus)

src/components/Sidebar.vue

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@
6060
<v-list-tile-title>Nuova</v-list-tile-title>
6161
</v-list-tile-content>
6262
</v-list-tile>
63-
<v-list-tile to="/actvity/edit">
64-
<v-list-tile-action>
65-
<v-icon>edit</v-icon>
66-
</v-list-tile-action>
67-
<v-list-tile-content>
68-
<v-list-tile-title>Modifica</v-list-tile-title>
69-
</v-list-tile-content>
70-
</v-list-tile>
7163
<br>
7264
<v-divider>
7365
</v-divider>
@@ -168,14 +160,6 @@
168160
<v-list-tile-title>Nuova</v-list-tile-title>
169161
</v-list-tile-content>
170162
</v-list-tile>
171-
<v-list-tile to="/actvity/edit">
172-
<v-list-tile-action>
173-
<v-icon>edit</v-icon>
174-
</v-list-tile-action>
175-
<v-list-tile-content>
176-
<v-list-tile-title>Modifica</v-list-tile-title>
177-
</v-list-tile-content>
178-
</v-list-tile>
179163
<br>
180164
<v-divider>
181165
</v-divider>
@@ -223,29 +207,6 @@
223207
</div>
224208
</v-list>
225209
</v-navigation-drawer>
226-
<v-dialog v-model="editModal" max-width="290">
227-
<v-card>
228-
<v-card-title class="headline">
229-
Lista Programmi
230-
</v-card-title>
231-
<v-list>
232-
<v-list-tile v-for="program in activitiesList" :key="program.el" avatar @click="">
233-
<v-list-tile-title ripple @click="loadProgram(program.name)">
234-
{{ program.name }}
235-
</v-list-tile-title>
236-
<v-btn v-if="program.default != 'True'" flat icon color="grey darken-1" ripple @click="deleteProgramDlg(program.name)">
237-
<v-icon>delete</v-icon>
238-
</v-btn>
239-
</v-list-tile>
240-
</v-list>
241-
<v-card-actions>
242-
<v-spacer></v-spacer>
243-
<v-btn color="green darken-1" flat="flat" @click="carica = false">
244-
Annulla
245-
</v-btn>
246-
</v-card-actions>
247-
</v-card>
248-
</v-dialog>
249210
</template>
250211
</div>
251212

0 commit comments

Comments
 (0)