mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 15:17:25 +01:00
Resized tasks, filter completed, add cron for non yesterdailies
This commit is contained in:
@@ -24,13 +24,16 @@ habitrpg.controller('NotificationCtrl',
|
|||||||
var yesterDailies = [];
|
var yesterDailies = [];
|
||||||
dailys.forEach(function (task) {
|
dailys.forEach(function (task) {
|
||||||
if (task && task.group.approval && task.group.approval.requested) return;
|
if (task && task.group.approval && task.group.approval.requested) return;
|
||||||
|
if (task.completed) return;
|
||||||
var shouldDo = Shared.shouldDo(yesterDay, task);
|
var shouldDo = Shared.shouldDo(yesterDay, task);
|
||||||
|
|
||||||
if (task.yesterDaily && shouldDo) yesterDailies.push(task);
|
if (task.yesterDaily && shouldDo) yesterDailies.push(task);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (yesterDailies.length === 0) return;
|
if (yesterDailies.length === 0) {
|
||||||
|
User.runCron();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
var modalScope = $rootScope.$new();
|
var modalScope = $rootScope.$new();
|
||||||
modalScope.obj = User.user;
|
modalScope.obj = User.user;
|
||||||
|
|||||||
20
website/client/components/guilds/newPartyModal.jade
Normal file
20
website/client/components/guilds/newPartyModal.jade
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
<template lang="pug">
|
||||||
|
div
|
||||||
|
button.btn.btn-primary(b-btn, @click="$root.$emit('show::modal','new-party-modal')") {{ $t('viewMembers') }}
|
||||||
|
|
||||||
|
b-modal#new-party-modal(:title="$t('createGuild')", size='lg')
|
||||||
|
.header-wrap(slot="modal-header")
|
||||||
|
.row
|
||||||
|
.col-6
|
||||||
|
h1(v-once) {{$t('members')}}
|
||||||
|
.col-6
|
||||||
|
button(type="button" aria-label="Close" class="close")
|
||||||
|
span(aria-hidden="true") ×
|
||||||
|
.row
|
||||||
|
.form-group.col-6
|
||||||
|
input.form-control.search(type="text", :placeholder="$t('search')", v-model='searchTerm')
|
||||||
|
.col-4.offset-2
|
||||||
|
span.dropdown-label {{ $t('sortBy') }}
|
||||||
|
b-dropdown(:text="$t('sort')", right=true)
|
||||||
|
b-dropdown-item(v-for='sortOption in sortOptions', @click='sort(sortOption.value)', :key='sortOption.value') {{sortOption.text}}
|
||||||
|
</template>
|
||||||
@@ -4,7 +4,7 @@ script(type='text/ng-template', id='modals/yesterDailies.html')
|
|||||||
.modal-body
|
.modal-body
|
||||||
.container-fluid
|
.container-fluid
|
||||||
.row
|
.row
|
||||||
.col-md-6.col-md-offset-3
|
.col-md-8.col-md-offset-2
|
||||||
.task-column.dailys
|
.task-column.dailys
|
||||||
task-list
|
task-list
|
||||||
.modal-footer
|
.modal-footer
|
||||||
|
|||||||
Reference in New Issue
Block a user