Merge branch 'develop' into issue-2824-extract-advanced-component-authoring-to-angular-component

Author: hirokiterashima

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.19.0",
+  "version": "5.20.0",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

package.json

@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.19.0</version>
+  <version>5.20.0</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

pom.xml

@@ -1 +1 @@
-5.19.0
+5.20.0

src/main/resources/version.txt

@@ -30,6 +30,7 @@ import { NodeAdvancedGeneralAuthoringComponent } from '../../../wise5/authoringT
 import { WiseAuthoringTinymceEditorComponent } from '../../../wise5/directives/wise-tinymce-editor/wise-authoring-tinymce-editor.component';
 import { EditComponentRubricComponent } from './authoring-tool/edit-component-rubric/edit-component-rubric.component';
 import { EditComponentJsonComponent } from './authoring-tool/edit-component-json/edit-component-json.component';
+import { RubricAuthoringComponent } from '../../../wise5/authoringTool/rubric/rubric-authoring.component';
 
 @NgModule({
   declarations: [
@@ -45,6 +46,7 @@ import { EditComponentJsonComponent } from './authoring-tool/edit-component-json
     MilestoneReportDataComponent,
     NodeAdvancedGeneralAuthoringComponent,
     NodeAdvancedJsonAuthoringComponent,
+    RubricAuthoringComponent,
     StatusIconComponent,
     WorkgroupInfoComponent,
     WorkgroupNodeScoreComponent,

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

@@ -5782,6 +5782,10 @@
           <context context-type="sourcefile">../../wise5/authoringTool/advanced/advanced-project-authoring.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../../wise5/authoringTool/rubric/rubric-authoring.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
       </trans-unit>
       <trans-unit datatype="html" id="077fb7924ecebe2ae768d860909315c29ee61fbe">
         <source>Show JSON</source>
@@ -6020,6 +6024,13 @@
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
+      <trans-unit datatype="html" id="92328333ea9c72926ca7c631e9e1c0f081cbf565">
+        <source>Edit Unit Rubric</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../../wise5/authoringTool/rubric/rubric-authoring.component.html</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
       <trans-unit datatype="html" id="f9c52903219e583ddefb23cd102d2057504ac980">
         <source>(Team <x equiv-text="{{workgroupId}}" id="INTERPOLATION"/>)</source>
         <context-group purpose="location">

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

@@ -0,0 +1,8 @@
+<button mat-button class='topButton mat-raised-button mat-primary' (click)='goBack()'
+    matTooltip="Back to Unit Plan" i18n-matTooltip matToolTipPosition="above">
+  <mat-icon>arrow_back</mat-icon>
+</button>
+<br/>
+<h5 i18n>Edit Unit Rubric</h5>
+<wise-authoring-tinymce-editor [(model)]='rubric' (modelChange)='rubricChanged()'>
+</wise-authoring-tinymce-editor>

src/main/webapp/wise5/authoringTool/rubric/rubric-authoring.component.html

@@ -0,0 +1,32 @@
+import { ConfigService } from '../../services/configService';
+import { UtilService } from '../../services/utilService';
+import { TeacherProjectService } from '../../services/teacherProjectService';
+import { UpgradeModule } from '@angular/upgrade/static';
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'rubric-authoring.component.html',
+})
+export class RubricAuthoringComponent {
+
+  rubric: string = '';
+
+  constructor(private upgrade: UpgradeModule, private ConfigService: ConfigService,
+    private ProjectService: TeacherProjectService, private UtilService: UtilService) {
+  }
+
+  ngOnInit(): void {
+    this.rubric = this.ProjectService.replaceAssetPaths(this.ProjectService.getProjectRubric());
+  }
+
+  rubricChanged(): void {
+    const html = this.UtilService.insertWISELinks(
+      this.ConfigService.removeAbsoluteAssetPaths(this.rubric));
+    this.ProjectService.setProjectRubric(html);
+    this.ProjectService.saveProject();
+  }
+
+  goBack(): void {
+    this.upgrade.$injector.get('$state').go('root.at.project');
+  }
+}