Merge branch 'master' of https://github.com/chrisrocco/research-coder

src/app/auth/login/login.component.html

@@ -28,7 +28,7 @@
                [(ngModel)]="model.rememberMe" name="remember">
         <label for="inputCheckbox">Remember me</label>
       </div>
-      <a class="float-right" href="forgot-password.html">Forgot password?</a>
+      <!--<a class="float-right" href="forgot-password.html">Forgot password?</a>-->
     </div>
     <button type="submit" class="btn btn-primary btn-block btn-lg mt-40"
             [disabled]="!loginForm.form.valid">Sign in</button>

src/app/auth/register/register.component.html

@@ -42,7 +42,7 @@
                [(ngModel)]="model.rememberMe" name="remember">
         <label for="inputCheckbox">Remember me</label>
       </div>
-      <a class="float-right" href="javascript:void(0)">Forgot password?</a>
+      <!--<a class="float-right" href="javascript:void(0)">Forgot password?</a>-->
     </div>
     <button type="submit" class="btn btn-primary btn-block btn-lg mt-40"
             [disabled]="!loginForm.form.valid">Register</button>

src/app/callbacks/redeem-invite/redeem-encoder-invite.component.html

@@ -23,17 +23,6 @@ <h2> Validating Invitation... </h2>
               <h3 class="panel-title">
                 <i class="icon wb-book"></i>
                 <a [routerLink]="['/projects', invitation.project.id]">{{invitation.project.name}}</a></h3>
-              <div class="panel-actions panel-actions-keep">
-                <div class="dropdown">
-                  <a class="panel-action" id="examplePanelDropdown" data-toggle="dropdown" href="#"
-                     role="button"><i class="icon wb-more-vertical"></i></a>
-                  <div class="dropdown-menu dropdown-menu-bullet dropdown-menu-right" aria-labelledby="examplePanelDropdown"
-                       role="menu">
-                    <a (click)="editProject(invitation.project, modal)" class="dropdown-item" href="javascript:void(0)" role="menuitem">
-                      <i class="icon wb-settings" aria-hidden="true"></i> Edit</a>
-                  </div>
-                </div>
-              </div>
             </div>
             <div class="panel-body">
               <p>{{invitation.project.description}}</p>

src/app/callbacks/redeem-invite/redeem-researcher-invite.component.html

@@ -23,17 +23,6 @@ <h2> Validating Invitation... </h2>
               <h3 class="panel-title">
                 <i class="icon wb-book"></i>
                 <a [routerLink]="['/projects', invitation.project.id]">{{invitation.project.name}}</a></h3>
-              <div class="panel-actions panel-actions-keep">
-                <div class="dropdown">
-                  <a class="panel-action" id="examplePanelDropdown" data-toggle="dropdown" href="#"
-                     role="button"><i class="icon wb-more-vertical"></i></a>
-                  <div class="dropdown-menu dropdown-menu-bullet dropdown-menu-right" aria-labelledby="examplePanelDropdown"
-                       role="menu">
-                    <a (click)="editProject(invitation.project, modal)" class="dropdown-item" href="javascript:void(0)" role="menuitem">
-                      <i class="icon wb-settings" aria-hidden="true"></i> Edit</a>
-                  </div>
-                </div>
-              </div>
             </div>
             <div class="panel-body">
               <p>{{invitation.project.description}}</p>

src/app/pages/form-builder/codebook-tree/codebook-tree.component.html

@@ -48,7 +48,6 @@
     #questionTree
     (nodeDoubleClicked)="treeNodeDoubleClicked($event)"
     [allowDrag]="true"
-    [allowDrop]="allowDrop"
     (nodeMoved)="treeMove($event)"
     [rootCategory]="form.root_category">
   </app-question-tree>

src/app/pages/form-builder/codebook-tree/codebook-tree.component.ts

