WIP(teams): fixes, beta banner

This commit is contained in:
Sabe Jones
2021-06-25 08:56:06 -05:00
committed by SabreCat
parent 85a9ea726c
commit 59dc97b75f
6 changed files with 49 additions and 2 deletions

View File

@@ -54,7 +54,7 @@ async function updateTeamTasks (team) {
if (daily.value < MIN_TASK_VALUE) daily.value = MIN_TASK_VALUE; if (daily.value < MIN_TASK_VALUE) daily.value = MIN_TASK_VALUE;
} }
daily.isDue = shouldDo(new Date(), daily, teamLeader.preferences); daily.isDue = shouldDo(new Date(), daily, teamLeader.preferences);
if (daily.isModified()) toSave.push(daily.save()); toSave.push(daily.save());
}); });
if (!team.cron) team.cron = {}; if (!team.cron) team.cron = {};

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -28,12 +28,40 @@
{{ $t('groupBilling') }} {{ $t('groupBilling') }}
</router-link> </router-link>
</secondary-menu> </secondary-menu>
<div
class="row beta-banner d-flex justify-content-center align-items-center"
>
<img src="~@/assets/images/bug.png" class="mr-2">
<strong
class="mr-1"
>
Thank you for being a Habitica beta tester.
</strong>
<a href="mailto:admin@habitica.com">Please submit bugs and feedback here.</a>
</div>
<div class="col-12"> <div class="col-12">
<router-view /> <router-view />
</div> </div>
</div> </div>
</template> </template>
<style lang="scss" scoped>
@import '~@/assets/scss/colors.scss';
.beta-banner {
background-color: rgba($purple-600, 0.25);
border: solid 1px $purple-500;
color: $purple-300;
height: 2rem;
width: 101%;
a {
color: $purple-300;
text-decoration: underline;
}
}
</style>
<script> <script>
import groupFormModal from '@/components/groups/groupFormModal'; import groupFormModal from '@/components/groups/groupFormModal';
import SecondaryMenu from '@/components/secondaryMenu'; import SecondaryMenu from '@/components/secondaryMenu';

View File

@@ -94,6 +94,10 @@
color: $purple-300; color: $purple-300;
} }
.create-task-area {
top: 1rem;
}
.tasks-navigation { .tasks-navigation {
margin-bottom: 40px; margin-bottom: 40px;
} }

View File

@@ -654,7 +654,7 @@ api.updateTask = {
// the other of the keys when using .toObject() // the other of the keys when using .toObject()
// see https://github.com/Automattic/mongoose/issues/2749 // see https://github.com/Automattic/mongoose/issues/2749
if (sanitizedObj.managerNotes) { if (Object.prototype.hasOwnProperty.call(sanitizedObj, 'managerNotes')) {
task.group.managerNotes = sanitizedObj.managerNotes; task.group.managerNotes = sanitizedObj.managerNotes;
} }

View File

@@ -377,6 +377,21 @@ async function scoreTask (user, task, direction, req, res) {
if (rollbackUser) { if (rollbackUser) {
delta = shared.ops.scoreTask({ task, user: rollbackUser, direction }, req, res.analytics); delta = shared.ops.scoreTask({ task, user: rollbackUser, direction }, req, res.analytics);
rollbackUser.addNotification('GROUP_TASK_NEEDS_WORK', {
message: res.t('taskNeedsWork', { taskText: task.text, managerName: user.profile.name }, rollbackUser.preferences.language),
task: {
id: task._id,
text: task.text,
},
group: {
id: group._id,
name: group.name,
},
manager: {
id: user._id,
name: user.profile.name,
},
});
await rollbackUser.save(); await rollbackUser.save();
} else { } else {
delta = shared.ops.scoreTask({ task, user, direction }, req, res.analytics); delta = shared.ops.scoreTask({ task, user, direction }, req, res.analytics);