Bouni
/
vikunja-frontend
forked from vikunja/frontend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add repeat mode setting for tasks 

See vikunja/api#834
This commit is contained in:
kolaente 2021-04-14 10:24:07 +02:00
parent 6e58acf98f
commit 4ed5d1e8fe
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
3 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/components/tasks/partials/repeatAfter.vue
View File

@ -5,52 +5,56 @@
<x-button type="secondary" class="is-small" @click="() => setRepeatAfter(1, 'weeks')">Every Week</x-button> <x-button type="secondary" class="is-small" @click="() => setRepeatAfter(1, 'weeks')">Every Week</x-button>
<x-button type="secondary" class="is-small" @click="() => setRepeatAfter(1, 'months')">Every Month</x-button> <x-button type="secondary" class="is-small" @click="() => setRepeatAfter(1, 'months')">Every Month</x-button>
</div> </div>
<div class="columns is-align-items-center"> <div class="is-flex is-align-items-center mb-2">
<div class="is-flex column"> <label for="repeatMode" class="is-fullwidth">
<p class="pr-4"> Repeat mode:
Each </label>
</p> <div class="control">
<div class="field has-addons is-fullwidth"> <div class="select">
<div class="control"> <select @change="updateData" v-model="task.repeatMode" id="repeatMode">
<input <option :value="repeatModes.REPEAT_MODE_DEFAULT">Default</option>
:disabled="disabled" <option :value="repeatModes.REPEAT_MODE_MONTH">Monthly</option>
@change="updateData" <option :value="repeatModes.REPEAT_MODE_FROM_CURRENT_DATE">From Current Date</option>
class="input" </select>
placeholder="Specify an amount..." </div>
v-model="repeatAfter.amount"/> </div>
</div> </div>
<div class="control"> <div class="is-flex" v-if="task.repeatMode !== repeatModes.REPEAT_MODE_MONTH">
<div class="select"> <p class="pr-4">
<select :disabled="disabled" @change="updateData" v-model="repeatAfter.type"> Each
<option value="hours">Hours</option> </p>
<option value="days">Days</option> <div class="field has-addons is-fullwidth">
<option value="weeks">Weeks</option> <div class="control">
<option value="months">Months</option> <input
<option value="years">Years</option> :disabled="disabled"
</select> @change="updateData"
</div> class="input"
placeholder="Specify an amount..."
v-model="repeatAfter.amount"
type="number"
/>
</div>
<div class="control">
<div class="select">
<select :disabled="disabled" @change="updateData" v-model="repeatAfter.type">
<option value="hours">Hours</option>
<option value="days">Days</option>
<option value="weeks">Weeks</option>
<option value="months">Months</option>
<option value="years">Years</option>
</select>
</div> </div>
</div> </div>
</div> </div>
<fancycheckbox
:disabled="disabled"
@change="updateData"
class="column"
v-model="task.repeatFromCurrentDate"
v-tooltip="'When marking the task as done, all dates will be set relative to the current date rather than the date they had before.'"
>
Repeat from current date
</fancycheckbox>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Fancycheckbox from '../../input/fancycheckbox' import repeatModes from '@/models/taskRepeatModes'
export default { export default {
name: 'repeatAfter', name: 'repeatAfter',
components: {Fancycheckbox},
data() { data() {
return { return {
task: {}, task: {},
@ -58,12 +62,12 @@ export default {
amount: 0, amount: 0,
type: '', type: '',
}, },
repeatModes: repeatModes,
} }
}, },
props: { props: {
value: { value: {
default: () => { default: () => {},
},
required: true, required: true,
}, },
disabled: { disabled: {
@ -107,8 +111,4 @@ p {
.input { .input {
min-width: 2rem; min-width: 2rem;
} }
.fancycheckbox {
padding: 0;
}
</style> </style>

5
src/models/task.js
View File

@ -2,6 +2,8 @@ import AbstractModel from './abstractModel'
import UserModel from './user' import UserModel from './user'
import LabelModel from './label' import LabelModel from './label'
import AttachmentModel from './attachment' import AttachmentModel from './attachment'
import {REPEAT_MODE_DEFAULT} from './taskRepeatModes'
import SubscriptionModel from '@/models/subscription' import SubscriptionModel from '@/models/subscription'
import {parseDateOrNull} from '@/helpers/parseDateOrNull' import {parseDateOrNull} from '@/helpers/parseDateOrNull'
@ -94,6 +96,7 @@ export default class TaskModel extends AbstractModel {
endDate: 0, endDate: 0,
repeatAfter: 0, repeatAfter: 0,
repeatFromCurrentDate: false, repeatFromCurrentDate: false,
repeatMode: REPEAT_MODE_DEFAULT,
reminderDates: [], reminderDates: [],
parentTaskId: 0, parentTaskId: 0,
hexColor: '', hexColor: '',
@ -114,7 +117,7 @@ export default class TaskModel extends AbstractModel {
} }
getTextIdentifier() { getTextIdentifier() {
if(this.identifier === '') { if (this.identifier === '') {
return `#${this.index}` return `#${this.index}`
} }

5
src/models/taskRepeatModes.json Normal file
View File

@ -0,0 +1,5 @@
{
"REPEAT_MODE_DEFAULT": 0,
"REPEAT_MODE_MONTH": 1,
"REPEAT_MODE_FROM_CURRENT_DATE": 2
}