Adds Instructions task type (#2153)

Author: rfontanarosa

web/src/app/components/tasks-editor/task-form/task-form.component.html

@@ -43,7 +43,7 @@
       <div>{{ Tasks[taskGroup].label }}</div>
     </div>
 
-    <div class="toolbar-right">
+    <div class="toolbar-right" *ngIf="taskGroup !== TaskGroup.INSTRUCTIONS">
       <div>
         <mat-label>Required</mat-label>
 
@@ -70,6 +70,18 @@
         </button>
       </mat-menu>
     </div>
+
+    <div class="toolbar-right" *ngIf="taskGroup === TaskGroup.INSTRUCTIONS">
+      <button mat-icon-button [matMenuTriggerFor]="menu">
+        <mat-icon>more_vert</mat-icon>
+      </button>
+
+      <mat-menu #menu="matMenu">
+        <button mat-menu-item (click)="onTaskDelete()">
+          <span>Delete</span>
+        </button>
+      </mat-menu>
+    </div>
   </div>
 
   <div class="task-form">

web/src/app/components/tasks-editor/task-form/task-form.component.ts

@@ -99,7 +99,7 @@ export const Tasks: {
     icon: string;
     label: string;
     placeholder: string;
-    requiredMessage: string;
+    requiredMessage?: string;
     isGeometry?: boolean;
   };
 } = {
@@ -136,6 +136,11 @@ export const Tasks: {
     requiredMessage: 'Instructions are required',
     isGeometry: true,
   },
+  [TaskGroup.INSTRUCTIONS]: {
+    icon: 'list_alt_check',
+    label: 'Instructions',
+    placeholder: 'Instructions',
+  },
 };
 
 const GeometryTasks = List([TaskGroup.DROP_PIN, TaskGroup.DRAW_AREA]);

web/src/app/components/tasks-editor/tasks-editor.component.ts

@@ -47,6 +47,7 @@ export enum TaskGroup {
   DROP_PIN = 3,
   DRAW_AREA = 4,
   CAPTURE_LOCATION = 5,
+  INSTRUCTIONS = 6,
 }
 
 export const taskGroupToTypes = new Map([
@@ -65,6 +66,7 @@ export const taskGroupToTypes = new Map([
   [TaskGroup.DROP_PIN, List([TaskType.DROP_PIN])],
   [TaskGroup.DRAW_AREA, List([TaskType.DRAW_AREA])],
   [TaskGroup.CAPTURE_LOCATION, List([TaskType.CAPTURE_LOCATION])],
+  [TaskGroup.INSTRUCTIONS, List([TaskType.INSTRUCTIONS])],
 ]);
 
 export const taskTypeToGroup = new Map([
@@ -78,6 +80,7 @@ export const taskTypeToGroup = new Map([
   [TaskType.DROP_PIN, TaskGroup.DROP_PIN],
   [TaskType.DRAW_AREA, TaskGroup.DRAW_AREA],
   [TaskType.CAPTURE_LOCATION, TaskGroup.CAPTURE_LOCATION],
+  [TaskType.INSTRUCTIONS, TaskGroup.INSTRUCTIONS],
 ]);
 
 @Component({
@@ -94,6 +97,7 @@ export class TasksEditorComponent {
   @Output() onValueChanges: EventEmitter<boolean> = new EventEmitter<boolean>();
 
   addableTaskGroups: Array<TaskGroup> = [
+    TaskGroup.INSTRUCTIONS,
     TaskGroup.QUESTION,
     TaskGroup.PHOTO,
     TaskGroup.CAPTURE_LOCATION,

web/src/app/converters/firebase-data-converter.ts

@@ -46,6 +46,7 @@ const TASK_TYPE_ENUMS_BY_STRING = Map([
   [TaskType.DROP_PIN, 'drop_pin'],
   [TaskType.DRAW_AREA, 'draw_area'],
   [TaskType.CAPTURE_LOCATION, 'capture_location'],
+  [TaskType.INSTRUCTIONS, 'instructions'],
 ]);
 
 export class FirebaseDataConverter {

web/src/app/converters/proto-model-converter.ts

@@ -169,6 +169,12 @@ function toTaskTypeMessage(
           type: Pb.Task.NumberQuestion.Type.FLOAT,
         }),
       };
+    case TaskType.INSTRUCTIONS:
+      return {
+        instructions: new Pb.Task.InstructionsTask({
+          text: '',
+        }),
+      };
     case TaskType.DATE:
       return {
         dateTimeQuestion: new Pb.Task.DateTimeQuestion({

web/src/app/converters/survey-data-converter.ts

@@ -124,6 +124,7 @@ function taskPbToModelTaskType(pb: Pb.ITask): TaskType {
     drawGeometry,
     captureLocation,
     takePhoto,
+    instructions,
   } = pb;
 
   if (textQuestion) return TaskType.TEXT;
@@ -145,6 +146,7 @@ function taskPbToModelTaskType(pb: Pb.ITask): TaskType {
     else throw new Error('Error converting to Task: invalid task data');
   } else if (captureLocation) return TaskType.CAPTURE_LOCATION;
   else if (takePhoto) return TaskType.PHOTO;
+  else if (instructions) return TaskType.INSTRUCTIONS;
   else throw new Error('Error converting to Task: invalid task data');
 }
 

web/src/app/models/task/task.model.ts

@@ -53,6 +53,7 @@ export enum TaskType {
   DRAW_AREA = 8,
   DROP_PIN = 9,
   CAPTURE_LOCATION = 10,
+  INSTRUCTIONS = 11,
 }
 
 // TODO: add a subclass of Task for each task type.