From 59dc97b75f50d2fedfff00b2c8a6fda214577d1f Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Fri, 25 Jun 2021 08:56:06 -0500
Subject: [PATCH] WIP(teams): fixes, beta banner

---
 scripts/team-cron.js                          |   2 +-
 website/client/src/assets/images/bug.png      | Bin 0 -> 1056 bytes
 .../src/components/group-plans/index.vue      |  28 ++++++++++++++++++
 .../group-plans/taskInformation.vue           |   4 +++
 website/server/controllers/api-v3/tasks.js    |   2 +-
 website/server/libs/tasks/index.js            |  15 ++++++++++
 6 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 website/client/src/assets/images/bug.png

diff --git a/scripts/team-cron.js b/scripts/team-cron.js
index 1903009691..a08fde261e 100644
--- a/scripts/team-cron.js
+++ b/scripts/team-cron.js
@@ -54,7 +54,7 @@ async function updateTeamTasks (team) {
         if (daily.value < MIN_TASK_VALUE) daily.value = MIN_TASK_VALUE;
       }
       daily.isDue = shouldDo(new Date(), daily, teamLeader.preferences);
-      if (daily.isModified()) toSave.push(daily.save());
+      toSave.push(daily.save());
     });
 
     if (!team.cron) team.cron = {};
diff --git a/website/client/src/assets/images/bug.png b/website/client/src/assets/images/bug.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3116a722960ddd51e04a2c649cd84d01d5478fc
GIT binary patch
literal 1056
zcmV+*1mF9KP)<h;3K|Lk000e1NJLTq000yK000#T1^@s6M%B)!00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR916rckD1ONa40RR916#xJL0FS-dO#lD`ib+I4R5%fpR9$FPM-=|%&dlB2
z?50uE#HeXOlp@6nwnC}Uf~{1jr9MS!R7fAH1qnX%trpxDsZuQcGZ3{uDD<(kV4>|p
zO(>PV_#%R|Mu<qNn~h78X7}#>nK?ak(@n2t8|Z<1@7$SlzVn@L&J3`ukyv)Q&7#+4
zE}a@ZMEc`l_&|Hm^9N|-XRp)RhvVA<Ixue@`}`U%jP67C!$Ic<=|i$8TZK1A2dFE%
zz66kngf!?RV5b&%$#~e94Y+uOP6!XLKwyUraWm{glQLDb)#!r(DwJ~gk+UUnWIp|~
zKL68(T~e)FQ92RNW1ETaR2<?|7+~bLF--Rs(OKw0*Bf7oN!7~kn6WW2peuwD9r%`v
zeZLVjuX!>as$G{`x?kYHRahYegi<(S2~(nmpXaJLX)S*EVu&uL44r1GiEY*cu{O10
zf@&=Yh7v(X!>IANfFj*ND0M4u{q_<(DWI8(l&IYr$L;Vwo?ssDcJ09@UaDCGyJ7GS
zYj;UoT$wfTr7#XQM^VsEaI_OItQ&7`Cc^Ds1CRmY1ZXy~s^d{?BEr{AjqmsF6-KVT
zTh{pmK}^`i^-jdrOvg#`WNggyB*=3mq&o0hl7bXI;#rAOAJ;7q!s6V_B;FhTN=!Jp
z(vr^%P^nr)($fQFykvXOm>pqBH-NoUFs7iDM&8fES2^f{KyD?ldMke6E;#n`pcr>x
z&QidI;llg$YtvgT`D2#MBbEVK)qlZsj#+UCXVC@JRS9DUJ`%5H<CpZI5h(G_Bq_Ic
zU@qEWM$q*tu8clIx?HA3oW(&ai!j7s_8NG*7t3rhV<#snlXOm6O9WyQ-g;~T$1WVC
zUWc*RhwjJi_~(0Ou2+n`=eIP=fH@z=OSu0k(!)(=bD9%Wc(TZwn!jA8;|~D3#y&GJ
zO?l%_`7%G1^K*U7MlK{{<ybpbRT+b~c{oQ2Mx??PE70^jjCcOw$hWa``y2g4g`J+n
zdIss_=Q(!kX0RLFl+W`0^WB;vhOhpPXw6>`hp&p*9gf3iMcfw9<!}z}>ql7Ew1_JK
zs{INtGT-A$qBqRpX$F{eK3RL9<m`gW_RsmAY|Wn?q<g}mhnZIOe0r@d0bH`ntzh?U
zT^4TauBZm#E}!2!+*+6UiCjXrmbGO8vyObwh=mX0ItH2HH@1jMHeuHHe~rta^g{Ws
apuYh^=Y*W;bOeq70000<MNUMnLSTYgHR0y~

literal 0
HcmV?d00001

diff --git a/website/client/src/components/group-plans/index.vue b/website/client/src/components/group-plans/index.vue
index bd4fd903da..b4672070ca 100644
--- a/website/client/src/components/group-plans/index.vue
+++ b/website/client/src/components/group-plans/index.vue
@@ -28,12 +28,40 @@
         {{ $t('groupBilling') }}
       </router-link>
     </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">
       <router-view />
     </div>
   </div>
 </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>
 import groupFormModal from '@/components/groups/groupFormModal';
 import SecondaryMenu from '@/components/secondaryMenu';
diff --git a/website/client/src/components/group-plans/taskInformation.vue b/website/client/src/components/group-plans/taskInformation.vue
index db197c1d8b..e5867f8168 100644
--- a/website/client/src/components/group-plans/taskInformation.vue
+++ b/website/client/src/components/group-plans/taskInformation.vue
@@ -94,6 +94,10 @@
     color: $purple-300;
   }
 
+  .create-task-area {
+    top: 1rem;
+  }
+
   .tasks-navigation {
     margin-bottom: 40px;
   }
diff --git a/website/server/controllers/api-v3/tasks.js b/website/server/controllers/api-v3/tasks.js
index 8d8d9eeed5..a33901c936 100644
--- a/website/server/controllers/api-v3/tasks.js
+++ b/website/server/controllers/api-v3/tasks.js
@@ -654,7 +654,7 @@ api.updateTask = {
     // the other of the keys when using .toObject()
     // see https://github.com/Automattic/mongoose/issues/2749
 
-    if (sanitizedObj.managerNotes) {
+    if (Object.prototype.hasOwnProperty.call(sanitizedObj, 'managerNotes')) {
       task.group.managerNotes = sanitizedObj.managerNotes;
     }
 
diff --git a/website/server/libs/tasks/index.js b/website/server/libs/tasks/index.js
index 345b8f88d7..db2d9074a4 100644
--- a/website/server/libs/tasks/index.js
+++ b/website/server/libs/tasks/index.js
@@ -377,6 +377,21 @@ async function scoreTask (user, task, direction, req, res) {
 
   if (rollbackUser) {
     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();
   } else {
     delta = shared.ops.scoreTask({ task, user, direction }, req, res.analytics);