Merge branch 'develop' into issue-2902-upgrade-table-authoring-to-angular

Author: hirokiterashima

src/main/webapp/site/src/app/teacher-hybrid-angular.module.ts

@@ -53,6 +53,7 @@ import { DrawAuthoring } from '../../../wise5/components/draw/draw-authoring/dra
 import { MatchAuthoring } from '../../../wise5/components/match/match-authoring/match-authoring.component';
 import { LabelAuthoring } from '../../../wise5/components/label/label-authoring/label-authoring.component';
 import { TableAuthoring } from '../../../wise5/components/table/table-authoring/table-authoring.component';
+import { DiscussionAuthoring } from '../../../wise5/components/discussion/discussion-authoring/discussion-authoring.component';
 
 @NgModule({
   declarations: [
@@ -66,6 +67,7 @@ import { TableAuthoring } from '../../../wise5/components/table/table-authoring/
     ComponentSelectComponent,
     ConceptMapAuthoring,
     DrawAuthoring,
+    DiscussionAuthoring,
     EditComponentRubricComponent,
     EditComponentJsonComponent,
     EditComponentMaxScoreComponent,

src/main/webapp/site/src/messages.xlf

@@ -6024,6 +6024,10 @@
           <context context-type="sourcefile">../../wise5/components/draw/draw-authoring/draw-authoring.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../../wise5/components/discussion/discussion-authoring/discussion-authoring.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">../../wise5/components/label/label-authoring/label-authoring.component.html</context>
           <context context-type="linenumber">2</context>
@@ -6055,6 +6059,10 @@
           <context context-type="sourcefile">../../wise5/components/draw/draw-authoring/draw-authoring.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../../wise5/components/discussion/discussion-authoring/discussion-authoring.component.html</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">../../wise5/components/label/label-authoring/label-authoring.component.html</context>
           <context context-type="linenumber">6</context>
@@ -6669,6 +6677,20 @@
           <context context-type="linenumber">285</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="1037affb09c3a77f83838b47e805b78b82314e6c">
+        <source> Students can upload and use images in their posts </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../../wise5/components/discussion/discussion-authoring/discussion-authoring.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit datatype="html" id="4b10143a37c7361d1cc9c3ffc72e792e99ffebda">
+        <source> Students must create a post before viewing classmates' posts </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../../wise5/components/discussion/discussion-authoring/discussion-authoring.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="7affaae0e14529c0192d5a4bfabd6fcb1ea27529">
         <source>Rubric</source>
         <context-group purpose="location">

src/main/webapp/wise5/components/discussion/authoring.html

@@ -0,0 +1,28 @@
+<mat-form-field class="prompt">
+  <mat-label i18n>Prompt</mat-label>
+  <textarea matInput
+      [ngModel]="authoringComponentContent.prompt"
+      (ngModelChange)="promptChanged($event)"
+      placeholder="Enter Prompt Here"
+      i18n-placeholder
+      cdkTextareaAutosize>
+  </textarea>
+</mat-form-field>
+<div class="checkbox-container">
+  <mat-checkbox
+      color="primary"
+      [(ngModel)]="authoringComponentContent.isStudentAttachmentEnabled"
+      (ngModelChange)="componentChanged()"
+      i18n>
+    Students can upload and use images in their posts
+  </mat-checkbox>
+</div>
+<div class="checkbox-container">
+  <mat-checkbox
+      color="primary"
+      [(ngModel)]="authoringComponentContent.gateClassmateResponses"
+      (ngModelChange)="componentChanged()"
+      i18n>
+    Students must create a post before viewing classmates' posts
+  </mat-checkbox>
+</div>

src/main/webapp/wise5/components/discussion/discussion-authoring/discussion-authoring.component.html

@@ -0,0 +1,8 @@
+.prompt {
+  width: 100%;
+}
+
+.checkbox-container {
+  margin-top: 5px;
+  margin-bottom: 15px;
+}

src/main/webapp/wise5/components/discussion/discussion-authoring/discussion-authoring.component.scss

@@ -0,0 +1,24 @@
+'use strict';
+
+import { Component } from '@angular/core';
+import { ProjectAssetService } from '../../../../site/src/app/services/projectAssetService';
+import { ComponentAuthoring } from '../../../authoringTool/components/component-authoring.component';
+import { ConfigService } from '../../../services/configService';
+import { NodeService } from '../../../services/nodeService';
+import { TeacherProjectService } from '../../../services/teacherProjectService';
+
+@Component({
+  selector: 'discussion-authoring',
+  templateUrl: 'discussion-authoring.component.html',
+  styleUrls: ['discussion-authoring.component.scss']
+})
+export class DiscussionAuthoring extends ComponentAuthoring {
+  constructor(
+    protected ConfigService: ConfigService,
+    protected NodeService: NodeService,
+    protected ProjectAssetService: ProjectAssetService,
+    protected ProjectService: TeacherProjectService
+  ) {
+    super(ConfigService, NodeService, ProjectAssetService, ProjectService);
+  }
+}

src/main/webapp/wise5/components/discussion/discussion-authoring/discussion-authoring.component.ts

@@ -1,16 +1,19 @@
 'use strict';
 
 import * as angular from 'angular';
-import { downgradeInjectable } from '@angular/upgrade/static';
+import { downgradeComponent, downgradeInjectable } from '@angular/upgrade/static';
 import { DiscussionService } from './discussionService';
-import DiscussionAuthoring from './discussionAuthoring';
 import { EditDiscussionAdvancedComponent } from './edit-discussion-advanced/edit-discussion-advanced.component';
+import { DiscussionAuthoring } from './discussion-authoring/discussion-authoring.component';
 
 const discussionAuthoringComponentModule = angular
   .module('discussionAuthoringComponentModule', ['pascalprecht.translate'])
   .service('DiscussionService', downgradeInjectable(DiscussionService))
-  .component('discussionAuthoring', DiscussionAuthoring)
   .component('editDiscussionAdvanced', EditDiscussionAdvancedComponent)
+  .directive(
+    'discussionAuthoring',
+    downgradeComponent({ component: DiscussionAuthoring }) as angular.IDirectiveFactory
+  )
   .config([
     '$translatePartialLoaderProvider',
     ($translatePartialLoaderProvider) => {

src/main/webapp/wise5/components/discussion/discussionAuthoring.ts

@@ -39,7 +39,7 @@ export class DiscussionService extends ComponentService {
   createComponent() {
     const component: any = super.createComponent();
     component.type = 'Discussion';
-    component.prompt = this.getTranslation('ENTER_PROMPT_HERE');
+    component.prompt = '';
     component.isStudentAttachmentEnabled = true;
     component.gateClassmateResponses = true;
     return component;