Merge branch 'integration' into LF-2230/allow-completion-of-tasks-for…

…-psuedo-users
LiteFarmOrg · May 10, 2022 · d63c5f7 · d63c5f7
2 parents 3a10bb8 + 941e07a
commit d63c5f7
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 36 deletions.
diff --git a/packages/api/src/controllers/taskController.js b/packages/api/src/controllers/taskController.js
@@ -50,10 +50,9 @@ const taskController = {
         return res.status(400).send('Task has already been completed or abandoned');
       }
 
-      if (!adminRoles.includes(req.role) && checkTaskStatus.assignee_user_id != req.user.user_id) {
-        return res
-          .status(400)
-          .send('Farm workers are not allowed to reassign a task assigned to another worker');
+
+      if (!adminRoles.includes(req.role) && checkTaskStatus.assignee_user_id != req.user.user_id && checkTaskStatus.assignee_user_id !== null){
+        return res.status(403).send('Farm workers are not allowed to reassign a task assigned to another worker');
       }
 
       // Avoid 1) making an empty update, and 2) sending a redundant notification.

diff --git a/packages/api/tests/task.test.js b/packages/api/tests/task.test.js
@@ -331,7 +331,7 @@ describe('Task tests', () => {
         { assignee_user_id: user_id },
         task_id,
         async (err, res) => {
-          expect(res.status).toBe(400);
+          expect(res.status).toBe(403);
           done();
         },
       );

diff --git a/packages/webapp/public/locales/en/translation.json b/packages/webapp/public/locales/en/translation.json
@@ -639,7 +639,7 @@
     "DATE": "Date",
     "ESTIMATED_REVENUE": {
       "ESTIMATED_ANNUAL_REVENUE": "Estimated annual revenue",
-      "ESTIMATED_ANNUAL_YIELD": "Estimated annual yield",
+      "ESTIMATED_ANNUAL_YIELD": "Estimated annual harvest",
       "ESTIMATED_PRICE_PER_UNIT": "Estimated price per unit",
       "TITLE": "Estimated Revenue"
     },
@@ -913,7 +913,7 @@
     "DURATION_TOOLTIP": "These are suggested values. Please adjust for your local conditions.",
     "EDITING_PLAN_WILL_NOT_MODIFY": "Editing this plan will not modify tasks assigned to it.",
     "ESTIMATED_SEED": "Estimated seed required",
-    "ESTIMATED_YIELD": "Estimated annual yield",
+    "ESTIMATED_YIELD": "Estimated annual harvest",
     "FIRST_MP_SPOTLIGHT": {
       "BODY_PART1": "LiteFarm has generated a few tasks based on your plan. You can add more tasks or assign them on this screen.",
       "BODY_PART2": "Your plan will become active once you complete a task.",

diff --git a/packages/webapp/public/locales/es/translation.json b/packages/webapp/public/locales/es/translation.json
@@ -638,7 +638,7 @@
     "DATE": "Fecha",
     "ESTIMATED_REVENUE": {
       "ESTIMATED_ANNUAL_REVENUE": "Ingresos anuales estimados",
-      "ESTIMATED_ANNUAL_YIELD": "Rendimiento anual estimado",
+      "ESTIMATED_ANNUAL_YIELD": "MISSING",
       "ESTIMATED_PRICE_PER_UNIT": "Precio estimado por unidad",
       "TITLE": "Ingresos estimados"
     },
@@ -916,7 +916,7 @@
     "DURATION_TOOLTIP": "Estos son valores sugeridos. Ajústelo a las condiciones locales.",
     "EDITING_PLAN_WILL_NOT_MODIFY": "La edición de este plan no modificará las tareas asignadas.",
     "ESTIMATED_SEED": "Semilla estimada es obligatoria",
-    "ESTIMATED_YIELD": "Rendimiento estimado",
+    "ESTIMATED_YIELD": "MISSING",
     "FIRST_MP_SPOTLIGHT": {
       "BODY_PART1": "LiteFarm ha generado algunas tareas basadas en su plan. Puede agregar más tareas o asignarlas en esta pantalla.",
       "BODY_PART2": "Su plan se activará una vez que complete una tarea.",

diff --git a/packages/webapp/public/locales/fr/translation.json b/packages/webapp/public/locales/fr/translation.json
@@ -917,7 +917,7 @@
     "DURATION_TOOLTIP": "Ce sont des valeurs suggérées. Veuillez les ajuster en fonction de vos conditions locales.",
     "EDITING_PLAN_WILL_NOT_MODIFY": "MISSING",
     "ESTIMATED_SEED": "Semence estimée requise",
-    "ESTIMATED_YIELD": "Rendement estimé",
+    "ESTIMATED_YIELD": "MISSING",
     "FIRST_MP_SPOTLIGHT": {
       "BODY_PART1": "MISSING",
       "BODY_PART2": "MISSING",

diff --git a/packages/webapp/public/locales/pt/translation.json b/packages/webapp/public/locales/pt/translation.json
@@ -638,7 +638,7 @@
     "DATE": "Data",
     "ESTIMATED_REVENUE": {
       "ESTIMATED_ANNUAL_REVENUE": "Receita anual estimada",
-      "ESTIMATED_ANNUAL_YIELD": "Rendimento anual estimado",
+      "ESTIMATED_ANNUAL_YIELD": "MISSING",
       "ESTIMATED_PRICE_PER_UNIT": "Preço por unidade estimado",
       "TITLE": "Receita Estimada"
     },
@@ -916,7 +916,7 @@
     "DURATION_TOOLTIP": "Esses são valores sugeridos. Ajuste de acordo com as condições locais.",
     "EDITING_PLAN_WILL_NOT_MODIFY": "Editar este plano não irá modificar as tarefas atribuídas a ele.",
     "ESTIMATED_SEED": "Semente estimada necessária",
-    "ESTIMATED_YIELD": "Rendimento estimado",
+    "ESTIMATED_YIELD": "MISSING",
     "FIRST_MP_SPOTLIGHT": {
       "BODY_PART1": "LiteFarm gerou algumas tarefas com base em seu plano. Você pode adicionar mais tarefas ou atribuí-las nesta tela.",
       "BODY_PART2": "Seu plano será ativado assim que você concluir uma tarefa.",

diff --git a/packages/webapp/src/components/CardWithStatus/TaskCard/TaskCard.jsx b/packages/webapp/src/components/CardWithStatus/TaskCard/TaskCard.jsx
@@ -62,7 +62,7 @@ export const PureTaskCard = ({
     onClickCompleteOrDueDate?.();
   };
 
-  const iconStyle = {
+  const iconStyle = { 
     iconTextContainer: {
       display: 'flex',
       flexDirection: 'row',

diff --git a/packages/webapp/src/components/Modals/QuickAssignModal/index.jsx b/packages/webapp/src/components/Modals/QuickAssignModal/index.jsx
@@ -16,6 +16,7 @@ export default function TaskQuickAssignModal({
   onAssignTask,
   users,
   user,
+  taskCardContents,
 }) {
   const { t } = useTranslation();
   const selfOption = { label: `${user.first_name} ${user.last_name}`, value: user.user_id };
@@ -35,8 +36,24 @@ export default function TaskQuickAssignModal({
   const [selectedWorker, setWorker] = useState(isAssigned ? unAssignedOption : selfOption);
   const [assignAll, setAssignAll] = useState(false);
 
+  const checkUnassignedTaskForSameDate = () => {
+    const selectedTask = taskCardContents.find((t) => t.task_id == task_id);
+    let isUnassignedTaskPresent = false;
+    for (let task of taskCardContents) {
+      if (
+        task.completeOrDueDate === selectedTask.completeOrDueDate &&
+        !task.assignee &&
+        task.task_id !== task_id
+      ) {
+        isUnassignedTaskPresent = true;
+        break;
+      }
+    }
+    return isUnassignedTaskPresent;
+  };
+
   const onAssign = () => {
-    assignAll
+    assignAll && checkUnassignedTaskForSameDate()
       ? onAssignTasksOnDate({
           task_id: task_id,
           date: due_date,
@@ -49,6 +66,10 @@ export default function TaskQuickAssignModal({
     dismissModal();
   };
 
+  const onCheckedAll = () => {
+    setAssignAll(!assignAll);
+  };
+
   const disabled = selectedWorker === null;
 
   return (
@@ -86,7 +107,7 @@ export default function TaskQuickAssignModal({
       <Checkbox
         style={{ paddingRight: '24px' }}
         label={t('ADD_TASK.ASSIGN_ALL_TO_PERSON')}
-        onChange={() => setAssignAll(!assignAll)}
+        onChange={onCheckedAll}
       />
     </ModalComponent>
   );

diff --git a/packages/webapp/src/components/Task/TaskReadOnly/index.jsx b/packages/webapp/src/components/Task/TaskReadOnly/index.jsx
@@ -46,6 +46,7 @@ import ReactSelect from '../../Form/ReactSelect';
 import { BiPencil } from 'react-icons/bi';
 import TaskQuickAssignModal from '../../Modals/QuickAssignModal';
 import { getDateInputFormat } from '../../../util/moment';
+import UpdateTaskDateModal from '../../Modals/UpdateTaskDateModal';
 
 export default function PureTaskReadOnly({
   onGoBack,
@@ -63,6 +64,7 @@ export default function PureTaskReadOnly({
   getMaxZoom,
   onAssignTasksOnDate,
   onAssignTask,
+  onChangeTaskDate,
 }) {
   const { t } = useTranslation();
   const taskType = task.taskType;
@@ -89,7 +91,7 @@ export default function PureTaskReadOnly({
         secondDateLabel: null,
       };
     }
-  }, []);
+  }, [task]);
   const locationIds = task.locations.map(({ location_id }) => location_id);
   const owner_user_id = task.owner_user_id;
   const {
@@ -126,6 +128,7 @@ export default function PureTaskReadOnly({
     !isTaskType(taskType, 'PLANT_TASK') && !isTaskType(taskType, 'TRANSPLANT_TASK');
 
   const [showTaskAssignModal, setShowTaskAssignModal] = useState(false);
+  const [showDueDateModal, setShowDueDateModal] = useState(false);
 
   const canCompleteTask = (user.user_id === task.assignee_user_id) || (assignedToPseudoUser && user.is_admin);
 
@@ -152,7 +155,7 @@ export default function PureTaskReadOnly({
           />
         }
       />
-      <div className={styles.assigneeContainer} style={{ marginBottom: '40px' }}>
+      <div className={styles.editableContainer}>
         <Input
           label={t('ADD_TASK.ASSIGNEE')}
           disabled={true}
@@ -163,23 +166,14 @@ export default function PureTaskReadOnly({
         )}
       </div>
 
-      <Input
-        style={{ marginBottom: '40px' }}
-        type={'date'}
-        value={date}
-        label={dateLabel}
-        disabled
-      />
+      <div className={styles.editableContainer}>
+        <Input type={'date'} value={date} label={dateLabel} disabled />
+        {isCurrent && isAdmin && (
+          <BiPencil className={styles.pencil} onClick={(_) => setShowDueDateModal(true)} />
+        )}
+      </div>
 
-      {secondDate && (
-        <Input
-          style={{ marginBottom: '40px' }}
-          type={'date'}
-          value={secondDate}
-          label={secondDateLabel}
-          disabled
-        />
-      )}
+      {secondDate && <Input type={'date'} value={secondDate} label={secondDateLabel} disabled />}
 
       <Semibold style={{ marginBottom: '12px' }}>{t('TASK.LOCATIONS')}</Semibold>
       {isTaskType(taskType, 'TRANSPLANT_TASK') && (
@@ -391,6 +385,13 @@ export default function PureTaskReadOnly({
           dismissModal={() => setShowTaskAssignModal(false)}
         />
       )}
+      {showDueDateModal && (
+        <UpdateTaskDateModal
+          due_date={date}
+          onChangeTaskDate={onChangeTaskDate}
+          dismissModal={() => setShowDueDateModal(false)}
+        />
+      )}
     </Layout>
   );
 }

diff --git a/packages/webapp/src/components/Task/TaskReadOnly/styles.module.scss b/packages/webapp/src/components/Task/TaskReadOnly/styles.module.scss
@@ -20,9 +20,10 @@
   cursor: pointer;
 }
 
-.assigneeContainer {
+.editableContainer {
   display: flex;
   flex-direction: row;
+  margin-bottom: 40px;
   div {
     flex-grow: 1;
   }

diff --git a/packages/webapp/src/containers/Crop/ManagementDetail/ManagementTasks.jsx b/packages/webapp/src/containers/Crop/ManagementDetail/ManagementTasks.jsx
@@ -56,6 +56,7 @@ export default function ManagementTasks({ history, match }) {
             key={task.task_id}
             onClick={() => history.push(`/tasks/${task.task_id}/read_only`)}
             style={{ marginBottom: '14px' }}
+            taskCardContents={taskCardContents}
             {...task}
           />
         ))}

diff --git a/packages/webapp/src/containers/Task/TaskCard/index.jsx b/packages/webapp/src/containers/Task/TaskCard/index.jsx
@@ -20,6 +20,7 @@ const TaskCard = ({
   onClick = null,
   selected,
   happiness,
+  taskCardContents,
   classes = { card: {} },
   ...props
 }) => {
@@ -81,6 +82,7 @@ const TaskCard = ({
           onAssignTask={onAssignTask}
           users={users}
           user={user}
+          taskCardContents={taskCardContents}
           dismissModal={() => setShowTaskAssignModal(false)}
         />
       )}
@@ -110,6 +112,7 @@ TaskCard.propTypes = {
   onClickCompleteOrDueDate: PropTypes.func,
   selected: PropTypes.bool,
   task_id: PropTypes.number,
+  taskCardContents: PropTypes.array,
 };
 
 export default TaskCard;
diff --git a/packages/webapp/src/containers/Task/TaskReadOnly/index.jsx b/packages/webapp/src/containers/Task/TaskReadOnly/index.jsx
@@ -31,7 +31,7 @@ import { harvestUseTypesSelector } from '../../harvestUseTypeSlice';
 import { useReadonlyTask } from './useReadonlyTask';
 import { isTaskType } from '../useIsTaskType';
 import { useMaxZoom } from '../../Map/useMaxZoom';
-import { assignTask, assignTasksOnDate } from '../saga';
+import { assignTask, assignTasksOnDate, changeTaskDate } from '../saga';
 
 function TaskReadOnly({ history, match }) {
   const task_id = match.params.task_id;
@@ -80,6 +80,7 @@ function TaskReadOnly({ history, match }) {
   };
   const { maxZoomRef, getMaxZoom } = useMaxZoom();
 
+  const onChangeTaskDate = (date) => dispatch(changeTaskDate({ task_id, due_date: date }));
   const onAssignTasksOnDate = (task) => dispatch(assignTasksOnDate(task));
   const onAssignTask = (task) => dispatch(assignTask(task));
   return (
@@ -102,6 +103,7 @@ function TaskReadOnly({ history, match }) {
         getMaxZoom={getMaxZoom}
         onAssignTasksOnDate={onAssignTasksOnDate}
         onAssignTask={onAssignTask}
+        onChangeTaskDate={onChangeTaskDate}
       />
     </>
   );

diff --git a/packages/webapp/src/containers/Task/index.jsx b/packages/webapp/src/containers/Task/index.jsx
@@ -129,6 +129,7 @@ export default function TaskPage({ history }) {
             key={task.task_id}
             onClick={() => history.push(`/tasks/${task.task_id}/read_only`)}
             style={{ marginBottom: '14px' }}
+            taskCardContents={taskCardContents}
             {...task}
           />
         ))

diff --git a/packages/webapp/src/containers/Task/saga.js b/packages/webapp/src/containers/Task/saga.js
@@ -123,7 +123,7 @@ export function* assignTaskOnDateSaga({ payload: { task_id, date, assignee_user_
     let modified_tasks = [];
     for (let i = 0; i < result.data.length; i++) {
       modified_tasks.push({
-        id: result.data[i],
+        id: result.data[i].task_id,
         changes: { assignee_user_id },
       });
     }