Skip to content

Commit 8875e42

Browse files
committed
Add highest number of points earned variable when task is completed
1 parent bfeb7f6 commit 8875e42

File tree

2 files changed

+361
-531
lines changed

2 files changed

+361
-531
lines changed

src/components/TodoList.vue

Lines changed: 17 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,16 @@
33
<p>Level: {{ levels.toLocaleString("en-US") }}</p>
44
<p>XP: {{ xps.toLocaleString("en-US") }}</p>
55
<p>Daily Streak: {{ dailyStreaks.toLocaleString("en-US") }}</p>
6-
<p>
7-
Tasks Completed Today: {{ tasksCompletedTodays.toLocaleString("en-US") }}
8-
</p>
9-
<p>
10-
Total Tasks Completed: {{ totalTasksCompletions.toLocaleString("en-US") }}
11-
</p>
6+
<p>Tasks Completed Today: {{ tasksCompletedTodays.toLocaleString("en-US") }}</p>
7+
<p>Total Tasks Completed: {{ totalTasksCompletions.toLocaleString("en-US") }}</p>
128
<p>Score: {{ scores.toLocaleString("en-US") }}</p>
13-
<!--show circular progress bar filled with level progress--><ve-progress
14-
:progress="progresses"
15-
>Level {{ levels.toLocaleString("en-US") }}</ve-progress
16-
>
9+
<p>Best Points Earned After Completing the Task: {{ bestScoreEarneds.toLocaleString("en-US") }}</p>
10+
<!--show circular progress bar filled with level progress--><ve-progress :progress="progresses">Level {{ levels.toLocaleString("en-US") }}</ve-progress>
1711
<h3>Task list</h3>
18-
<ul class="todos">
19-
<!--repeat for each tasks-->
12+
<ul class="todos"><!--repeat for each tasks-->
2013
<li v-for="todo in todos" :key="todo.newId" class="todo">
21-
<span
22-
v-bind:class="{
23-
overdue: new Date(todo.dueDate + ' 23:59:59.999') < new Date(),
24-
}"
25-
>{{ todo.task }} <br />Streak:
26-
{{ todo.streak.toLocaleString("en-US") }} <br />Due date:
27-
{{ todo.dueDate }} <br />Priority: {{ todo.priority }}
28-
<br />Difficulty: {{ todo.difficulty }} <br />Repeat:
29-
<span v-if="todo.repeatFrequency != 5">{{
30-
todo.repeatOften.toLocaleString("en-US")
31-
}}</span
32-
>&nbsp;<span v-if="todo.repeatFrequency == 1">Day</span
33-
><span v-if="todo.repeatFrequency == 2">Week</span
34-
><span v-if="todo.repeatFrequency == 3">Month</span
35-
><span v-if="todo.repeatFrequency == 4">Year</span
36-
><span v-if="todo.repeatFrequency == 5">Once</span
37-
><span v-if="todo.repeatOften > 1 && todo.repeatFrequency != 5"
38-
>s</span
39-
></span
40-
>
41-
<!--don't show complete button if one-time task is completed--><button
42-
v-if="!todo.completed"
43-
@click="completeTodo(todo.newId)"
44-
>
45-
Complete
46-
</button>
14+
<span v-bind:class="{overdue: new Date(todo.dueDate + ' 23:59:59.999') < new Date()}">{{ todo.task }} <br/>Streak: {{ todo.streak.toLocaleString("en-US") }} <br/>Due date: {{ todo.dueDate }} <br/>Priority: {{ todo.priority }} <br/>Difficulty: {{ todo.difficulty }} <br/>Repeat: <span v-if="todo.repeatFrequency != 5">{{ todo.repeatOften.toLocaleString("en-US") }}</span>&nbsp;<span v-if="todo.repeatFrequency == 1">Day</span><span v-if="todo.repeatFrequency == 2">Week</span><span v-if="todo.repeatFrequency == 3">Month</span><span v-if="todo.repeatFrequency == 4">Year</span><span v-if="todo.repeatFrequency == 5">Once</span><span v-if="todo.repeatOften > 1 && todo.repeatFrequency != 5">s</span></span>
15+
<!--don't show complete button if one-time task is completed--><button v-if="!todo.completed" @click="completeTodo(todo.newId)">Complete</button>
4716
<button @click="deleteTodo(todo.newId)">Delete</button><br />
4817
</li>
4918
</ul>
@@ -88,14 +57,12 @@ export default defineComponent({
8857
timesCompleted: Number,
8958
streak: Number,
9059
dailyStreak: Number,
91-
originalDueDate: Date,
60+
originalDueDate: Date
9261
},
9362
computed: {
9463
todos() {
9564
//eslint-disable-next-line
96-
return store.getters.getTodos.sort((a: any, b: any) =>
97-
a.dueDate.localeCompare(b.dueDate)
98-
); //get tasks (todos) and sort tasks by task's due date with the top one the oldest
65+
return store.getters.getTodos.sort((a: any, b: any) => a.dueDate.localeCompare(b.dueDate)); //get tasks (todos) and sort tasks by task's due date with the top one the oldest
9966
},
10067
levels() {
10168
return store.getters.getLevel; //get current level
@@ -107,20 +74,23 @@ export default defineComponent({
10774
return store.getters.getProgress; //get current progress
10875
},
10976
scores() {
110-
return store.getters.getScore; //get current score
77+
return store.getters.getScore;//get current score
11178
},
11279
dailyStreaks() {
113-
return store.getters.getDailyStreak; //get current daily streak
80+
return store.getters.getDailyStreak;//get current daily streak
11481
},
11582
tasksCompletedTodays() {
116-
return store.getters.getTasksCompletedToday; //get tasks completed in a day (today)
83+
return store.getters.getTasksCompletedToday;//get tasks completed in a day (today)
11784
},
11885
totalTasksCompletions() {
119-
return store.getters.getTotalTasksCompleted; //get total tasks completed
86+
return store.getters.getTotalTasksCompleted;//get total tasks completed
12087
},
12188
lastCompletedDates() {
122-
return store.getters.getLastCompletionDate; //get current last completion date
89+
return store.getters.getLastCompletionDate;//get current last completion date
12390
},
91+
bestScoreEarneds() {
92+
return store.getters.getBestScoreEarned;//get best score earned
93+
}
12494
},
12595
methods: {
12696
/**

0 commit comments

Comments
 (0)