@@ -59,11 +59,11 @@ export class CodeBookTreeComponent {
   treeEdit(node: AppTreeNode){
     switch(node.type){
       case AppNodeType.category:
-        this.activeFormCategory = this.questionTree.lookupInForm(this.activeNode.id);
+        this.activeFormCategory = this.questionTree.sourceMap['categories'][node.id];
         return this.modal = this.ms.open(this.categoryModalContent);
 
       case AppNodeType.question:
-        this.activeFormQuestion = this.questionTree.lookupInForm(this.activeNode.id);
+        this.activeFormQuestion = this.questionTree.sourceMap['questions'][node.id];
         return this.modal = this.ms.open(this.questionModalContent);
     }
   }

src/app/shared/components/comments/channel/channel.component.html

@@ -8,7 +8,7 @@ <h2 class="mt-0">{{channel.display_name}}</h2>
   <p><mat-progress-bar mode="indeterminate" *ngIf="loading > 0"></mat-progress-bar></p>
 
   <app-comments *ngFor="let comment of displayComments"
-    [userID]="comment.user.id"
+    [userID]="user.id"
     (onReply)="onReply($event)"
     (onEdit)="onEdit($event)"
     (onDelete)="onDelete($event)"

src/app/shared/components/question-builder/question-builder.component.ts

@@ -79,6 +79,8 @@ export class QuestionBuilderComponent implements OnInit {
     let initialState: any = this.question;
     if(!initialState) initialState = defaultModel;
 
+    initialState.options = initialState.options || [];
+    initialState.accepts = initialState.accepts || [];
     initialState.options = initialState.options.map( opt => opt.txt );
     initialState.accepts = initialState.options.map( opt => opt.txt );
 

src/app/shared/components/question-tree/dataMapper.ts

@@ -2,17 +2,28 @@ import {AppQuestion} from '../../../models/AppQuestion';
 import {AppCategory} from '../../../models/AppCategory';
 import {AppNodeType, AppTreeNode} from './dataModel';
 
-export function mapToTreeNodes(rootCategory: AppCategory): AppTreeNode[] {
+let sourceMap;
+
+export function mapToTreeNodes(rootCategory: AppCategory) {
+  sourceMap = {
+    'categories': {},
+    'questions': {}
+  };
+
   let root = mapCategory(rootCategory);
   root.isRoot = true;
-  return [root];
+  return {
+    nodes: [root],
+    sourceMap: sourceMap
+  };
 }
 
 function mapCategory(category: AppCategory): AppTreeNode {
   let children = [];
   category.questions.map( question => children.push(mapQuestion(question)));
   category.children.map( _category => children.push(mapCategory(_category)));
 
+  sourceMap['categories'][category.id] = category;
   return new AppTreeNode({
     id: category.id,
     type: AppNodeType.category,
@@ -22,6 +33,7 @@ function mapCategory(category: AppCategory): AppTreeNode {
 }
 
 function mapQuestion(question: AppQuestion){
+  sourceMap['questions'][question.id] = question;
   return new AppTreeNode({
     id: question.id,
     type: AppNodeType.question,

src/app/shared/components/question-tree/question-tree.component.ts

@@ -1,6 +1,6 @@
 import {Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild} from '@angular/core';
 import {AppCategory} from '../../../models/AppCategory';
-import {AppTreeNode} from './dataModel';
+import {AppNodeType, AppTreeNode} from './dataModel';
 import {mapToTreeNodes} from './dataMapper';
 import {ITreeNode} from 'angular-tree-component/dist/defs/api';
 import {AppQuestion} from "../../../models/AppQuestion";
@@ -59,34 +59,20 @@ export class QuestionTreeComponent implements OnChanges {
     return null;
   }
 
+  sourceMap;
   public syncWithForm() {
-    this.treeNodes = mapToTreeNodes(this.rootCategory);
+    let {nodes, sourceMap} = mapToTreeNodes(this.rootCategory);
+    this.treeNodes = nodes;
+    this.sourceMap = sourceMap;
   }
 
-  public lookupInForm(nodeID: number): AppQuestion | AppCategory {
-    // BFS
-    let start = this.rootCategory;
-    let queue: AppCategory[] = [start];
-    while(queue.length > 0){
-      let current = queue.pop();
-      if(current.id == nodeID) return current;
-      for(let i = 0; i < current.questions.length; i++)
-        if(nodeID === current.questions[i].id)
-          return current.questions[i];
-      queue.push(...current.children);
-    }
-    return null;
-  }
-
-
   /**
    * ===========================================================
    * INPUT OPTIONS
    * ( Use these input properties to configure behavior )
    * ===========================================================
    */
-  @Input() allowDrop = (node, parent) => false;
-  @Input() allowDrag = false;
+  @Input() allowDrag = true;
 
 
   /**
@@ -109,7 +95,7 @@ export class QuestionTreeComponent implements OnChanges {
       }
     },
     allowDrop: (node, { parent, index }) => {
-      return this.allowDrop(node.data, parent.data);
+      return parent.data.type === AppNodeType.category;
     }
   };
 

src/app/shared/responses/converters.ts

@@ -1,19 +1,22 @@
 import {AppResponse} from "../../models/AppResponse";
+import {RESPONSE_FORMATS as fmt} from "../../models/formats";
 
 export function renderToString(response: AppResponse){
   if(!response) return '';
   if(typeof response === 'string')
     return response;
   switch (response.type){
-    case "txt":
+    case fmt.TEXT:
       return response.txt;
-    case "sel":
+    case fmt.SELECT:
       return response.sel;
-    case "boo":
+    case fmt.BOOLEAN:
       return response.boo;
-    case "num":
+    case fmt.NUMBER:
       return response.num;
-    case "multi-sel":
+    case fmt.MULTI_SELECT:
       return response.selections.map(sel => sel.txt).join(', ');
+    case fmt.NOT_REPORTED:
+      return 'NOT_REPORTED';
   }
 }