From c0cf3d1f5df2731120cee4973bee5878317482cd Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 29 Nov 2023 09:40:24 -0800 Subject: [PATCH 01/90] feat(Student,Preview): Switch between unit languages (#1520) Implement switching between languages of the unit content in in student and preview. A language select drop-down will appear if project has locale settings. --- angular.json | 16 +- custom-webpack.config.js | 17 - package-lock.json | 1816 +++++++++-------- package.json | 1 - src/app/domain/componentState.ts | 7 + src/app/domain/language.ts | 4 + src/app/domain/localeToLanguage.ts | 6 + src/app/domain/projectLocale.ts | 39 + .../notebook-item/notebook-item.component.ts | 4 + .../notebook-launcher.component.ts | 15 +- .../notebook-notes.component.ts | 13 +- .../notebook-report.component.ts | 17 +- .../sampleData/curriculum/Demo.project.json | 1 + .../services/translateProjectService.spec.ts | 56 + .../student-teacher-common-services.module.ts | 2 + .../project-language-chooser.component.html | 8 + ...project-language-chooser.component.spec.ts | 36 + .../project-language-chooser.component.ts | 36 + .../student/top-bar/top-bar.component.html | 1 + src/app/student/top-bar/top-bar.component.ts | 7 +- src/app/student/top-bar/top-bar.module.ts | 2 + .../data-export/data-export.component.ts | 284 +-- .../strategies/AbstractDataExportStrategy.ts | 54 + .../strategies/ComponentDataExportStrategy.ts | 63 + ...cussionComponentDataExportStrategy.spec.ts | 75 +- .../DiscussionComponentDataExportStrategy.ts | 79 +- .../strategies/ExportStrategyTester.ts | 96 +- ...penResponseComponentExportStrategy.spec.ts | 455 +++++ .../OpenResponseComponentExportStrategy.ts | 316 +++ ...eerChatComponentDataExportStrategy.spec.ts | 140 +- .../PeerChatComponentDataExportStrategy.ts | 102 +- src/assets/wise5/common/Annotation.ts | 8 +- .../multiple-choice-authoring.component.html | 8 +- .../multiple-choice-authoring.component.scss | 12 +- .../tabulator-table.component.scss | 1 + .../wise-tinymce-editor.component.ts | 16 +- src/assets/wise5/services/projectService.ts | 16 + .../wise5/services/translateProjectService.ts | 62 + .../navigation/navigation.component.spec.ts | 13 +- .../navigation/navigation.component.ts | 16 +- .../wise5/vle/nav-item/nav-item.component.ts | 11 +- .../wise5/vle/node/node.component.spec.ts | 2 + src/assets/wise5/vle/node/node.component.ts | 40 +- src/assets/wise5/vle/vle.component.html | 6 +- src/assets/wise5/vle/vle.component.ts | 20 +- src/messages.xlf | 161 +- 46 files changed, 2615 insertions(+), 1545 deletions(-) delete mode 100644 custom-webpack.config.js create mode 100644 src/app/domain/language.ts create mode 100644 src/app/domain/localeToLanguage.ts create mode 100644 src/app/domain/projectLocale.ts create mode 100644 src/app/services/translateProjectService.spec.ts create mode 100644 src/app/student/project-language-chooser/project-language-chooser.component.html create mode 100644 src/app/student/project-language-chooser/project-language-chooser.component.spec.ts create mode 100644 src/app/student/project-language-chooser/project-language-chooser.component.ts create mode 100644 src/assets/wise5/classroomMonitor/dataExport/strategies/ComponentDataExportStrategy.ts create mode 100644 src/assets/wise5/classroomMonitor/dataExport/strategies/OpenResponseComponentExportStrategy.spec.ts create mode 100644 src/assets/wise5/classroomMonitor/dataExport/strategies/OpenResponseComponentExportStrategy.ts create mode 100644 src/assets/wise5/services/translateProjectService.ts diff --git a/angular.json b/angular.json index cea5388000c..d2101931b82 100644 --- a/angular.json +++ b/angular.json @@ -9,7 +9,7 @@ "projectType": "application", "architect": { "build": { - "builder": "@angular-builders/custom-webpack:browser", + "builder": "@angular-devkit/build-angular:browser", "options": { "allowedCommonJsDependencies": [ "angular", @@ -23,10 +23,6 @@ "compute-covariance" ], "aot": true, - "customWebpackConfig": { - "path": "./custom-webpack.config.js", - "replaceDuplicatePlugins": true - }, "outputPath": "dist", "index": "src/index.html", "main": "src/main.ts", @@ -116,7 +112,7 @@ } }, "serve": { - "builder": "@angular-builders/custom-webpack:dev-server", + "builder": "@angular-devkit/build-angular:dev-server", "options": { "browserTarget": "wise:build", "publicHost": "localhost:4200" @@ -150,13 +146,13 @@ "defaultConfiguration": "development" }, "extract-i18n": { - "builder": "@angular-builders/custom-webpack:extract-i18n", + "builder": "@angular-devkit/build-angular:extract-i18n", "options": { "browserTarget": "wise:build" } }, "test": { - "builder": "@angular-builders/custom-webpack:karma", + "builder": "@angular-devkit/build-angular:karma", "options": { "karmaConfig": "karma.conf.js", "polyfills": ["@angular/localize/init", "zone.js", "zone.js/testing"], @@ -165,10 +161,6 @@ "styles": [ "src/style/styles.scss" ], - "customWebpackConfig": { - "path": "./custom-webpack.config.js", - "replaceDuplicatePlugins": true - }, "stylePreprocessorOptions": { "includePaths": [ "src/style" diff --git a/custom-webpack.config.js b/custom-webpack.config.js deleted file mode 100644 index 77ae1e9c829..00000000000 --- a/custom-webpack.config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - plugins: [ - ], - module: { - rules: [ - { - test: /\.svg$/, - use: [ - { - loader: 'url-loader' - } - ], - type: 'javascript/auto' - } - ], - }, -}; diff --git a/package-lock.json b/package-lock.json index 52749e75132..f48702951c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,6 @@ "zone.js": "^0.13.3" }, "devDependencies": { - "@angular-builders/custom-webpack": "^16.0.1", "@angular-devkit/build-angular": "^16.2.6", "@angular/cli": "^16.2.6", "@angular/compiler-cli": "^16.2.9", @@ -134,112 +133,13 @@ "node": ">=6.0.0" } }, - "node_modules/@angular-builders/custom-webpack": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-16.0.1.tgz", - "integrity": "sha512-C6INC8UOYDcp8LJwNhE0m66yp+nZX50JdgGI8oRn7fqw3gO58qhDgXrR/8BCrSeC8eOx8WxSuvBJ6u+9dozhyw==", - "dev": true, - "dependencies": { - "@angular-devkit/architect": ">=0.1600.0 < 0.1700.0", - "@angular-devkit/build-angular": "^16.0.0", - "@angular-devkit/core": "^16.0.0", - "lodash": "^4.17.15", - "ts-node": "^10.0.0", - "tsconfig-paths": "^4.1.0", - "webpack-merge": "^5.7.3" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" - }, - "peerDependencies": { - "@angular/compiler-cli": "^16.0.0" - } - }, - "node_modules/@angular-builders/custom-webpack/node_modules/acorn": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/@angular-builders/custom-webpack/node_modules/acorn-walk": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", - "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/@angular-builders/custom-webpack/node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", - "dev": true, - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, - "node_modules/@angular-builders/custom-webpack/node_modules/webpack-merge": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", - "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", - "dev": true, - "dependencies": { - "clone-deep": "^4.0.1", - "flat": "^5.0.2", - "wildcard": "^2.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/@angular-devkit/architect": { - "version": "0.1602.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.9.tgz", - "integrity": "sha512-U3vfb/e2sFfg0D9FyyRBXRPP7g4FBFtGK8Q3JPmvAVsHHwi5AUFRNR7YBChB/T5TMNY077HcTyEirVh2FeUpdA==", + "version": "0.1602.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.10.tgz", + "integrity": "sha512-FwemQXh3edqA/S6zPpsqKei5v7gt0R0WpjJoAJaz+FOpfDwij1fwnKr88XINY8xcefTcQaTDQxJZheJShA/hHw==", "dev": true, "dependencies": { - "@angular-devkit/core": "16.2.9", + "@angular-devkit/core": "16.2.10", "rxjs": "7.8.1" }, "engines": { @@ -249,15 +149,15 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "16.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.9.tgz", - "integrity": "sha512-S1C4UYxRVyNt3C0wCxbT2jZ1dN5i37kS0mol3PQjbR8gQ0GQzHmzhjTBl1oImo8aouET9yhrk9etk65oat4mBQ==", + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.10.tgz", + "integrity": "sha512-msB/qjIsAOySDxdU5DpcX2sWGUEJOFIO03O9+HbtLwf3NDfe74mFfejxuKlHJXIJdgpM2Zc948M6+618QKpUYA==", "dev": true, "dependencies": { "@ampproject/remapping": "2.2.1", - "@angular-devkit/architect": "0.1602.9", - "@angular-devkit/build-webpack": "0.1602.9", - "@angular-devkit/core": "16.2.9", + "@angular-devkit/architect": "0.1602.10", + "@angular-devkit/build-webpack": "0.1602.10", + "@angular-devkit/core": "16.2.10", "@babel/core": "7.22.9", "@babel/generator": "7.22.9", "@babel/helper-annotate-as-pure": "7.22.5", @@ -269,7 +169,7 @@ "@babel/runtime": "7.22.6", "@babel/template": "7.22.5", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "16.2.9", + "@ngtools/webpack": "16.2.10", "@vitejs/plugin-basic-ssl": "1.0.1", "ansi-colors": "4.1.3", "autoprefixer": "10.4.14", @@ -529,9 +429,9 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/@types/node": { - "version": "20.8.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz", - "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==", + "version": "20.9.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz", + "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==", "dev": true, "optional": true, "peer": true, @@ -971,12 +871,12 @@ } }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1602.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.9.tgz", - "integrity": "sha512-+3IxovfBPR2Vy730mGa0SVKkd5LQVom85gjXOs7WcnnnZmfc1q/BtFlqTgW1UWvTxP8IQdm7UYWVclQfL/WExw==", + "version": "0.1602.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.10.tgz", + "integrity": "sha512-H7HiFKbZl/xVxpr1RH05SGawTpA1417wvr2nFGRu2OiePd0lPr6pIhcq8F8gt7JcA8yZKKaqjn2gU+6um2MFLg==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1602.9", + "@angular-devkit/architect": "0.1602.10", "rxjs": "7.8.1" }, "engines": { @@ -990,9 +890,9 @@ } }, "node_modules/@angular-devkit/core": { - "version": "16.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.9.tgz", - "integrity": "sha512-dcHWjHBNGm3yCeNz19y8A1At4KgyC6XHNnbFL0y+nnZYiaESXjUoXJYKASedI6A+Bpl0HNq2URhH6bL6Af3+4w==", + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.10.tgz", + "integrity": "sha512-eo7suLDjyu5bSlEr4TluYkFm4v2PVLSAPgnau8XHHlN5Yg4P/BZ00ve7LA7C9S1gzRSCrxQhK5ki4rnoFTo5zg==", "dev": true, "dependencies": { "ajv": "8.12.0", @@ -1017,12 +917,12 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "16.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.9.tgz", - "integrity": "sha512-lB51CGCILpcSI37CwKUAGDLxMqh7zmuRbiPo9s9mSkCM4ccqxFlaL+VFTq2/laneARD6aikpOHnkVm5myNzQPw==", + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.10.tgz", + "integrity": "sha512-UCfPJKVNekb21bWRbzyx81tfHN3x8vU4ZMX/VA6xALg//QalMB7NOkkXBAssthnLastkyzkUtlvApTp2+R+EkQ==", "dev": true, "dependencies": { - "@angular-devkit/core": "16.2.9", + "@angular-devkit/core": "16.2.10", "jsonc-parser": "3.2.0", "magic-string": "0.30.1", "ora": "5.4.1", @@ -1035,9 +935,9 @@ } }, "node_modules/@angular/animations": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.11.tgz", - "integrity": "sha512-xdLYXsGi7OuJawhiVIppl2VkPHhPdxUP/nR6+ETR3TdAscVruCWJs4z9XKval4fbik/brekbFNFuYtlx6csDhQ==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.12.tgz", + "integrity": "sha512-MD0ElviEfAJY8qMOd6/jjSSvtqER2RDAi0lxe6EtUacC1DHCYkaPrKW4vLqY+tmZBg1yf+6n+uS77pXcHHcA3w==", "dependencies": { "tslib": "^2.3.0" }, @@ -1045,13 +945,13 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "16.2.11" + "@angular/core": "16.2.12" } }, "node_modules/@angular/cdk": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.11.tgz", - "integrity": "sha512-FcJ9xd9ptjULdScnBNg7YkVnY9NKePFfmvvs2zt841Hd489L8BUkTUdbvtCLhMJTTSN+k+D+RYFhevZuhPKVVg==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.12.tgz", + "integrity": "sha512-wT8/265zm2WKY0BDaRoYbrAT4kadrmejTRLjuimQIEUKnw4vBsJMWCwQkpFo3s6zr6eznGqYVAFb8KKPVLKGBg==", "dependencies": { "tslib": "^2.3.0" }, @@ -1065,15 +965,15 @@ } }, "node_modules/@angular/cli": { - "version": "16.2.9", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.2.9.tgz", - "integrity": "sha512-wkpV/Ni26LUeDmhee2TPXXEq3feEdZMSG8+nkfUK9kqIcxm0IjI1GLPeiVOX7aQobuKNe2cCAFNwsrXWjj+2og==", + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.2.10.tgz", + "integrity": "sha512-zDqlD+rXFuYZP169c2v35HkMbkchVCft5sS+VpoCCgYTk2rwxpeYkjJ8DQZztZJZRXQ+EMpkv/TubswmDro2zA==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1602.9", - "@angular-devkit/core": "16.2.9", - "@angular-devkit/schematics": "16.2.9", - "@schematics/angular": "16.2.9", + "@angular-devkit/architect": "0.1602.10", + "@angular-devkit/core": "16.2.10", + "@angular-devkit/schematics": "16.2.10", + "@schematics/angular": "16.2.10", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.3", "ini": "4.1.1", @@ -1099,9 +999,9 @@ } }, "node_modules/@angular/common": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.11.tgz", - "integrity": "sha512-h80WUR2OYlqxQy+4XgNtWT2vB+vZ6oCrFX/q8cU5jAvbvGQfJuH0zfcbSlUflStmAhk5/OT25F0mt96cqapEAw==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.12.tgz", + "integrity": "sha512-B+WY/cT2VgEaz9HfJitBmgdk4I333XG/ybC98CMC4Wz8E49T8yzivmmxXB3OD6qvjcOB6ftuicl6WBqLbZNg2w==", "dependencies": { "tslib": "^2.3.0" }, @@ -1109,14 +1009,14 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "16.2.11", + "@angular/core": "16.2.12", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.11.tgz", - "integrity": "sha512-9q/E3uurvoQbdTTWDyWCLpzmfJ4+et7SUca1/EljD/X7Xg2FNU5GpTMutBtWFL7wDyWk1oswivuq9/C4GVW7fA==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.12.tgz", + "integrity": "sha512-6SMXUgSVekGM7R6l1Z9rCtUGtlg58GFmgbpMCsGf+VXxP468Njw8rjT2YZkf5aEPxEuRpSHhDYjqz7n14cwCXQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1124,7 +1024,7 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "16.2.11" + "@angular/core": "16.2.12" }, "peerDependenciesMeta": { "@angular/core": { @@ -1133,9 +1033,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.11.tgz", - "integrity": "sha512-ZtZCXfkVBH78HUm2Byf+WX3Y6WzQK9EXYXNU/ni1rvSZ1vLNwieLDfWb/xwiO7QojrHZTym1RJ10jTMinTguqw==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.12.tgz", + "integrity": "sha512-pWSrr152562ujh6lsFZR8NfNc5Ljj+zSTQO44DsuB0tZjwEpnRcjJEgzuhGXr+CoiBf+jTSPZKemtSktDk5aaA==", "dev": true, "dependencies": { "@babel/core": "7.23.2", @@ -1156,14 +1056,88 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/compiler": "16.2.11", + "@angular/compiler": "16.2.12", "typescript": ">=4.9.3 <5.2" } }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/generator": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", + "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.3", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@angular/core": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.11.tgz", - "integrity": "sha512-Jb+7/p1vczQRQ3iC1QxUS5cE4X1hPVAvbrFnyMpSx6Pq5o274v/lK6PvhUZrfKrp9FxFp9pN+WHjUqNFqOuJZg==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.12.tgz", + "integrity": "sha512-GLLlDeke/NjroaLYOks0uyzFVo6HyLl7VOm0K1QpLXnYvW63W9Ql/T3yguRZa7tRkOAeFZ3jw+1wnBD4O8MoUA==", "dependencies": { "tslib": "^2.3.0" }, @@ -1176,9 +1150,9 @@ } }, "node_modules/@angular/elements": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-16.2.11.tgz", - "integrity": "sha512-VTRNygM5B09e4S7WJlmmkAwqnKfT9F3ieMYpBPyU+ze0Oa3TBiUVpPqjzRSpYJWVe0wkQfZd4aErXLP4PJoNOA==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-16.2.12.tgz", + "integrity": "sha512-x5EPsoh6hikR52yWh4w9E+YEIIsHwPq88dlamTjDbqlShNfMFg9vRRTIGd0xzrSKc0yM/kkXNMzJUMcZAVdycQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1186,7 +1160,7 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "16.2.11", + "@angular/core": "16.2.12", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -1207,9 +1181,9 @@ } }, "node_modules/@angular/forms": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.11.tgz", - "integrity": "sha512-2powweUorehB1opfev6/sUeb3Bdey+Txq4gjI1Qdeo9c9OgtaKu6wK0KXgoism8HXXRFcGHMfS0dUVoDPVrtiQ==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.12.tgz", + "integrity": "sha512-1Eao89hlBgLR3v8tU91vccn21BBKL06WWxl7zLpQmG6Hun+2jrThgOE4Pf3os4fkkbH4Apj0tWL2fNIWe/blbw==", "dependencies": { "tslib": "^2.3.0" }, @@ -1217,25 +1191,25 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "16.2.11", - "@angular/core": "16.2.11", - "@angular/platform-browser": "16.2.11", + "@angular/common": "16.2.12", + "@angular/core": "16.2.12", + "@angular/platform-browser": "16.2.12", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-service": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-16.2.11.tgz", - "integrity": "sha512-rzZcqeBvgByu27gZk/f0K1VuwIYbScOG3sJYyWXBdSMmjqnl3ARwEEI/zyQT7I6uU6I9SwmoJhy44pQlrDDD7g==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-16.2.12.tgz", + "integrity": "sha512-sZwB+ZEjChx9EYcqPaS4OnhC/q5RcedZjIdM9mCxuU/MtseURRYRI/8Hnm1RHo9qyc5PmsQpg7p9Vp/5hXLUjw==", "dev": true, "engines": { "node": "^16.14.0 || >=18.10.0" } }, "node_modules/@angular/localize": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-16.2.11.tgz", - "integrity": "sha512-0wVJisUwUaSXAJXc3d+TEtYKYql1D866CJkEvDmWmZnhRCDtrdhvJH0rzkYPFMuK/9YYPH0VZeJQ0hmTHWFlpg==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-16.2.12.tgz", + "integrity": "sha512-sNIHDlZKENPQqx64qGF99g2sOCy9i9O4VOmjKD/FZbeE8O5qBbaQlkwOlFoQIt35/cnvtAtf7oQF6tqmiVtS2w==", "dev": true, "dependencies": { "@babel/core": "7.23.2", @@ -1251,10 +1225,75 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/compiler": "16.2.11", - "@angular/compiler-cli": "16.2.11" + "@angular/compiler": "16.2.12", + "@angular/compiler-cli": "16.2.12" + } + }, + "node_modules/@angular/localize/node_modules/@babel/core": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@angular/localize/node_modules/@babel/generator": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", + "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.3", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" } }, + "node_modules/@angular/localize/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@angular/localize/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, "node_modules/@angular/localize/node_modules/fast-glob": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", @@ -1271,10 +1310,19 @@ "node": ">=8.6.0" } }, + "node_modules/@angular/localize/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@angular/material": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.11.tgz", - "integrity": "sha512-hrkRD9/38++nIyo3k/KQpxsIaWm+FOJVmoJa83qvwZZt+fHKfT7xaNvRPZ+L2oqFaAvH5ivnL1u1nDuDyWz/0w==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.12.tgz", + "integrity": "sha512-k1DGRfP1mMmhg/nLJjZBOPzX3SyAjgbRBY2KauKOV8OFCXJGoMn/oLgMBh+qB1WugzIna/31dBV8ruHD3Uvp2w==", "dependencies": { "@material/animation": "15.0.0-canary.bc9ae6c9c.0", "@material/auto-init": "15.0.0-canary.bc9ae6c9c.0", @@ -1327,7 +1375,7 @@ }, "peerDependencies": { "@angular/animations": "^16.0.0 || ^17.0.0", - "@angular/cdk": "16.2.11", + "@angular/cdk": "16.2.12", "@angular/common": "^16.0.0 || ^17.0.0", "@angular/core": "^16.0.0 || ^17.0.0", "@angular/forms": "^16.0.0 || ^17.0.0", @@ -1336,9 +1384,9 @@ } }, "node_modules/@angular/platform-browser": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.11.tgz", - "integrity": "sha512-gUptbI3lbaRg+L8rcTlxKtFunYmR/M/mm9/l9uRd+5qk2mnFI0+s/tzRoaq7K0XaRGKZiWLNTz6FTkviO1zo2g==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.12.tgz", + "integrity": "sha512-NnH7ju1iirmVEsUq432DTm0nZBGQsBrU40M3ZeVHMQ2subnGiyUs3QyzDz8+VWLL/T5xTxWLt9BkDn65vgzlIQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1346,9 +1394,9 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/animations": "16.2.11", - "@angular/common": "16.2.11", - "@angular/core": "16.2.11" + "@angular/animations": "16.2.12", + "@angular/common": "16.2.12", + "@angular/core": "16.2.12" }, "peerDependenciesMeta": { "@angular/animations": { @@ -1357,9 +1405,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.11.tgz", - "integrity": "sha512-e+A7z6MUJaqC4Fdq7XQfIhAox3ZPM1lczM6G08fUKPbFDEe+c9i7C8YRLL+69BXDuG790btugIeOQcn5lnJcFg==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.12.tgz", + "integrity": "sha512-ya54jerNgreCVAR278wZavwjrUWImMr2F8yM5n9HBvsMBbFaAQ83anwbOEiHEF2BlR+gJiEBLfpuPRMw20pHqw==", "dependencies": { "tslib": "^2.3.0" }, @@ -1367,16 +1415,16 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "16.2.11", - "@angular/compiler": "16.2.11", - "@angular/core": "16.2.11", - "@angular/platform-browser": "16.2.11" + "@angular/common": "16.2.12", + "@angular/compiler": "16.2.12", + "@angular/core": "16.2.12", + "@angular/platform-browser": "16.2.12" } }, "node_modules/@angular/router": { - "version": "16.2.11", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.11.tgz", - "integrity": "sha512-QTssqJue+xQ8M1gzmfJcIHPIpPOijVwGnXQjt7cnFggNe/CedOckLEzk2j7/6aC1b5aQKuZePPw6XMvk8ciilQ==", + "version": "16.2.12", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.12.tgz", + "integrity": "sha512-aU6QnYSza005V9P3W6PpkieL56O0IHps96DjqI1RS8yOJUl3THmokqYN4Fm5+HXy4f390FN9i6ftadYQDKeWmA==", "dependencies": { "tslib": "^2.3.0" }, @@ -1384,9 +1432,9 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "16.2.11", - "@angular/core": "16.2.11", - "@angular/platform-browser": "16.2.11", + "@angular/common": "16.2.12", + "@angular/core": "16.2.12", + "@angular/platform-browser": "16.2.12", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -1445,30 +1493,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", - "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz", + "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", - "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz", + "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", + "@babel/generator": "^7.23.3", "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helpers": "^7.23.2", - "@babel/parser": "^7.23.0", + "@babel/parser": "^7.23.3", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.2", - "@babel/types": "^7.23.0", + "@babel/traverse": "^7.23.3", + "@babel/types": "^7.23.3", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -1484,12 +1532,12 @@ } }, "node_modules/@babel/core/node_modules/@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", + "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", "dev": true, "dependencies": { - "@babel/types": "^7.23.0", + "@babel/types": "^7.23.3", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -1738,9 +1786,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", - "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", @@ -1945,9 +1993,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", + "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -1957,9 +2005,9 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz", - "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz", + "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1972,14 +2020,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz", - "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz", + "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.22.15" + "@babel/plugin-transform-optional-chaining": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -1988,6 +2036,22 @@ "@babel/core": "^7.13.0" } }, + "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz", + "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, "node_modules/@babel/plugin-proposal-async-generator-functions": { "version": "7.20.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz", @@ -2100,9 +2164,9 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", - "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz", + "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2115,9 +2179,9 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz", - "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz", + "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2272,9 +2336,9 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz", - "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz", + "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2287,9 +2351,9 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz", - "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz", + "integrity": "sha512-59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", @@ -2322,9 +2386,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz", - "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz", + "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2337,9 +2401,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz", - "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz", + "integrity": "sha512-QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2352,12 +2416,12 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz", - "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz", + "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2368,12 +2432,12 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz", - "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz", + "integrity": "sha512-PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-class-static-block": "^7.14.5" }, @@ -2385,18 +2449,18 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz", - "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz", + "integrity": "sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-replace-supers": "^7.22.20", "@babel/helper-split-export-declaration": "^7.22.6", "globals": "^11.1.0" }, @@ -2408,13 +2472,13 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz", - "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz", + "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/template": "^7.22.5" + "@babel/template": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -2423,10 +2487,24 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz", - "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz", + "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2439,12 +2517,12 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz", - "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz", + "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2455,9 +2533,9 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz", - "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz", + "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2470,9 +2548,9 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz", - "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz", + "integrity": "sha512-vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2486,12 +2564,12 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz", - "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz", + "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2502,9 +2580,9 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz", - "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz", + "integrity": "sha512-yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2518,9 +2596,9 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz", - "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz", + "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2533,13 +2611,13 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz", - "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz", + "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2550,9 +2628,9 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz", - "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz", + "integrity": "sha512-H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2566,9 +2644,9 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz", - "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz", + "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2581,9 +2659,9 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz", - "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz", + "integrity": "sha512-+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2597,9 +2675,9 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz", - "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz", + "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2612,12 +2690,12 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz", - "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz", + "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2628,12 +2706,12 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz", - "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz", + "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-simple-access": "^7.22.5" }, @@ -2645,13 +2723,13 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz", - "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz", + "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==", "dev": true, "dependencies": { "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-identifier": "^7.22.20" }, @@ -2663,12 +2741,12 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz", - "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz", + "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2695,9 +2773,9 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz", - "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz", + "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2710,9 +2788,9 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz", - "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz", + "integrity": "sha512-xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2726,9 +2804,9 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz", - "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz", + "integrity": "sha512-s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2742,16 +2820,16 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz", - "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz", + "integrity": "sha512-VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.9", + "@babel/compat-data": "^7.23.3", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.22.15" + "@babel/plugin-transform-parameters": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -2761,13 +2839,13 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz", - "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz", + "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5" + "@babel/helper-replace-supers": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -2777,9 +2855,9 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz", - "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz", + "integrity": "sha512-LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2793,9 +2871,9 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz", - "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz", + "integrity": "sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2810,9 +2888,9 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", - "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz", + "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2825,12 +2903,12 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz", - "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz", + "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2841,13 +2919,13 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz", - "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz", + "integrity": "sha512-a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, @@ -2859,9 +2937,9 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz", - "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz", + "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2874,9 +2952,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", - "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz", + "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2890,9 +2968,9 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz", - "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz", + "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2934,9 +3012,9 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", - "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz", + "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2949,9 +3027,9 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz", - "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz", + "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2965,9 +3043,9 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz", - "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz", + "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2980,9 +3058,9 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz", - "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz", + "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2995,9 +3073,9 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz", - "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz", + "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3010,9 +3088,9 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", - "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz", + "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3025,12 +3103,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz", - "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz", + "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3041,12 +3119,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz", - "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz", + "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3057,12 +3135,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz", - "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz", + "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3073,25 +3151,26 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz", - "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz", + "integrity": "sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.23.2", + "@babel/compat-data": "^7.23.3", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-option": "^7.22.15", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.22.5", - "@babel/plugin-syntax-import-attributes": "^7.22.5", + "@babel/plugin-syntax-import-assertions": "^7.23.3", + "@babel/plugin-syntax-import-attributes": "^7.23.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", @@ -3103,56 +3182,55 @@ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.22.5", - "@babel/plugin-transform-async-generator-functions": "^7.23.2", - "@babel/plugin-transform-async-to-generator": "^7.22.5", - "@babel/plugin-transform-block-scoped-functions": "^7.22.5", - "@babel/plugin-transform-block-scoping": "^7.23.0", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-classes": "^7.22.15", - "@babel/plugin-transform-computed-properties": "^7.22.5", - "@babel/plugin-transform-destructuring": "^7.23.0", - "@babel/plugin-transform-dotall-regex": "^7.22.5", - "@babel/plugin-transform-duplicate-keys": "^7.22.5", - "@babel/plugin-transform-dynamic-import": "^7.22.11", - "@babel/plugin-transform-exponentiation-operator": "^7.22.5", - "@babel/plugin-transform-export-namespace-from": "^7.22.11", - "@babel/plugin-transform-for-of": "^7.22.15", - "@babel/plugin-transform-function-name": "^7.22.5", - "@babel/plugin-transform-json-strings": "^7.22.11", - "@babel/plugin-transform-literals": "^7.22.5", - "@babel/plugin-transform-logical-assignment-operators": "^7.22.11", - "@babel/plugin-transform-member-expression-literals": "^7.22.5", - "@babel/plugin-transform-modules-amd": "^7.23.0", - "@babel/plugin-transform-modules-commonjs": "^7.23.0", - "@babel/plugin-transform-modules-systemjs": "^7.23.0", - "@babel/plugin-transform-modules-umd": "^7.22.5", + "@babel/plugin-transform-arrow-functions": "^7.23.3", + "@babel/plugin-transform-async-generator-functions": "^7.23.3", + "@babel/plugin-transform-async-to-generator": "^7.23.3", + "@babel/plugin-transform-block-scoped-functions": "^7.23.3", + "@babel/plugin-transform-block-scoping": "^7.23.3", + "@babel/plugin-transform-class-properties": "^7.23.3", + "@babel/plugin-transform-class-static-block": "^7.23.3", + "@babel/plugin-transform-classes": "^7.23.3", + "@babel/plugin-transform-computed-properties": "^7.23.3", + "@babel/plugin-transform-destructuring": "^7.23.3", + "@babel/plugin-transform-dotall-regex": "^7.23.3", + "@babel/plugin-transform-duplicate-keys": "^7.23.3", + "@babel/plugin-transform-dynamic-import": "^7.23.3", + "@babel/plugin-transform-exponentiation-operator": "^7.23.3", + "@babel/plugin-transform-export-namespace-from": "^7.23.3", + "@babel/plugin-transform-for-of": "^7.23.3", + "@babel/plugin-transform-function-name": "^7.23.3", + "@babel/plugin-transform-json-strings": "^7.23.3", + "@babel/plugin-transform-literals": "^7.23.3", + "@babel/plugin-transform-logical-assignment-operators": "^7.23.3", + "@babel/plugin-transform-member-expression-literals": "^7.23.3", + "@babel/plugin-transform-modules-amd": "^7.23.3", + "@babel/plugin-transform-modules-commonjs": "^7.23.3", + "@babel/plugin-transform-modules-systemjs": "^7.23.3", + "@babel/plugin-transform-modules-umd": "^7.23.3", "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", - "@babel/plugin-transform-new-target": "^7.22.5", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11", - "@babel/plugin-transform-numeric-separator": "^7.22.11", - "@babel/plugin-transform-object-rest-spread": "^7.22.15", - "@babel/plugin-transform-object-super": "^7.22.5", - "@babel/plugin-transform-optional-catch-binding": "^7.22.11", - "@babel/plugin-transform-optional-chaining": "^7.23.0", - "@babel/plugin-transform-parameters": "^7.22.15", - "@babel/plugin-transform-private-methods": "^7.22.5", - "@babel/plugin-transform-private-property-in-object": "^7.22.11", - "@babel/plugin-transform-property-literals": "^7.22.5", - "@babel/plugin-transform-regenerator": "^7.22.10", - "@babel/plugin-transform-reserved-words": "^7.22.5", - "@babel/plugin-transform-shorthand-properties": "^7.22.5", - "@babel/plugin-transform-spread": "^7.22.5", - "@babel/plugin-transform-sticky-regex": "^7.22.5", - "@babel/plugin-transform-template-literals": "^7.22.5", - "@babel/plugin-transform-typeof-symbol": "^7.22.5", - "@babel/plugin-transform-unicode-escapes": "^7.22.10", - "@babel/plugin-transform-unicode-property-regex": "^7.22.5", - "@babel/plugin-transform-unicode-regex": "^7.22.5", - "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.23.3", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.3", + "@babel/plugin-transform-numeric-separator": "^7.23.3", + "@babel/plugin-transform-object-rest-spread": "^7.23.3", + "@babel/plugin-transform-object-super": "^7.23.3", + "@babel/plugin-transform-optional-catch-binding": "^7.23.3", + "@babel/plugin-transform-optional-chaining": "^7.23.3", + "@babel/plugin-transform-parameters": "^7.23.3", + "@babel/plugin-transform-private-methods": "^7.23.3", + "@babel/plugin-transform-private-property-in-object": "^7.23.3", + "@babel/plugin-transform-property-literals": "^7.23.3", + "@babel/plugin-transform-regenerator": "^7.23.3", + "@babel/plugin-transform-reserved-words": "^7.23.3", + "@babel/plugin-transform-shorthand-properties": "^7.23.3", + "@babel/plugin-transform-spread": "^7.23.3", + "@babel/plugin-transform-sticky-regex": "^7.23.3", + "@babel/plugin-transform-template-literals": "^7.23.3", + "@babel/plugin-transform-typeof-symbol": "^7.23.3", + "@babel/plugin-transform-unicode-escapes": "^7.23.3", + "@babel/plugin-transform-unicode-property-regex": "^7.23.3", + "@babel/plugin-transform-unicode-regex": "^7.23.3", + "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", "@babel/preset-modules": "0.1.6-no-external-plugins", - "@babel/types": "^7.23.0", "babel-plugin-polyfill-corejs2": "^0.4.6", "babel-plugin-polyfill-corejs3": "^0.8.5", "babel-plugin-polyfill-regenerator": "^0.5.3", @@ -3166,6 +3244,23 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/preset-env/node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz", + "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/preset-env/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -3222,19 +3317,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", - "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz", + "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==", "dev": true, "dependencies": { "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", + "@babel/generator": "^7.23.3", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", + "@babel/parser": "^7.23.3", + "@babel/types": "^7.23.3", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -3243,12 +3338,12 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", + "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", "dev": true, "dependencies": { - "@babel/types": "^7.23.0", + "@babel/types": "^7.23.3", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -3258,9 +3353,9 @@ } }, "node_modules/@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", + "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.22.5", @@ -3281,13 +3376,13 @@ } }, "node_modules/@commitlint/config-validator": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-18.1.0.tgz", - "integrity": "sha512-kbHkIuItXn93o2NmTdwi5Mk1ujyuSIysRE/XHtrcps/27GuUKEIqBJp6TdJ4Sq+ze59RlzYSHMKuDKZbfg9+uQ==", + "version": "18.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-18.4.0.tgz", + "integrity": "sha512-1y6qHMU3o4cYQSK+Y9EnmH6H1GRiwQGjnLIUOIKlekrmfc8MrMk1ByNmb8od4vK3qHJAaL/77/5n+1uyyIF5dA==", "dev": true, "optional": true, "dependencies": { - "@commitlint/types": "^18.1.0", + "@commitlint/types": "^18.4.0", "ajv": "^8.11.0" }, "engines": { @@ -3295,9 +3390,9 @@ } }, "node_modules/@commitlint/execute-rule": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-18.1.0.tgz", - "integrity": "sha512-w3Vt4K+O7+nSr9/gFSEfZ1exKUOPSlJaRpnk7Y+XowEhvwT7AIk1HNANH+gETf0zGZ020+hfiMW/Ome+SNCUsg==", + "version": "18.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-18.4.0.tgz", + "integrity": "sha512-g013SWki6ZWhURBLOSXTaVQGWHdA0QlPJGiW4a+YpThezmJOemvc4LiKVpn13AjSKQ40QnmBqpBrxujOaSo+3A==", "dev": true, "optional": true, "engines": { @@ -3305,19 +3400,19 @@ } }, "node_modules/@commitlint/load": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-18.2.0.tgz", - "integrity": "sha512-xjX3d3CRlOALwImhOsmLYZh14/+gW/KxsY7+bPKrzmGuFailf9K7ckhB071oYZVJdACnpY4hDYiosFyOC+MpAA==", + "version": "18.4.1", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-18.4.1.tgz", + "integrity": "sha512-o/plBiPJQgbSq/4ipDpsq4HCmURjBAEjr1EO/p2falr3VhwV0WGXTvb8NlihgI8xtSyO6lHvtycrE535GMLQbA==", "dev": true, "optional": true, "dependencies": { - "@commitlint/config-validator": "^18.1.0", - "@commitlint/execute-rule": "^18.1.0", - "@commitlint/resolve-extends": "^18.1.0", - "@commitlint/types": "^18.1.0", + "@commitlint/config-validator": "^18.4.0", + "@commitlint/execute-rule": "^18.4.0", + "@commitlint/resolve-extends": "^18.4.0", + "@commitlint/types": "^18.4.0", "@types/node": "^18.11.9", "chalk": "^4.1.0", - "cosmiconfig": "^8.0.0", + "cosmiconfig": "^8.3.6", "cosmiconfig-typescript-loader": "^5.0.0", "lodash.isplainobject": "^4.0.6", "lodash.merge": "^4.6.2", @@ -3329,9 +3424,9 @@ } }, "node_modules/@commitlint/load/node_modules/@types/node": { - "version": "18.18.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz", - "integrity": "sha512-OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ==", + "version": "18.18.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.9.tgz", + "integrity": "sha512-0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ==", "dev": true, "optional": true, "dependencies": { @@ -3415,14 +3510,14 @@ } }, "node_modules/@commitlint/resolve-extends": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-18.1.0.tgz", - "integrity": "sha512-3mZpzOEJkELt7BbaZp6+bofJyxViyObebagFn0A7IHaLARhPkWTivXdjvZHS12nAORftv88Yhbh8eCPKfSvB7g==", + "version": "18.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-18.4.0.tgz", + "integrity": "sha512-qhgU6ach+S6sJMD9NjCYiEycOObGhxzWQLQzqlScJCv9zkPs15Bg0ffLXTQ3z7ipXv46XEKYMnSJzjLRw2Tlkg==", "dev": true, "optional": true, "dependencies": { - "@commitlint/config-validator": "^18.1.0", - "@commitlint/types": "^18.1.0", + "@commitlint/config-validator": "^18.4.0", + "@commitlint/types": "^18.4.0", "import-fresh": "^3.0.0", "lodash.mergewith": "^4.6.2", "resolve-from": "^5.0.0", @@ -3433,9 +3528,9 @@ } }, "node_modules/@commitlint/types": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-18.1.0.tgz", - "integrity": "sha512-65vGxZmbs+2OVwEItxhp3Ul7X2m2LyLfifYI/NdPwRqblmuES2w2aIRhIjb7cwUIBHHSTT8WXj4ixVHQibmvLQ==", + "version": "18.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-18.4.0.tgz", + "integrity": "sha512-MKeaFxt0I9fhqUb2E+YIzX/gZtmkuodJET/XKiZIMvXUff8Ee4Ih86eLg+yAm2jf1pwGBmU02uNOp0y094w2Uw==", "dev": true, "optional": true, "dependencies": { @@ -3526,6 +3621,8 @@ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@jridgewell/trace-mapping": "0.3.9" }, @@ -3538,6 +3635,8 @@ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -4988,9 +5087,9 @@ } }, "node_modules/@ngtools/webpack": { - "version": "16.2.9", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.9.tgz", - "integrity": "sha512-rOclD7FfT4OSwVA0nDnULbJS6TORJ0+sQiuT2ebaNFErYr3LOm6Zut05tnmzFw8q1cePrILbG+xpnbggNr9Pyw==", + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.10.tgz", + "integrity": "sha512-XAVn59zP3ztuKDtw92Xc9+64RK4u4c9g8y5GgtjIWeOwgNXl8bYhAo3uTZzrSrOu96DFZGjsmghFab/7/C2pDg==", "dev": true, "engines": { "node": "^16.14.0 || >=18.10.0", @@ -5426,13 +5525,13 @@ "dev": true }, "node_modules/@schematics/angular": { - "version": "16.2.9", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.9.tgz", - "integrity": "sha512-uiU2YbZRVHgk1N1DDsek/5CKhfpZ8myJYNJk8eHV5LswnXOP3aqvH23VhneaAgOYwK5fISC7eMG0pLVKMvFfZQ==", + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.10.tgz", + "integrity": "sha512-PXmoswvN7qknTsXDmEvhZ9UG+awwWnQ/1Jd/eqqQx08iAaAT81OsXj1bN7eSs6tEGBKGjPb6q2xzuiECAdymzg==", "dev": true, "dependencies": { - "@angular-devkit/core": "16.2.9", - "@angular-devkit/schematics": "16.2.9", + "@angular-devkit/core": "16.2.10", + "@angular-devkit/schematics": "16.2.10", "jsonc-parser": "3.2.0" }, "engines": { @@ -5442,9 +5541,9 @@ } }, "node_modules/@semantic-release/commit-analyzer": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-11.0.0.tgz", - "integrity": "sha512-uEXyf4Z0AWJuxI9TbSQP5kkIYqus1/E1NcmE7pIv6d6/m/5EJcNWAGR4FOo34vrV26FhEaRVkxFfYzp/M7BKIg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-11.1.0.tgz", + "integrity": "sha512-cXNTbv3nXR2hlzHjAMgbuiQVtvWHTlwwISt60B+4NZv01y/QRY7p2HcJm8Eh2StzcTJoNnflvKjHH/cjFS7d5g==", "dev": true, "peer": true, "dependencies": { @@ -5452,7 +5551,7 @@ "conventional-commits-filter": "^4.0.0", "conventional-commits-parser": "^5.0.0", "debug": "^4.0.0", - "import-from": "^4.0.0", + "import-from-esm": "^1.0.3", "lodash-es": "^4.17.21", "micromatch": "^4.0.2" }, @@ -5517,9 +5616,9 @@ } }, "node_modules/@semantic-release/npm": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@semantic-release/npm/-/npm-11.0.0.tgz", - "integrity": "sha512-ozNCiPUp14Xp2rgeY7j96yFTEhDncLSWOJr0IAUr888+ax6fH5xgYkNVv08vpkV8C5GIXBgnGd9coRiOCD6oqQ==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@semantic-release/npm/-/npm-11.0.1.tgz", + "integrity": "sha512-nFcT0pgVwpXsPkzjqP3ObH+pILeN1AbYscCDuYwgZEPZukL+RsGhrtdT4HA1Gjb/y1bVbE90JNtMIcgRi5z/Fg==", "dev": true, "peer": true, "dependencies": { @@ -5532,7 +5631,7 @@ "normalize-url": "^8.0.0", "npm": "^10.0.0", "rc": "^1.2.8", - "read-pkg": "^8.0.0", + "read-pkg": "^9.0.0", "registry-auth-token": "^5.0.0", "semver": "^7.1.2", "tempy": "^3.0.0" @@ -5627,9 +5726,9 @@ } }, "node_modules/@semantic-release/release-notes-generator": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@semantic-release/release-notes-generator/-/release-notes-generator-12.0.0.tgz", - "integrity": "sha512-m7Ds8ComP1KJgA2Lke2xMwE1TOOU40U7AzP4lT8hJ2tUAeicziPz/1GeDFmRkTOkMFlfHvE6kuvMkvU+mIzIDQ==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/@semantic-release/release-notes-generator/-/release-notes-generator-12.1.0.tgz", + "integrity": "sha512-g6M9AjUKAZUZnxaJZnouNBeDNTCUrJ5Ltj+VJ60gJeDaRRahcHsry9HW8yKrnKkKNkx5lbWiEP1FPMqVNQz8Kg==", "dev": true, "peer": true, "dependencies": { @@ -5639,10 +5738,10 @@ "conventional-commits-parser": "^5.0.0", "debug": "^4.0.0", "get-stream": "^7.0.0", - "import-from": "^4.0.0", + "import-from-esm": "^1.0.3", "into-stream": "^7.0.0", "lodash-es": "^4.17.21", - "read-pkg-up": "^10.0.0" + "read-pkg-up": "^11.0.0" }, "engines": { "node": "^18.17 || >=20.6.1" @@ -5812,6 +5911,19 @@ "url": "https://github.com/sindresorhus/is?sponsor=1" } }, + "node_modules/@sindresorhus/merge-streams": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz", + "integrity": "sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==", + "dev": true, + "peer": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@socket.io/component-emitter": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", @@ -5873,25 +5985,33 @@ "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@tsconfig/node12": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@tsconfig/node14": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@tsconfig/node16": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@tufjs/canonical-json": { "version": "1.0.0", @@ -5940,9 +6060,9 @@ } }, "node_modules/@types/body-parser": { - "version": "1.19.4", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz", - "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==", + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", "dev": true, "dependencies": { "@types/connect": "*", @@ -5950,27 +6070,27 @@ } }, "node_modules/@types/bonjour": { - "version": "3.5.12", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz", - "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==", + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", + "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect": { - "version": "3.4.37", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz", - "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==", + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect-history-api-fallback": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz", - "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.3.tgz", + "integrity": "sha512-6mfQ6iNvhSKCZJoY6sIG3m0pKkdUcweVNOLuBBKvoWGzl2yRxOJcYOTRyLKt3nxXvBLJWa6QkW//tgbIwJehmA==", "dev": true, "dependencies": { "@types/express-serve-static-core": "*", @@ -5984,24 +6104,24 @@ "dev": true }, "node_modules/@types/cors": { - "version": "2.8.15", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.15.tgz", - "integrity": "sha512-n91JxbNLD8eQIuXDIChAN1tCKNWCEgpceU9b7ZMbFA+P+Q4yIeh80jizFLEvolRPc1ES0VdwFlGv+kJTSirogw==", + "version": "2.8.16", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.16.tgz", + "integrity": "sha512-Trx5or1Nyg1Fq138PCuWqoApzvoSLWzZ25ORBiHMbbUT42g578lH1GT4TwYDbiUOLFuDsCkfLneT2105fsFWGg==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/dom-mediacapture-record": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.18.tgz", - "integrity": "sha512-bPMN/T+lmuIZNIbmup8zJ1mb80AicoeMGI3GAI2w69XU1saGV54lEFG2z8VqF0RhoNMrHGB6dFL9S6INioShBw==", + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/@types/dom-mediacapture-record/-/dom-mediacapture-record-1.0.19.tgz", + "integrity": "sha512-Cz/85z3YTuUPnXrOp5MvSZZSgDkWTWvj1HgE7MWc5C8d/w/soJBXjnAoYDl4P5gmenDNNZkhXzNylGqxS1FzOw==", "dev": true }, "node_modules/@types/eslint": { - "version": "8.44.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.6.tgz", - "integrity": "sha512-P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw==", + "version": "8.44.7", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz", + "integrity": "sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==", "dev": true, "dependencies": { "@types/estree": "*", @@ -6009,9 +6129,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.6", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz", - "integrity": "sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==", + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -6019,9 +6139,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz", - "integrity": "sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", "dev": true }, "node_modules/@types/expect": { @@ -6031,9 +6151,9 @@ "dev": true }, "node_modules/@types/express": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz", - "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, "dependencies": { "@types/body-parser": "*", @@ -6043,9 +6163,9 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.39", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz", - "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==", + "version": "4.17.41", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz", + "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==", "dev": true, "dependencies": { "@types/node": "*", @@ -6065,59 +6185,59 @@ } }, "node_modules/@types/grecaptcha": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.6.tgz", - "integrity": "sha512-4BR/3v+pbiRt3cwRwibFnV4+LmuvRUjVVqgeCul9ODAyQhlPKE4tIIRJwZUeWWpmX8e9vo/xXuQTQl8FJPP7KA==" + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.7.tgz", + "integrity": "sha512-ah5GDQfsiK3dnkaCbYcDFZXkZCG3o90VRu9hzXHnSe4kACrRB1KUI/ZyWHvYmqm1W5Tl8B5YxxT98uGTlkbf2Q==" }, "node_modules/@types/http-errors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz", - "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", "dev": true }, "node_modules/@types/http-proxy": { - "version": "1.17.13", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz", - "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==", + "version": "1.17.14", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz", + "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/jasmine": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.6.1.tgz", - "integrity": "sha512-Q00+pqd3WGt3xLmbIV6w9cP2uncjzIld+NOE4dl1ETQEut7RACj3QdAE8nD+n2ubPHneeGYsqXK//ORvH2m6eQ==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.6.2.tgz", + "integrity": "sha512-1JpgHd7kIaggg8er9h6GCf82ZI0yzCAKjx3rXTuvuZlLqxKj6hqqr7qcDPjQw2791y/AX7XLTahLyZdgnZLlog==", "dev": true }, "node_modules/@types/jasminewd2": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.12.tgz", - "integrity": "sha512-C4rXKMnGqLqTw4mgfiT0fL91g5oFAUhreR8jeeYk4xYcgh1/CImqgn5pWcErnpJJS43XFUfHGit0sSPQ39G1Pg==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.13.tgz", + "integrity": "sha512-aJ3wj8tXMpBrzQ5ghIaqMisD8C3FIrcO6sDKHqFbuqAsI7yOxj0fA7MrRCPLZHIVUjERIwsMmGn/vB0UQ9u0Hg==", "dev": true, "dependencies": { "@types/jasmine": "*" } }, "node_modules/@types/jquery": { - "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.25.tgz", - "integrity": "sha512-gykx2c+OZf5nx2tv/5fDQqmvGgTiXshELy5jf9IgXPtVfSBl57IUYByN4osbwMXwJijWGOEYQABzGaFZE79A0Q==", + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.27.tgz", + "integrity": "sha512-TR28Y8ezIGgfyA02UOh9x+Fy16/1qWYAnvtRd2gTBJuccX/vmddyti0MezLkTv7f+OLofVc2T961VPyKv1tXJQ==", "dev": true, "dependencies": { "@types/sizzle": "*" } }, "node_modules/@types/json-schema": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", - "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, "node_modules/@types/mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz", - "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true }, "node_modules/@types/minimatch": { @@ -6133,18 +6253,18 @@ "dev": true }, "node_modules/@types/node-forge": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.8.tgz", - "integrity": "sha512-vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg==", + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.9.tgz", + "integrity": "sha512-meK88cx/sTalPSLSoCzkiUB4VPIFHmxtXm5FaaqRDqBX2i/Sy8bJ4odsan0b20RBjPh06dAQ+OTTdnyQyhJZyQ==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/normalize-package-data": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz", - "integrity": "sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", "dev": true, "peer": true }, @@ -6155,15 +6275,15 @@ "dev": true }, "node_modules/@types/qs": { - "version": "6.9.9", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz", - "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==", + "version": "6.9.10", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.10.tgz", + "integrity": "sha512-3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw==", "dev": true }, "node_modules/@types/range-parser": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz", - "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", "dev": true }, "node_modules/@types/retry": { @@ -6173,15 +6293,15 @@ "dev": true }, "node_modules/@types/selenium-webdriver": { - "version": "3.0.25", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.25.tgz", - "integrity": "sha512-gkb8rx0kjHuaVUzIfKa1tVVjnEmjYLufDmoOHKPsaoRraTcNjV9W9ruFWi3Xv821c7M5gZVmrGOT8BJYsY/acQ==", + "version": "3.0.26", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.26.tgz", + "integrity": "sha512-dyIGFKXfUFiwkMfNGn1+F6b80ZjR3uSYv1j6xVJSDlft5waZ2cwkHW4e7zNzvq7hiEackcgvBpmnXZrI1GltPg==", "dev": true }, "node_modules/@types/send": { - "version": "0.17.3", - "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz", - "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==", + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", "dev": true, "dependencies": { "@types/mime": "^1", @@ -6189,18 +6309,18 @@ } }, "node_modules/@types/serve-index": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz", - "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", + "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", "dev": true, "dependencies": { "@types/express": "*" } }, "node_modules/@types/serve-static": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz", - "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz", + "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==", "dev": true, "dependencies": { "@types/http-errors": "*", @@ -6209,24 +6329,24 @@ } }, "node_modules/@types/sizzle": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.5.tgz", - "integrity": "sha512-tAe4Q+OLFOA/AMD+0lq8ovp8t3ysxAOeaScnfNdZpUxaGl51ZMDEITxkvFl1STudQ58mz6gzVGl9VhMKhwRnZQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.6.tgz", + "integrity": "sha512-m04Om5Gz6kbjUwAQ7XJJQ30OdEFsSmAVsvn4NYwcTRyMVpKKa1aPuESw1n2CxS5fYkOQv3nHgDKeNa8e76fUkw==", "dev": true }, "node_modules/@types/sockjs": { - "version": "0.3.35", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz", - "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==", + "version": "0.3.36", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", + "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/vinyl": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.9.tgz", - "integrity": "sha512-KCr4aTEUkzSF89qw09e2oxsC/RXXT3K5ZPv4gvj3XTiWVrxNoi7WrqNTahNE/Hul5C9z3B8w+yWNTQgua12oag==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.10.tgz", + "integrity": "sha512-DqN5BjCrmjAtZ1apqzcq2vk2PSW0m1nFfjIafBFkAyddmHxuw3ZAK3omLiSdpuu81+8h07i6U4DtaE38Xsf2xQ==", "dev": true, "dependencies": { "@types/expect": "^1.20.4", @@ -6234,9 +6354,9 @@ } }, "node_modules/@types/ws": { - "version": "8.5.8", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz", - "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==", + "version": "8.5.9", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.9.tgz", + "integrity": "sha512-jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg==", "dev": true, "dependencies": { "@types/node": "*" @@ -8363,9 +8483,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001559", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", - "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==", + "version": "1.0.30001562", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz", + "integrity": "sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==", "dev": true, "funding": [ { @@ -9507,7 +9627,9 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/critters": { "version": "0.0.20", @@ -9938,6 +10060,12 @@ "node": ">=4.0" } }, + "node_modules/debounce": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", + "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", + "dev": true + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -10665,9 +10793,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.574", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.574.tgz", - "integrity": "sha512-bg1m8L0n02xRzx4LsTTMbBPiUd9yIR+74iPtS/Ao65CuXvhVZHP0ym1kSdDG3yHFDXqHQQBKujlN1AQ8qZnyFg==", + "version": "1.4.583", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.583.tgz", + "integrity": "sha512-93y1gcONABZ7uqYe/JWDVQP/Pj/sQSunF0HVAPdlg/pfBnOyBMLlQUxWvkqcljJg1+W6cjvPuYD+r1Th9Tn8mA==", "dev": true }, "node_modules/emoji-regex": { @@ -10731,9 +10859,9 @@ } }, "node_modules/engine.io": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.3.tgz", - "integrity": "sha512-IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz", + "integrity": "sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==", "dev": true, "dependencies": { "@types/cookie": "^0.4.1", @@ -10864,9 +10992,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", - "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", + "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", "dev": true }, "node_modules/es5-ext": { @@ -12345,6 +12473,19 @@ "node": ">=8" } }, + "node_modules/find-up-simple": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.0.tgz", + "integrity": "sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==", + "dev": true, + "peer": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/find-versions": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-5.1.0.tgz", @@ -12413,15 +12554,6 @@ "node": ">= 0.10" } }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true, - "bin": { - "flat": "cli.js" - } - }, "node_modules/flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -14870,17 +15002,28 @@ "node": ">=4" } }, - "node_modules/import-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz", - "integrity": "sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==", + "node_modules/import-from-esm": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/import-from-esm/-/import-from-esm-1.2.1.tgz", + "integrity": "sha512-Nly5Ab75rWZmOwtMa0B0NQNnHGcHOQ2zkU/bVENwK2lbPq+kamPDqNKNJ0hF7w7lR/ETD5nGgJq0XbofsZpYCA==", "dev": true, "peer": true, - "engines": { - "node": ">=12.2" + "dependencies": { + "import-meta-resolve": "^4.0.0" }, + "engines": { + "node": ">=16.20" + } + }, + "node_modules/import-meta-resolve": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz", + "integrity": "sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==", + "dev": true, + "peer": true, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, "node_modules/imurmurhash": { @@ -14901,6 +15044,19 @@ "node": ">=8" } }, + "node_modules/index-to-position": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-0.1.2.tgz", + "integrity": "sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==", + "dev": true, + "peer": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", @@ -15543,9 +15699,9 @@ } }, "node_modules/istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, "engines": { "node": ">=8" @@ -16863,30 +17019,12 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, - "node_modules/lodash.escape": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz", - "integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==", - "dev": true - }, "node_modules/lodash.escaperegexp": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==", "dev": true }, - "node_modules/lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==", - "dev": true - }, - "node_modules/lodash.invokemap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz", - "integrity": "sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==", - "dev": true - }, "node_modules/lodash.isplainobject": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", @@ -16924,12 +17062,6 @@ "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", "dev": true }, - "node_modules/lodash.pullall": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.pullall/-/lodash.pullall-4.2.0.tgz", - "integrity": "sha512-VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg==", - "dev": true - }, "node_modules/lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -17416,9 +17548,9 @@ } }, "node_modules/marked": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.5.tgz", - "integrity": "sha512-14QG3shv8Kg/xc0Yh6TNkMj90wXH9mmldi5941I2OevfJ/FQAFLEwtwU2/FfgSAOMlWHrEukWSGQf8MiVYNG2A==", + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.6.tgz", + "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==", "dev": true, "peer": true, "bin": { @@ -17429,9 +17561,9 @@ } }, "node_modules/marked-terminal": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-6.0.0.tgz", - "integrity": "sha512-6rruICvqRfA4N+Mvdc0UyDbLA0A0nI5omtARIlin3P2F+aNc3EbW91Rd9HTuD0v9qWyHmNIu8Bt40gAnPfldsg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-6.1.0.tgz", + "integrity": "sha512-QaCSF6NV82oo6K0szEnmc65ooDeW0T/Adcyf0fcW+Hto2GT1VADFg8dn1zaeHqzj65fqDH1hMNChGNRaC/lbkA==", "dev": true, "peer": true, "dependencies": { @@ -17446,7 +17578,7 @@ "node": ">=16.0.0" }, "peerDependencies": { - "marked": ">=1 <10" + "marked": ">=1 <11" } }, "node_modules/marked-terminal/node_modules/ansi-escapes": { @@ -18228,9 +18360,9 @@ "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, "funding": [ { @@ -18734,9 +18866,9 @@ } }, "node_modules/npm": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/npm/-/npm-10.2.2.tgz", - "integrity": "sha512-VSP/rh88wBQ+b7bz0NOdZQBQCuWLI/etpWfgUWDmNaMy0MuD1xJBMofEzuFojNpJANVaJCkN5U7KgfPdR2V1fg==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/npm/-/npm-10.2.3.tgz", + "integrity": "sha512-GbUui/rHTl0mW8HhJSn4A0Xg89yCR3I9otgJT1i0z1QBPOVlgbh6rlcUTpHT8Gut9O1SJjWRUU0nEcAymhG2tQ==", "bundleDependencies": [ "@isaacs/string-locale-compare", "@npmcli/arborist", @@ -18855,7 +18987,7 @@ "minipass": "^7.0.4", "minipass-pipeline": "^1.2.4", "ms": "^2.1.2", - "node-gyp": "^10.0.0", + "node-gyp": "^10.0.1", "nopt": "^7.2.0", "normalize-package-data": "^6.0.0", "npm-audit-report": "^5.0.0", @@ -20965,7 +21097,7 @@ } }, "node_modules/npm/node_modules/node-gyp": { - "version": "10.0.0", + "version": "10.0.1", "dev": true, "inBundle": true, "license": "MIT", @@ -22824,10 +22956,13 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.2.tgz", + "integrity": "sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==", "dev": true, + "dependencies": { + "semver": "^7.3.5" + }, "engines": { "node": "14 || >=16.14" } @@ -24233,121 +24368,47 @@ } }, "node_modules/read-pkg": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz", - "integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.0.tgz", + "integrity": "sha512-SBoBio4xhJmlF4xs9IBliWZGSbDAnrOfQkLGL7xB+RYEUZNAN2LlNkzO45B7gc7c2dLMX987bhHAaJ/LG3efeQ==", "dev": true, "peer": true, "dependencies": { - "@types/normalize-package-data": "^2.4.1", + "@types/normalize-package-data": "^2.4.3", "normalize-package-data": "^6.0.0", - "parse-json": "^7.0.0", - "type-fest": "^4.2.0" + "parse-json": "^8.0.0", + "type-fest": "^4.6.0" }, "engines": { - "node": ">=16" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/read-pkg-up": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-10.1.0.tgz", - "integrity": "sha512-aNtBq4jR8NawpKJQldrQcSW9y/d+KWH4v24HWkHljOZ7H0av+YTGANBzRh9A5pw7v/bLVsLVPpOhJ7gHNVy8lA==", - "dev": true, - "peer": true, - "dependencies": { - "find-up": "^6.3.0", - "read-pkg": "^8.1.0", - "type-fest": "^4.2.0" - }, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/find-up": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", - "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", - "dev": true, - "peer": true, - "dependencies": { - "locate-path": "^7.1.0", - "path-exists": "^5.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/locate-path": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", - "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", - "dev": true, - "peer": true, - "dependencies": { - "p-locate": "^6.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/p-limit": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", - "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", - "dev": true, - "peer": true, - "dependencies": { - "yocto-queue": "^1.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/p-locate": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", - "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-11.0.0.tgz", + "integrity": "sha512-LOVbvF1Q0SZdjClSefZ0Nz5z8u+tIE7mV5NibzmE9VYmDe9CaBbAVtz1veOSZbofrdsilxuDAYnFenukZVp8/Q==", + "deprecated": "Renamed to read-package-up", "dev": true, "peer": true, "dependencies": { - "p-limit": "^4.0.0" + "find-up-simple": "^1.0.0", + "read-pkg": "^9.0.0", + "type-fest": "^4.6.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/read-pkg-up/node_modules/path-exists": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", - "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", - "dev": true, - "peer": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/read-pkg-up/node_modules/type-fest": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.6.0.tgz", - "integrity": "sha512-rLjWJzQFOq4xw7MgJrCZ6T1jIOvvYElXT12r+y0CC6u67hegDHaxcPqb2fZHOGlqxugGQPNB1EnTezjBetkwkw==", + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.7.1.tgz", + "integrity": "sha512-iWr8RUmzAJRfhZugX9O7nZE6pCxDU8CZ3QxsLuTnGcBLJpCaP2ll3s4eMTBoFnU/CeXY/5rfQSuAEsTGJO4y8A==", "dev": true, "peer": true, "engines": { @@ -24380,22 +24441,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/read-pkg/node_modules/lines-and-columns": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", - "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", - "dev": true, - "peer": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/read-pkg/node_modules/lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.2.tgz", + "integrity": "sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==", "dev": true, "peer": true, + "dependencies": { + "semver": "^7.3.5" + }, "engines": { "node": "14 || >=16.14" } @@ -24417,42 +24471,28 @@ } }, "node_modules/read-pkg/node_modules/parse-json": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz", - "integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.0.1.tgz", + "integrity": "sha512-soKUg/q/8bcfuF3+plsbYldE74cVEVEPSC1BUPIGTaX1byXdz6Fo+CVYBdH0jj/5xWsFrNRksl11QkBgHqPQeQ==", "dev": true, "peer": true, "dependencies": { - "@babel/code-frame": "^7.21.4", - "error-ex": "^1.3.2", + "@babel/code-frame": "^7.22.13", + "index-to-position": "^0.1.1", "json-parse-even-better-errors": "^3.0.0", - "lines-and-columns": "^2.0.3", - "type-fest": "^3.8.0" - }, - "engines": { - "node": ">=16" + "type-fest": "^4.7.1" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg/node_modules/parse-json/node_modules/type-fest": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", - "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", - "dev": true, - "peer": true, "engines": { - "node": ">=14.16" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/read-pkg/node_modules/type-fest": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.6.0.tgz", - "integrity": "sha512-rLjWJzQFOq4xw7MgJrCZ6T1jIOvvYElXT12r+y0CC6u67hegDHaxcPqb2fZHOGlqxugGQPNB1EnTezjBetkwkw==", + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.7.1.tgz", + "integrity": "sha512-iWr8RUmzAJRfhZugX9O7nZE6pCxDU8CZ3QxsLuTnGcBLJpCaP2ll3s4eMTBoFnU/CeXY/5rfQSuAEsTGJO4y8A==", "dev": true, "peer": true, "engines": { @@ -25306,9 +25346,9 @@ } }, "node_modules/semantic-release": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-22.0.6.tgz", - "integrity": "sha512-SxgpGR6b52gaKrb42nnaZWa2h5ig06XlloS3NjUN4W/lRBB8SId4JMaZaxN6Ncb+Ii2Uxd8WO6uvshTSSf8XRg==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-22.0.7.tgz", + "integrity": "sha512-Stx23Hjn7iU8GOAlhG3pHlR7AoNEahj9q7lKBP0rdK2BasGtJ4AWYh3zm1u3SCMuFiA8y4CE/Gu4RGKau1WiaQ==", "dev": true, "peer": true, "dependencies": { @@ -25334,7 +25374,7 @@ "micromatch": "^4.0.2", "p-each-series": "^3.0.0", "p-reduce": "^3.0.0", - "read-pkg-up": "^10.0.0", + "read-pkg-up": "^11.0.0", "resolve-from": "^5.0.0", "semver": "^7.3.2", "semver-diff": "^4.0.0", @@ -25415,13 +25455,13 @@ "peer": true }, "node_modules/semantic-release/node_modules/@octokit/plugin-paginate-rest": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.1.2.tgz", - "integrity": "sha512-euDbNV6fxX6btsCDnZoZM4vw3zO1nj1Z7TskHAulO6mZ9lHoFTpwll6farf+wh31mlBabgU81bBYdflp0GLVAQ==", + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.1.4.tgz", + "integrity": "sha512-MvZx4WvfhBnt7PtH5XE7HORsO7bBk4er1FgRIUr1qJ89NR2I6bWjGyKsxk8z42FPQ34hFQm0Baanh4gzdZR4gQ==", "dev": true, "peer": true, "dependencies": { - "@octokit/types": "^12.1.1" + "@octokit/types": "^12.3.0" }, "engines": { "node": ">= 18" @@ -25466,9 +25506,9 @@ } }, "node_modules/semantic-release/node_modules/@octokit/request": { - "version": "8.1.4", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.4.tgz", - "integrity": "sha512-M0aaFfpGPEKrg7XoA/gwgRvc9MSXHRO2Ioki1qrPDbl1e9YhjIwVoHE7HIKmv/m3idzldj//xBujcFNqGX6ENA==", + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.5.tgz", + "integrity": "sha512-zVKbNbX1xUluD9ZR4/tPs1yuYrK9xeh5fGZUXA6u04XGsTvomg0YO8/ZUC0FqAd49hAOEMFPAVUTh+2lBhOhLA==", "dev": true, "peer": true, "dependencies": { @@ -25498,9 +25538,9 @@ } }, "node_modules/semantic-release/node_modules/@octokit/types": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.1.1.tgz", - "integrity": "sha512-qnJTldJ1NyGT5MTsCg/Zi+y2IFHZ1Jo5+njNCjJ9FcainV7LjuHgmB697kA0g4MjZeDAJsM3B45iqCVsCLVFZg==", + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.3.0.tgz", + "integrity": "sha512-nJ8X2HRr234q3w/FcovDlA+ttUU4m1eJAourvfUUtwAWeqL8AsyRqfnLvVnYn3NFbUnsmzQCzLNdFerPwdmcDQ==", "dev": true, "peer": true, "dependencies": { @@ -25518,9 +25558,9 @@ } }, "node_modules/semantic-release/node_modules/@semantic-release/github": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-9.2.1.tgz", - "integrity": "sha512-fEn9uOe6jwWR6ro2Wh6YNBCBuZ5lRi8Myz+1j3KDTSt8OuUGlpVM4lFac/0bDrql2NOKrIEAMGCfWb9WMIdzIg==", + "version": "9.2.3", + "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-9.2.3.tgz", + "integrity": "sha512-FAjXb1F84CVI6IG8fWi+XS9ErYD+s3MHkP03zBa3+GyUrV4kqwYu/WPppIciHxujGFR51SAWPkOY5rnH6ZlrxA==", "dev": true, "peer": true, "dependencies": { @@ -25532,7 +25572,7 @@ "aggregate-error": "^5.0.0", "debug": "^4.3.4", "dir-glob": "^3.0.1", - "globby": "^13.1.4", + "globby": "^14.0.0", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.0", "issue-parser": "^6.0.0", @@ -25594,6 +25634,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/semantic-release/node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "peer": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, "node_modules/semantic-release/node_modules/figures": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/figures/-/figures-6.0.1.tgz", @@ -25611,20 +25668,21 @@ } }, "node_modules/semantic-release/node_modules/globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz", + "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==", "dev": true, "peer": true, "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", + "@sindresorhus/merge-streams": "^1.0.0", + "fast-glob": "^3.3.2", "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" + "path-type": "^5.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.1.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -25694,11 +25752,14 @@ } }, "node_modules/semantic-release/node_modules/lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.2.tgz", + "integrity": "sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==", "dev": true, "peer": true, + "dependencies": { + "semver": "^7.3.5" + }, "engines": { "node": "14 || >=16.14" } @@ -25768,10 +25829,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/semantic-release/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "node_modules/semantic-release/node_modules/path-type": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", + "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", "dev": true, "peer": true, "engines": { @@ -25781,6 +25842,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/semantic-release/node_modules/slash": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", + "dev": true, + "peer": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/semantic-release/node_modules/url-join": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz", @@ -27866,9 +27940,9 @@ } }, "node_modules/tinymce": { - "version": "5.10.8", - "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.8.tgz", - "integrity": "sha512-iyoo3VGMAJhLMDdblAefKvYgBRk9kQi58GTwAmoieqsyggGsKZWlQl/YY6nTILFHUCA1FhYu0HdmM5YYjs17UQ==" + "version": "5.10.9", + "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.9.tgz", + "integrity": "sha512-5bkrors87X9LhYX2xq8GgPHrIgJYHl87YNs+kBcjQ5I3CiUgzo/vFcGvT3MZQ9QHsEeYMhYO6a5CLGGffR8hMg==" }, "node_modules/tmp": { "version": "0.0.33", @@ -28126,29 +28200,6 @@ "typescript": ">=2.0" } }, - "node_modules/tsconfig-paths": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", - "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", - "dev": true, - "dependencies": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tsconfig-paths/node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", @@ -28552,6 +28603,19 @@ "node": ">=4" } }, + "node_modules/unicorn-magic": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", + "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "dev": true, + "peer": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", @@ -28627,9 +28691,9 @@ } }, "node_modules/universal-user-agent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", - "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", + "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==", "dev": true }, "node_modules/universalify": { @@ -28899,7 +28963,9 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/v8flags": { "version": "3.2.0", @@ -29404,24 +29470,20 @@ } }, "node_modules/webpack-bundle-analyzer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz", - "integrity": "sha512-jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.0.tgz", + "integrity": "sha512-j+apH0Cs+FY8IOIwxLbkgEJnbQgEPEG8uqLVnRb9tAoGbyKNxQA1u9wNDrTQHK3PinO4Pckew7AE7pnX/RS3wA==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "0.5.7", "acorn": "^8.0.4", "acorn-walk": "^8.0.0", "commander": "^7.2.0", + "debounce": "^1.2.1", "escape-string-regexp": "^4.0.0", "gzip-size": "^6.0.0", + "html-escaper": "^2.0.2", "is-plain-object": "^5.0.0", - "lodash.debounce": "^4.0.8", - "lodash.escape": "^4.0.1", - "lodash.flatten": "^4.4.0", - "lodash.invokemap": "^4.6.0", - "lodash.pullall": "^4.2.0", - "lodash.uniqby": "^4.7.0", "opener": "^1.5.2", "picocolors": "^1.0.0", "sirv": "^2.0.3", diff --git a/package.json b/package.json index ea8a4ed8721..afef226432e 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "zone.js": "^0.13.3" }, "devDependencies": { - "@angular-builders/custom-webpack": "^16.0.1", "@angular-devkit/build-angular": "^16.2.6", "@angular/cli": "^16.2.6", "@angular/compiler-cli": "^16.2.9", diff --git a/src/app/domain/componentState.ts b/src/app/domain/componentState.ts index 4098d52e1e0..4d17fd303bd 100644 --- a/src/app/domain/componentState.ts +++ b/src/app/domain/componentState.ts @@ -8,6 +8,13 @@ export class ComponentState { peerGroupId?: number; periodId: number; runId: number; + serverSaveTime?: number; studentData: any; workgroupId: number; + + constructor(jsonObject: any = {}) { + for (const key of Object.keys(jsonObject)) { + this[key] = jsonObject[key]; + } + } } diff --git a/src/app/domain/language.ts b/src/app/domain/language.ts new file mode 100644 index 00000000000..9a73bb4f2a8 --- /dev/null +++ b/src/app/domain/language.ts @@ -0,0 +1,4 @@ +export interface Language { + language: string; + locale: string; +} diff --git a/src/app/domain/localeToLanguage.ts b/src/app/domain/localeToLanguage.ts new file mode 100644 index 00000000000..c66d368e73d --- /dev/null +++ b/src/app/domain/localeToLanguage.ts @@ -0,0 +1,6 @@ +export const localeToLanguage = { + en_US: $localize`English`, + es: $localize`Spanish`, + ja: $localize`Japanese`, + it: $localize`Italian` +}; diff --git a/src/app/domain/projectLocale.ts b/src/app/domain/projectLocale.ts new file mode 100644 index 00000000000..862302fd771 --- /dev/null +++ b/src/app/domain/projectLocale.ts @@ -0,0 +1,39 @@ +import { Language } from './language'; +import { localeToLanguage } from './localeToLanguage'; + +const defaultLocales = { + default: 'en_US', + supported: [] +}; +export class ProjectLocale { + private default: string; + private supported: string[]; + + constructor(locales: any = defaultLocales) { + this.default = locales.default; + this.supported = locales.supported; + } + + getSupportedLanguages(): Language[] { + return this.supported.map((locale) => ({ + language: localeToLanguage[locale], + locale: locale + })); + } + + private hasLocale(locale: string): boolean { + return this.supported.includes(locale); + } + + hasTranslations(): boolean { + return this.supported.length > 1; + } + + hasTranslationsToApply(locale: string): boolean { + return !this.isDefaultLocale(locale) && this.hasLocale(locale); + } + + isDefaultLocale(locale: string): boolean { + return this.default === locale; + } +} diff --git a/src/app/notebook/notebook-item/notebook-item.component.ts b/src/app/notebook/notebook-item/notebook-item.component.ts index 938e3af8212..3e8441110fa 100644 --- a/src/app/notebook/notebook-item/notebook-item.component.ts +++ b/src/app/notebook/notebook-item/notebook-item.component.ts @@ -55,6 +55,10 @@ export class NotebookItemComponent { ); } + ngOnChanges(): void { + this.label = this.config.itemTypes[this.type].label; + } + ngOnDestroy(): void { this.notebookUpdatedSubscription.unsubscribe(); } diff --git a/src/app/notebook/notebook-launcher/notebook-launcher.component.ts b/src/app/notebook/notebook-launcher/notebook-launcher.component.ts index 1e1bd19de70..8d6ffa6f55a 100644 --- a/src/app/notebook/notebook-launcher/notebook-launcher.component.ts +++ b/src/app/notebook/notebook-launcher/notebook-launcher.component.ts @@ -1,5 +1,7 @@ import { Component, Input } from '@angular/core'; import { NotebookService } from '../../../assets/wise5/services/notebookService'; +import { ProjectService } from '../../../assets/wise5/services/projectService'; +import { Subscription } from 'rxjs'; @Component({ selector: 'notebook-launcher', @@ -11,9 +13,20 @@ export class NotebookLauncherComponent { label: string = ''; - constructor(private NotebookService: NotebookService) {} + private subscription: Subscription = new Subscription(); + + constructor(private NotebookService: NotebookService, private projectService: ProjectService) {} ngOnInit(): void { + this.setLabel(); + this.subscription.add(this.projectService.projectParsed$.subscribe(() => this.setLabel())); + } + + ngOnDestroy(): void { + this.subscription.unsubscribe(); + } + + private setLabel(): void { this.label = this.notebookConfig.itemTypes.note.label.link; } diff --git a/src/app/notebook/notebook-notes/notebook-notes.component.ts b/src/app/notebook/notebook-notes/notebook-notes.component.ts index 70f3193ae21..40c86cc97e6 100644 --- a/src/app/notebook/notebook-notes/notebook-notes.component.ts +++ b/src/app/notebook/notebook-notes/notebook-notes.component.ts @@ -37,7 +37,7 @@ export class NotebookNotesComponent extends NotebookParentComponent { ngOnInit(): void { super.ngOnInit(); - this.label = this.config.itemTypes.note.label; + this.setLabel(); this.addPersonalGroupToGroups(); this.addSpacesToGroups(); this.hasPrivateNotes = this.isHasPrivateNotes(); @@ -76,6 +76,13 @@ export class NotebookNotesComponent extends NotebookParentComponent { }) ); + this.subscriptions.add( + this.ProjectService.projectParsed$.subscribe(() => { + this.setConfig(); + this.setLabel(); + }) + ); + this.NotebookService.retrievePublicNotebookItems('public'); } @@ -83,6 +90,10 @@ export class NotebookNotesComponent extends NotebookParentComponent { this.subscriptions.unsubscribe(); } + private setLabel(): void { + this.label = this.config.itemTypes.note.label; + } + isHasPrivateNotes(): boolean { return this.groupNameToGroup['private'].items.some((note) => note.serverDeleteTime == null); } diff --git a/src/app/notebook/notebook-report/notebook-report.component.ts b/src/app/notebook/notebook-report/notebook-report.component.ts index 0b4c4804257..178efd3d989 100644 --- a/src/app/notebook/notebook-report/notebook-report.component.ts +++ b/src/app/notebook/notebook-report/notebook-report.component.ts @@ -56,9 +56,6 @@ export class NotebookReportComponent extends NotebookParentComponent { if (this.mode !== 'classroomMonitor') { this.reportItem.id = null; // set the id to null so it can be inserted as initial version, as opposed to updated. this is true for both new and just-loaded reports. } - this.reportItemContent = this.ProjectService.injectAssetPaths( - replaceWiseLinks(this.reportItem.content.content) - ); this.latestAnnotations = this.AnnotationService.getLatestNotebookItemAnnotations( this.workgroupId, this.reportId @@ -105,6 +102,15 @@ export class NotebookReportComponent extends NotebookParentComponent { } }) ); + + this.subscriptions.add( + this.ProjectService.projectParsed$.subscribe(() => { + if (this.saveTime == null) { + this.setConfig(); + this.setReportItem(); + } + }) + ); } ngOnDestroy(): void { @@ -125,6 +131,11 @@ export class NotebookReportComponent extends NotebookParentComponent { } else { this.reportItem = this.NotebookService.getTemplateReportItemByReportId(this.reportId); } + if (this.reportItem != null) { + this.reportItemContent = this.ProjectService.injectAssetPaths( + replaceWiseLinks(this.reportItem.content.content) + ); + } } calculateHasAnnotation(latestAnnotations: any): boolean { diff --git a/src/app/services/sampleData/curriculum/Demo.project.json b/src/app/services/sampleData/curriculum/Demo.project.json index 01689d1643b..21411f3638c 100644 --- a/src/app/services/sampleData/curriculum/Demo.project.json +++ b/src/app/services/sampleData/curriculum/Demo.project.json @@ -2644,6 +2644,7 @@ }, "metadata": { "title": "Demo Project", + "title.i18nId": "d66d3be571e16cf8d0166286a0a632ec", "authors": [ { "firstName": "g", diff --git a/src/app/services/translateProjectService.spec.ts b/src/app/services/translateProjectService.spec.ts new file mode 100644 index 00000000000..80ecff07edd --- /dev/null +++ b/src/app/services/translateProjectService.spec.ts @@ -0,0 +1,56 @@ +import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module'; +import { TranslateProjectService } from '../../assets/wise5/services/translateProjectService'; +import { ProjectService } from '../../assets/wise5/services/projectService'; +import { ProjectLocale } from '../domain/projectLocale'; +import demoProjectJSON_import from './sampleData/curriculum/Demo.project.json'; +import { copy } from '../../assets/wise5/common/object/object'; +import { ConfigService } from '../../assets/wise5/services/configService'; + +let http: HttpTestingController; +let demoProjectJSON: any; +let configService: ConfigService; +let projectService: ProjectService; +let service: TranslateProjectService; +describe('TranslateProjectService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule] + }); + http = TestBed.inject(HttpTestingController); + demoProjectJSON = copy(demoProjectJSON_import); + configService = TestBed.inject(ConfigService); + projectService = TestBed.inject(ProjectService); + service = TestBed.inject(TranslateProjectService); + spyOn(projectService, 'getOriginalProject').and.returnValue(demoProjectJSON); + }); + describe('translate()', () => { + describe('has no translations to apply', () => { + beforeEach(() => { + spyOn(projectService, 'getLocale').and.returnValue(new ProjectLocale()); + }); + it('should keep original project in tact', () => { + service.translate().subscribe(() => { + expect(projectService.getProjectTitle()).toEqual('Demo Project'); + }); + }); + }); + describe('has translations to apply', () => { + beforeEach(() => { + spyOn(projectService, 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en_US', supported: ['es'] }) + ); + spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json'); + }); + it('should retrieve translation mapping file and translate project', () => { + service.translate('es').subscribe(() => { + expect(projectService.getProjectTitle()).toEqual('Proyecto de demostración'); + }); + http + .expectOne('/123/project.es.json') + .flush({ d66d3be571e16cf8d0166286a0a632ec: 'Proyecto de demostración' }); + }); + }); + }); +}); diff --git a/src/app/student-teacher-common-services.module.ts b/src/app/student-teacher-common-services.module.ts index 5f76f54b8a6..298b451817b 100644 --- a/src/app/student-teacher-common-services.module.ts +++ b/src/app/student-teacher-common-services.module.ts @@ -53,6 +53,7 @@ import { PeerGroupService } from '../assets/wise5/services/peerGroupService'; import { NodeProgressService } from '../assets/wise5/services/nodeProgressService'; import { CompletionService } from '../assets/wise5/services/completionService'; import { StudentNodeService } from '../assets/wise5/services/studentNodeService'; +import { TranslateProjectService } from '../assets/wise5/services/translateProjectService'; @NgModule({ providers: [ @@ -108,6 +109,7 @@ import { StudentNodeService } from '../assets/wise5/services/studentNodeService' TableService, TabulatorDataService, TagService, + TranslateProjectService, VLEProjectService, WiseLinkService ] diff --git a/src/app/student/project-language-chooser/project-language-chooser.component.html b/src/app/student/project-language-chooser/project-language-chooser.component.html new file mode 100644 index 00000000000..af1a789b38b --- /dev/null +++ b/src/app/student/project-language-chooser/project-language-chooser.component.html @@ -0,0 +1,8 @@ +Language: + + + + {{ language.language }} + + + diff --git a/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts b/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts new file mode 100644 index 00000000000..11d6582b8d2 --- /dev/null +++ b/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts @@ -0,0 +1,36 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ProjectLanguageChooserComponent } from './project-language-chooser.component'; +import { StudentTeacherCommonServicesModule } from '../../student-teacher-common-services.module'; +import { ProjectService } from '../../../assets/wise5/services/projectService'; +import { ProjectLocale } from '../../domain/projectLocale'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + +let projectService: ProjectService; +describe('ProjectLanguageChooserComponent', () => { + let component: ProjectLanguageChooserComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ + BrowserAnimationsModule, + HttpClientTestingModule, + ProjectLanguageChooserComponent, + StudentTeacherCommonServicesModule + ] + }).compileComponents(); + projectService = TestBed.inject(ProjectService); + }); + + beforeEach(() => { + spyOn(projectService, 'getLocale').and.returnValue(new ProjectLocale()); + fixture = TestBed.createComponent(ProjectLanguageChooserComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/student/project-language-chooser/project-language-chooser.component.ts b/src/app/student/project-language-chooser/project-language-chooser.component.ts new file mode 100644 index 00000000000..451d25a2943 --- /dev/null +++ b/src/app/student/project-language-chooser/project-language-chooser.component.ts @@ -0,0 +1,36 @@ +import { CommonModule } from '@angular/common'; +import { Component, OnInit } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { TranslateProjectService } from '../../../assets/wise5/services/translateProjectService'; +import { Language } from '../../domain/language'; +import { ProjectService } from '../../../assets/wise5/services/projectService'; + +@Component({ + standalone: true, + selector: 'project-language-chooser', + imports: [CommonModule, FormsModule, MatFormFieldModule, MatSelectModule], + templateUrl: './project-language-chooser.component.html' +}) +export class ProjectLanguageChooserComponent implements OnInit { + protected availableLanguages: Language[]; + protected selectedLanguage: Language; + + constructor( + private projectService: ProjectService, + private translateProjectService: TranslateProjectService + ) {} + + ngOnInit(): void { + const unitLocale = this.projectService.getLocale(); + this.availableLanguages = unitLocale.getSupportedLanguages(); + this.selectedLanguage = this.availableLanguages.find((language) => + unitLocale.isDefaultLocale(language.locale) + ); + } + + protected changeLanguage(): void { + this.translateProjectService.translate(this.selectedLanguage.locale); + } +} diff --git a/src/app/student/top-bar/top-bar.component.html b/src/app/student/top-bar/top-bar.component.html index bb822b04bc3..2f9f606dfc1 100644 --- a/src/app/student/top-bar/top-bar.component.html +++ b/src/app/student/top-bar/top-bar.component.html @@ -25,6 +25,7 @@

{{ projectName }}

Constraints Are Off +
diff --git a/src/assets/wise5/vle/vle.component.ts b/src/assets/wise5/vle/vle.component.ts index 50c70bc5876..f30c5d12498 100644 --- a/src/assets/wise5/vle/vle.component.ts +++ b/src/assets/wise5/vle/vle.component.ts @@ -14,6 +14,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { WiseLinkService } from '../../../app/services/wiseLinkService'; import { convertToPNGFile } from '../common/canvas/canvas'; import { NodeStatusService } from '../services/nodeStatusService'; +import { Node } from '../common/Node'; @Component({ selector: 'vle', @@ -25,15 +26,17 @@ export class VLEComponent implements AfterViewInit { @ViewChild('drawer') public drawer: any; @ViewChild('tabbedVLETemplate') private tabbedVLETemplate: TemplateRef; - currentNode: any; + currentNode: Node; initialized: boolean; layoutState: string; notebookConfig: any; notesEnabled: boolean = false; notesVisible: boolean = false; + project: any; projectStyle: string; reportEnabled: boolean = false; reportFullscreen: boolean = false; + rootNode: any; runEndedAndLocked: boolean; subscriptions: Subscription = new Subscription(); vleTemplate: TemplateRef; @@ -65,6 +68,7 @@ export class VLEComponent implements AfterViewInit { } initRestOfVLE() { + this.setProject(); this.vleTemplate = this.projectService.project.theme === 'tab' ? this.tabbedVLETemplate @@ -98,7 +102,6 @@ export class VLEComponent implements AfterViewInit { // TODO: set these variables dynamically from theme settings this.notebookConfig = this.notebookService.getNotebookConfig(); - this.currentNode = this.studentDataService.getCurrentNode(); this.setLayoutState(); this.initializeSubscriptions(); } @@ -109,6 +112,16 @@ export class VLEComponent implements AfterViewInit { this.sessionService.broadcastExit(); } + private setProject(): void { + this.project = this.projectService.getProject(); + this.rootNode = this.projectService.rootNode; + this.setCurrentNode(); + } + + private setCurrentNode(): void { + this.currentNode = this.projectService.getNode(this.studentDataService.getCurrentNodeId()); + } + @HostListener('window:snip-image', ['$event.detail.target']) snipImage(image: HTMLImageElement): void { this.notebookService.addNote( @@ -135,6 +148,7 @@ export class VLEComponent implements AfterViewInit { this.subscribeToNotesVisible(); this.subscribeToReportFullScreen(); this.subscribeToViewCurrentAmbientNotification(); + this.subscriptions.add(this.projectService.projectParsed$.subscribe(() => this.setProject())); } private subscribeToShowSessionWarning(): void { @@ -162,7 +176,7 @@ export class VLEComponent implements AfterViewInit { private subscribeToCurrentNodeChanged(): void { this.subscriptions.add( this.studentDataService.currentNodeChanged$.subscribe(({ previousNode }) => { - this.currentNode = this.studentDataService.getCurrentNode(); + this.setCurrentNode(); let currentNodeId = this.currentNode.id; this.studentDataService.updateStackHistory(currentNodeId); diff --git a/src/messages.xlf b/src/messages.xlf index 7eec122f49b..1bfea5bc722 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -637,7 +637,7 @@ src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 100 + 96 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -696,7 +696,7 @@ src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 114 + 110 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -803,11 +803,11 @@ src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 127 + 123 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 130 + 126 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -2261,6 +2261,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.138 + + English + + src/app/domain/localeToLanguage.ts + 2 + + + + Spanish + + src/app/domain/localeToLanguage.ts + 3 + + + + Japanese + + src/app/domain/localeToLanguage.ts + 4 + + + + Italian + + src/app/domain/localeToLanguage.ts + 5 + + Elementary School @@ -6221,28 +6249,28 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete this ? src/app/notebook/notebook-item/notebook-item.component.ts - 95 + 99 Delete src/app/notebook/notebook-item/notebook-item.component.ts - 96 + 100 Are you sure you want to revive this ? src/app/notebook/notebook-item/notebook-item.component.ts - 112 + 116 Revive src/app/notebook/notebook-item/notebook-item.component.ts - 113 + 117 @@ -6277,7 +6305,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Personal src/app/notebook/notebook-notes/notebook-notes.component.ts - 92 + 103 @@ -7511,13 +7539,20 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 30 + 26 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 116 + + Language: + + src/app/student/project-language-chooser/project-language-chooser.component.html + 1 + + Add unit @@ -7814,21 +7849,21 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.View alerts src/app/student/top-bar/top-bar.component.html - 34 + 35 Unit percent completed src/app/student/top-bar/top-bar.component.html - 53 + 54 Open Account Menu src/app/student/top-bar/top-bar.component.html - 63 + 64 @@ -9613,7 +9648,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/vle/vle.component.ts - 146 + 160 @@ -9628,7 +9663,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/vle/vle.component.ts - 147 + 161 @@ -13556,7 +13591,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/services/teacherDataService.ts - 604 + 575 @@ -13910,14 +13945,14 @@ Are you sure you want to proceed? Team has not saved any work src/assets/wise5/classroomMonitor/classroomMonitorComponents/workgroup-component-grading/workgroup-component-grading.component.html - 16,18 + 22,24 See revisions src/assets/wise5/classroomMonitor/classroomMonitorComponents/workgroup-component-grading/workgroup-component-grading.component.html - 26 + 32 @@ -14360,49 +14395,49 @@ Are you sure you want to proceed? Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 138 + 140 One Workgroup Per Row src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 161 + 163 Latest Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 163 + 165 All Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 165 + 167 Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 167 + 169 Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 169 + 171 Downloading Export src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 2220 + 2022 @@ -15171,7 +15206,7 @@ Are you sure you want to proceed? src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 65 + 61 @@ -15266,7 +15301,7 @@ Are you sure you want to proceed? src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 62 + 58 @@ -15319,7 +15354,7 @@ Are you sure you want to proceed? src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 103 + 99 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -15357,7 +15392,7 @@ Are you sure you want to proceed? src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 117 + 113 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -18738,7 +18773,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 20 + 16 @@ -18774,7 +18809,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 53 + 49 @@ -19049,18 +19084,18 @@ Warning: This will delete all existing choices in this component. 29 - - Single Answer + + Single Answer src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 12,14 + 12 - - Multiple Answer + + Multiple Answer src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 15,17 + 13 @@ -19068,42 +19103,42 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 38,40 + 34,36 Choice Text src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 47 + 43 Is Correct src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 75 + 71 Is Correct src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 77,79 + 73,75 Feeback src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 84 + 80 Optional src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 90 + 86 @@ -20893,28 +20928,28 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 155 Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 169 Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 170 Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 196 @@ -21124,112 +21159,112 @@ If this problem continues, let your teacher know and move on to the next activit Complete <b></b> src/assets/wise5/services/projectService.ts - 1180 + 1192 Visit <b></b> src/assets/wise5/services/projectService.ts - 1186 + 1198 Correctly answer <b></b> src/assets/wise5/services/projectService.ts - 1192 + 1204 Obtain a score of <b></b> on <b></b> src/assets/wise5/services/projectService.ts - 1207 + 1219 You must choose "" on "" src/assets/wise5/services/projectService.ts - 1215 + 1227 Submit <b></b> time on <b></b> src/assets/wise5/services/projectService.ts - 1227 + 1239 Submit <b></b> times on <b></b> src/assets/wise5/services/projectService.ts - 1229 + 1241 Take the branch path from <b></b> to <b></b> src/assets/wise5/services/projectService.ts - 1236 + 1248 Write <b></b> words on <b></b> src/assets/wise5/services/projectService.ts - 1242 + 1254 "" is visible src/assets/wise5/services/projectService.ts - 1248 + 1260 "" is visitable src/assets/wise5/services/projectService.ts - 1254 + 1266 Add <b></b> note on <b></b> src/assets/wise5/services/projectService.ts - 1261 + 1273 Add <b></b> notes on <b></b> src/assets/wise5/services/projectService.ts - 1263 + 1275 You must fill in <b></b> row in the <b>Table</b> on <b></b> src/assets/wise5/services/projectService.ts - 1270 + 1282 You must fill in <b></b> rows in the <b>Table</b> on <b></b> src/assets/wise5/services/projectService.ts - 1272 + 1284 Wait for your teacher to unlock the item src/assets/wise5/services/projectService.ts - 1275 + 1287 From 6eaebf0e03ffd9295bc30b8a28b03b3e15402b10 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 5 Dec 2023 09:31:02 -0800 Subject: [PATCH 02/90] feat(Edit Project Info): Multiple languages setting (#1546) Allow authors to select default language and supported languages --- package-lock.json | 18 +++ package.json | 1 + src/app/domain/localeToLanguage.ts | 12 +- src/app/domain/projectLocale.ts | 39 ++++--- .../TeacherProjectServiceSpec.project.json | 1 + .../services/translateProjectService.spec.ts | 8 +- ...project-language-chooser.component.spec.ts | 20 +++- .../project-language-chooser.component.ts | 2 +- src/app/teacher/authoring-tool.module.ts | 4 + .../project-info-authoring.component.html | 5 +- ...it-project-language-setting.component.html | 20 ++++ ...it-project-language-setting.component.scss | 0 ...project-language-setting.component.spec.ts | 33 ++++++ ...edit-project-language-setting.component.ts | 46 ++++++++ src/assets/wise5/services/projectService.ts | 4 + src/messages.xlf | 106 ++++++++++++++---- src/style/styles.scss | 1 + 17 files changed, 273 insertions(+), 47 deletions(-) create mode 100644 src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html create mode 100644 src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.scss create mode 100644 src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.spec.ts create mode 100644 src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.ts diff --git a/package-lock.json b/package-lock.json index af51c2deeb7..8241af685ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "@angular/platform-browser": "^16.2.9", "@angular/platform-browser-dynamic": "^16.2.9", "@angular/router": "^16.2.9", + "@ng-select/ng-select": "^11.2.0", "@ng-web-apis/common": "^2.0.1", "@ng-web-apis/intersection-observer": "^3.0.0", "@stomp/rx-stomp": "^1.1.4", @@ -5062,6 +5063,23 @@ "tslib": "^2.1.0" } }, + "node_modules/@ng-select/ng-select": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-11.2.0.tgz", + "integrity": "sha512-lTyw93kFdKGecp9eKmOP0PQSCaAJS8DCt4D60ns055+ixvRSp2fuXAuJUvn1e3gAsvpZor37osmYlOJ4LYwYIA==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">= 16", + "npm": ">= 8" + }, + "peerDependencies": { + "@angular/common": "^16.0.0", + "@angular/core": "^16.0.0", + "@angular/forms": "^16.0.0" + } + }, "node_modules/@ng-web-apis/common": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ng-web-apis/common/-/common-2.2.0.tgz", diff --git a/package.json b/package.json index 1a6965ab2f4..010f7767356 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@angular/platform-browser": "^16.2.9", "@angular/platform-browser-dynamic": "^16.2.9", "@angular/router": "^16.2.9", + "@ng-select/ng-select": "^11.2.0", "@ng-web-apis/common": "^2.0.1", "@ng-web-apis/intersection-observer": "^3.0.0", "@stomp/rx-stomp": "^1.1.4", diff --git a/src/app/domain/localeToLanguage.ts b/src/app/domain/localeToLanguage.ts index c66d368e73d..c18f05d2bbc 100644 --- a/src/app/domain/localeToLanguage.ts +++ b/src/app/domain/localeToLanguage.ts @@ -1,6 +1,12 @@ -export const localeToLanguage = { +export const localeToLanguage: { [locale: string]: string } = { + zh_CN: $localize`Chinese (Simplified)`, + zh_TW: $localize`Chinese (Traditional)`, + nl: $localize`Dutch`, en_US: $localize`English`, - es: $localize`Spanish`, + de: $localize`German`, + it: $localize`Italian`, ja: $localize`Japanese`, - it: $localize`Italian` + ko: $localize`Korean`, + es: $localize`Spanish`, + vi: $localize`Vietnamese` }; diff --git a/src/app/domain/projectLocale.ts b/src/app/domain/projectLocale.ts index 862302fd771..a6e3846cded 100644 --- a/src/app/domain/projectLocale.ts +++ b/src/app/domain/projectLocale.ts @@ -1,32 +1,45 @@ import { Language } from './language'; import { localeToLanguage } from './localeToLanguage'; -const defaultLocales = { - default: 'en_US', - supported: [] -}; export class ProjectLocale { - private default: string; - private supported: string[]; + private locale: { default: string; supported: string[] }; - constructor(locales: any = defaultLocales) { - this.default = locales.default; - this.supported = locales.supported; + constructor(locale: any) { + this.locale = locale; + } + + getAvailableLanguages(): Language[] { + return [this.getDefaultLanguage()].concat(this.getSupportedLanguages()); + } + + getDefaultLanguage(): Language { + return { language: localeToLanguage[this.locale.default], locale: this.locale.default }; + } + + setDefaultLocale(locale: string): void { + this.locale.default = locale; + this.locale.supported = this.locale.supported.filter( + (supportedLocale) => supportedLocale != locale + ); } getSupportedLanguages(): Language[] { - return this.supported.map((locale) => ({ + return this.locale.supported.map((locale) => ({ language: localeToLanguage[locale], locale: locale })); } + setSupportedLanguages(languages: Language[]): void { + this.locale.supported = languages.map((language) => language.locale); + } + private hasLocale(locale: string): boolean { - return this.supported.includes(locale); + return this.locale.supported.includes(locale); } hasTranslations(): boolean { - return this.supported.length > 1; + return this.locale.supported.length > 0; } hasTranslationsToApply(locale: string): boolean { @@ -34,6 +47,6 @@ export class ProjectLocale { } isDefaultLocale(locale: string): boolean { - return this.default === locale; + return this.locale.default === locale; } } diff --git a/src/app/services/sampleData/curriculum/TeacherProjectServiceSpec.project.json b/src/app/services/sampleData/curriculum/TeacherProjectServiceSpec.project.json index bd80120f958..89021c0d7b9 100644 --- a/src/app/services/sampleData/curriculum/TeacherProjectServiceSpec.project.json +++ b/src/app/services/sampleData/curriculum/TeacherProjectServiceSpec.project.json @@ -1,6 +1,7 @@ { "startGroupId": "group0", "startNodeId": "node1", + "metadata": {}, "nodes": [ { "id": "group0", diff --git a/src/app/services/translateProjectService.spec.ts b/src/app/services/translateProjectService.spec.ts index 80ecff07edd..2476f22d560 100644 --- a/src/app/services/translateProjectService.spec.ts +++ b/src/app/services/translateProjectService.spec.ts @@ -28,10 +28,12 @@ describe('TranslateProjectService', () => { describe('translate()', () => { describe('has no translations to apply', () => { beforeEach(() => { - spyOn(projectService, 'getLocale').and.returnValue(new ProjectLocale()); + spyOn(projectService, 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en_US', supported: [] }) + ); }); it('should keep original project in tact', () => { - service.translate().subscribe(() => { + service.translate().then(() => { expect(projectService.getProjectTitle()).toEqual('Demo Project'); }); }); @@ -44,7 +46,7 @@ describe('TranslateProjectService', () => { spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json'); }); it('should retrieve translation mapping file and translate project', () => { - service.translate('es').subscribe(() => { + service.translate('es').then(() => { expect(projectService.getProjectTitle()).toEqual('Proyecto de demostración'); }); http diff --git a/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts b/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts index 11d6582b8d2..f69b2ad36cd 100644 --- a/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts +++ b/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts @@ -5,11 +5,15 @@ import { StudentTeacherCommonServicesModule } from '../../student-teacher-common import { ProjectService } from '../../../assets/wise5/services/projectService'; import { ProjectLocale } from '../../domain/projectLocale'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { HarnessLoader } from '@angular/cdk/testing'; +import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; +import { MatSelectHarness } from '@angular/material/select/testing'; let projectService: ProjectService; describe('ProjectLanguageChooserComponent', () => { let component: ProjectLanguageChooserComponent; let fixture: ComponentFixture; + let loader: HarnessLoader; beforeEach(async () => { await TestBed.configureTestingModule({ @@ -24,13 +28,23 @@ describe('ProjectLanguageChooserComponent', () => { }); beforeEach(() => { - spyOn(projectService, 'getLocale').and.returnValue(new ProjectLocale()); + spyOn(projectService, 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en_US', supported: ['ja', 'es'] }) + ); fixture = TestBed.createComponent(ProjectLanguageChooserComponent); + loader = TestbedHarnessEnvironment.loader(fixture); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { - expect(component).toBeTruthy(); + it('shows available languages', async () => { + const selects = await loader.getAllHarnesses(MatSelectHarness); + const selectComponent = selects[0]; + await selectComponent.open(); + const options = await selectComponent.getOptions(); + expect(options.length).toEqual(3); + expect(await options[0].getText()).toMatch('English'); + expect(await options[1].getText()).toMatch('Japanese'); + expect(await options[2].getText()).toMatch('Spanish'); }); }); diff --git a/src/app/student/project-language-chooser/project-language-chooser.component.ts b/src/app/student/project-language-chooser/project-language-chooser.component.ts index 451d25a2943..617f03e3433 100644 --- a/src/app/student/project-language-chooser/project-language-chooser.component.ts +++ b/src/app/student/project-language-chooser/project-language-chooser.component.ts @@ -24,7 +24,7 @@ export class ProjectLanguageChooserComponent implements OnInit { ngOnInit(): void { const unitLocale = this.projectService.getLocale(); - this.availableLanguages = unitLocale.getSupportedLanguages(); + this.availableLanguages = unitLocale.getAvailableLanguages(); this.selectedLanguage = this.availableLanguages.find((language) => unitLocale.isDefaultLocale(language.locale) ); diff --git a/src/app/teacher/authoring-tool.module.ts b/src/app/teacher/authoring-tool.module.ts index 5cd193731a8..a1912f53f9b 100644 --- a/src/app/teacher/authoring-tool.module.ts +++ b/src/app/teacher/authoring-tool.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { NgSelectModule } from '@ng-select/ng-select'; import { AddYourOwnNode } from '../../assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component'; import { ChooseNewNodeLocation } from '../../assets/wise5/authoringTool/addNode/choose-new-node-location/choose-new-node-location.component'; import { ChooseNewNodeTemplate } from '../../assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component'; @@ -56,6 +57,7 @@ import { ComponentTypeButtonComponent } from '../../assets/wise5/authoringTool/c import { ComponentInfoDialogComponent } from '../../assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component'; import { ComponentTypeSelectorComponent } from '../../assets/wise5/authoringTool/components/component-type-selector/component-type-selector.component'; import { EditNodeTitleComponent } from '../../assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component'; +import { EditProjectLanguageSettingComponent } from '../../assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component'; import { AddComponentButtonComponent } from '../../assets/wise5/authoringTool/node/add-component-button/add-component-button.component'; @NgModule({ @@ -87,6 +89,7 @@ import { AddComponentButtonComponent } from '../../assets/wise5/authoringTool/no ConcurrentAuthorsMessageComponent, ConfigureAutomatedAssessmentComponent, EditNodeTitleComponent, + EditProjectLanguageSettingComponent, InsertNodeAfterButtonComponent, InsertNodeInsideButtonComponent, MilestonesAuthoringComponent, @@ -113,6 +116,7 @@ import { AddComponentButtonComponent } from '../../assets/wise5/authoringTool/no MatBadgeModule, MatChipsModule, ImportComponentModule, + NgSelectModule, NodeAdvancedAuthoringModule, PreviewComponentModule, ProjectAssetAuthoringModule, diff --git a/src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html b/src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html index 104e922a9d7..204472394ae 100644 --- a/src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html +++ b/src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html @@ -52,7 +52,10 @@ (ngModelChange)="metadataChanged.next()" /> - + + diff --git a/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html b/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html new file mode 100644 index 00000000000..6fe1e62558c --- /dev/null +++ b/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html @@ -0,0 +1,20 @@ +

Language

+Default language: + + +Additional languages: + + diff --git a/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.scss b/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.spec.ts b/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.spec.ts new file mode 100644 index 00000000000..ecd4a4f58a1 --- /dev/null +++ b/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NgSelectModule } from '@ng-select/ng-select'; +import { EditProjectLanguageSettingComponent } from './edit-project-language-setting.component'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { ProjectLocale } from '../../../../../app/domain/projectLocale'; +import { FormsModule } from '@angular/forms'; + +class MockTeacherProjectService { + getLocale() {} + saveProject() {} +} +describe('EditProjectLanguageSettingComponent', () => { + let component: EditProjectLanguageSettingComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [EditProjectLanguageSettingComponent], + imports: [FormsModule, NgSelectModule], + providers: [{ provide: TeacherProjectService, useClass: MockTeacherProjectService }] + }); + fixture = TestBed.createComponent(EditProjectLanguageSettingComponent); + component = fixture.componentInstance; + spyOn(TestBed.inject(TeacherProjectService), 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en_US', supported: [] }) + ); + fixture.detectChanges(); + }); + + it('creates', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.ts b/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.ts new file mode 100644 index 00000000000..4bd26f05117 --- /dev/null +++ b/src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.ts @@ -0,0 +1,46 @@ +import { Component } from '@angular/core'; +import { Language } from '../../../../../app/domain/language'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { ProjectLocale } from '../../../../../app/domain/projectLocale'; +import { localeToLanguage } from '../../../../../app/domain/localeToLanguage'; + +@Component({ + selector: 'edit-project-language-setting', + templateUrl: './edit-project-language-setting.component.html' +}) +export class EditProjectLanguageSettingComponent { + protected availableLanguages: Language[]; + protected defaultLanguage: Language; + private projectLocale: ProjectLocale; + protected supportedLanguages: Language[]; + + constructor(private projectService: TeacherProjectService) {} + + ngOnInit(): void { + this.updateModel(); + } + + private updateModel(): void { + this.projectLocale = this.projectService.getLocale(); + this.defaultLanguage = this.projectLocale.getDefaultLanguage(); + this.supportedLanguages = this.projectLocale.getSupportedLanguages(); + this.availableLanguages = Object.entries(localeToLanguage) + .map(([locale, language]) => ({ + locale: locale, + language: language + })) + .filter((language) => language.locale != this.defaultLanguage.locale); + } + + protected updateDefaultLanguage(): void { + this.projectLocale.setDefaultLocale(this.defaultLanguage.locale); + this.projectService.saveProject(); + this.updateModel(); + } + + protected updateSupportedLanguages(): void { + this.projectLocale.setSupportedLanguages(this.supportedLanguages); + this.projectService.saveProject(); + this.updateModel(); + } +} diff --git a/src/assets/wise5/services/projectService.ts b/src/assets/wise5/services/projectService.ts index b9b436412d3..354013f666d 100644 --- a/src/assets/wise5/services/projectService.ts +++ b/src/assets/wise5/services/projectService.ts @@ -237,6 +237,10 @@ export class ProjectService { instantiateDefaults(): void { this.project.nodes = this.project.nodes ? this.project.nodes : []; this.project.inactiveNodes = this.project.inactiveNodes ? this.project.inactiveNodes : []; + this.project.metadata.locale = this.project.metadata.locale ?? { + default: 'en_US', + supported: [] + }; } private calculateNodeOrderOfProject(): void { diff --git a/src/messages.xlf b/src/messages.xlf index 81d3df56e35..7a2fb192dfd 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -2265,32 +2265,74 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.138 - - English + + Chinese (Simplified) src/app/domain/localeToLanguage.ts 2 - - Spanish + + Chinese (Traditional) src/app/domain/localeToLanguage.ts 3 - - Japanese + + Dutch src/app/domain/localeToLanguage.ts 4 + + English + + src/app/domain/localeToLanguage.ts + 5 + + + + German + + src/app/domain/localeToLanguage.ts + 6 + + Italian src/app/domain/localeToLanguage.ts - 5 + 7 + + + + Japanese + + src/app/domain/localeToLanguage.ts + 8 + + + + Korean + + src/app/domain/localeToLanguage.ts + 9 + + + + Spanish + + src/app/domain/localeToLanguage.ts + 10 + + + + Vietnamese + + src/app/domain/localeToLanguage.ts + 11 @@ -7392,6 +7434,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/teacher/account/edit-profile/edit-profile.component.html 109 + + src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html + 1 + Language required @@ -12268,6 +12314,20 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.22,24 + + Default language: + + src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html + 2 + + + + Additional languages: + + src/assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component.html + 11 + + Back to Teacher Home @@ -21168,112 +21228,112 @@ If this problem continues, let your teacher know and move on to the next activit Complete <b></b> src/assets/wise5/services/projectService.ts - 1192 + 1196 Visit <b></b> src/assets/wise5/services/projectService.ts - 1198 + 1202 Correctly answer <b></b> src/assets/wise5/services/projectService.ts - 1204 + 1208 Obtain a score of <b></b> on <b></b> src/assets/wise5/services/projectService.ts - 1219 + 1223 You must choose "" on "" src/assets/wise5/services/projectService.ts - 1227 + 1231 Submit <b></b> time on <b></b> src/assets/wise5/services/projectService.ts - 1239 + 1243 Submit <b></b> times on <b></b> src/assets/wise5/services/projectService.ts - 1241 + 1245 Take the branch path from <b></b> to <b></b> src/assets/wise5/services/projectService.ts - 1248 + 1252 Write <b></b> words on <b></b> src/assets/wise5/services/projectService.ts - 1254 + 1258 "" is visible src/assets/wise5/services/projectService.ts - 1260 + 1264 "" is visitable src/assets/wise5/services/projectService.ts - 1266 + 1270 Add <b></b> note on <b></b> src/assets/wise5/services/projectService.ts - 1273 + 1277 Add <b></b> notes on <b></b> src/assets/wise5/services/projectService.ts - 1275 + 1279 You must fill in <b></b> row in the <b>Table</b> on <b></b> src/assets/wise5/services/projectService.ts - 1282 + 1286 You must fill in <b></b> rows in the <b>Table</b> on <b></b> src/assets/wise5/services/projectService.ts - 1284 + 1288 Wait for your teacher to unlock the item src/assets/wise5/services/projectService.ts - 1287 + 1291 diff --git a/src/style/styles.scss b/src/style/styles.scss index a9ff04bd1ed..62cae66dc2f 100644 --- a/src/style/styles.scss +++ b/src/style/styles.scss @@ -63,6 +63,7 @@ @import 'themes/dark'; @import 'themes/author'; @import 'themes/monitor'; +@import "~@ng-select/ng-select/themes/material.theme.css"; // TODO: remove/merge after upgrading apps to Angular @import 'themes/apps'; From 30e982cb41b95039be3905538cbad8f17a379a02 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 5 Dec 2023 10:40:46 -0800 Subject: [PATCH 03/90] Multiple languages: Change i18nId string to i18n object (#1548) - Change i18nId: string to i18n: { id: string, modified: number } - Rename translation files from project.es.json -> translations.es.json --- src/assets/wise5/services/translateProjectService.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/assets/wise5/services/translateProjectService.ts b/src/assets/wise5/services/translateProjectService.ts index 14b5cd4bf74..8e8db7fb9bd 100644 --- a/src/assets/wise5/services/translateProjectService.ts +++ b/src/assets/wise5/services/translateProjectService.ts @@ -38,17 +38,19 @@ export class TranslateProjectService { } private getTranslationMappingURL(locale: string): string { - return this.configService.getConfigParam('projectURL').replace('.json', `.${locale}.json`); + return this.configService + .getConfigParam('projectURL') + .replace('project.json', `translations.${locale}.json`); } private applyTranslations(projectElement: any, translations: any): void { Object.keys(projectElement) - .filter((key) => key.endsWith('.i18nId')) + .filter((key) => key.endsWith('.i18n')) .forEach((key) => { - const translationKey = projectElement[key]; + const translationKey = projectElement[key].id; if (translations[translationKey]) { - const keyWithoutI18NId = key.substring(0, key.lastIndexOf('.i18nId')); - projectElement[keyWithoutI18NId] = translations[translationKey]; + const keyWithoutI18NId = key.substring(0, key.lastIndexOf('.i18n')); + projectElement[keyWithoutI18NId] = translations[translationKey].value; } }); Object.values(projectElement).forEach((value) => { From 7cf802249151a98e45f6699d945a17fb2a14ed2a Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 5 Dec 2023 14:09:50 -0800 Subject: [PATCH 04/90] Update unit tests to reflect new i18n content structure changes --- src/app/services/sampleData/curriculum/Demo.project.json | 2 +- src/app/services/translateProjectService.spec.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/services/sampleData/curriculum/Demo.project.json b/src/app/services/sampleData/curriculum/Demo.project.json index 21411f3638c..44d13c2d429 100644 --- a/src/app/services/sampleData/curriculum/Demo.project.json +++ b/src/app/services/sampleData/curriculum/Demo.project.json @@ -2644,7 +2644,7 @@ }, "metadata": { "title": "Demo Project", - "title.i18nId": "d66d3be571e16cf8d0166286a0a632ec", + "title.i18n": { "id": "d66d3be571e16cf8d0166286a0a632ec", "modified": 123 }, "authors": [ { "firstName": "g", diff --git a/src/app/services/translateProjectService.spec.ts b/src/app/services/translateProjectService.spec.ts index 2476f22d560..bf1855b4ee1 100644 --- a/src/app/services/translateProjectService.spec.ts +++ b/src/app/services/translateProjectService.spec.ts @@ -49,9 +49,9 @@ describe('TranslateProjectService', () => { service.translate('es').then(() => { expect(projectService.getProjectTitle()).toEqual('Proyecto de demostración'); }); - http - .expectOne('/123/project.es.json') - .flush({ d66d3be571e16cf8d0166286a0a632ec: 'Proyecto de demostración' }); + http.expectOne('/123/translations.es.json').flush({ + d66d3be571e16cf8d0166286a0a632ec: { value: 'Proyecto de demostración', modified: 456 } + }); }); }); }); From 8b22cc2abdc73a5e52b769bdec412befa02602a8 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 12 Dec 2023 11:58:01 -0800 Subject: [PATCH 05/90] feat(Multiple Languages): Show ProjectLanguageChooser in AT (#1550) - Change ProjectLanguageChooser to take in ProjectLocale as input and emit selected Language as output. This will let us reuse this component in the AT. - Move ProjectLanguageChooser to common folder and show it in the AT's TopBarComponent. Update options when author changes them in the Project info view --- .../project-language-chooser.component.html | 6 +- ...project-language-chooser.component.spec.ts | 55 +++++++++++++++++++ .../project-language-chooser.component.ts | 34 ++++++++++++ src/app/domain/projectLocale.ts | 10 ++-- ...project-language-chooser.component.spec.ts | 50 ----------------- .../project-language-chooser.component.ts | 36 ------------ .../student/top-bar/top-bar.component.html | 6 +- src/app/student/top-bar/top-bar.component.ts | 14 ++++- src/app/student/top-bar/top-bar.module.ts | 2 +- src/app/teacher/authoring-tool.module.ts | 2 + .../components/top-bar/top-bar.component.html | 5 ++ .../top-bar/top-bar.component.spec.ts | 4 ++ .../components/top-bar/top-bar.component.ts | 21 +++++++ src/messages.xlf | 34 ++++++------ 14 files changed, 166 insertions(+), 113 deletions(-) rename src/app/{student => common}/project-language-chooser/project-language-chooser.component.html (60%) create mode 100644 src/app/common/project-language-chooser/project-language-chooser.component.spec.ts create mode 100644 src/app/common/project-language-chooser/project-language-chooser.component.ts delete mode 100644 src/app/student/project-language-chooser/project-language-chooser.component.spec.ts delete mode 100644 src/app/student/project-language-chooser/project-language-chooser.component.ts diff --git a/src/app/student/project-language-chooser/project-language-chooser.component.html b/src/app/common/project-language-chooser/project-language-chooser.component.html similarity index 60% rename from src/app/student/project-language-chooser/project-language-chooser.component.html rename to src/app/common/project-language-chooser/project-language-chooser.component.html index af1a789b38b..8fb7f625cd5 100644 --- a/src/app/student/project-language-chooser/project-language-chooser.component.html +++ b/src/app/common/project-language-chooser/project-language-chooser.component.html @@ -1,6 +1,10 @@ Language: - + {{ language.language }} diff --git a/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts b/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts new file mode 100644 index 00000000000..1ca38e7340a --- /dev/null +++ b/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts @@ -0,0 +1,55 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ProjectLanguageChooserComponent } from './project-language-chooser.component'; +import { ProjectLocale } from '../../domain/projectLocale'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { HarnessLoader } from '@angular/cdk/testing'; +import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; +import { MatSelectHarness } from '@angular/material/select/testing'; +import { MatOptionHarness } from '@angular/material/core/testing'; + +let loader: HarnessLoader; +let component: ProjectLanguageChooserComponent; +let fixture: ComponentFixture; +describe('ProjectLanguageChooserComponent', () => { + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [BrowserAnimationsModule, HttpClientTestingModule, ProjectLanguageChooserComponent] + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ProjectLanguageChooserComponent); + loader = TestbedHarnessEnvironment.loader(fixture); + component = fixture.componentInstance; + setProjectLocale(new ProjectLocale({ default: 'en_US', supported: ['ja', 'es'] })); + }); + + it('shows available languages and selects the default language', async () => { + const options = await getOptions(); + expect(options.length).toEqual(3); + expect(await options[0].getText()).toMatch('English'); + expect(await options[1].getText()).toMatch('Japanese'); + expect(await options[2].getText()).toMatch('Spanish'); + expect(await options[0].isSelected()).toBeTrue(); + }); + + it('keeps selected language option when language option changes', async () => { + const selectHarness = await loader.getHarness(MatSelectHarness); + await selectHarness.clickOptions({ text: 'Japanese' }); + setProjectLocale(new ProjectLocale({ default: 'it', supported: ['de', 'fr', 'ja', 'es'] })); + expect(await selectHarness.getValueText()).toEqual('Japanese'); + }); +}); + +function setProjectLocale(locale: ProjectLocale): void { + component.projectLocale = locale; + component.ngOnChanges(); + fixture.detectChanges(); +} + +async function getOptions(): Promise { + const selectHarness = await loader.getHarness(MatSelectHarness); + await selectHarness.open(); + return await selectHarness.getOptions(); +} diff --git a/src/app/common/project-language-chooser/project-language-chooser.component.ts b/src/app/common/project-language-chooser/project-language-chooser.component.ts new file mode 100644 index 00000000000..e3801d21a2a --- /dev/null +++ b/src/app/common/project-language-chooser/project-language-chooser.component.ts @@ -0,0 +1,34 @@ +import { CommonModule } from '@angular/common'; +import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { Language } from '../../domain/language'; +import { ProjectLocale } from '../../domain/projectLocale'; + +@Component({ + standalone: true, + selector: 'project-language-chooser', + imports: [CommonModule, FormsModule, MatFormFieldModule, MatSelectModule], + templateUrl: './project-language-chooser.component.html' +}) +export class ProjectLanguageChooserComponent implements OnChanges { + protected availableLanguages: Language[]; + @Output() languageChangedEvent = new EventEmitter(); + @Input() projectLocale: ProjectLocale; + protected selectedLanguage: Language; + + ngOnChanges(): void { + this.availableLanguages = this.projectLocale.getAvailableLanguages(); + if ( + this.selectedLanguage == null || + !this.availableLanguages.some((lang) => lang.locale === this.selectedLanguage.locale) + ) { + this.selectedLanguage = this.projectLocale.getDefaultLanguage(); + } + } + + protected isSameLanguage(lang1: Language, lang2: Language): boolean { + return lang1 && lang2 ? lang1.locale === lang2.locale : lang1 === lang2; + } +} diff --git a/src/app/domain/projectLocale.ts b/src/app/domain/projectLocale.ts index a6e3846cded..0e4b67a406e 100644 --- a/src/app/domain/projectLocale.ts +++ b/src/app/domain/projectLocale.ts @@ -34,10 +34,6 @@ export class ProjectLocale { this.locale.supported = languages.map((language) => language.locale); } - private hasLocale(locale: string): boolean { - return this.locale.supported.includes(locale); - } - hasTranslations(): boolean { return this.locale.supported.length > 0; } @@ -46,7 +42,11 @@ export class ProjectLocale { return !this.isDefaultLocale(locale) && this.hasLocale(locale); } - isDefaultLocale(locale: string): boolean { + private isDefaultLocale(locale: string): boolean { return this.locale.default === locale; } + + private hasLocale(locale: string): boolean { + return this.locale.supported.includes(locale); + } } diff --git a/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts b/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts deleted file mode 100644 index f69b2ad36cd..00000000000 --- a/src/app/student/project-language-chooser/project-language-chooser.component.spec.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ProjectLanguageChooserComponent } from './project-language-chooser.component'; -import { StudentTeacherCommonServicesModule } from '../../student-teacher-common-services.module'; -import { ProjectService } from '../../../assets/wise5/services/projectService'; -import { ProjectLocale } from '../../domain/projectLocale'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { HarnessLoader } from '@angular/cdk/testing'; -import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; - -let projectService: ProjectService; -describe('ProjectLanguageChooserComponent', () => { - let component: ProjectLanguageChooserComponent; - let fixture: ComponentFixture; - let loader: HarnessLoader; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ - BrowserAnimationsModule, - HttpClientTestingModule, - ProjectLanguageChooserComponent, - StudentTeacherCommonServicesModule - ] - }).compileComponents(); - projectService = TestBed.inject(ProjectService); - }); - - beforeEach(() => { - spyOn(projectService, 'getLocale').and.returnValue( - new ProjectLocale({ default: 'en_US', supported: ['ja', 'es'] }) - ); - fixture = TestBed.createComponent(ProjectLanguageChooserComponent); - loader = TestbedHarnessEnvironment.loader(fixture); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('shows available languages', async () => { - const selects = await loader.getAllHarnesses(MatSelectHarness); - const selectComponent = selects[0]; - await selectComponent.open(); - const options = await selectComponent.getOptions(); - expect(options.length).toEqual(3); - expect(await options[0].getText()).toMatch('English'); - expect(await options[1].getText()).toMatch('Japanese'); - expect(await options[2].getText()).toMatch('Spanish'); - }); -}); diff --git a/src/app/student/project-language-chooser/project-language-chooser.component.ts b/src/app/student/project-language-chooser/project-language-chooser.component.ts deleted file mode 100644 index 617f03e3433..00000000000 --- a/src/app/student/project-language-chooser/project-language-chooser.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { Component, OnInit } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatSelectModule } from '@angular/material/select'; -import { TranslateProjectService } from '../../../assets/wise5/services/translateProjectService'; -import { Language } from '../../domain/language'; -import { ProjectService } from '../../../assets/wise5/services/projectService'; - -@Component({ - standalone: true, - selector: 'project-language-chooser', - imports: [CommonModule, FormsModule, MatFormFieldModule, MatSelectModule], - templateUrl: './project-language-chooser.component.html' -}) -export class ProjectLanguageChooserComponent implements OnInit { - protected availableLanguages: Language[]; - protected selectedLanguage: Language; - - constructor( - private projectService: ProjectService, - private translateProjectService: TranslateProjectService - ) {} - - ngOnInit(): void { - const unitLocale = this.projectService.getLocale(); - this.availableLanguages = unitLocale.getAvailableLanguages(); - this.selectedLanguage = this.availableLanguages.find((language) => - unitLocale.isDefaultLocale(language.locale) - ); - } - - protected changeLanguage(): void { - this.translateProjectService.translate(this.selectedLanguage.locale); - } -} diff --git a/src/app/student/top-bar/top-bar.component.html b/src/app/student/top-bar/top-bar.component.html index 2f9f606dfc1..9f96fa6ecd3 100644 --- a/src/app/student/top-bar/top-bar.component.html +++ b/src/app/student/top-bar/top-bar.component.html @@ -25,7 +25,11 @@

{{ projectName }}

Constraints Are Off
- +
- - Source Bucket Name - - + + + Source Bucket Name + + +
Target Buckets
- - Feeback - - + + + Feeback + + + + + + diff --git a/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts b/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts index 1ca38e7340a..4570b608d1c 100644 --- a/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts +++ b/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts @@ -5,8 +5,7 @@ import { ProjectLocale } from '../../domain/projectLocale'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectHarness } from '@angular/material/select/testing'; -import { MatOptionHarness } from '@angular/material/core/testing'; +import { MatMenuHarness, MatMenuItemHarness } from '@angular/material/menu/testing'; let loader: HarnessLoader; let component: ProjectLanguageChooserComponent; @@ -31,14 +30,17 @@ describe('ProjectLanguageChooserComponent', () => { expect(await options[0].getText()).toMatch('English'); expect(await options[1].getText()).toMatch('Japanese'); expect(await options[2].getText()).toMatch('Spanish'); - expect(await options[0].isSelected()).toBeTrue(); + const selected = await options[0].host(); + expect(await selected.getAttribute('class')).toContain('primary'); }); it('keeps selected language option when language option changes', async () => { - const selectHarness = await loader.getHarness(MatSelectHarness); - await selectHarness.clickOptions({ text: 'Japanese' }); + const menuHarness = await loader.getHarness(MatMenuHarness); + await menuHarness.clickItem({ text: 'Japanese' }); setProjectLocale(new ProjectLocale({ default: 'it', supported: ['de', 'fr', 'ja', 'es'] })); - expect(await selectHarness.getValueText()).toEqual('Japanese'); + const options = await getOptions(); + const selected = await options[3].host(); + expect(await selected.getAttribute('class')).toContain('primary'); }); }); @@ -48,8 +50,8 @@ function setProjectLocale(locale: ProjectLocale): void { fixture.detectChanges(); } -async function getOptions(): Promise { - const selectHarness = await loader.getHarness(MatSelectHarness); - await selectHarness.open(); - return await selectHarness.getOptions(); +async function getOptions(): Promise { + const menuHarness = await loader.getHarness(MatMenuHarness); + await menuHarness.open(); + return await menuHarness.getItems(); } diff --git a/src/app/common/project-language-chooser/project-language-chooser.component.ts b/src/app/common/project-language-chooser/project-language-chooser.component.ts index e3801d21a2a..f3e39012402 100644 --- a/src/app/common/project-language-chooser/project-language-chooser.component.ts +++ b/src/app/common/project-language-chooser/project-language-chooser.component.ts @@ -1,15 +1,16 @@ import { CommonModule } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatSelectModule } from '@angular/material/select'; import { Language } from '../../domain/language'; import { ProjectLocale } from '../../domain/projectLocale'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatIconModule } from '@angular/material/icon'; +import { MatButtonModule } from '@angular/material/button'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ standalone: true, selector: 'project-language-chooser', - imports: [CommonModule, FormsModule, MatFormFieldModule, MatSelectModule], + imports: [CommonModule, MatButtonModule, MatIconModule, MatMenuModule, MatTooltipModule], templateUrl: './project-language-chooser.component.html' }) export class ProjectLanguageChooserComponent implements OnChanges { @@ -28,7 +29,8 @@ export class ProjectLanguageChooserComponent implements OnChanges { } } - protected isSameLanguage(lang1: Language, lang2: Language): boolean { - return lang1 && lang2 ? lang1.locale === lang2.locale : lang1 === lang2; + protected changeLanguage(language: Language): void { + this.selectedLanguage = language; + this.languageChangedEvent.emit(language); } } diff --git a/src/app/student/top-bar/top-bar.component.html b/src/app/student/top-bar/top-bar.component.html index 9f96fa6ecd3..ecc1d68007e 100644 --- a/src/app/student/top-bar/top-bar.component.html +++ b/src/app/student/top-bar/top-bar.component.html @@ -25,29 +25,27 @@

{{ projectName }}

Constraints Are Off
- -
-
- -
+
- - - Source Bucket Name - - - +
Target Buckets
- - - Feeback - - - + +
-
-
- - -
-
- - Include Student Work - -
-
- - Include Student Names - -
-
- - Include Annotations - -
-
- - Include Events - -
-
Include Names
- - - Export All Steps - - - Select Steps To Export - -
-
-
- - -
-
-

{{ project.metadata.title }}

- -
+ @@ -323,7 +246,7 @@

{{ project.metadata.title }}

Cancel
-
+ diff --git a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.scss b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.scss index d35d08b92da..415f49bde50 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.scss +++ b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.scss @@ -2,8 +2,3 @@ margin-top: 10px; margin-bottom: 10px; } - -.select-steps-radio-buttons-container { - margin-top: 10px; - margin-bottom: 10px; -} \ No newline at end of file diff --git a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.spec.ts b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.spec.ts index f6ee8216b4b..5f5815b5c60 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.spec.ts @@ -61,8 +61,6 @@ describe('DataExportComponent', () => { }); setExportType(); - selectAll(); - deselectAll(); }); function setExportType() { @@ -75,28 +73,6 @@ function setExportType() { }); } -function selectAll() { - describe('selectAll', () => { - it('should select all', () => { - component.selectAll(); - for (let i = 1; i < component.nodes.length; i++) { - expect(component.nodes[i].checked).toEqual(true); - } - }); - }); -} - -function deselectAll() { - describe('deselectAll', () => { - it('should deselect all', () => { - component.deselectAll(); - for (let i = 1; i < component.nodes.length; i++) { - expect(component.nodes[i].checked).toEqual(false); - } - }); - }); -} - function createProjectItem(node: any, order: number) { return { node: node, diff --git a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts index ed13c1a0dbb..11ca8c5a339 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts +++ b/src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts @@ -13,7 +13,6 @@ import { NotebookDataExportStrategy } from '../strategies/NotebookDataExportStra import { NotificationDataExportStrategy } from '../strategies/NotificationDataExportStrategy'; import { StudentAssetDataExportStrategy } from '../strategies/StudentAssetDataExportStrategy'; import { OneWorkgroupPerRowDataExportStrategy } from '../strategies/OneWorkgroupPerRowDataExportStrategy'; -import { RawDataExportStrategy } from '../strategies/RawDataExportStrategy'; import { MatDialog } from '@angular/material/dialog'; import { DialogWithSpinnerComponent } from '../../../directives/dialog-with-spinner/dialog-with-spinner.component'; import { ActivatedRoute, Router } from '@angular/router'; @@ -129,8 +128,6 @@ export class DataExportComponent implements OnInit { return $localize`All Student Work`; case 'events': return $localize`Events`; - case 'rawData': - return $localize`Raw Data`; default: return null; } @@ -162,8 +159,6 @@ export class DataExportComponent implements OnInit { this.dataExportContext.setStrategy(new StudentAssetDataExportStrategy()); } else if (exportType === 'oneWorkgroupPerRow') { this.dataExportContext.setStrategy(new OneWorkgroupPerRowDataExportStrategy()); - } else if (exportType === 'rawData') { - this.dataExportContext.setStrategy(new RawDataExportStrategy()); } this.dataExportContext.export(); } @@ -339,36 +334,6 @@ export class DataExportComponent implements OnInit { return selectedNodes; } - selectAll(doSelect: boolean = true): void { - if (this.projectIdToOrder != null) { - for (let nodeId in this.projectIdToOrder) { - let projectItem = this.projectIdToOrder[nodeId]; - if (projectItem.order != 0) { - projectItem.checked = doSelect; - if (projectItem.node.type != 'group') { - if ( - projectItem.node != null && - projectItem.node.components != null && - projectItem.node.components.length > 0 - ) { - projectItem.node.components.map((componentItem) => { - componentItem.checked = doSelect; - }); - } - } - } - } - } - } - - deselectAll(): void { - this.selectAll(false); - } - - previewProject(): void { - window.open(`${this.configService.getConfigParam('previewProjectURL')}`); - } - /** * Check if we want to export this node * @param selectedNodesMap a mapping of node id to boolean value of whether @@ -473,4 +438,8 @@ export class DataExportComponent implements OnInit { protected goToExportItemPage(): void { this.router.navigate(['item'], { relativeTo: this.route }); } + + protected goToExportRawDataPage(): void { + this.router.navigate(['raw'], { relativeTo: this.route }); + } } diff --git a/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html b/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html new file mode 100644 index 00000000000..000c8d64840 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -0,0 +1,55 @@ +
+ +

Export Raw Data

+
+
+ + +
+
+ + Include Student Work + +
+
+ + Include Student Names + +
+
+ + Include Annotations + +
+
+ Include Events +
+ +
+ +
+
+ +
diff --git a/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.scss b/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.scss new file mode 100644 index 00000000000..260aaaf8c6a --- /dev/null +++ b/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.scss @@ -0,0 +1,7 @@ +.parameters-div { + margin-bottom: 20px; +} + +.mat-icon { + margin: 0px; +} diff --git a/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.spec.ts b/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.spec.ts new file mode 100644 index 00000000000..92559495130 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.spec.ts @@ -0,0 +1,63 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ExportRawDataComponent } from './export-raw-data.component'; +import { ClassroomMonitorTestingModule } from '../../classroom-monitor-testing.module'; +import { DataExportService } from '../../../services/dataExportService'; +import { ActivatedRoute } from '@angular/router'; +import { MatIconModule } from '@angular/material/icon'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { SelectStepAndComponentCheckboxesComponent } from '../select-step-and-component-checkboxes/select-step-and-component-checkboxes.component'; +import { MatRadioModule } from '@angular/material/radio'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { FormsModule } from '@angular/forms'; +import { ConfigService } from '../../../services/configService'; + +let configService: ConfigService; +let teacherProjectService: TeacherProjectService; + +describe('ExportRawDataComponent', () => { + let component: ExportRawDataComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [ExportRawDataComponent, SelectStepAndComponentCheckboxesComponent], + imports: [ + ClassroomMonitorTestingModule, + FormsModule, + MatCheckboxModule, + MatIconModule, + MatRadioModule + ], + providers: [ + { + provide: ActivatedRoute, + useValue: {} + }, + DataExportService + ] + }); + teacherProjectService = TestBed.inject(TeacherProjectService); + spyOn(teacherProjectService, 'getNodeOrderOfProject').and.returnValue({ + idToOrder: {}, + nodes: [] + }); + teacherProjectService.project = { + metadata: { + title: 'Test Project' + } + }; + configService = TestBed.inject(ConfigService); + spyOn(configService, 'getPermissions').and.returnValue({ + canGradeStudentWork: true, + canViewStudentNames: true, + canAuthorProject: true + }); + fixture = TestBed.createComponent(ExportRawDataComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.ts b/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.ts new file mode 100644 index 00000000000..3a0257b8149 --- /dev/null +++ b/src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.ts @@ -0,0 +1,39 @@ +import { Component } from '@angular/core'; +import { RawDataExportStrategy } from '../strategies/RawDataExportStrategy'; +import { AbstractExportComponent } from '../abstract-export.component'; + +@Component({ + selector: 'export-raw-data', + templateUrl: './export-raw-data.component.html', + styleUrls: ['./export-raw-data.component.scss'] +}) +export class ExportRawDataComponent extends AbstractExportComponent { + protected includeAnnotations = false; + protected includeEvents = false; + + protected goBack(): void { + this.router.navigate(['..'], { relativeTo: this.route }); + } + + protected selectDefault(): void { + this.includeStudentWork = true; + this.includeStudentNames = true; + this.includeAnnotations = false; + this.includeEvents = false; + } + + protected selectAll(): void { + this.includeStudentWork = true; + this.includeStudentNames = true; + this.includeAnnotations = true; + this.includeEvents = true; + } + + protected export(): void { + this.showDownloadingExportMessage(); + const strategy = new RawDataExportStrategy(); + strategy.setDataExportContext({ controller: this } as any); + strategy.export(); + this.hideDownloadingExportMessage(); + } +} diff --git a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html index 08cd4dee358..5a89290e5cd 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html +++ b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html @@ -1,22 +1,44 @@ -
-
- + + Export All Steps + + + Select Steps To Export + + + +
+ +
+
+

{{ project.metadata.title }}

+
-
- -
+
+ +
{{ nodeIdToPositionAndTitle[node.node.id] }}
+ + +
+
+ +
- {{ componentIndex + 1 }}. {{ componentItem.type }} - -
- + + {{ componentIndex + 1 }}. {{ componentItem.type }} + +
+ +
-
+ diff --git a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.scss b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.scss index 72880fb58a9..bfc8a9516e1 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.scss +++ b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.scss @@ -9,3 +9,13 @@ .component { margin-left: 40px !important; } + +.button-div { + margin-top: 10px; + margin-bottom: 10px; +} + +.select-steps-radio-buttons-container { + margin-top: 10px; + margin-bottom: 10px; +} \ No newline at end of file diff --git a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.spec.ts b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.spec.ts index 2f44fc9b4d6..494c7348f9b 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.spec.ts @@ -11,6 +11,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatButtonModule } from '@angular/material/button'; import { FormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; +import { MatRadioModule } from '@angular/material/radio'; let component: SelectStepAndComponentCheckboxesComponent; let fixture: ComponentFixture; @@ -31,6 +32,7 @@ describe('SelectStepAndComponentCheckboxesComponent', () => { MatButtonModule, MatCheckboxModule, MatIconModule, + MatRadioModule, StudentTeacherCommonServicesModule ], providers: [TeacherProjectService] @@ -46,6 +48,7 @@ describe('SelectStepAndComponentCheckboxesComponent', () => { nodes = Object.values(projectIdToOrder); nodes.sort(sortNodesByOrder); component.nodes = nodes; + component.exportStepSelectionType = 'exportSelectSteps'; fixture.detectChanges(); harness = await TestbedHarnessEnvironment.harnessForFixture( fixture, @@ -55,6 +58,8 @@ describe('SelectStepAndComponentCheckboxesComponent', () => { selectStep_selectsAllComponentsInStep(); selectLesson_selectsAllStepsAndComponentsInLesson(); + selectAll_selectsEverything(); + deselectAll_deselectsEverything(); }); function sortNodesByOrder(nodeA: any, nodeB: any): number { @@ -83,6 +88,30 @@ function selectLesson_selectsAllStepsAndComponentsInLesson() { }); } +function selectAll_selectsEverything() { + describe('select all button is clicked', () => { + it('all lessons, steps, and components are checked', async () => { + (await harness.getSelectAllButton()).click(); + const checkboxes = await harness.getCheckboxes(); + for (const checkbox of checkboxes) { + expect(await checkbox.isChecked()).toEqual(true); + } + }); + }); +} + +function deselectAll_deselectsEverything() { + describe('deselect all button is clicked', () => { + it('all lessons, steps, and components are not checked', async () => { + (await harness.getDeselectAllButton()).click(); + const checkboxes = await harness.getCheckboxes(); + for (const checkbox of checkboxes) { + expect(await checkbox.isChecked()).toEqual(false); + } + }); + }); +} + function expectAllChildrenOfStepToBeCheckedValue( nodeId: string, expectedCheckedValue: boolean diff --git a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.ts b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.ts index fec1810e059..dacdcc7673f 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.ts +++ b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { ConfigService } from '../../../services/configService'; @@ -8,13 +8,17 @@ import { ConfigService } from '../../../services/configService'; styleUrls: ['./select-step-and-component-checkboxes.component.scss'] }) export class SelectStepAndComponentCheckboxesComponent { + @Input() exportStepSelectionType: string = 'exportAllSteps'; + @Output() exportStepSelectionTypeChange: EventEmitter = new EventEmitter(); protected nodeIdToPositionAndTitle: any = {}; @Input() nodes: any[] = []; + protected project: any; @Input() projectIdToOrder: any; constructor(public configService: ConfigService, public projectService: TeacherProjectService) {} ngOnInit(): void { + this.project = this.projectService.project; for (const node of this.nodes) { const nodeId = node.node.id; const position = this.getNodePositionById(nodeId); @@ -23,6 +27,34 @@ export class SelectStepAndComponentCheckboxesComponent { } } + protected previewProject(): void { + window.open(`${this.configService.getConfigParam('previewProjectURL')}`); + } + + protected selectAll(doSelect: boolean = true): void { + for (let nodeId in this.projectIdToOrder) { + let projectItem = this.projectIdToOrder[nodeId]; + if (projectItem.order != 0) { + projectItem.checked = doSelect; + if (projectItem.node.type != 'group') { + if ( + projectItem.node != null && + projectItem.node.components != null && + projectItem.node.components.length > 0 + ) { + projectItem.node.components.map((componentItem) => { + componentItem.checked = doSelect; + }); + } + } + } + } + } + + protected deselectAll(): void { + this.selectAll(false); + } + protected nodeItemClicked(nodeItem: any): void { if (nodeItem.node != null) { var node = nodeItem.node; diff --git a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.harness.ts b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.harness.ts index bcb081581a9..d21819da087 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.harness.ts +++ b/src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.harness.ts @@ -1,10 +1,18 @@ import { ComponentHarness } from '@angular/cdk/testing'; +import { MatButtonHarness } from '@angular/material/button/testing'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; export class SelectStepAndComponentCheckboxesComponentHarness extends ComponentHarness { static hostSelector = 'select-step-and-component-checkboxes'; + getDeselectAllButton = this.locatorFor(MatButtonHarness.with({ text: 'Deselect All' })); + getSelectAllButton = this.locatorFor(MatButtonHarness.with({ text: 'Select All' })); + getCheckbox(labelText: string): Promise { return this.locatorFor(MatCheckboxHarness.with({ label: labelText }))(); } + + getCheckboxes(): Promise { + return this.locatorForAll(MatCheckboxHarness)(); + } } diff --git a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts index 0beb844500a..a9e29d5e604 100644 --- a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts +++ b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts @@ -22,31 +22,38 @@ export class StudentProgressComponent implements OnInit { sortOptions: any = { team: { label: $localize`Team`, - method: this.createSortTeam + fieldName: 'workgroupId', + isNumeric: true }, student: { label: $localize`Student`, - method: this.createSortStudent + fieldName: 'username', + isNumeric: false }, firstName: { label: $localize`First Name`, - method: this.createSortFirstName + fieldName: 'firstName', + isNumeric: false }, lastName: { label: $localize`Last Name`, - method: this.createSortLastName + fieldName: 'lastName', + isNumeric: false }, location: { label: $localize`Location`, - method: this.createSortLocation + fieldName: 'location', + isNumeric: true }, completion: { label: $localize`Completion`, - method: this.createSortCompletion + fieldName: 'completionPct', + isNumeric: true }, score: { label: $localize`Score`, - method: this.createSortScore + fieldName: 'scorePct', + isNumeric: true } }; students: StudentProgress[]; @@ -112,7 +119,7 @@ export class StudentProgressComponent implements OnInit { private updateTeam(workgroupId: number): void { const location = this.getCurrentNodeForWorkgroupId(workgroupId) || ''; const completion = this.classroomStatusService.getStudentProjectCompletion(workgroupId); - const score = this.getStudentTotalScore(workgroupId); + const score = this.getStudentTotalScore(workgroupId) || 0; let maxScore = this.classroomStatusService.getMaxScoreForWorkgroupId(workgroupId); maxScore = maxScore ? maxScore : 0; @@ -142,89 +149,41 @@ export class StudentProgressComponent implements OnInit { this.sortedStudents = [...this.students]; const dir = this.sort.charAt(0) === '-' ? 'desc' : 'asc'; const sort = this.sort.charAt(0) === '-' ? this.sort.slice(1) : this.sort; - this.sortedStudents.sort(this.sortOptions[sort].method(dir)); - } - - private createSortTeam(direction: 'asc' | 'desc'): any { - return (studentA: any, studentB: any): number => { - return direction === 'asc' - ? studentA.workgroupId - studentB.workgroupId - : studentB.workgroupId - studentA.workgroupId; - }; - } - - private createSortStudent(direction: 'asc' | 'desc'): any { - return (studentA: any, studentB: any): number => { - const localeCompare = - direction === 'asc' - ? studentA.username.localeCompare(studentB.username) - : studentB.username.localeCompare(studentA.username); - return localeCompare === 0 ? studentA.workgroupId - studentB.workgroupId : localeCompare; - }; - } - - private createSortFirstName(direction: 'asc' | 'desc'): any { - return (studentA: any, studentB: any): number => { - const localeCompare = - direction === 'asc' - ? studentA.firstName.localeCompare(studentB.firstName) - : studentB.firstName.localeCompare(studentA.firstName); - return localeCompare === 0 ? studentA.workgroupId - studentB.workgroupId : localeCompare; - }; - } - - private createSortLastName(direction: 'asc' | 'desc'): any { - return (studentA: any, studentB: any): number => { - const localeCompare = - direction === 'asc' - ? studentA.lastName.localeCompare(studentB.lastName) - : studentB.lastName.localeCompare(studentA.lastName); - return localeCompare === 0 ? studentA.workgroupId - studentB.workgroupId : localeCompare; - }; - } - - private createSortScore(direction: 'asc' | 'desc'): any { - return (studentA: any, studentB: any): number => { - if (studentA.scorePct === studentB.scorePct) { - return studentA.workgroupId - .toString() - .localeCompare(studentB.workgroupId.toString(), undefined, { - numeric: true - }); - } - return direction === 'asc' - ? studentA.scorePct - studentB.scorePct - : studentB.scorePct - studentA.scorePct; - }; + this.sortedStudents.sort( + this.createSort(this.sortOptions[sort].fieldName, dir, this.sortOptions[sort].isNumeric) + ); } - private createSortCompletion(direction: 'asc' | 'desc'): any { - return (studentA: any, studentB: any): number => { - const completionA = studentA.completionPct; - const completionB = studentB.completionPct; - if (completionA === completionB) { - return studentA.workgroupId - .toString() - .localeCompare(studentB.workgroupId.toString(), undefined, { - numeric: true - }); - } - return direction === 'asc' ? completionA - completionB : completionB - completionA; + private createSort(fieldName: string, direction: 'asc' | 'desc', isNumeric: boolean): any { + return (studentA: StudentProgress, studentB: StudentProgress): number => { + const localeCompare = this.localeCompareBy( + fieldName, + studentA, + studentB, + direction, + isNumeric + ); + return fieldName !== 'workgroupId' && localeCompare === 0 + ? this.localeCompareBy('workgroupId', studentA, studentB, 'asc', true) + : localeCompare; }; } - private createSortLocation(direction: 'asc' | 'desc'): any { - return (studentA: any, studentB: any): number => { - const localeCompare = - direction === 'asc' - ? studentA.location.localeCompare(studentB.location) - : studentB.location.localeCompare(studentA.location); - return localeCompare === 0 - ? studentA.workgroupId - .toString() - .localeCompare(studentB.workgroupId.toString(), undefined, { numeric: true }) - : localeCompare; - }; + private localeCompareBy( + fieldName: string, + studentA: any, + studentB: any, + direction: 'asc' | 'desc', + isNumeric: boolean + ): number { + const valueA = studentA[fieldName]; + const valueB = studentB[fieldName]; + if (isNumeric) { + const numA = parseFloat(valueA); + const numB = parseFloat(valueB); + return direction === 'asc' ? numA - numB : numB - numA; + } + return direction === 'asc' ? valueA.localeCompare(valueB) : valueB.localeCompare(valueA); } isWorkgroupShown(workgroup: number): boolean { diff --git a/src/assets/wise5/components/html/html-authoring/html-authoring.component.html b/src/assets/wise5/components/html/html-authoring/html-authoring.component.html index c5a7d2d6e70..14258d7d425 100644 --- a/src/assets/wise5/components/html/html-authoring/html-authoring.component.html +++ b/src/assets/wise5/components/html/html-authoring/html-authoring.component.html @@ -1,2 +1,6 @@ - - + + diff --git a/src/assets/wise5/components/html/html-authoring/html-authoring.component.ts b/src/assets/wise5/components/html/html-authoring/html-authoring.component.ts index 71dc9e3045f..69db84df037 100644 --- a/src/assets/wise5/components/html/html-authoring/html-authoring.component.ts +++ b/src/assets/wise5/components/html/html-authoring/html-authoring.component.ts @@ -1,36 +1,8 @@ import { Component } from '@angular/core'; -import { ProjectAssetService } from '../../../../../app/services/projectAssetService'; import { AbstractComponentAuthoring } from '../../../authoringTool/components/AbstractComponentAuthoring'; -import { insertWiseLinks, replaceWiseLinks } from '../../../common/wise-link/wise-link'; -import { ConfigService } from '../../../services/configService'; -import { TeacherProjectService } from '../../../services/teacherProjectService'; -import { TeacherNodeService } from '../../../services/teacherNodeService'; @Component({ selector: 'html-authoring', templateUrl: 'html-authoring.component.html' }) -export class HtmlAuthoring extends AbstractComponentAuthoring { - html: string = ''; - - constructor( - protected configService: ConfigService, - protected nodeService: TeacherNodeService, - protected projectAssetService: ProjectAssetService, - protected projectService: TeacherProjectService - ) { - super(configService, nodeService, projectAssetService, projectService); - } - - ngOnInit() { - super.ngOnInit(); - this.html = this.projectService.replaceAssetPaths(replaceWiseLinks(this.componentContent.html)); - } - - htmlChanged(): void { - this.componentContent.html = insertWiseLinks( - this.configService.removeAbsoluteAssetPaths(this.html) - ); - this.componentChanged(); - } -} +export class HtmlAuthoring extends AbstractComponentAuthoring {} diff --git a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts index 454c233e269..08c9e059496 100644 --- a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts +++ b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts @@ -1,8 +1,10 @@ -import { Component, EventEmitter, Input, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, Input, Output, SimpleChanges, ViewChild } from '@angular/core'; import { debounceTime } from 'rxjs/operators'; import { Subject, Subscription } from 'rxjs'; import { NotebookService } from '../../services/notebookService'; import 'tinymce'; +import { EditorComponent } from '@tinymce/tinymce-angular'; +import { Language } from '../../../../app/domain/language'; declare let tinymce: any; @@ -12,10 +14,13 @@ declare let tinymce: any; templateUrl: 'wise-tinymce-editor.component.html' }) export class WiseTinymceEditorComponent { + @ViewChild(EditorComponent) editorComponent: EditorComponent; public editor: any; public config: any; private previousContent: string; + @Input() language: Language; + @Input() model: string; @@ -107,8 +112,18 @@ export class WiseTinymceEditorComponent { } ngOnChanges(changes: SimpleChanges): void { - if (changes.model) { - this.editor.setContent(changes.model.currentValue); + if (this.editorComponent) { + if (changes.model) { + this.editorComponent.editor.setContent(changes.model.currentValue ?? ''); + } + if (changes.language && !this.model) { + // handles an edge case in the AT translation mode where + // 1. show lang1 (original value: undefined) + // 2. translate lang1 (set value to 'XYZ') + // 3. switch to lang2 (original value: undefined) + // should show empty editor, but is showing 'XYZ' + this.editorComponent.editor.setContent(''); + } } } diff --git a/src/messages.xlf b/src/messages.xlf index 44048b1cfa0..e0f8d67e1a5 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -541,11 +541,11 @@ src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 268 + 222 src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 319 + 242 src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html @@ -1145,11 +1145,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/modules/header/header-account-menu/header-account-menu.component.html - 83 - - - src/app/modules/header/header-account-menu/header-account-menu.component.html - 93 + 80 src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html @@ -1541,6 +1537,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 6 + + + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 49 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 @@ -5293,25 +5297,25 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Account avatar src/app/modules/header/header-account-menu/header-account-menu.component.html - 15 + 13 src/app/modules/header/header-account-menu/header-account-menu.component.html - 19 + 17 Switch back to original user src/app/modules/header/header-account-menu/header-account-menu.component.html - 24 + 22 Student Home src/app/modules/header/header-account-menu/header-account-menu.component.html - 35 + 33 src/app/student/student-home/student-home.component.html @@ -5322,7 +5326,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Teacher Home src/app/modules/header/header-account-menu/header-account-menu.component.html - 45 + 43 src/app/teacher/teacher-home/teacher-home.component.html @@ -5333,11 +5337,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Edit Profile src/app/modules/header/header-account-menu/header-account-menu.component.html - 55 + 53 src/app/modules/header/header-account-menu/header-account-menu.component.html - 65 + 63 src/app/student/account/edit/edit.component.html @@ -5352,21 +5356,21 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Researcher Tools src/app/modules/header/header-account-menu/header-account-menu.component.html - 69 + 67 Admin Tools src/app/modules/header/header-account-menu/header-account-menu.component.html - 73 + 71 Sign Out src/app/modules/header/header-account-menu/header-account-menu.component.html - 98 + 85 @@ -5699,10 +5703,6 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-list/project-list.component.html 33 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 301 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 42 @@ -5713,7 +5713,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html - 21 + 43 + + + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + 70 @@ -9229,7 +9233,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 322,324 + 245,247 src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html @@ -10347,7 +10351,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 48 + 54 src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts @@ -12316,18 +12320,25 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.29 + + Move lesson + + src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html + 39 + + Delete lesson src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html - 40 + 49 Are you sure you want to delete this lesson? src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts - 50 + 60 @@ -12373,21 +12384,21 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Move step src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html - 64 + 63 Copy step src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html - 75 + 73 Delete step src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html - 86 + 83 @@ -14189,6 +14200,21 @@ Are you sure you want to proceed? 32 + + Downloading Export + + src/assets/wise5/classroomMonitor/dataExport/abstract-export.component.ts + 52 + + + src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts + 424 + + + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 226 + + Export One Workgroup Per Row @@ -14325,6 +14351,10 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 107 + + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 12 + Export Raw Data @@ -14351,174 +14381,142 @@ Are you sure you want to proceed? Default src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 138 + 137 - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 199 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 Everything src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 139 + 138 - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 200 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 Include Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 142,144 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 203,205 + 141,143 Include Student Work IDs src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 147,149 + 146,148 Include Student Names src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 152,154 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 208,210 + 151,153 Include Student Work Timestamps src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 157,159 + 156,158 Include Branch Path Taken src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 162,164 + 161,163 Include Branch Path Taken Node ID src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 167,169 + 166,168 Include Branch Path Taken Step Title src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 172,174 + 171,173 Include Scores src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 177,179 + 176,178 Include Score Timestamps src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 182,184 + 181,183 Include Comments src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 187,189 + 186,188 Include Comment Timestamps src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 192,194 - - - - Include Annotations - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 213,215 - - - - Include Events - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 218,220 + 191,193 Include Student Names src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 229,231 + 202,204 Include Student Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + 207,209 Include Teacher Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 237,239 + 210,212 Include Names src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 240 - - - - Export All Steps - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 254,256 - - - - Select Steps To Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 257,259 + 213 Export src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 262 + 216 src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 313 + 236 + + + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 42 src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html @@ -14533,64 +14531,28 @@ Are you sure you want to proceed? Export src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 262,264 + 216,218 Cancel src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 271,273 - - - - Select All - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 280 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 50 - - - - Select All - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 283,285 - - - - Deselect All - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 289 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 51 - - - - Deselect All - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 292,294 + 225,227 Export src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 313,315 + 236,238 Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 102 + 101 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -14601,46 +14563,28 @@ Are you sure you want to proceed? One Workgroup Per Row src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 125 + 124 Latest Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 127 + 126 All Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 129 + 128 Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 131 - - - - Raw Data - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 133 - - - - Downloading Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 459 - - - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 226 + 130 @@ -14649,6 +14593,10 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 20,22 + + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 + Include Correctness Columns @@ -14685,6 +14633,27 @@ Are you sure you want to proceed? 98 + + Include Student Work + + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 19,21 + + + + Include Annotations + + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 29,31 + + + + Include Events + + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 34 + + Export Step Visit Events @@ -14738,6 +14707,28 @@ Are you sure you want to proceed? 48 + + Select All + + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 50 + + + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + 21 + + + + Deselect All + + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 51 + + + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + 31 + + Include Deleted Steps (If Any) @@ -14934,11 +14925,39 @@ Are you sure you want to proceed? 192 + + Export All Steps + + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + 8,10 + + + + Select Steps To Export + + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + 11,13 + + + + Select All + + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + 24,26 + + + + Deselect All + + src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html + 34,36 + + Item src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html - 12 + 61 @@ -15051,7 +15070,7 @@ Are you sure you want to proceed? Student src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 28 + 29 src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.ts @@ -15062,28 +15081,28 @@ Are you sure you want to proceed? First Name src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 32 + 34 Last Name src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 36 + 39 Location src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 40 + 44 Completion src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts - 44 + 49 @@ -21306,28 +21325,28 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 155 + 170 Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 169 + 184 Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 170 + 185 Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 196 + 211 From 8dfd56e107d30c9f35b08938d55a72e4f8959399 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Tue, 5 Mar 2024 11:16:45 -0800 Subject: [PATCH 25/90] feat(Multiple Languages): Disable default language editor (#1670) --- .../translatable-rich-text-editor.component.html | 6 +++++- .../wise-tinymce-editor.component.html | 1 + .../wise-tinymce-editor.component.ts | 1 + src/messages.xlf | 15 +++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html b/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html index 741058e4741..23eb486f3c2 100644 --- a/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html +++ b/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html @@ -20,7 +20,11 @@ > - + Editing is disabled. Please switch back to {{ defaultLanguage.language }} if you want to + edit. + diff --git a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.html b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.html index 9a2b7d0fd52..97a2cece9f1 100644 --- a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.html +++ b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.html @@ -1,6 +1,7 @@ diff --git a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts index 08c9e059496..efedaafdfb3 100644 --- a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts +++ b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts @@ -17,6 +17,7 @@ export class WiseTinymceEditorComponent { @ViewChild(EditorComponent) editorComponent: EditorComponent; public editor: any; public config: any; + @Input() disabled: boolean; private previousContent: string; @Input() language: Language; diff --git a/src/messages.xlf b/src/messages.xlf index e0f8d67e1a5..3ba2a1ae00a 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -10129,6 +10129,13 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.75 + + Editing is disabled. Please switch back to if you want to edit. + + src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html + 24,25 + + Also currently editing this unit: src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 170 + 171 Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 184 + 185 Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 185 + 186 Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 211 + 212 From 117df07d5711cdbc871f658b215df4152a7f44c1 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 6 Mar 2024 11:01:36 -0800 Subject: [PATCH 26/90] Remove unnecessary check for showTranslationInput when computing translationText and defaultLanguageText --- .../abstract-translatable-field.component.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts index 1c6b49e8edd..46e0a4794ef 100644 --- a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts +++ b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts @@ -33,14 +33,10 @@ export abstract class AbstractTranslatableFieldComponent { ngOnInit(): void { this.i18nId = this.content[`${this.key}.i18n`]?.id; - this.translationText = computed(() => - this.showTranslationInput() - ? this.translateProjectService.currentTranslations()[this.i18nId]?.value - : '' - ); - this.defaultLanguageText = computed(() => - this.showTranslationInput() ? this.content[this.key] : '' + this.translationText = computed( + () => this.translateProjectService.currentTranslations()[this.i18nId]?.value ); + this.defaultLanguageText = computed(() => this.content[this.key]); this.translationTextChangedSubscription = this.translationTextChanged .pipe(debounceTime(1000), distinctUntilChanged()) .subscribe(async (text: string) => { From 91a69c3e7337b6b12db9c398d8ef2c696303f91e Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 7 Mar 2024 10:55:36 -0800 Subject: [PATCH 27/90] Fix issue where saving HTML using RTE was causing editor to flicker and move cursor back to beginning --- .../wise-tinymce-editor/wise-tinymce-editor.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts index efedaafdfb3..d9a50977642 100644 --- a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts +++ b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts @@ -114,7 +114,7 @@ export class WiseTinymceEditorComponent { ngOnChanges(changes: SimpleChanges): void { if (this.editorComponent) { - if (changes.model) { + if (changes.model && changes.model.currentValue !== this.model) { this.editorComponent.editor.setContent(changes.model.currentValue ?? ''); } if (changes.language && !this.model) { From 0313c2d4c0027d0f82cbc2812c299d576d7d1315 Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Tue, 12 Mar 2024 11:59:36 -0400 Subject: [PATCH 28/90] feat(Translation): Convert table item inputs to translatable (#1681) --- .../table-authoring.component.html | 17 ++++++++--------- src/messages.xlf | 16 ++++++++++------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/assets/wise5/components/table/table-authoring/table-authoring.component.html b/src/assets/wise5/components/table/table-authoring/table-authoring.component.html index d067d9acc9f..e1685509c64 100644 --- a/src/assets/wise5/components/table/table-authoring/table-authoring.component.html +++ b/src/assets/wise5/components/table/table-authoring/table-authoring.component.html @@ -146,15 +146,14 @@
- - - + src/assets/wise5/components/label/label-authoring/label-authoring.component.html 137 + + src/assets/wise5/components/table/table-authoring/table-authoring.component.html + 152 + Move Object Up @@ -21088,42 +21092,42 @@ If this problem continues, let your teacher know and move on to the next activit Editable src/assets/wise5/components/table/table-authoring/table-authoring.component.html - 163,165 + 162,164 Column Cell Size src/assets/wise5/components/table/table-authoring/table-authoring.component.html - 183 + 182 You can freeze the first column and any next to it to the beginning of the table. Other columns you freeze will be pinned to the end. src/assets/wise5/components/table/table-authoring/table-authoring.component.html - 199 + 198 Freeze src/assets/wise5/components/table/table-authoring/table-authoring.component.html - 203 + 202 Make All Cells Editable src/assets/wise5/components/table/table-authoring/table-authoring.component.html - 217,219 + 216,218 Make All Cells Uneditable src/assets/wise5/components/table/table-authoring/table-authoring.component.html - 226,228 + 225,227 From 3b9bca65e3a0b0012e7a95958e70e6c113b6e157 Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Tue, 12 Mar 2024 13:44:05 -0700 Subject: [PATCH 29/90] feat(Translation): Make animation authoring inputs translatable (#1683) --- .../animation-authoring.component.html | 13 ++- src/messages.xlf | 92 +++++++++---------- 2 files changed, 55 insertions(+), 50 deletions(-) diff --git a/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html b/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html index 6d1d548a76c..70fbe31663b 100644 --- a/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html +++ b/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -145,10 +145,15 @@ insert_photo
- - Text - - +
- - URL - - + +
diff --git a/src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.scss b/src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.scss index 03e99c94811..9ab26898490 100644 --- a/src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.scss +++ b/src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.scss @@ -74,10 +74,6 @@ p.select-oer-instructions { margin-top: 20px; } -.url-input-container { - width: 100%; -} - .dimension-input-container { margin-right: 20px; width: 150px; diff --git a/src/messages.xlf b/src/messages.xlf index 3b30f90e408..6f6f9028fce 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -17907,7 +17907,7 @@ Category Name: src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html - 115 + 113 @@ -17918,7 +17918,7 @@ Category Name: src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html - 124 + 122 @@ -20203,25 +20203,18 @@ If this problem continues, let your teacher know and move on to the next activit URL src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html - 103 - - - - Enter URL Here - - src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html - 108 + 105 Reload resource src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html - 136 + 134 src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html - 138 + 136 From df806383a1559cd446519ff37da4de9ef3618bed Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 20 Mar 2024 10:32:04 -0700 Subject: [PATCH 42/90] feat(Multiple Languages): TranslatableAssetChooserComponent (#1692) Co-authored-by: Jonathan Lim-Breitbart --- src/app/teacher/component-authoring.module.ts | 2 + .../translatable-asset-chooser.component.html | 10 + .../translatable-asset-chooser.component.scss | 3 + ...anslatable-asset-chooser.component.spec.ts | 39 +++ .../translatable-asset-chooser.component.ts | 45 +++ .../animation-authoring.component.html | 30 +- .../animation-authoring.component.ts | 21 +- src/messages.xlf | 289 +++++++++--------- 8 files changed, 257 insertions(+), 182 deletions(-) create mode 100644 src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html create mode 100644 src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.scss create mode 100644 src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.spec.ts create mode 100644 src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts diff --git a/src/app/teacher/component-authoring.module.ts b/src/app/teacher/component-authoring.module.ts index 2f0c8a9a62e..f66c1a6f225 100644 --- a/src/app/teacher/component-authoring.module.ts +++ b/src/app/teacher/component-authoring.module.ts @@ -87,6 +87,7 @@ import { EditComponentAdvancedButtonComponent } from '../../assets/wise5/authori import { TranslatableInputComponent } from '../../assets/wise5/authoringTool/components/translatable-input/translatable-input.component'; import { TranslatableTextareaComponent } from '../../assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component'; import { TranslatableRichTextEditorComponent } from '../../assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component'; +import { TranslatableAssetChooserComponent } from '../../assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component'; @NgModule({ declarations: [ @@ -176,6 +177,7 @@ import { TranslatableRichTextEditorComponent } from '../../assets/wise5/authorin ConstraintAuthoringModule, StudentTeacherCommonModule, PeerGroupingAuthoringModule, + TranslatableAssetChooserComponent, TranslatableInputComponent, TranslatableRichTextEditorComponent, TranslatableTextareaComponent, diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html new file mode 100644 index 00000000000..f4f169ddac9 --- /dev/null +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html @@ -0,0 +1,10 @@ + diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.scss b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.scss new file mode 100644 index 00000000000..113e9772633 --- /dev/null +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.scss @@ -0,0 +1,3 @@ +.mat-mdc-raised-button>.mat-icon { + margin: 0; +} \ No newline at end of file diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.spec.ts b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.spec.ts new file mode 100644 index 00000000000..f610bffca4a --- /dev/null +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.spec.ts @@ -0,0 +1,39 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslatableAssetChooserComponent } from './translatable-asset-chooser.component'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module'; +import { MatDialogModule } from '@angular/material/dialog'; +import { EditProjectTranslationService } from '../../../services/editProjectTranslationService'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { ProjectLocale } from '../../../../../app/domain/projectLocale'; + +describe('TranslatableAssetChooserComponent', () => { + let component: TranslatableAssetChooserComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + BrowserAnimationsModule, + HttpClientTestingModule, + MatDialogModule, + StudentTeacherCommonServicesModule, + TranslatableAssetChooserComponent + ], + providers: [EditProjectTranslationService, TeacherProjectService] + }); + spyOn(TestBed.inject(TeacherProjectService), 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en-US' }) + ); + spyOn(TestBed.inject(TeacherProjectService), 'isDefaultLocale').and.returnValue(true); + fixture = TestBed.createComponent(TranslatableAssetChooserComponent); + component = fixture.componentInstance; + component.content = {}; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts new file mode 100644 index 00000000000..116bb4a2429 --- /dev/null +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts @@ -0,0 +1,45 @@ +import { Component } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatIconModule } from '@angular/material/icon'; +import { MatButtonModule } from '@angular/material/button'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { AssetChooser } from '../../project-asset-authoring/asset-chooser'; +import { MatDialog } from '@angular/material/dialog'; +import { filter } from 'rxjs'; +import { AbstractTranslatableFieldComponent } from '../abstract-translatable-field/abstract-translatable-field.component'; +import { EditProjectTranslationService } from '../../../services/editProjectTranslationService'; +import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { TranslateProjectService } from '../../../services/translateProjectService'; + +@Component({ + standalone: true, + selector: 'translatable-asset-chooser', + imports: [CommonModule, MatButtonModule, MatIconModule, MatTooltipModule], + templateUrl: './translatable-asset-chooser.component.html', + styleUrls: ['./translatable-asset-chooser.component.scss'] +}) +export class TranslatableAssetChooserComponent extends AbstractTranslatableFieldComponent { + constructor( + private dialog: MatDialog, + protected editProjectTranslationService: EditProjectTranslationService, + protected projectService: TeacherProjectService, + protected translateProjectService: TranslateProjectService + ) { + super(editProjectTranslationService, projectService, translateProjectService); + } + + protected chooseAsset(): void { + new AssetChooser(this.dialog) + .open(this.key, this.content) + .afterClosed() + .pipe(filter((data) => data != null)) + .subscribe(({ assetItem }) => { + if (this.showTranslationInput()) { + this.translationTextChanged.next(assetItem.fileName); + } else { + this.content[this.key] = assetItem.fileName; + this.defaultLanguageTextChanged.next(assetItem.fileName); + } + }); + } +} diff --git a/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html b/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html index 70fbe31663b..d196d09d4d7 100644 --- a/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html +++ b/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -127,23 +127,19 @@ fxLayoutAlign="start center" class="object-image-input-container" > - - Image - - - + +
data != null)) - .subscribe((data: any) => { - return this.assetSelected(data); - }); - } - /** * @param {string} targetString Can be 'image', 'imageMovingLeft', or 'imageMovingRight'. * @param {object} authoredObject @@ -263,12 +250,6 @@ export class AnimationAuthoring extends AbstractComponentAuthoring { }; } - assetSelected({ nodeId, componentId, assetItem, target, targetObject }): void { - super.assetSelected({ nodeId, componentId, assetItem, target }); - targetObject[target] = assetItem.fileName; - this.componentChanged(); - } - authoredObjectTypeChanged(authoredObject: any): void { if (authoredObject.type === 'image') { this.removeTextFromAuthoredObject(authoredObject); diff --git a/src/messages.xlf b/src/messages.xlf index 6f6f9028fce..2ef753f8450 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -593,7 +593,7 @@ src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 390 + 386 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html @@ -656,7 +656,7 @@ src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 404 + 400 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html @@ -727,15 +727,15 @@ src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 194 + 190 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 420 + 416 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 452 + 448 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html @@ -1659,7 +1659,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 460 + 456 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1678,7 +1678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 474 + 470 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -7745,11 +7745,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 318 + 314 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 439 + 435 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html @@ -10149,6 +10149,13 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.75 + + Choose an image + + src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html + 5 + + Editing is disabled. Please switch back to if you want to edit. @@ -15547,11 +15554,7 @@ Are you sure you want to proceed? Image src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 131 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 142 + 133 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html @@ -15570,106 +15573,11 @@ Are you sure you want to proceed? 61 - - Choose an Image - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 139 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 236 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 239 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 257 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 260 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 375 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 378 - - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 19 - - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 128 - - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 131 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 19 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 22 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 252 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 261 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 264 - - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 315 - - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 318 - - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 18 - - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 81 - - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 84 - - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 183 - - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 186 - - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 58 - - Text src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 152 + 148 src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html @@ -15692,18 +15600,18 @@ Are you sure you want to proceed? Move Object Up src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 164 + 160 Up src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 167 + 163 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 393 + 389 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html @@ -15730,18 +15638,18 @@ Are you sure you want to proceed? Move Object Down src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 178 + 174 Down src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 181 + 177 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 407 + 403 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html @@ -15768,70 +15676,161 @@ Are you sure you want to proceed? Delete Object src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 191 + 187 Image Width (Pixels) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 202 + 198 Image Height (Pixels) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 212 + 208 Image Moving Left src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 224 + 220 + + + + Choose an Image + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 232 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 235 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 253 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 256 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 371 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 374 + + + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + 19 + + + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + 128 + + + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + 131 + + + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + 19 + + + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + 22 + + + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + 252 + + + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + 261 + + + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + 264 + + + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + 315 + + + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + 318 + + + src/assets/wise5/components/label/label-authoring/label-authoring.component.html + 18 + + + src/assets/wise5/components/match/match-authoring/match-authoring.component.html + 81 + + + src/assets/wise5/components/match/match-authoring/match-authoring.component.html + 84 + + + src/assets/wise5/components/match/match-authoring/match-authoring.component.html + 183 + + + src/assets/wise5/components/match/match-authoring/match-authoring.component.html + 186 + + + src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html + 58 Image Moving Right src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 245 + 241 Location X (Pixels) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 268 + 264 Location Y (Pixels) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 278 + 274 Data X (Units) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 288 + 284 Data Y (Units) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 298 + 294 Data Points src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 309 + 305 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html @@ -15842,7 +15841,7 @@ Are you sure you want to proceed? Add Data Point src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 315 + 311 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html @@ -15853,14 +15852,14 @@ Are you sure you want to proceed? Time src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 337 + 333 X src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 347 + 343 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html @@ -15879,7 +15878,7 @@ Are you sure you want to proceed? Y src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 357 + 353 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html @@ -15898,14 +15897,14 @@ Are you sure you want to proceed? Change to Image (Optional) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 367 + 363 Delete Data Point src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 417 + 413 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html @@ -15916,91 +15915,91 @@ Are you sure you want to proceed? Data Source src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 429 + 425 Add Data Source src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 436 + 432 Delete Data Source src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 449 + 445 Trial Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 498 + 494 Series Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 508 + 504 Time Column Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 518 + 514 X Column Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 528 + 524 Y Column Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 538 + 534 You can only have Data Points or a Data Source. If you add a Data Point, the Data Source will be deleted. Are you sure you want to add a Data Point? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts - 72 + 69 Are you sure you want to delete this data point? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts - 89 + 86 Are you sure you want to delete this object? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts - 146 + 143 You can only have Data Points or a Data Source. If you add a Data Source, the Data Points will be deleted. Are you sure you want to add a Data Source? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts - 160 + 157 Are you sure you want to delete the Data Source? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts - 189 + 186 From d93e7e1d7ac0122be6176593948189c4258e8c37 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 20 Mar 2024 11:22:18 -0700 Subject: [PATCH 43/90] Fix tests and compile issues --- .../translatable-asset-chooser.component.spec.ts | 4 ++-- .../translatable-asset-chooser.component.ts | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.spec.ts b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.spec.ts index f610bffca4a..56b20343fe7 100644 --- a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.spec.ts +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.spec.ts @@ -4,9 +4,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module'; import { MatDialogModule } from '@angular/material/dialog'; -import { EditProjectTranslationService } from '../../../services/editProjectTranslationService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { ProjectLocale } from '../../../../../app/domain/projectLocale'; +import { TeacherProjectTranslationService } from '../../../services/teacherProjectTranslationService'; describe('TranslatableAssetChooserComponent', () => { let component: TranslatableAssetChooserComponent; @@ -21,7 +21,7 @@ describe('TranslatableAssetChooserComponent', () => { StudentTeacherCommonServicesModule, TranslatableAssetChooserComponent ], - providers: [EditProjectTranslationService, TeacherProjectService] + providers: [TeacherProjectService, TeacherProjectTranslationService] }); spyOn(TestBed.inject(TeacherProjectService), 'getLocale').and.returnValue( new ProjectLocale({ default: 'en-US' }) diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts index 116bb4a2429..0d1affcb4c9 100644 --- a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts @@ -7,9 +7,8 @@ import { AssetChooser } from '../../project-asset-authoring/asset-chooser'; import { MatDialog } from '@angular/material/dialog'; import { filter } from 'rxjs'; import { AbstractTranslatableFieldComponent } from '../abstract-translatable-field/abstract-translatable-field.component'; -import { EditProjectTranslationService } from '../../../services/editProjectTranslationService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; -import { TranslateProjectService } from '../../../services/translateProjectService'; +import { TeacherProjectTranslationService } from '../../../services/teacherProjectTranslationService'; @Component({ standalone: true, @@ -21,11 +20,10 @@ import { TranslateProjectService } from '../../../services/translateProjectServi export class TranslatableAssetChooserComponent extends AbstractTranslatableFieldComponent { constructor( private dialog: MatDialog, - protected editProjectTranslationService: EditProjectTranslationService, protected projectService: TeacherProjectService, - protected translateProjectService: TranslateProjectService + protected projectTranslationService: TeacherProjectTranslationService ) { - super(editProjectTranslationService, projectService, translateProjectService); + super(projectService, projectTranslationService); } protected chooseAsset(): void { From 6973e73b2f36e793f75e17094f34328110a07d29 Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Thu, 21 Mar 2024 14:19:24 -0400 Subject: [PATCH 44/90] feat(Translation): Convert open response authoring inputs to translatable (#1695) --- ...edit-open-response-advanced.component.html | 96 +++++++-------- ...edit-open-response-advanced.component.scss | 6 +- src/messages.xlf | 114 +++++++++--------- 3 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html index 6921fabc759..197dc526547 100644 --- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html +++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1,13 +1,11 @@ - - Starter Sentence (Optional) - - + +
- - Feedback Text - - + +
Notify Teacher - - Feedback to Teacher - - + +
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.scss b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.scss index 18d50504261..607421b47d9 100644 --- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.scss +++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.scss @@ -44,7 +44,7 @@ $notice-bg: map-get($default-colors, notice-bg); } .scoring-rule-score { - width: 5%; + width: 10%; } .scoring-rule-feedback-text { @@ -82,3 +82,7 @@ $notice-bg: map-get($default-colors, notice-bg); .custom-completion-criteria-action { width: 8%; } + +.mat-icon { + margin: 0; +} diff --git a/src/messages.xlf b/src/messages.xlf index 2ef753f8450..fdab0b803b2 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -1663,7 +1663,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 + 494 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -1682,7 +1682,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 508 + 504 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -1697,7 +1697,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 515 + 511 src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html @@ -2180,11 +2180,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 64 + 62 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 522 + 518 src/assets/wise5/vle/node/node.component.html @@ -11235,7 +11235,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 138 + 136 @@ -15286,11 +15286,11 @@ Are you sure you want to proceed? src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 65 + 63 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 523 + 519 src/assets/wise5/vle/node/node.component.html @@ -19493,7 +19493,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 87,89 + 85,87 @@ -19644,102 +19644,102 @@ Warning: This will delete all existing choices in this component. 78 - - Starter Sentence (Optional) + + Starter Sentence src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 2 + 4 Allow students to record audio response src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 18,20 + 16,18 Enable CRater src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 29,31 + 27,29 Item Id src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 36 + 34 Verify src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 49,51 + 47,49 Verifying... src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 53 + 51 Valid src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 54 + 52 Invalid src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 55 + 53 Score On src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 59 + 57 Change src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 66 + 64 Show Score src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 77,79 + 75,77 Enable Feedback Rules src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 97,99 + 95,97 Scoring Rule src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 113 + 111 Add Scoring Rule src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 118 + 116 @@ -19753,152 +19753,152 @@ Warning: This will delete all existing choices in this component. Move Scoring Rule Up src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 163 + 160 Move Scoring Rule Down src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 174 + 171 Delete Scoring Rule src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 184 + 181 Enable Multiple Attempt Feedback src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 201,203 + 198,200 Multiple Attempt Scoring Rules src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 207 + 204 Add Multiple Attempt Scoring Rule src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 212 + 209 Previous Score src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 232 + 229 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 343 + 339 Current Score src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 241 + 238 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 353 + 349 Feedback to Student src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 250 + 249 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 428 + 427 Move Multiple Attempt Scoring Rule Up src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 270 + 266 Move Multiple Attempt Scoring Rule Down src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 286 + 282 Delet Multiple Attempt Scoring src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 296 + 292 Enable Notifications src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 314,316 + 310,312 Notifications src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 320 + 316 add src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 329 + 325 Move Notification Up src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 371 + 367 Move Notification Down src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 387 + 383 Delete Notification src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 397 + 393 Enable Ambient Display Dismiss Mode src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 406,408 + 402,404 Dismiss Code src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 410 + 406 src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html @@ -19909,63 +19909,63 @@ Warning: This will delete all existing choices in this component. Notify Student src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 424,426 + 420,422 Notify Teacher src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 444,446 + 440,442 Feedback to Teacher src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 448 + 447 Use Custom Completion Criteria src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 468,470 + 464,466 Custom Completion Criteria src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 473 + 469 Add Completion Criteria src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 478 + 474 Move Completion Criteria Up src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 533 + 529 Move Completion Criteria Down src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 544 + 540 Delete Completion Criteria src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 554 + 550 From 3d687437f67764ea3b8148252d31c1f29fd31382 Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Thu, 21 Mar 2024 15:45:47 -0400 Subject: [PATCH 45/90] feat(Translation): Convert match authoring inputs to translatable (#1691) --- .../match-authoring.component.html | 58 ++++++++++--------- src/messages.xlf | 36 ++++++------ 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html index 64707635039..70761338876 100644 --- a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html +++ b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html @@ -165,16 +165,17 @@ fxLayout="row" fxLayoutAlign="start center" > - - Target Bucket Name - - + + -
+
+ + Category Name + + + -
+ delete +
-
+
Enable Multiple Y Axes -
+ -
+
2 3 4
-
+
-
- Y Axis - - Title - - - +
+ Y Axis + + Color - - Units - - - + Min - + Max
-
+
- Y Axis - - Title - - - + Y Axis + + Color - - Units - - - + + Min - + Max Right Side
-
+
Background Image (Optional) @@ -321,19 +322,17 @@ insert_photo
-
- - Round Values To - - - {{ availableRoundingOption.text }} - - - -
+ + Round Values To + + + {{ availableRoundingOption.text }} + + +

-
- Series +
+ Series
-
- - Pre Prompt (Optional) - - -
+ -
- - Post Prompt (Optional) - - -
+
diff --git a/src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.scss b/src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.scss index 573b30f080a..625669d5b10 100644 --- a/src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.scss +++ b/src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.scss @@ -1,9 +1,5 @@ @import 'style/abstracts/variables'; -.prompt { - width: 100%; -} - .section-container { padding: 16px; border: 2px solid #dddddd; diff --git a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html index ee4bac274c3..5eec5f064d6 100644 --- a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html +++ b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html @@ -56,6 +56,7 @@
fxLayoutGap="8px" > @@ -63,25 +64,13 @@
Question #{{ questionIndex + 1 }} - - - - - - - + - + + + +
+ +
+ +
+ +
diff --git a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.scss b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.scss index 41baff19086..e2b65bf609f 100644 --- a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.scss +++ b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.scss @@ -48,3 +48,7 @@ li { .question-input { width: 100%; } + +.question-button-div { + height: 100%; +} \ No newline at end of file diff --git a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts index 8292bafc22a..f9489c8cd45 100644 --- a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts +++ b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts @@ -54,4 +54,10 @@ export class EditQuestionBankRulesComponent extends EditFeedbackRulesComponent { customTrackBy(index: number): number { return index; } + + protected getQuestionLabel(rule: QuestionBankRule, questionIndex: number): string { + return rule.questions.length === 1 + ? $localize`Question` + : $localize`Question #${questionIndex + 1}`; + } } diff --git a/src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html b/src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html index f176c47c459..b0bbdf50dbf 100644 --- a/src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html +++ b/src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html @@ -11,16 +11,14 @@
- - Custom Label - - + +
src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html - 47 + 49 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html @@ -1194,11 +1194,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Delete rule src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html - 61 + 60 src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 114 + 128 src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html @@ -1209,11 +1209,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Move up src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html - 72 + 71 src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 125 + 139 src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html @@ -1224,11 +1224,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Move down src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html - 82 + 81 src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 135 + 149 src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html @@ -1239,11 +1239,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Add a new rule at the end src/app/authoring-tool/edit-dynamic-prompt-rules/edit-dynamic-prompt-rules.component.html - 97 + 96 src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 150 + 164 @@ -1268,35 +1268,21 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html - 52 + 50 Pre Prompt (Optional) src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html - 33 - - - - Enter Pre Prompt Here - - src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html - 38 + 34 Post Prompt (Optional) src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html - 51 - - - - Enter Post Prompt Here - - src/app/authoring-tool/edit-dynamic-prompt/edit-dynamic-prompt.component.html - 56 + 45 @@ -1310,35 +1296,39 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Question src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 62 + 63 Question # src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 64 + 65 Delete question src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 89 + 78 + + + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html + 100 Add new question src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 100 + 113 - + add_circle src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html - 106 + 119 @@ -1355,6 +1345,20 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.48 + + Question + + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts + 60 + + + + Question # + + src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts + 61 + + Enable Question Bank @@ -1366,32 +1370,21 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Custom Label src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html - 15 - - - - Question Bank - - src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html - 20 - - - src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html - 19 + 17 Student can select questions to use in Peer Chat src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html - 31,33 + 29,31 Max Number of Questions src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html - 37 + 35 @@ -20358,6 +20351,13 @@ If this problem continues, let your teacher know and move on to the next activit 38 + + Question Bank + + src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html + 19 + + Add to chat From 80941191b27cf372e692f2da839731cb210eae28 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 8 Apr 2024 14:50:27 -0700 Subject: [PATCH 48/90] feat(Multiple languages): Copy default language in HTML component (#1704) Remove the distinctUntilChanged filter. This was causing successive content copying from default languages to different languages to fail. Co-authored-by: Jonathan Lim-Breitbart --- .../abstract-translatable-field.component.ts | 16 ++++----- ...anslatable-rich-text-editor.component.html | 29 +++++++++++----- ...anslatable-rich-text-editor.component.scss | 3 ++ ...translatable-rich-text-editor.component.ts | 34 ++++++++++++++++--- src/messages.xlf | 27 +++++++++++++-- 5 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.scss diff --git a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts index 1b9f0cb0852..ebb3234acd1 100644 --- a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts +++ b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts @@ -1,5 +1,5 @@ import { Input, Signal, Output, computed, Directive } from '@angular/core'; -import { Subject, Subscription, debounceTime, distinctUntilChanged } from 'rxjs'; +import { Subject, Subscription, debounceTime } from 'rxjs'; import { Language } from '../../../../../app/domain/language'; import { TeacherProjectTranslationService } from '../../../services/teacherProjectTranslationService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; @@ -37,14 +37,12 @@ export abstract class AbstractTranslatableFieldComponent { }) ); this.subscriptions.add( - this.translationTextChanged - .pipe(debounceTime(1000), distinctUntilChanged()) - .subscribe(async (text: string) => { - if (this.i18nId == null) { - await this.createI18NField(); - } - this.saveTranslationText(text); - }) + this.translationTextChanged.pipe(debounceTime(1000)).subscribe(async (text: string) => { + if (this.i18nId == null) { + await this.createI18NField(); + } + this.saveTranslationText(text); + }) ); } diff --git a/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html b/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html index c97e6d7b048..b5e6c3b4b6b 100644 --- a/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html +++ b/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html @@ -5,21 +5,32 @@ > - + +
+ +
+ - + + + - Editing is disabled. Please switch back to {{ defaultLanguage.language }} if you want to - edit. +
+ Note: Editing is disabled. Please switch back to {{ defaultLanguage.language }} if you + want to edit. + +
diff --git a/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.scss b/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.scss new file mode 100644 index 00000000000..c282c2ad94a --- /dev/null +++ b/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.scss @@ -0,0 +1,3 @@ +.translation-tools { + padding: 8px 0; +} \ No newline at end of file diff --git a/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.ts b/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.ts index 3157387a9dd..406260a45b9 100644 --- a/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.ts +++ b/src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.ts @@ -1,22 +1,33 @@ -import { Component } from '@angular/core'; +import { Component, ViewChild } from '@angular/core'; import { AbstractTranslatableFieldComponent } from '../abstract-translatable-field/abstract-translatable-field.component'; import { WiseTinymceEditorModule } from '../../../directives/wise-tinymce-editor/wise-tinymce-editor.module'; -import { MatTabsModule } from '@angular/material/tabs'; +import { MatTabGroup, MatTabsModule } from '@angular/material/tabs'; import { insertWiseLinks, replaceWiseLinks } from '../../../common/wise-link/wise-link'; import { ConfigService } from '../../../services/configService'; import { TeacherProjectTranslationService } from '../../../services/teacherProjectTranslationService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { CommonModule } from '@angular/common'; import { MatDialogModule } from '@angular/material/dialog'; +import { MatButtonModule } from '@angular/material/button'; +import { FlexLayoutModule } from '@angular/flex-layout'; @Component({ standalone: true, selector: 'translatable-rich-text-editor', - imports: [CommonModule, MatDialogModule, MatTabsModule, WiseTinymceEditorModule], - templateUrl: './translatable-rich-text-editor.component.html' + imports: [ + CommonModule, + FlexLayoutModule, + MatButtonModule, + MatDialogModule, + MatTabsModule, + WiseTinymceEditorModule + ], + templateUrl: './translatable-rich-text-editor.component.html', + styleUrls: ['./translatable-rich-text-editor.component.scss'] }) export class TranslatableRichTextEditorComponent extends AbstractTranslatableFieldComponent { protected html: string = ''; + @ViewChild(MatTabGroup) private tabs: MatTabGroup; constructor( private configService: ConfigService, @@ -42,6 +53,21 @@ export class TranslatableRichTextEditorComponent extends AbstractTranslatableFie this.defaultLanguageTextChanged.next(this.content[this.key]); } + protected copyDefaultLanguageText(): void { + if ( + this.translationText == undefined || + this.translationText === '' || + confirm( + $localize`Are you sure you want to replace the content in ${ + this.currentLanguage().language + } with content in ${this.defaultLanguage.language} for this item?` + ) + ) { + this.translationTextChanged.next(this.html); + this.tabs.selectedIndex = 0; + } + } + protected saveTranslationText(text: string): void { super.saveTranslationText(insertWiseLinks(this.configService.removeAbsoluteAssetPaths(text))); } diff --git a/src/messages.xlf b/src/messages.xlf index fd3f618c915..5ad35be9d1d 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -10149,11 +10149,32 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.5 - - Editing is disabled. Please switch back to if you want to edit. + + Copy content from src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html - 20,21 + 11,13 + + + + Note: Editing is disabled. Please switch back to if you want to edit. + + src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html + 27,28 + + + + Copy content to + + src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.html + 30,32 + + + + Are you sure you want to replace the content in with content in for this item? + + src/assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component.ts + 61,63 From 4ca5fb33e125afcd77fa7a70a6fc169121fff79f Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Wed, 10 Apr 2024 12:48:31 -0400 Subject: [PATCH 49/90] feat(Translation): Convert label authoring inputs to translatable (#1697) --- .../label-authoring.component.html | 20 ++++---- src/messages.xlf | 47 ++++++++----------- 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/src/assets/wise5/components/label/label-authoring/label-authoring.component.html b/src/assets/wise5/components/label/label-authoring/label-authoring.component.html index 6064e7c97c8..eabd592df53 100644 --- a/src/assets/wise5/components/label/label-authoring/label-authoring.component.html +++ b/src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -132,17 +132,15 @@ *ngFor="let label of componentContent.labels; index as labelIndex" class="starter-label-container" > -
- - Text - - +
+ Color src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 239 + 237 src/assets/wise5/components/label/label-student/label-student.component.html @@ -15601,10 +15601,6 @@ Are you sure you want to proceed? src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 144 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 137 - src/assets/wise5/components/table/table-authoring/table-authoring.component.html 152 @@ -15881,11 +15877,11 @@ Are you sure you want to proceed? src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 193 + 191 src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 214 + 212 @@ -15900,11 +15896,11 @@ Are you sure you want to proceed? src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 202 + 200 src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 223 + 221 @@ -16899,7 +16895,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 147 + 145 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -19002,60 +18998,64 @@ Category Name: 128,130 - - Enter Label Text Here + + Label Text src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 142 + 139 + + + src/assets/wise5/components/label/label-student/label-student.component.html + 18 View Colors src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 159 + 157 Color Palette src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 162 + 160 Can Student Edit Label src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 175,177 + 173,175 Can Student Delete Label src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 185,187 + 183,185 Point Location src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 191 + 189 Text Location src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 212 + 210 Delete Label src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 236 + 234 @@ -19085,13 +19085,6 @@ Category Name: 10 - - Label Text - - src/assets/wise5/components/label/label-student/label-student.component.html - 18 - - A New Label From ddb859a1ea16b32320de9546c8cd0590807a40b6 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 11 Apr 2024 15:54:42 -0700 Subject: [PATCH 50/90] feat(Translation): Make embedded authoring inputs translatable (#1728) - Parameterize button input for TranslatableAssetChooser - Convert url input and asset chooser to TranslatableInput and TranslatableAssetChooser for Embedded component authoring Co-authored-by: Jonathan Lim-Breitbart --- .../translatable-asset-chooser.component.html | 3 +- .../translatable-asset-chooser.component.ts | 4 +- .../embedded-authoring.component.html | 32 +++++------ .../embedded-authoring.component.spec.ts | 53 +++++++------------ .../embedded-authoring.component.ts | 22 -------- .../embedded-authoring.module.ts | 6 ++- src/messages.xlf | 20 +++---- 7 files changed, 53 insertions(+), 87 deletions(-) diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html index f4f169ddac9..4daa03b3cc0 100644 --- a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html @@ -2,9 +2,8 @@ mat-raised-button color="primary" (click)="chooseAsset()" - matTooltip="Choose an image" + [matTooltip]="tooltip" matTooltipPosition="above" - i18n-matTooltip > insert_photo diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts index 0d1affcb4c9..5e634d73761 100644 --- a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; @@ -18,6 +18,8 @@ import { TeacherProjectTranslationService } from '../../../services/teacherProje styleUrls: ['./translatable-asset-chooser.component.scss'] }) export class TranslatableAssetChooserComponent extends AbstractTranslatableFieldComponent { + @Input() tooltip: String = $localize`Choose image`; + constructor( private dialog: MatDialog, protected projectService: TeacherProjectService, diff --git a/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html b/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html index 8827ae41c25..d916ee362af 100644 --- a/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html +++ b/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html @@ -1,19 +1,19 @@ -
- - Model File Name - - - +
+ +
; @@ -22,9 +23,22 @@ describe('EmbeddedAuthoringComponent', () => { ], providers: [TeacherNodeService] }); + spyOn(TestBed.inject(TeacherProjectService), 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en-US' }) + ); fixture = TestBed.createComponent(EmbeddedAuthoring); component = fixture.componentInstance; - const componentContent = createComponentContent(); + const componentContent = { + id: '86fel4wjm4', + type: 'Embedded', + prompt: '', + showSaveButton: false, + showSubmitButton: false, + url: 'glucose.html', + showAddToNotebookButton: true, + width: null + }; + spyOn(TestBed.inject(TeacherProjectService), 'isDefaultLocale').and.returnValue(true); spyOn(TestBed.inject(TeacherProjectService), 'getComponent').and.returnValue( copy(componentContent) ); @@ -32,38 +46,7 @@ describe('EmbeddedAuthoringComponent', () => { fixture.detectChanges(); }); - shouldSelectTheModelFile(); -}); - -function createComponentContent() { - return { - id: '86fel4wjm4', - type: 'Embedded', - prompt: '', - showSaveButton: false, - showSubmitButton: false, - url: 'glucose.html', - showAddToNotebookButton: true, - width: null - }; -} - -function shouldSelectTheModelFile() { - it('should select the model file', () => { - component.nodeId = 'node1'; - component.componentId = 'component1'; - expect(component.componentContent.url).toEqual('glucose.html'); - spyOn(component, 'componentChanged').and.callFake(() => {}); - const args = { - nodeId: 'node1', - componentId: 'component1', - target: 'modelFile', - targetObject: {}, - assetItem: { - fileName: 'thermo.html' - } - }; - component.assetSelected(args); - expect(component.componentContent.url).toEqual('thermo.html'); + it('should create', () => { + expect(component).toBeTruthy(); }); -} +}); diff --git a/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.ts b/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.ts index 521aaf7453a..3421f6d06b9 100644 --- a/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.ts +++ b/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.ts @@ -6,9 +6,6 @@ import { AbstractComponentAuthoring } from '../../../authoringTool/components/Ab import { ConfigService } from '../../../services/configService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { EmbeddedService } from '../embeddedService'; -import { MatDialog } from '@angular/material/dialog'; -import { AssetChooser } from '../../../authoringTool/project-asset-authoring/asset-chooser'; -import { filter } from 'rxjs/operators'; import { TeacherNodeService } from '../../../services/teacherNodeService'; @Component({ @@ -21,7 +18,6 @@ export class EmbeddedAuthoring extends AbstractComponentAuthoring { constructor( protected ConfigService: ConfigService, - private dialog: MatDialog, private EmbeddedService: EmbeddedService, protected NodeService: TeacherNodeService, protected ProjectAssetService: ProjectAssetService, @@ -37,14 +33,6 @@ export class EmbeddedAuthoring extends AbstractComponentAuthoring { ); } - assetSelected({ nodeId, componentId, assetItem, target }): void { - super.assetSelected({ nodeId, componentId, assetItem, target }); - if (target === 'modelFile') { - this.componentContent.url = assetItem.fileName; - this.componentChanged(); - } - } - reloadModel(): void { const iframe: any = document.getElementById(this.embeddedApplicationIFrameId); const src = iframe.src; @@ -56,14 +44,4 @@ export class EmbeddedAuthoring extends AbstractComponentAuthoring { this.componentContent.url = url; this.componentChanged(); } - - chooseModelFile(): void { - new AssetChooser(this.dialog, this.nodeId, this.componentId) - .open('modelFile') - .afterClosed() - .pipe(filter((data) => data != null)) - .subscribe((data: any) => { - return this.assetSelected(data); - }); - } } diff --git a/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.module.ts b/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.module.ts index d54c69933ad..eb091a462b7 100644 --- a/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.module.ts +++ b/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.module.ts @@ -21,18 +21,22 @@ import { TagService } from '../../../services/tagService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { EmbeddedService } from '../embeddedService'; import { EmbeddedAuthoring } from './embedded-authoring.component'; +import { ComponentAuthoringModule } from '../../component-authoring.module'; +import { TranslatableAssetChooserComponent } from '../../../authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component'; @NgModule({ declarations: [EmbeddedAuthoring, EditComponentPrompt, AuthorUrlParametersComponent], imports: [ CommonModule, + ComponentAuthoringModule, FormsModule, MatCheckboxModule, MatDialogModule, MatFormFieldModule, MatIconModule, MatInputModule, - MatRadioModule + MatRadioModule, + TranslatableAssetChooserComponent ], providers: [ AnnotationService, diff --git a/src/messages.xlf b/src/messages.xlf index 814b8ea818a..2d41ec28227 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -10142,11 +10142,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.75 - - Choose an image + + Choose image - src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.html - 5 + src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts + 21 @@ -17894,18 +17894,18 @@ Category Name: 5 - - Model File Name + + Model file name src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html - 3 + 5 - - Choose Model File + + Choose model file src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html - 11 + 13 From c2a96a38c97295d2c7c8f9c11f14a3fbed860421 Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Fri, 12 Apr 2024 10:19:31 -0400 Subject: [PATCH 51/90] feat(Translation): Convert unit info view to translatable (#1724) --- src/app/teacher/authoring-tool.module.ts | 4 +++ .../project-info-authoring.component.html | 33 +++++++++---------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/app/teacher/authoring-tool.module.ts b/src/app/teacher/authoring-tool.module.ts index c4bd17f76f5..a468129c0b0 100644 --- a/src/app/teacher/authoring-tool.module.ts +++ b/src/app/teacher/authoring-tool.module.ts @@ -65,6 +65,8 @@ import { SaveIndicatorComponent } from '../../assets/wise5/common/save-indicator import { ProjectAuthoringLessonComponent } from '../../assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component'; import { ProjectAuthoringStepComponent } from '../../assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component'; import { AddLessonButtonComponent } from '../../assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component'; +import { TranslatableInputComponent } from '../../assets/wise5/authoringTool/components/translatable-input/translatable-input.component'; +import { TranslatableTextareaComponent } from '../../assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component'; @NgModule({ declarations: [ @@ -135,6 +137,8 @@ import { AddLessonButtonComponent } from '../../assets/wise5/authoringTool/add-l SaveIndicatorComponent, StepToolsModule, StructureAuthoringModule, + TranslatableInputComponent, + TranslatableTextareaComponent, WiseTinymceEditorModule ] }) diff --git a/src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html b/src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html index 204472394ae..627afdb6c9a 100644 --- a/src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html +++ b/src/assets/wise5/authoringTool/project-info-authoring/project-info-authoring.component.html @@ -35,23 +35,22 @@

- - {{ metadataField.name }} - - - - {{ metadataField.name }} - - + + From fca0bbbbf7f610ee47dcd5129e290f13c5158d8f Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Fri, 12 Apr 2024 10:20:14 -0400 Subject: [PATCH 52/90] feat(Translation): Convert milestone authoring view to translatable (#1725) --- .../milestones-authoring.component.html | 80 ++++++++----------- .../milestones-authoring.component.scss | 4 - src/messages.xlf | 23 ++---- 3 files changed, 43 insertions(+), 64 deletions(-) diff --git a/src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html b/src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html index 67c38e7b8c8..4087c5aa4a4 100644 --- a/src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html +++ b/src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html @@ -58,23 +58,23 @@
Milestone {{ milestoneIndex + 1 }}
-
- - Milestone Name - - +
+
- - Milestone Description - - +
Template Satisfy Criteria {{ satisfyCriteriaIndex + 1 }}
- - Description - - +
- - Content - - +
Content Preview
- - Recommendations - - +
Recommendations Preview
diff --git a/src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.scss b/src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.scss index 8dda6fca2a9..d1be5e9a81a 100644 --- a/src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.scss +++ b/src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.scss @@ -8,10 +8,6 @@ margin: 0px; } -.full-width { - width: 100%; -} - .width-200 { width: 200px; } diff --git a/src/messages.xlf b/src/messages.xlf index 2d41ec28227..63f6bbc7cb4 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -2066,7 +2066,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 509 + 511 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html @@ -10699,7 +10699,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 572 + 562 @@ -10742,14 +10742,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Milestone Name src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 63 + 65 Milestone Description src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 69 + 74 @@ -10952,7 +10952,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 561 + 551 @@ -11022,32 +11022,25 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.486 - - Content - - src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 521 - - Content Preview src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 531 + 524 Recommendations src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 537 + 532 Recommendations Preview src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html - 547 + 537 From 1e0c2602828237ab505a3788b0001ece0bcf0f33 Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Fri, 12 Apr 2024 10:24:48 -0400 Subject: [PATCH 53/90] feat(Translation): Convert rubric authoring to translatable (#1726) --- .../edit-component-rubric.component.html | 10 +++--- .../edit-component-rubric.component.ts | 34 +++---------------- src/app/teacher/authoring-tool.module.ts | 2 ++ .../node-advanced-authoring.module.ts | 2 ++ .../edit-node-rubric.component.html | 8 +++-- .../edit-node-rubric.component.spec.ts | 16 ++------- .../editRubric/edit-node-rubric.component.ts | 15 ++------ .../rubric/rubric-authoring.component.html | 8 +++-- .../rubric/rubric-authoring.component.ts | 13 ++----- 9 files changed, 35 insertions(+), 73 deletions(-) diff --git a/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html b/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html index 791c0d31ddb..c4bb268e1a9 100644 --- a/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html +++ b/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html @@ -12,9 +12,9 @@ message
- - + [content]="componentContent" + key="rubric" + (defaultLanguageTextChanged)="rubricChanged()" +> diff --git a/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.ts b/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.ts index 2ab06f7ce1d..dc27a3c1e71 100644 --- a/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.ts +++ b/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.ts @@ -1,10 +1,5 @@ import { Component, Input } from '@angular/core'; -import { ConfigService } from '../../../assets/wise5/services/configService'; import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService'; -import { - insertWiseLinks, - replaceWiseLinks -} from '../../../assets/wise5/common/wise-link/wise-link'; @Component({ selector: 'edit-component-rubric', @@ -12,31 +7,12 @@ import { styleUrls: ['edit-component-rubric.component.scss'] }) export class EditComponentRubricComponent { - @Input() - componentContent: any; - rubric: string; - showRubricAuthoring: boolean = false; + @Input() componentContent: any; + protected showRubricAuthoring: boolean = false; - constructor( - private ConfigService: ConfigService, - private ProjectService: TeacherProjectService - ) {} + constructor(private projectService: TeacherProjectService) {} - ngOnInit() { - const componentContent = this.ConfigService.replaceStudentNames( - this.ProjectService.injectAssetPaths(this.componentContent) - ); - if (componentContent.rubric == null) { - this.rubric = ''; - } else { - this.rubric = replaceWiseLinks(componentContent.rubric); - } - } - - rubricChanged(): void { - this.componentContent.rubric = this.ConfigService.removeAbsoluteAssetPaths( - insertWiseLinks(this.rubric) - ); - this.ProjectService.componentChanged(); + protected rubricChanged(): void { + this.projectService.componentChanged(); } } diff --git a/src/app/teacher/authoring-tool.module.ts b/src/app/teacher/authoring-tool.module.ts index a468129c0b0..397e4d85e89 100644 --- a/src/app/teacher/authoring-tool.module.ts +++ b/src/app/teacher/authoring-tool.module.ts @@ -67,6 +67,7 @@ import { ProjectAuthoringStepComponent } from '../../assets/wise5/authoringTool/ import { AddLessonButtonComponent } from '../../assets/wise5/authoringTool/add-lesson-button/add-lesson-button.component'; import { TranslatableInputComponent } from '../../assets/wise5/authoringTool/components/translatable-input/translatable-input.component'; import { TranslatableTextareaComponent } from '../../assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component'; +import { TranslatableRichTextEditorComponent } from '../../assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component'; @NgModule({ declarations: [ @@ -138,6 +139,7 @@ import { TranslatableTextareaComponent } from '../../assets/wise5/authoringTool/ StepToolsModule, StructureAuthoringModule, TranslatableInputComponent, + TranslatableRichTextEditorComponent, TranslatableTextareaComponent, WiseTinymceEditorModule ] diff --git a/src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring.module.ts b/src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring.module.ts index 81aa0ae4c53..4973d1cdf28 100644 --- a/src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring.module.ts +++ b/src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring.module.ts @@ -11,6 +11,7 @@ import { ConstraintAuthoringModule } from '../../constraint/constraint-authoring import { EditNodeRubricComponent } from '../editRubric/edit-node-rubric.component'; import { WiseTinymceEditorModule } from '../../../directives/wise-tinymce-editor/wise-tinymce-editor.module'; import { RouterModule } from '@angular/router'; +import { TranslatableRichTextEditorComponent } from '../../components/translatable-rich-text-editor/translatable-rich-text-editor.component'; @NgModule({ declarations: [ @@ -37,6 +38,7 @@ import { RouterModule } from '@angular/router'; ConstraintAuthoringModule, RouterModule, StudentTeacherCommonModule, + TranslatableRichTextEditorComponent, WiseTinymceEditorModule ] }) diff --git a/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.html b/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.html index 99a7462a92f..a1b533549b4 100644 --- a/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.html +++ b/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.html @@ -1,3 +1,7 @@
Edit Step Rubric
- - + + diff --git a/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.spec.ts b/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.spec.ts index 20dfbc3181f..64068afa60d 100644 --- a/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.spec.ts @@ -55,17 +55,7 @@ describe('EditNodeRubricComponent', () => { fixture.detectChanges(); }); - rubricChanged(); -}); - -function rubricChanged() { - describe('rubricChanged()', () => { - it('should update the rubric in the node', () => { - expect(component.node.rubric).toEqual(''); - const newRubric = 'Hello World'; - component.rubric = newRubric; - component.rubricChanged(); - expect(component.node.rubric).toEqual(newRubric); - }); + it('should create', () => { + expect(component).toBeTruthy(); }); -} +}); diff --git a/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.ts b/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.ts index 4d5544f7501..4dac496815c 100644 --- a/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.ts +++ b/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.ts @@ -1,6 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { insertWiseLinks, replaceWiseLinks } from '../../../common/wise-link/wise-link'; -import { ConfigService } from '../../../services/configService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { ActivatedRoute } from '@angular/router'; @@ -9,24 +7,17 @@ import { ActivatedRoute } from '@angular/router'; templateUrl: 'edit-node-rubric.component.html' }) export class EditNodeRubricComponent implements OnInit { - node: any; - rubric: string; + protected node: any; - constructor( - private configService: ConfigService, - private projectService: TeacherProjectService, - private route: ActivatedRoute - ) {} + constructor(private projectService: TeacherProjectService, private route: ActivatedRoute) {} ngOnInit(): void { this.route.parent.parent.params.subscribe((params) => { this.node = this.projectService.getNodeById(params.nodeId); - this.rubric = this.projectService.replaceAssetPaths(replaceWiseLinks(this.node.rubric)); }); } - rubricChanged(): void { - this.node.rubric = insertWiseLinks(this.configService.removeAbsoluteAssetPaths(this.rubric)); + protected rubricChanged(): void { this.projectService.saveProject(); } } diff --git a/src/assets/wise5/authoringTool/rubric/rubric-authoring.component.html b/src/assets/wise5/authoringTool/rubric/rubric-authoring.component.html index 86a015798fe..98f8a3df556 100644 --- a/src/assets/wise5/authoringTool/rubric/rubric-authoring.component.html +++ b/src/assets/wise5/authoringTool/rubric/rubric-authoring.component.html @@ -1,3 +1,7 @@
Edit Unit Rubric
- - + + diff --git a/src/assets/wise5/authoringTool/rubric/rubric-authoring.component.ts b/src/assets/wise5/authoringTool/rubric/rubric-authoring.component.ts index fb00fbb6a2a..83e8a0722e3 100644 --- a/src/assets/wise5/authoringTool/rubric/rubric-authoring.component.ts +++ b/src/assets/wise5/authoringTool/rubric/rubric-authoring.component.ts @@ -1,7 +1,5 @@ -import { ConfigService } from '../../services/configService'; import { TeacherProjectService } from '../../services/teacherProjectService'; import { Component } from '@angular/core'; -import { insertWiseLinks } from '../../common/wise-link/wise-link'; @Component({ selector: 'rubric-authoring', @@ -9,20 +7,15 @@ import { insertWiseLinks } from '../../common/wise-link/wise-link'; styleUrls: ['./rubric-authoring.component.scss'] }) export class RubricAuthoringComponent { - rubric: string = ''; + protected project: any; - constructor( - private configService: ConfigService, - private projectService: TeacherProjectService - ) {} + constructor(private projectService: TeacherProjectService) {} ngOnInit(): void { - this.rubric = this.projectService.replaceAssetPaths(this.projectService.getProjectRubric()); + this.project = this.projectService.getProject(); } protected rubricChanged(): void { - const html = insertWiseLinks(this.configService.removeAbsoluteAssetPaths(this.rubric)); - this.projectService.setProjectRubric(html); this.projectService.saveProject(); } } From 81913d1f6226c86c73aa6b523eb04d8a7418fbb5 Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Tue, 16 Apr 2024 12:18:26 -0400 Subject: [PATCH 54/90] feat(Translation): Convert notebook authoring to translatable (#1729) Co-authored-by: Jonathan Lim-Breitbart --- .../notebook-authoring.component.html | 191 +++++++++--------- .../notebook-authoring.component.scss | 4 + .../notebook-authoring.component.ts | 27 +-- src/messages.xlf | 56 ++--- 4 files changed, 135 insertions(+), 143 deletions(-) diff --git a/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html b/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html index 3038518126a..2f80c4c6ea6 100644 --- a/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html +++ b/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html @@ -13,11 +13,14 @@

Notebook Settings

-
- - Notebook Label - - +
+
Notebook Settings
-
- - Label (Singular) - - - - Label (Plural) - - - - Label (Link) - - +
+ + +
Notebook Settings Enable Report
-
- - Label (Singular) - - - - Label (Plural) - - - - Label (Link) - - +
+ + +
- - Title - - -
- - Max Score - - -
- - Description - - -
- - Prompt - - -
+
+ +
+
+ + Max Score + + +
+ + Starter Text - - +
diff --git a/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.scss b/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.scss index e1450ff39f1..bc622fd36a6 100644 --- a/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.scss +++ b/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.scss @@ -17,3 +17,7 @@ .textarea { width: 100%; } + +.notebook-input { + width: 240px; +} diff --git a/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.ts b/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.ts index b40244bdf90..8bd1ecfc02b 100644 --- a/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.ts +++ b/src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.ts @@ -11,7 +11,6 @@ import { Subject, debounceTime } from 'rxjs'; }) export class NotebookAuthoringComponent { protected notebookChanged: Subject = new Subject(); - protected projectId: number; protected project: any; protected reportIdToAuthoringNote: any; @@ -22,7 +21,6 @@ export class NotebookAuthoringComponent { ngOnInit(): void { this.project = this.projectService.project; - this.projectId = this.configService.getProjectId(); this.reportIdToAuthoringNote = {}; if (this.project.notebook == null) { @@ -36,17 +34,12 @@ export class NotebookAuthoringComponent { this.project.teacherNotebook = projectTemplate.teacherNotebook; } - this.initializeStudentNotesAuthoring(); this.initializeTeacherNotesAuthoring(); this.notebookChanged.pipe(debounceTime(1000)).subscribe(() => { this.save(); }); } - private initializeStudentNotesAuthoring(): void { - this.initializeNotesAuthoring(this.project.notebook.itemTypes.report.notes); - } - private initializeTeacherNotesAuthoring(): void { this.initializeNotesAuthoring(this.project.teacherNotebook.itemTypes.report.notes); } @@ -68,17 +61,14 @@ export class NotebookAuthoringComponent { this.reportIdToAuthoringNote[reportId] = authoringReportNote; } - private getAuthoringReportNote(id: string): any { - return this.reportIdToAuthoringNote[id]; + protected reportStarterTextChanged(reportId: string): void { + const note = this.getReportNote(reportId); + const authoringNote = this.getAuthoringReportNote(reportId); + note.content = insertWiseLinks(this.configService.removeAbsoluteAssetPaths(authoringNote.html)); + this.save(); } private getReportNote(id: string): any { - const studentNotes = this.project.notebook.itemTypes.report.notes; - for (const note of studentNotes) { - if (note.reportId === id) { - return note; - } - } const teacherNotes = this.project.teacherNotebook.itemTypes.report.notes; for (const note of teacherNotes) { if (note.reportId === id) { @@ -88,11 +78,8 @@ export class NotebookAuthoringComponent { return null; } - protected reportStarterTextChanged(reportId: string): void { - const note = this.getReportNote(reportId); - const authoringNote = this.getAuthoringReportNote(reportId); - note.content = insertWiseLinks(this.configService.removeAbsoluteAssetPaths(authoringNote.html)); - this.save(); + private getAuthoringReportNote(id: string): any { + return this.reportIdToAuthoringNote[id]; } protected contentChanged(): void { diff --git a/src/messages.xlf b/src/messages.xlf index 63f6bbc7cb4..95264dc42e3 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -953,7 +953,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 140 + 147 @@ -975,11 +975,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 160 + 166 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 253 + 254 @@ -2070,11 +2070,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 150 + 159 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 243 + 244 src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html @@ -11739,11 +11739,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 135 + 140 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 238 + 239 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html @@ -11876,120 +11876,120 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Notebook Label src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 18 + 20 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 192 + 193 Enable Note src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 29,31 + 32,34 Label (Singular) src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 36 + 41 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 109 + 114 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 212 + 213 Label (Plural) src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 44 + 49 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 117 + 122 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 220 + 221 Label (Link) src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 52 + 57 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 125 + 130 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 228 + 229 Enable Add Note Button src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 65,67 + 68,70 Require students to write text on every note src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 75,77 + 78,80 Enable Clipping src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 84,86 + 87,89 Enable Student Uploads src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 93,95 + 96,98 Enable Report src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 103,105 + 106,108 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 206,208 + 207,209 Starter Text src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 169 + 170 src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 262 + 263 Teacher Notebook src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html - 185,187 + 186,188 From 79fa5a18c2c0d211e8b504499882b245400d25bf Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Thu, 25 Apr 2024 12:56:58 -0700 Subject: [PATCH 55/90] feat(Authoring): Add translatable asset choosers (#1753) --- .../translatable-asset-chooser.component.ts | 10 +- .../animation-authoring.component.html | 95 ++- .../animation-authoring.component.spec.ts | 2 - .../animation-authoring.component.ts | 15 - .../components/component-authoring.module.ts | 13 +- .../concept-map-authoring.component.html | 68 +- .../concept-map-authoring.component.ts | 27 - .../draw-authoring.component.html | 36 +- .../draw-authoring.component.spec.ts | 21 - .../draw-authoring.component.ts | 15 +- .../embedded-authoring.module.ts | 4 +- .../graph-authoring.component.html | 33 +- .../graph-authoring.component.ts | 22 - .../label-authoring.component.html | 35 +- .../label-authoring.component.ts | 22 - .../match-authoring.component.html | 41 +- .../match-authoring.component.ts | 29 +- .../multiple-choice-authoring.component.html | 21 +- .../multiple-choice-authoring.component.ts | 21 +- src/messages.xlf | 587 ++++++++---------- 20 files changed, 402 insertions(+), 715 deletions(-) diff --git a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts index 5e634d73761..771cb72856f 100644 --- a/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts +++ b/src/assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component.ts @@ -19,6 +19,9 @@ import { TeacherProjectTranslationService } from '../../../services/teacherProje }) export class TranslatableAssetChooserComponent extends AbstractTranslatableFieldComponent { @Input() tooltip: String = $localize`Choose image`; + @Input() processAsset: (value: string) => string = (value) => { + return value; + }; constructor( private dialog: MatDialog, @@ -34,11 +37,12 @@ export class TranslatableAssetChooserComponent extends AbstractTranslatableField .afterClosed() .pipe(filter((data) => data != null)) .subscribe(({ assetItem }) => { + const value = this.processAsset(assetItem.fileName); if (this.showTranslationInput()) { - this.translationTextChanged.next(assetItem.fileName); + this.translationTextChanged.next(value); } else { - this.content[this.key] = assetItem.fileName; - this.defaultLanguageTextChanged.next(assetItem.fileName); + this.content[this.key] = value; + this.defaultLanguageTextChanged.next(value); } }); } diff --git a/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html b/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html index d196d09d4d7..17961a6251c 100644 --- a/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html +++ b/src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -216,48 +216,34 @@
- - Image Moving Left - - - - - Image Moving Right - - - + />
@@ -359,23 +345,20 @@ (ngModelChange)="inputChange.next($event)" /> - - Change to Image (Optional) - - - + />
+
+ +
- - Image - - - + +
diff --git a/src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts b/src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts index 5c33db56052..443991792af 100644 --- a/src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts +++ b/src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts @@ -6,9 +6,6 @@ import { AbstractComponentAuthoring } from '../../../authoringTool/components/Ab import { ConfigService } from '../../../services/configService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { ConceptMapService } from '../conceptMapService'; -import { MatDialog } from '@angular/material/dialog'; -import { AssetChooser } from '../../../authoringTool/project-asset-authoring/asset-chooser'; -import { filter } from 'rxjs/operators'; import { TeacherNodeService } from '../../../services/teacherNodeService'; @Component({ @@ -23,7 +20,6 @@ export class ConceptMapAuthoring extends AbstractComponentAuthoring { constructor( private ConceptMapService: ConceptMapService, protected ConfigService: ConfigService, - private dialog: MatDialog, protected NodeService: TeacherNodeService, protected ProjectAssetService: ProjectAssetService, protected ProjectService: TeacherProjectService @@ -114,27 +110,4 @@ export class ConceptMapAuthoring extends AbstractComponentAuthoring { this.componentContent.starterConceptMap = null; this.componentChanged(); } - - assetSelected(args: any): void { - super.assetSelected(args); - const fileName = args.assetItem.fileName; - if (args.target === 'background') { - this.componentContent.background = fileName; - this.componentChanged(); - } else if (args.target != null && args.target.indexOf('node') == 0) { - const node = this.getNodeById(args.target); - node.fileName = fileName; - this.componentChanged(); - } - } - - chooseAsset(target: string): void { - new AssetChooser(this.dialog, this.nodeId, this.componentId) - .open(target) - .afterClosed() - .pipe(filter((data) => data != null)) - .subscribe((data: any) => { - return this.assetSelected(data); - }); - } } diff --git a/src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html b/src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html index a7390d4cf16..0e995992344 100644 --- a/src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html +++ b/src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html @@ -2,28 +2,20 @@ [componentContent]="componentContent" (promptChangedEvent)="promptChanged($event)" > -
- - Background Image (Optional) - - - +
+ +
{ }); moveAStampDown(); moveAStampUp(); - selectTheBackgroundImage(); }); -function selectTheBackgroundImage() { - it('should select the background image', () => { - component.nodeId = 'node1'; - component.componentId = 'component1'; - expect(component.componentContent.background).toEqual('background.png'); - spyOn(component, 'componentChanged').and.callFake(() => {}); - const args = { - nodeId: 'node1', - componentId: 'component1', - target: 'background', - targetObject: {}, - assetItem: { - fileName: 'new_background.png' - } - }; - component.assetSelected(args); - expect(component.componentContent.background).toEqual('new_background.png'); - }); -} - function moveAStampUp() { it('should move a stamp up', () => { expect(component.componentContent.stamps.Stamps[0]).toEqual('carbon.png'); diff --git a/src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts b/src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts index 4841efe523b..f75534a98a8 100644 --- a/src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts +++ b/src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts @@ -158,10 +158,7 @@ export class DrawAuthoring extends AbstractComponentAuthoring { assetSelected({ nodeId, componentId, assetItem, target, targetObject }): void { super.assetSelected({ nodeId, componentId, assetItem, target }); const fileName = assetItem.fileName; - if (target === 'background') { - this.componentContent.background = fileName; - this.updateStarterDrawDataBackgroundAndSave(); - } else if (target === 'stamp') { + if (target === 'stamp') { const stampIndex = targetObject; this.setStampImage(stampIndex, fileName); this.updateAuthoringComponentContentStampsAndSave(); @@ -272,14 +269,4 @@ export class DrawAuthoring extends AbstractComponentAuthoring { } return stampStrings; } - - chooseBackground(): void { - new AssetChooser(this.dialog, this.nodeId, this.componentId) - .open('background') - .afterClosed() - .pipe(filter((data) => data != null)) - .subscribe((data: any) => { - return this.assetSelected(data); - }); - } } diff --git a/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.module.ts b/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.module.ts index eb091a462b7..58d75cb8253 100644 --- a/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.module.ts +++ b/src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.module.ts @@ -22,7 +22,6 @@ import { TeacherProjectService } from '../../../services/teacherProjectService'; import { EmbeddedService } from '../embeddedService'; import { EmbeddedAuthoring } from './embedded-authoring.component'; import { ComponentAuthoringModule } from '../../component-authoring.module'; -import { TranslatableAssetChooserComponent } from '../../../authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component'; @NgModule({ declarations: [EmbeddedAuthoring, EditComponentPrompt, AuthorUrlParametersComponent], @@ -35,8 +34,7 @@ import { TranslatableAssetChooserComponent } from '../../../authoringTool/compon MatFormFieldModule, MatIconModule, MatInputModule, - MatRadioModule, - TranslatableAssetChooserComponent + MatRadioModule ], providers: [ AnnotationService, diff --git a/src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html b/src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html index 148406b5d23..6f320b8eb2f 100644 --- a/src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html +++ b/src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html @@ -301,26 +301,19 @@
- - Background Image (Optional) - - - + +
Round Values To diff --git a/src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts b/src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts index 3ba5abd85d5..8b6fcfc85ce 100644 --- a/src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts +++ b/src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts @@ -7,9 +7,6 @@ import { ConfigService } from '../../../services/configService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { GraphService } from '../graphService'; import { isMultipleYAxes } from '../util'; -import { MatDialog } from '@angular/material/dialog'; -import { AssetChooser } from '../../../authoringTool/project-asset-authoring/asset-chooser'; -import { filter } from 'rxjs/operators'; import { TeacherNodeService } from '../../../services/teacherNodeService'; @Component({ @@ -132,7 +129,6 @@ export class GraphAuthoring extends AbstractComponentAuthoring { constructor( protected ConfigService: ConfigService, - private dialog: MatDialog, private GraphService: GraphService, protected NodeService: TeacherNodeService, protected ProjectAssetService: ProjectAssetService, @@ -209,14 +205,6 @@ export class GraphAuthoring extends AbstractComponentAuthoring { this.componentChanged(); } - assetSelected({ nodeId, componentId, assetItem, target, targetObject }): void { - super.assetSelected({ nodeId, componentId, assetItem, target }); - if (target === 'background') { - this.componentContent.backgroundImage = assetItem.fileName; - this.componentChanged(); - } - } - addXAxisCategory(): void { this.componentContent.xAxis.categories.push(''); this.componentChanged(); @@ -563,14 +551,4 @@ export class GraphAuthoring extends AbstractComponentAuthoring { customTrackBy(index: number): number { return index; } - - chooseBackground(): void { - new AssetChooser(this.dialog, this.nodeId, this.componentId) - .open('background') - .afterClosed() - .pipe(filter((data) => data != null)) - .subscribe((data: any) => { - return this.assetSelected(data); - }); - } } diff --git a/src/assets/wise5/components/label/label-authoring/label-authoring.component.html b/src/assets/wise5/components/label/label-authoring/label-authoring.component.html index eabd592df53..284ccca8d65 100644 --- a/src/assets/wise5/components/label/label-authoring/label-authoring.component.html +++ b/src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -2,27 +2,20 @@ [componentContent]="componentContent" (promptChangedEvent)="promptChanged($event)" > -
- - Background Image - - - +
+ +
diff --git a/src/assets/wise5/components/label/label-authoring/label-authoring.component.ts b/src/assets/wise5/components/label/label-authoring/label-authoring.component.ts index 175e3147939..3e02030d559 100644 --- a/src/assets/wise5/components/label/label-authoring/label-authoring.component.ts +++ b/src/assets/wise5/components/label/label-authoring/label-authoring.component.ts @@ -7,8 +7,6 @@ import { TeacherProjectService } from '../../../services/teacherProjectService'; import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter } from 'rxjs/operators'; import { ProjectAssetService } from '../../../../../app/services/projectAssetService'; -import { MatDialog } from '@angular/material/dialog'; -import { AssetChooser } from '../../../authoringTool/project-asset-authoring/asset-chooser'; import { TeacherNodeService } from '../../../services/teacherNodeService'; @Component({ @@ -22,7 +20,6 @@ export class LabelAuthoring extends AbstractComponentAuthoring { constructor( protected ConfigService: ConfigService, - private dialog: MatDialog, protected NodeService: TeacherNodeService, protected ProjectAssetService: ProjectAssetService, protected ProjectService: TeacherProjectService @@ -72,15 +69,6 @@ export class LabelAuthoring extends AbstractComponentAuthoring { } } - assetSelected({ nodeId, componentId, assetItem, target }): void { - super.assetSelected({ nodeId, componentId, assetItem, target }); - const fileName = assetItem.fileName; - if (target === 'background') { - this.componentContent.backgroundImage = fileName; - this.componentChanged(); - } - } - saveStarterState(starterState: any): void { this.componentContent.labels = starterState; this.componentChanged(); @@ -104,14 +92,4 @@ export class LabelAuthoring extends AbstractComponentAuthoring { openColorViewer(): void { window.open('http://www.javascripter.net/faq/colornam.htm'); } - - chooseBackground(): void { - new AssetChooser(this.dialog, this.nodeId, this.componentId) - .open('background') - .afterClosed() - .pipe(filter((data) => data != null)) - .subscribe((data: any) => { - return this.assetSelected(data); - }); - } } diff --git a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html index 70761338876..c055e7034c8 100644 --- a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html +++ b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html @@ -73,19 +73,12 @@ (defaultLanguageTextChanged)="inputChange.next($event)" class="name" /> - + + /> + +
data != null)) - .subscribe((data: any) => { - return this.assetSelected(data); - }); - } - - assetSelected({ nodeId, componentId, assetItem, target, targetObject }): void { - super.assetSelected({ nodeId, componentId, assetItem, target }); - if (target === 'choice') { - targetObject.text = ``; - this.componentChanged(); - } + processSelectedAsset(value: string): string { + return `${value}`; } } diff --git a/src/messages.xlf b/src/messages.xlf index ca1cab6324b..1ff43d42953 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -577,23 +577,23 @@ src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 386 + 369 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 164 + 152 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 167 + 155 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 272 + 260 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 275 + 263 src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html @@ -601,27 +601,27 @@ src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 275 + 267 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 569 + 562 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 572 + 565 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 95 + 88 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 198 + 183 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 96 + 89 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -640,23 +640,23 @@ src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 400 + 383 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 177 + 165 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 180 + 168 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 285 + 273 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 288 + 276 src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html @@ -664,23 +664,23 @@ src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 583 + 576 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 586 + 579 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 109 + 102 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 212 + 197 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 110 + 103 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -715,27 +715,27 @@ src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 416 + 399 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 448 + 431 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 189 + 177 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 192 + 180 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 297 + 285 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 300 + 288 src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html @@ -743,11 +743,11 @@ src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 302 + 294 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 305 + 297 src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html @@ -763,15 +763,15 @@ src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 599 + 592 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 614 + 607 src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 237 + 230 src/assets/wise5/components/label/label-student/label-student.component.html @@ -779,19 +779,19 @@ src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 125 + 118 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 228 + 213 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 123 + 116 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 126 + 119 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -1052,7 +1052,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 450 + 443 @@ -1647,7 +1647,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 456 + 439 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1666,7 +1666,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 470 + 453 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1937,7 +1937,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 429 + 422 @@ -7719,15 +7719,15 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 314 + 300 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 435 + 418 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 236 + 228 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html @@ -7735,11 +7735,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 411 + 404 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 503 + 496 src/assets/wise5/components/match/match-authoring/match-authoring.component.html @@ -7747,7 +7747,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 150 + 143 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html @@ -9594,15 +9594,15 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 237 + 222 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 258 + 243 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 82 + 75 @@ -10430,7 +10430,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.ts - 303 + 278 src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts @@ -15647,20 +15647,12 @@ Are you sure you want to proceed? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 117 + 114 src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html 54 - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 21 - - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 61 - Text @@ -15696,23 +15688,23 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 389 + 372 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 278 + 270 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 98 + 91 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 201 + 186 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 99 + 92 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -15734,23 +15726,23 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 403 + 386 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 292 + 284 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 112 + 105 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 215 + 200 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 113 + 106 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -15782,274 +15774,183 @@ Are you sure you want to proceed? Image Moving Left src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 220 - - - - Choose an Image - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 232 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 235 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 253 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 256 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 371 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 374 - - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 19 - - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 128 - - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 131 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 19 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 22 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 252 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 261 - - - src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 264 - - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 316 - - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 319 - - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 18 - - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 81 - - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 84 - - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 184 - - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 187 - - - src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 58 + 222 Image Moving Right src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 241 + 236 Location X (Pixels) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 264 + 250 Location Y (Pixels) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 274 + 260 Data X (Units) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 284 + 270 Data Y (Units) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 294 + 280 Data Points src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 305 + 291 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 495 + 488 Add Data Point src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 311 + 297 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 500 + 493 Time src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 333 + 319 X src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 343 + 329 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 534 + 527 src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 191 + 184 src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 212 + 205 Y src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 353 + 339 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 543 + 536 src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 200 + 193 src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 221 + 214 Change to Image (Optional) src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 363 + 351 Delete Data Point src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 413 + 396 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 596 + 589 Data Source src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 425 + 408 Add Data Source src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 432 + 415 Delete Data Source src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 445 + 428 Trial Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 494 + 477 Series Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 504 + 487 Time Column Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 514 + 497 X Column Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 524 + 507 Y Column Index src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 534 + 517 @@ -16807,146 +16708,150 @@ Are you ready to receive feedback on this answer? Background Image (Optional) src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 8 + 10 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 7 + 9 src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 305 + 307 + + + src/assets/wise5/components/label/label-authoring/label-authoring.component.html + 9 Stretch background to fit src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 32,34 + 27,29 Allow student to upload background image src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 42,44 + 37,39 Canvas Width (Optional) src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 48 + 43 Canvas Height (Optional) src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 57 + 52 src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 49 + 41 Nodes src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 68 + 63 Add Node src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 73 + 68 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 76 + 71 There are no nodes. Click the "Add Node" button to add a node. src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 83 + 78 Node Label src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 103 + 98 Width src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 139 + 127 Height src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 148 + 136 Show Node Labels src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 206,208 + 194,196 Links Title src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 215 + 203 Links src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 221 + 209 Add Link src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 226 + 214 src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 229 + 217 There are no links. Click the "Add Link" button to add a link. src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 236 + 224 Link Label src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 256 + 244 Color src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 262 + 250 src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html @@ -16966,11 +16871,11 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 434 + 427 src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 145 + 138 src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html @@ -16984,7 +16889,7 @@ File Name: Label: src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts - 51 + 47 @@ -16993,7 +16898,7 @@ Label: Label: src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts - 63 + 59 @@ -17661,161 +17566,176 @@ Category Name: Allow student to upload background image src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 34,36 + 26,28 Enable All Tools src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 63 + 55 Enable All src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 66 + 58 Disable All Tools src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 76 + 68 Disable All src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 79 + 71 Select Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 91,93 + 83,85 Line Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 100,102 + 92,94 Shape Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 109,111 + 101,103 Free Hand Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 118,120 + 110,112 Text Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 128,130 + 120,122 Stamp Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 137,139 + 129,131 Clone Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 146,148 + 138,140 Stroke Color Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 155,157 + 147,149 Fill Color Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 165,167 + 157,159 Stroke Width Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 174,176 + 166,168 Send Back Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 183,185 + 175,177 Send Forward Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 192,194 + 184,186 Undo Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 202,204 + 194,196 Redo Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 211,213 + 203,205 Delete Tool src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 220,222 + 212,214 Stamps src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 227 + 219 Add Stamp src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 233 + 225 + + + + Choose an Image + + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + 244 + + + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + 253 + + + src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html + 256 above src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html - 290 + 282 @@ -17824,7 +17744,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts - 244 + 241 @@ -18318,7 +18238,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 482 + 475 src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html @@ -18350,63 +18270,63 @@ Category Name: Round Values To src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 326 + 319 Enable Trials src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 342,344 + 335,337 Can Student Create Trials src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 352,354 + 345,347 Can Student Delete Trials src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 361,363 + 354,356 Hide Existing Trials On New Trial src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 370,372 + 363,365 Can Student Hide Series By Clicking On Legend src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 379,381 + 372,374 Enable File Upload src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 388,390 + 381,383 Hide Legend src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 397,399 + 390,392 Series src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 403 + 396 src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html @@ -18417,7 +18337,7 @@ Category Name: Add Series src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 408 + 401 @@ -18425,252 +18345,252 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 421,423 + 414,416 Symbol src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 440 + 433 Line Type src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 463 + 456 Can Student Edit src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 478,480 + 471,473 Y Axis : src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 488,490 + 481,483 Delete Series src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 611 + 604 Line Plot src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 24 + 21 Column Plot src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 28 + 25 Scatter Plot src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 32 + 29 No Rounding src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 39 + 36 Integer (example 1) src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 43 + 40 Tenth (exapmle 0.1) src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 47 + 44 Hundredth (example 0.01) src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 51 + 48 Circle src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 58 + 55 Square src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 62 + 59 Triangle src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 66 + 63 Triangle Down src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 70 + 67 Diamond src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 74 + 71 Line src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 81 + 78 Point src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 85 + 82 Solid src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 92 + 89 Dash src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 96 + 93 Dot src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 100 + 97 Short Dash src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 104 + 101 Short Dot src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 108 + 105 Limits src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 115 + 112 Categories src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 119 + 116 Are you sure you want to delete the series? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 190 + 186 Are you sure you want to delete the "" series? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 192 + 188 Are you sure you want to delete the category? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 232 + 220 Are you sure you want to delete the "" category? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 234 + 222 Are you sure you want to delete the data point? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 258 + 246 Category One src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 297 + 285 Category Two src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 297 + 285 Are you sure you want to remove multiple Y axes? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 341 + 329 Are you sure you want to decrease the number of Y Axes? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts - 434 + 422 @@ -18922,98 +18842,91 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 58 - - - - Background Image - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 7 + 51 Canvas Width (px) src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 29 + 22 Canvas Height (px) src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 38 + 31 Point Radius Size (px) src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 49 + 42 Label Max Character Width src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 67 + 60 Can Student Create Labels src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 83,85 + 76,78 Enable Dots src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 93,95 + 86,88 Allow Student to Upload Image for Background src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 103,105 + 96,98 Starter Labels src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 110 + 103 Add Starter Label src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 115 + 108 add src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 118 + 111 There are no starter labels. Click the "Add Label" button to add a starter label. src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 128,130 + 121,123 Label Text src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 139 + 132 src/assets/wise5/components/label/label-student/label-student.component.html @@ -19024,56 +18937,56 @@ Category Name: View Colors src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 157 + 150 Color Palette src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 160 + 153 Can Student Edit Label src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 173,175 + 166,168 Can Student Delete Label src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 183,185 + 176,178 Point Location src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 189 + 182 Text Location src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 210 + 203 Delete Label src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 234 + 227 Enter text here src/assets/wise5/components/label/label-authoring/label-authoring.component.ts - 54 + 51 @@ -19082,7 +18995,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.ts - 69 + 66 src/assets/wise5/components/label/label-student/label-student.component.ts @@ -19230,7 +19143,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 173 + 166 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html @@ -19241,109 +19154,109 @@ Warning: This will delete all existing choices and buckets in this component.Delete Choice src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 122 + 115 Source Bucket Name src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 136 + 129 Target Buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 141 + 134 Add Target Bucket src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 147 + 140 There are no target buckets. Click the "Add Target Bucket" button to add a bucket. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 155,157 + 148,150 Target Bucket Name src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 171 + 164 Delete Bucket src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 225 + 210 Choices need to be ordered within buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 243,245 + 228,230 Bucket Name: src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 248 + 233 Choice: src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 253 + 238 Is Correct src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 270,272 + 255,257 Position src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 276 + 261 Incorrect Position Feedback src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 287 + 272 Are you sure you want to delete this choice? src/assets/wise5/components/match/match-authoring/match-authoring.component.ts - 116 + 113 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.ts - 73 + 70 Are you sure you want to delete this bucket? src/assets/wise5/components/match/match-authoring/match-authoring.component.ts - 174 + 171 @@ -19556,21 +19469,21 @@ Warning: This will delete all existing choices in this component. Is Correct src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 71 + 64 Is Correct src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 73,75 + 66,68 Optional src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html - 84 + 77 From 371e84f71032b8cf17098612d6bf4a7f6948de36 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 29 Apr 2024 08:21:11 -0700 Subject: [PATCH 56/90] feat(MultipleLanguages): Delete translations when components are deleted (#1756) --- .../removeTranslationsService.spec.ts | 49 ++++++++++++++ src/app/teacher/teacher-authoring.module.ts | 2 + .../node-authoring.component.spec.ts | 11 +++- .../node-authoring.component.ts | 34 ++++++---- .../services/removeTranslationsService.ts | 66 +++++++++++++++++++ src/messages.xlf | 4 +- 6 files changed, 148 insertions(+), 18 deletions(-) create mode 100644 src/app/services/removeTranslationsService.spec.ts create mode 100644 src/assets/wise5/services/removeTranslationsService.ts diff --git a/src/app/services/removeTranslationsService.spec.ts b/src/app/services/removeTranslationsService.spec.ts new file mode 100644 index 00000000000..eecd905a141 --- /dev/null +++ b/src/app/services/removeTranslationsService.spec.ts @@ -0,0 +1,49 @@ +import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { TeacherProjectService } from '../../assets/wise5/services/teacherProjectService'; +import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module'; +import { RemoveTranslationsService } from '../../assets/wise5/services/removeTranslationsService'; +import { ProjectLocale } from '../domain/projectLocale'; +import { ComponentContent } from '../../assets/wise5/common/ComponentContent'; +import { ConfigService } from '../../assets/wise5/services/configService'; + +let configService: ConfigService; +let http: HttpTestingController; +let projectService: TeacherProjectService; +let service: RemoveTranslationsService; +describe('RemoveTranslationsService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule], + providers: [RemoveTranslationsService, TeacherProjectService], + teardown: { destroyAfterEach: false } + }); + configService = TestBed.inject(ConfigService); + http = TestBed.inject(HttpTestingController); + projectService = TestBed.inject(TeacherProjectService); + service = TestBed.inject(RemoveTranslationsService); + }); + removeComponent(); +}); + +function removeComponent() { + describe('removeComponent()', () => { + it('fetches all supported translations', () => { + spyOn(projectService, 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en_us', supported: ['es', 'ja'] }) + ); + spyOn(configService, 'getProjectId').and.returnValue('123'); + spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json'); + service.removeComponents([ + { + id: 'abc', + type: 'OpenResponse', + prompt: 'hello', + 'prompt.i18n': { id: 'xyz' } + } as ComponentContent + ]); + http.expectOne(`/123/translations.es.json`).flush({ xyz: {} }); + http.expectOne(`/123/translations.ja.json`).flush({ xyz: {} }); + }); + }); +} diff --git a/src/app/teacher/teacher-authoring.module.ts b/src/app/teacher/teacher-authoring.module.ts index e84a8cb1f6f..4073f6b8da5 100644 --- a/src/app/teacher/teacher-authoring.module.ts +++ b/src/app/teacher/teacher-authoring.module.ts @@ -33,6 +33,7 @@ import { AuthoringRoutingModule } from './authoring-routing.module'; import { RouterModule } from '@angular/router'; import { ComponentInfoService } from '../../assets/wise5/services/componentInfoService'; import { TeacherProjectTranslationService } from '../../assets/wise5/services/teacherProjectTranslationService'; +import { RemoveTranslationsService } from '../../assets/wise5/services/removeTranslationsService'; @NgModule({ imports: [StudentTeacherCommonModule, AuthoringToolModule, RouterModule, AuthoringRoutingModule], @@ -55,6 +56,7 @@ import { TeacherProjectTranslationService } from '../../assets/wise5/services/te { provide: NodeService, useExisting: TeacherNodeService }, ProjectAssetService, SpaceService, + RemoveTranslationsService, { provide: PeerGroupService, useExisting: TeacherPeerGroupService }, { provide: ProjectService, useExisting: TeacherProjectService }, TeacherDataService, diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts index 8e2523cf879..e97cb395503 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts @@ -28,6 +28,7 @@ import { CopyComponentButtonComponent } from '../copy-component-button/copy-comp import { ProjectLocale } from '../../../../../app/domain/projectLocale'; import { TeacherProjectTranslationService } from '../../../services/teacherProjectTranslationService'; import { ComponentTypeServiceModule } from '../../../services/componentTypeService.module'; +import { RemoveTranslationsService } from '../../../services/removeTranslationsService'; let component: NodeAuthoringComponent; let component1: any; @@ -39,6 +40,7 @@ let node1Components = []; const nodeId1 = 'node1'; let teacherDataService: TeacherDataService; let teacherProjectService: TeacherProjectService; +let saveProjectSpy: jasmine.Spy; describe('NodeAuthoringComponent', () => { beforeEach(async () => { @@ -68,6 +70,7 @@ describe('NodeAuthoringComponent', () => { ClassroomStatusService, TeacherProjectTranslationService, ProjectAssetService, + RemoveTranslationsService, TeacherDataService, TeacherNodeService, TeacherProjectService, @@ -106,7 +109,8 @@ describe('NodeAuthoringComponent', () => { teacherProjectService.idToNode = { node1: node1 }; teacherProjectService.project = { nodes: [{ id: nodeId1, components: node1Components }], - inactiveNodes: [] + inactiveNodes: [], + metadata: { locale: { default: 'en_US', supported: ['es'] } } }; spyOn(teacherProjectService, 'getNodeById').and.returnValue(node1); teacherDataService = TestBed.inject(TeacherDataService); @@ -114,8 +118,10 @@ describe('NodeAuthoringComponent', () => { return Promise.resolve(); }); spyOn(teacherProjectService, 'getLocale').and.returnValue( - new ProjectLocale({ default: 'en-US' }) + new ProjectLocale({ default: 'en-US', supported: ['es'] }) ); + spyOn(TestBed.inject(TeacherProjectService), 'isDefaultLocale').and.returnValue(true); + saveProjectSpy = spyOn(teacherProjectService, 'saveProject').and.returnValue(Promise.resolve()); fixture = TestBed.createComponent(NodeAuthoringComponent); component = fixture.componentInstance; component.nodeId = nodeId1; @@ -156,6 +162,7 @@ function deleteComponent() { expect(confirmSpy).toHaveBeenCalledWith( `Are you sure you want to delete this component?\n2. MultipleChoice` ); + expect(saveProjectSpy).toHaveBeenCalled(); expect(teacherProjectService.idToNode[nodeId1].components).toEqual([component1, component3]); }); }); diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts index b0b91890366..244aee18def 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts @@ -10,6 +10,7 @@ import { scrollToTopOfPage, temporarilyHighlightElement } from '../../../common/ import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { ActivatedRoute, Router } from '@angular/router'; import { TeacherNodeService } from '../../../services/teacherNodeService'; +import { RemoveTranslationsService } from '../../../services/removeTranslationsService'; @Component({ selector: 'node-authoring', @@ -35,6 +36,7 @@ export class NodeAuthoringComponent implements OnInit { private nodeService: TeacherNodeService, private projectService: TeacherProjectService, private dataService: TeacherDataService, + private removeTranslationsService: RemoveTranslationsService, private route: ActivatedRoute, private router: Router ) {} @@ -172,10 +174,9 @@ export class NodeAuthoringComponent implements OnInit { protected deleteComponents(): void { scrollToTopOfPage(); if (this.confirmDeleteComponent(this.getSelectedComponentNumbersAndTypes())) { - const componentIdAndTypes = this.getSelectedComponents() - .map((component) => this.node.deleteComponent(component.id)) - .map((component) => ({ componentId: component.id, type: component.type })); - this.afterDeleteComponent(componentIdAndTypes); + this.deleteComponentsOnServer( + this.getSelectedComponents().map((component) => this.node.deleteComponent(component.id)) + ); } } @@ -186,10 +187,7 @@ export class NodeAuthoringComponent implements OnInit { ): void { event.stopPropagation(); if (this.confirmDeleteComponent([`${componentNumber}. ${component.type}`])) { - const deletedComponent = this.node.deleteComponent(component.id); - this.afterDeleteComponent([ - { componentId: deletedComponent.id, type: deletedComponent.type } - ]); + this.deleteComponentsOnServer([this.node.deleteComponent(component.id)]); } } @@ -202,13 +200,15 @@ export class NodeAuthoringComponent implements OnInit { return confirm(confirmMessage); } - private afterDeleteComponent(componentIdAndTypes: any[]): void { - for (const componentIdAndType of componentIdAndTypes) { - this.componentsToChecked.mutate((obj) => delete obj[componentIdAndType.componentId]); - delete this.componentsToExpanded[componentIdAndType.componentId]; - } + private deleteComponentsOnServer(components: ComponentContent[]): void { this.checkIfNeedToShowNodeSaveOrNodeSubmitButtons(); - this.projectService.saveProject(); + this.projectService.saveProject().then(() => { + for (const component of components) { + this.componentsToChecked.mutate((obj) => delete obj[component.id]); + delete this.componentsToExpanded[component.id]; + } + this.removeTranslations(components); + }); } private checkIfNeedToShowNodeSaveOrNodeSubmitButtons(): void { @@ -224,6 +224,12 @@ export class NodeAuthoringComponent implements OnInit { } } + private removeTranslations(components: ComponentContent[]): void { + if (this.projectService.getLocale().hasTranslations()) { + this.removeTranslationsService.removeComponents(components); + } + } + /** * Temporarily highlight the specified components and show the component * authoring views. Used to bring user's attention to new changes. diff --git a/src/assets/wise5/services/removeTranslationsService.ts b/src/assets/wise5/services/removeTranslationsService.ts new file mode 100644 index 00000000000..73074f5c3e1 --- /dev/null +++ b/src/assets/wise5/services/removeTranslationsService.ts @@ -0,0 +1,66 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable, forkJoin, lastValueFrom } from 'rxjs'; +import { Translations } from '../../../app/domain/translations'; +import { ComponentContent } from '../common/ComponentContent'; +import { ConfigService } from './configService'; +import { Language } from '../../../app/domain/language'; +import { ProjectTranslationService } from './projectTranslationService'; +import { TeacherProjectService } from './teacherProjectService'; + +@Injectable() +export class RemoveTranslationsService extends ProjectTranslationService { + constructor( + protected configService: ConfigService, + protected http: HttpClient, + protected projectService: TeacherProjectService + ) { + super(configService, http, projectService); + } + + async removeComponents(components: ComponentContent[]): Promise { + const allTranslations = await this.fetchAllTranslations(); + const i18nKeys = components.flatMap((component) => this.getI18NKeys(component)); + const saveTranslationRequests: Observable[] = []; + allTranslations.forEach((translations, language) => { + i18nKeys.forEach((i18nKey) => delete translations[i18nKey]); + saveTranslationRequests.push( + this.http.post( + `/api/author/project/translate/${this.configService.getProjectId()}/${language.locale}`, + translations + ) + ); + }); + forkJoin(saveTranslationRequests).subscribe(); + } + + private async fetchAllTranslations(): Promise> { + const allTranslations = new Map(); + await Promise.all( + this.projectService + .getLocale() + .getSupportedLanguages() + .map(async (language) => { + allTranslations.set( + language, + await lastValueFrom(this.fetchTranslations(language.locale)) + ); + }) + ); + return allTranslations; + } + + private getI18NKeys(componentElement: object): string[] { + let i18nKeys = Object.keys(componentElement) + .filter((key) => key.endsWith('.i18n')) + .map((key) => componentElement[key].id); + Object.values(componentElement).forEach((value) => { + if (Array.isArray(value)) { + i18nKeys = i18nKeys.concat(...value.map((val) => this.getI18NKeys(val))); + } else if (typeof value === 'object' && value != null) { + i18nKeys = i18nKeys.concat(this.getI18NKeys(value)); + } + }); + return i18nKeys; + } +} diff --git a/src/messages.xlf b/src/messages.xlf index 1ff43d42953..6233307ef60 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -11827,7 +11827,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 197 @@ -11835,7 +11835,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 198 From 6d4991d98af959b0797e8d9e57c737015c75b342 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 29 Apr 2024 11:43:01 -0700 Subject: [PATCH 57/90] Rename removeTranslation to deleteTranslation to be consistent with deleteNode --- ...ec.ts => deleteTranslationsService.spec.ts} | 18 +++++++++--------- src/app/teacher/teacher-authoring.module.ts | 4 ++-- .../node-authoring.component.spec.ts | 4 ++-- .../node-authoring/node-authoring.component.ts | 10 +++++----- ...Service.ts => deleteTranslationsService.ts} | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) rename src/app/services/{removeTranslationsService.spec.ts => deleteTranslationsService.spec.ts} (79%) rename src/assets/wise5/services/{removeTranslationsService.ts => deleteTranslationsService.ts} (94%) diff --git a/src/app/services/removeTranslationsService.spec.ts b/src/app/services/deleteTranslationsService.spec.ts similarity index 79% rename from src/app/services/removeTranslationsService.spec.ts rename to src/app/services/deleteTranslationsService.spec.ts index eecd905a141..68c468401c4 100644 --- a/src/app/services/removeTranslationsService.spec.ts +++ b/src/app/services/deleteTranslationsService.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { TestBed } from '@angular/core/testing'; import { TeacherProjectService } from '../../assets/wise5/services/teacherProjectService'; import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module'; -import { RemoveTranslationsService } from '../../assets/wise5/services/removeTranslationsService'; +import { DeleteTranslationsService } from '../../assets/wise5/services/deleteTranslationsService'; import { ProjectLocale } from '../domain/projectLocale'; import { ComponentContent } from '../../assets/wise5/common/ComponentContent'; import { ConfigService } from '../../assets/wise5/services/configService'; @@ -10,31 +10,31 @@ import { ConfigService } from '../../assets/wise5/services/configService'; let configService: ConfigService; let http: HttpTestingController; let projectService: TeacherProjectService; -let service: RemoveTranslationsService; -describe('RemoveTranslationsService', () => { +let service: DeleteTranslationsService; +describe('DeleteTranslationsService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule], - providers: [RemoveTranslationsService, TeacherProjectService], + providers: [DeleteTranslationsService, TeacherProjectService], teardown: { destroyAfterEach: false } }); configService = TestBed.inject(ConfigService); http = TestBed.inject(HttpTestingController); projectService = TestBed.inject(TeacherProjectService); - service = TestBed.inject(RemoveTranslationsService); + service = TestBed.inject(DeleteTranslationsService); }); - removeComponent(); + deleteComponents(); }); -function removeComponent() { - describe('removeComponent()', () => { +function deleteComponents() { + describe('deleteComponents()', () => { it('fetches all supported translations', () => { spyOn(projectService, 'getLocale').and.returnValue( new ProjectLocale({ default: 'en_us', supported: ['es', 'ja'] }) ); spyOn(configService, 'getProjectId').and.returnValue('123'); spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json'); - service.removeComponents([ + service.deleteComponents([ { id: 'abc', type: 'OpenResponse', diff --git a/src/app/teacher/teacher-authoring.module.ts b/src/app/teacher/teacher-authoring.module.ts index 4073f6b8da5..16d7121f9b7 100644 --- a/src/app/teacher/teacher-authoring.module.ts +++ b/src/app/teacher/teacher-authoring.module.ts @@ -33,7 +33,7 @@ import { AuthoringRoutingModule } from './authoring-routing.module'; import { RouterModule } from '@angular/router'; import { ComponentInfoService } from '../../assets/wise5/services/componentInfoService'; import { TeacherProjectTranslationService } from '../../assets/wise5/services/teacherProjectTranslationService'; -import { RemoveTranslationsService } from '../../assets/wise5/services/removeTranslationsService'; +import { DeleteTranslationsService } from '../../assets/wise5/services/deleteTranslationsService'; @NgModule({ imports: [StudentTeacherCommonModule, AuthoringToolModule, RouterModule, AuthoringRoutingModule], @@ -56,7 +56,7 @@ import { RemoveTranslationsService } from '../../assets/wise5/services/removeTra { provide: NodeService, useExisting: TeacherNodeService }, ProjectAssetService, SpaceService, - RemoveTranslationsService, + DeleteTranslationsService, { provide: PeerGroupService, useExisting: TeacherPeerGroupService }, { provide: ProjectService, useExisting: TeacherProjectService }, TeacherDataService, diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts index e97cb395503..b506521c7f5 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts @@ -28,7 +28,7 @@ import { CopyComponentButtonComponent } from '../copy-component-button/copy-comp import { ProjectLocale } from '../../../../../app/domain/projectLocale'; import { TeacherProjectTranslationService } from '../../../services/teacherProjectTranslationService'; import { ComponentTypeServiceModule } from '../../../services/componentTypeService.module'; -import { RemoveTranslationsService } from '../../../services/removeTranslationsService'; +import { DeleteTranslationsService } from '../../../services/deleteTranslationsService'; let component: NodeAuthoringComponent; let component1: any; @@ -68,9 +68,9 @@ describe('NodeAuthoringComponent', () => { ], providers: [ ClassroomStatusService, + DeleteTranslationsService, TeacherProjectTranslationService, ProjectAssetService, - RemoveTranslationsService, TeacherDataService, TeacherNodeService, TeacherProjectService, diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts index 244aee18def..550d4b85147 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts @@ -10,7 +10,7 @@ import { scrollToTopOfPage, temporarilyHighlightElement } from '../../../common/ import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { ActivatedRoute, Router } from '@angular/router'; import { TeacherNodeService } from '../../../services/teacherNodeService'; -import { RemoveTranslationsService } from '../../../services/removeTranslationsService'; +import { DeleteTranslationsService } from '../../../services/deleteTranslationsService'; @Component({ selector: 'node-authoring', @@ -36,7 +36,7 @@ export class NodeAuthoringComponent implements OnInit { private nodeService: TeacherNodeService, private projectService: TeacherProjectService, private dataService: TeacherDataService, - private removeTranslationsService: RemoveTranslationsService, + private deleteTranslationsService: DeleteTranslationsService, private route: ActivatedRoute, private router: Router ) {} @@ -207,7 +207,7 @@ export class NodeAuthoringComponent implements OnInit { this.componentsToChecked.mutate((obj) => delete obj[component.id]); delete this.componentsToExpanded[component.id]; } - this.removeTranslations(components); + this.deleteTranslations(components); }); } @@ -224,9 +224,9 @@ export class NodeAuthoringComponent implements OnInit { } } - private removeTranslations(components: ComponentContent[]): void { + private deleteTranslations(components: ComponentContent[]): void { if (this.projectService.getLocale().hasTranslations()) { - this.removeTranslationsService.removeComponents(components); + this.deleteTranslationsService.deleteComponents(components); } } diff --git a/src/assets/wise5/services/removeTranslationsService.ts b/src/assets/wise5/services/deleteTranslationsService.ts similarity index 94% rename from src/assets/wise5/services/removeTranslationsService.ts rename to src/assets/wise5/services/deleteTranslationsService.ts index 73074f5c3e1..b85917dfa32 100644 --- a/src/assets/wise5/services/removeTranslationsService.ts +++ b/src/assets/wise5/services/deleteTranslationsService.ts @@ -9,7 +9,7 @@ import { ProjectTranslationService } from './projectTranslationService'; import { TeacherProjectService } from './teacherProjectService'; @Injectable() -export class RemoveTranslationsService extends ProjectTranslationService { +export class DeleteTranslationsService extends ProjectTranslationService { constructor( protected configService: ConfigService, protected http: HttpClient, @@ -18,7 +18,7 @@ export class RemoveTranslationsService extends ProjectTranslationService { super(configService, http, projectService); } - async removeComponents(components: ComponentContent[]): Promise { + async deleteComponents(components: ComponentContent[]): Promise { const allTranslations = await this.fetchAllTranslations(); const i18nKeys = components.flatMap((component) => this.getI18NKeys(component)); const saveTranslationRequests: Observable[] = []; From 987c9a2873ec2bae28105c6628a71d9c02be6230 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Wed, 1 May 2024 15:16:48 -0700 Subject: [PATCH 58/90] feat(MultipleLanguages): Delete translations when steps and lessons are deleted (#1767) --- .../deleteTranslationsService.spec.ts | 8 +- .../node-authoring.component.ts | 8 +- ...project-authoring-lesson.component.spec.ts | 2 + .../project-authoring-lesson.component.ts | 4 + .../project-authoring-step.component.spec.ts | 2 + .../project-authoring-step.component.ts | 5 ++ .../project-authoring.component.spec.ts | 2 + .../project-authoring.component.ts | 19 ++++- .../services/deleteTranslationsService.ts | 8 +- .../wise5/services/teacherProjectService.ts | 11 +++ src/messages.xlf | 75 +++++++++---------- 11 files changed, 87 insertions(+), 57 deletions(-) diff --git a/src/app/services/deleteTranslationsService.spec.ts b/src/app/services/deleteTranslationsService.spec.ts index 68c468401c4..febac4b9ff5 100644 --- a/src/app/services/deleteTranslationsService.spec.ts +++ b/src/app/services/deleteTranslationsService.spec.ts @@ -23,18 +23,18 @@ describe('DeleteTranslationsService', () => { projectService = TestBed.inject(TeacherProjectService); service = TestBed.inject(DeleteTranslationsService); }); - deleteComponents(); + tryDeleteComponents(); }); -function deleteComponents() { - describe('deleteComponents()', () => { +function tryDeleteComponents() { + describe('tryDeleteComponents()', () => { it('fetches all supported translations', () => { spyOn(projectService, 'getLocale').and.returnValue( new ProjectLocale({ default: 'en_us', supported: ['es', 'ja'] }) ); spyOn(configService, 'getProjectId').and.returnValue('123'); spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json'); - service.deleteComponents([ + service.tryDeleteComponents([ { id: 'abc', type: 'OpenResponse', diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts index 550d4b85147..408e0a38407 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts @@ -207,7 +207,7 @@ export class NodeAuthoringComponent implements OnInit { this.componentsToChecked.mutate((obj) => delete obj[component.id]); delete this.componentsToExpanded[component.id]; } - this.deleteTranslations(components); + this.deleteTranslationsService.tryDeleteComponents(components); }); } @@ -224,12 +224,6 @@ export class NodeAuthoringComponent implements OnInit { } } - private deleteTranslations(components: ComponentContent[]): void { - if (this.projectService.getLocale().hasTranslations()) { - this.deleteTranslationsService.deleteComponents(components); - } - } - /** * Temporarily highlight the specified components and show the component * authoring views. Used to bring user's attention to new changes. diff --git a/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.spec.ts b/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.spec.ts index 6969ab79a9f..5b6f95143d2 100644 --- a/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.spec.ts +++ b/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.spec.ts @@ -20,6 +20,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { CopyNodesService } from '../../services/copyNodesService'; import { MatMenuModule } from '@angular/material/menu'; import { AddStepButtonComponent } from '../add-step-button/add-step-button.component'; +import { DeleteTranslationsService } from '../../services/deleteTranslationsService'; let component: ProjectAuthoringLessonComponent; let fixture: ComponentFixture; @@ -56,6 +57,7 @@ describe('ProjectAuthoringLessonComponent', () => { ClassroomStatusService, CopyNodesService, DeleteNodeService, + DeleteTranslationsService, TeacherDataService, TeacherProjectService, TeacherWebSocketService diff --git a/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts b/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts index 01424c414b6..3cd687838c4 100644 --- a/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts +++ b/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts @@ -6,6 +6,7 @@ import { NodeTypeSelected } from '../domain/node-type-selected'; import { ExpandEvent } from '../domain/expand-event'; import { DeleteNodeService } from '../../services/deleteNodeService'; import { ActivatedRoute, Router } from '@angular/router'; +import { DeleteTranslationsService } from '../../services/deleteTranslationsService'; @Component({ selector: 'project-authoring-lesson', @@ -25,6 +26,7 @@ export class ProjectAuthoringLessonComponent { constructor( private dataService: TeacherDataService, private deleteNodeService: DeleteNodeService, + private deleteTranslationsService: DeleteTranslationsService, private projectService: TeacherProjectService, private route: ActivatedRoute, private router: Router @@ -58,8 +60,10 @@ export class ProjectAuthoringLessonComponent { protected delete(): void { if (confirm($localize`Are you sure you want to delete this lesson?`)) { + const components = this.projectService.getComponentsFromLesson(this.lesson.id); this.deleteNodeService.deleteNode(this.lesson.id); this.saveAndRefreshProject(); + this.deleteTranslationsService.tryDeleteComponents(components); } } diff --git a/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.spec.ts b/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.spec.ts index 739e1ef539f..5f23b63aa97 100644 --- a/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.spec.ts +++ b/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.spec.ts @@ -15,6 +15,7 @@ import { MatIconModule } from '@angular/material/icon'; import { DeleteNodeService } from '../../services/deleteNodeService'; import { RouterTestingModule } from '@angular/router/testing'; import { CopyNodesService } from '../../services/copyNodesService'; +import { DeleteTranslationsService } from '../../services/deleteTranslationsService'; const nodeId1 = 'nodeId1'; const node = { id: nodeId1 }; @@ -39,6 +40,7 @@ describe('ProjectAuthoringStepComponent', () => { ClassroomStatusService, CopyNodesService, DeleteNodeService, + DeleteTranslationsService, TeacherDataService, TeacherProjectService, TeacherWebSocketService diff --git a/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.ts b/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.ts index 4d77664f915..a9e877dac74 100644 --- a/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.ts +++ b/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.ts @@ -6,6 +6,7 @@ import { SelectNodeEvent } from '../domain/select-node-event'; import { NodeTypeSelected } from '../domain/node-type-selected'; import { DeleteNodeService } from '../../services/deleteNodeService'; import { CopyNodesService } from '../../services/copyNodesService'; +import { DeleteTranslationsService } from '../../services/deleteTranslationsService'; @Component({ selector: 'project-authoring-step', @@ -23,6 +24,7 @@ export class ProjectAuthoringStepComponent { private copyNodesService: CopyNodesService, private dataService: TeacherDataService, private deleteNodeService: DeleteNodeService, + private deleteTranslationsService: DeleteTranslationsService, private projectService: TeacherProjectService, private route: ActivatedRoute, private router: Router @@ -110,8 +112,11 @@ export class ProjectAuthoringStepComponent { protected delete(): void { if (confirm($localize`Are you sure you want to delete this step?`)) { + // get the components before they're removed by the following line + const components = this.step.components; this.deleteNodeService.deleteNode(this.step.id); this.saveAndRefreshProject(); + this.deleteTranslationsService.tryDeleteComponents(components); } } diff --git a/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.spec.ts b/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.spec.ts index aeea9472650..f611f5ddfe7 100644 --- a/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.spec.ts +++ b/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.spec.ts @@ -38,6 +38,7 @@ import { of } from 'rxjs/internal/observable/of'; import { HttpClient } from '@angular/common/http'; import { AddLessonButtonComponent } from '../add-lesson-button/add-lesson-button.component'; import { AddStepButtonComponent } from '../add-step-button/add-step-button.component'; +import { DeleteTranslationsService } from '../../services/deleteTranslationsService'; let configService: ConfigService; let component: ProjectAuthoringComponent; @@ -83,6 +84,7 @@ describe('ProjectAuthoringComponent', () => { ClassroomStatusService, CopyNodesService, DeleteNodeService, + DeleteTranslationsService, MoveNodesService, TeacherDataService, TeacherProjectService, diff --git a/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts b/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts index 0f6b5329223..1fda3455138 100644 --- a/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts +++ b/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts @@ -9,6 +9,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { SelectNodeEvent } from '../domain/select-node-event'; import { NodeTypeSelected } from '../domain/node-type-selected'; import { ExpandEvent } from '../domain/expand-event'; +import { DeleteTranslationsService } from '../../services/deleteTranslationsService'; +import { ComponentContent } from '../../common/ComponentContent'; @Component({ selector: 'project-authoring', @@ -35,6 +37,7 @@ export class ProjectAuthoringComponent implements OnInit { constructor( private deleteNodeService: DeleteNodeService, + private deleteTranslationsService: DeleteTranslationsService, private projectService: TeacherProjectService, private dataService: TeacherDataService, private route: ActivatedRoute, @@ -84,18 +87,26 @@ export class ProjectAuthoringComponent implements OnInit { protected deleteSelectedNodes(): void { const selectedNodeIds = this.getSelectedNodeIds(); - const confirmMessage = - selectedNodeIds.length === 1 - ? $localize`Are you sure you want to delete the selected item?` - : $localize`Are you sure you want to delete the ${selectedNodeIds.length} selected items?`; + const confirmMessage = $localize`Are you sure you want to delete the ${selectedNodeIds.length} selected item(s)?`; if (confirm(confirmMessage)) { + // get the components before they're removed by the following line + const components = this.getComponents(selectedNodeIds); selectedNodeIds.forEach((nodeId) => this.deleteNodeService.deleteNode(nodeId)); this.removeLessonIdToExpandedEntries(selectedNodeIds); this.projectService.saveProject(); this.refreshProject(); + this.deleteTranslationsService.tryDeleteComponents(components); } } + private getComponents(nodeIds: string[]): ComponentContent[] { + return nodeIds.flatMap((nodeId: string) => { + return this.projectService.isGroupNode(nodeId) + ? this.projectService.getComponentsFromLesson(nodeId) + : this.projectService.getComponentsFromStep(nodeId); + }); + } + private getSelectedNodeIds(): string[] { const selectedNodeIds = []; this.items.forEach((item: any) => { diff --git a/src/assets/wise5/services/deleteTranslationsService.ts b/src/assets/wise5/services/deleteTranslationsService.ts index b85917dfa32..a0dfa6bac45 100644 --- a/src/assets/wise5/services/deleteTranslationsService.ts +++ b/src/assets/wise5/services/deleteTranslationsService.ts @@ -18,7 +18,13 @@ export class DeleteTranslationsService extends ProjectTranslationService { super(configService, http, projectService); } - async deleteComponents(components: ComponentContent[]): Promise { + tryDeleteComponents(components: ComponentContent[]): void { + if (this.projectService.getLocale().hasTranslations()) { + this.deleteComponents(components); + } + } + + private async deleteComponents(components: ComponentContent[]): Promise { const allTranslations = await this.fetchAllTranslations(); const i18nKeys = components.flatMap((component) => this.getI18NKeys(component)); const saveTranslationRequests: Observable[] = []; diff --git a/src/assets/wise5/services/teacherProjectService.ts b/src/assets/wise5/services/teacherProjectService.ts index adb38698be6..1b5c144cd95 100644 --- a/src/assets/wise5/services/teacherProjectService.ts +++ b/src/assets/wise5/services/teacherProjectService.ts @@ -12,6 +12,7 @@ import { generateRandomKey } from '../common/string/string'; import { branchPathBackgroundColors } from '../common/color/color'; import { reduceByUniqueId } from '../common/array/array'; import { NodeTypeSelected } from '../authoringTool/domain/node-type-selected'; +import { ComponentContent } from '../common/ComponentContent'; @Injectable() export class TeacherProjectService extends ProjectService { @@ -3090,4 +3091,14 @@ export class TeacherProjectService extends ProjectService { getNodeTypeSelected(): Signal { return this.nodeTypeSelected.asReadonly(); } + + getComponentsFromStep(nodeId: string): ComponentContent[] { + return this.getNodeById(nodeId).components; + } + + getComponentsFromLesson(lessonId: string): ComponentContent[] { + return this.getNodeById(lessonId).ids.flatMap((nodeId: string) => + this.getComponentsFromStep(nodeId) + ); + } } diff --git a/src/messages.xlf b/src/messages.xlf index 6233307ef60..3fdcb02f9af 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -12367,7 +12367,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete this lesson? src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts - 60 + 62 @@ -12434,7 +12434,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete this step? src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.ts - 112 + 114 @@ -12479,15 +12479,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.101 - - Are you sure you want to delete the selected item? - - src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 - - - - Are you sure you want to delete the selected items? + + Are you sure you want to delete the selected item(s)? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts 90 @@ -21480,7 +21473,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 97 + 98 @@ -21491,11 +21484,11 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 109 + 110 src/assets/wise5/services/teacherProjectService.ts - 151 + 152 @@ -21506,11 +21499,11 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 110 + 111 src/assets/wise5/services/teacherProjectService.ts - 152 + 153 @@ -21528,7 +21521,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 119 + 120 @@ -21539,7 +21532,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 120 + 121 @@ -21550,7 +21543,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 121 + 122 @@ -21767,145 +21760,145 @@ If this problem continues, let your teacher know and move on to the next activit First Lesson src/assets/wise5/services/teacherProjectService.ts - 57 + 58 First Step src/assets/wise5/services/teacherProjectService.ts - 75 + 76 Notes src/assets/wise5/services/teacherProjectService.ts - 111 + 112 src/assets/wise5/services/teacherProjectService.ts - 153 + 154 Final Report src/assets/wise5/services/teacherProjectService.ts - 128 + 129 Final summary report of what you learned in this unit src/assets/wise5/services/teacherProjectService.ts - 129 + 130 Use this space to write your final report using evidence from your notebook. src/assets/wise5/services/teacherProjectService.ts - 130 + 131 <h3>This is a heading</h3><p>This is a paragraph.</p> src/assets/wise5/services/teacherProjectService.ts - 131 + 132 Teacher Notebook src/assets/wise5/services/teacherProjectService.ts - 139 + 140 teacher notes src/assets/wise5/services/teacherProjectService.ts - 161 + 162 src/assets/wise5/services/teacherProjectService.ts - 162 + 163 Teacher Notes src/assets/wise5/services/teacherProjectService.ts - 163 + 164 src/assets/wise5/services/teacherProjectService.ts - 170 + 171 Notes for the teacher as they're running the WISE unit src/assets/wise5/services/teacherProjectService.ts - 171 + 172 Use this space to take notes for this unit src/assets/wise5/services/teacherProjectService.ts - 172 + 173 <p>Use this space to take notes for this unit</p> src/assets/wise5/services/teacherProjectService.ts - 173 + 174 All steps after this one will not be visitable until src/assets/wise5/services/teacherProjectService.ts - 945 + 946 All steps after this one will not be visible until src/assets/wise5/services/teacherProjectService.ts - 948 + 949 All other steps will not be visitable until src/assets/wise5/services/teacherProjectService.ts - 951 + 952 All other steps will not be visible until src/assets/wise5/services/teacherProjectService.ts - 954 + 955 This step will not be visitable until src/assets/wise5/services/teacherProjectService.ts - 957 + 958 This step will not be visible until src/assets/wise5/services/teacherProjectService.ts - 960 + 961 From 19b3b009d9558c06ee6af5622688d3ddb5ff6572 Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Mon, 6 May 2024 14:34:58 -0700 Subject: [PATCH 59/90] feat(Translation): Make source language text display more visible (#1777) --- .../abstract-translatable-field.component.scss | 16 ++++++++++++++++ .../translatable-input.component.html | 7 +++++-- .../translatable-input.component.scss | 3 --- .../translatable-input.component.ts | 10 ++++++---- .../translatable-textarea.component.html | 7 +++++-- .../translatable-textarea.component.scss | 3 --- .../translatable-textarea.component.ts | 10 ++++++---- .../concept-map-authoring.component.html | 6 +++--- .../label-authoring.component.html | 2 +- .../match-authoring.component.html | 2 +- 10 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.scss delete mode 100644 src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.scss delete mode 100644 src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.scss diff --git a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.scss b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.scss new file mode 100644 index 00000000000..bdda1607fb1 --- /dev/null +++ b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.scss @@ -0,0 +1,16 @@ +.translatable { + width: 100%; + + .mat-mdc-form-field-hint-wrapper { + position: relative; + margin: -16px 0 4px; + } + + .mat-mdc-form-field-hint-spacer { + display: none; + } + + .source-language { + padding: 4px 8px; + } +} \ No newline at end of file diff --git a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html index 0c1ab2b92a6..f3a07cf2d77 100644 --- a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html +++ b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html @@ -7,7 +7,7 @@ placeholder="{{ placeholder }}" /> - + {{ label }} ({{ currentLanguage().language }}) - [{{ defaultLanguage.language }}] {{ content[key] }} + + translate {{ defaultLanguage.language }}: + {{ content[key] }} + diff --git a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.scss b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.scss deleted file mode 100644 index c7acb4bf6e7..00000000000 --- a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -mat-form-field { - width: 100%; -} diff --git a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts index cdf0b52d9b5..0ad0153d869 100644 --- a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts +++ b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts @@ -1,14 +1,16 @@ -import { Component } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MatInputModule } from '@angular/material/input'; import { FormsModule } from '@angular/forms'; import { AbstractTranslatableFieldComponent } from '../abstract-translatable-field/abstract-translatable-field.component'; +import { MatIconModule } from '@angular/material/icon'; @Component({ standalone: true, selector: 'translatable-input', - imports: [CommonModule, FormsModule, MatInputModule], - styleUrls: ['./translatable-input.component.scss'], - templateUrl: './translatable-input.component.html' + imports: [CommonModule, FormsModule, MatIconModule, MatInputModule], + styleUrls: ['../abstract-translatable-field/abstract-translatable-field.component.scss'], + templateUrl: './translatable-input.component.html', + encapsulation: ViewEncapsulation.None }) export class TranslatableInputComponent extends AbstractTranslatableFieldComponent {} diff --git a/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.html b/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.html index 5618a66b32e..dbe5b032b29 100644 --- a/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.html +++ b/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.html @@ -9,7 +9,7 @@ > - + {{ label }} ({{ currentLanguage().language }}) - [{{ defaultLanguage.language }}] {{ content[key] }} + + translate {{ defaultLanguage.language }}: + {{ content[key] }} + diff --git a/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.scss b/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.scss deleted file mode 100644 index c7acb4bf6e7..00000000000 --- a/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -mat-form-field { - width: 100%; -} diff --git a/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.ts b/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.ts index a7d07f4a41c..4e5807493da 100644 --- a/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.ts +++ b/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.ts @@ -1,14 +1,16 @@ -import { Component } from '@angular/core'; +import { Component, ViewEncapsulation } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { MatInputModule } from '@angular/material/input'; import { AbstractTranslatableFieldComponent } from '../abstract-translatable-field/abstract-translatable-field.component'; +import { MatIconModule } from '@angular/material/icon'; @Component({ standalone: true, selector: 'translatable-textarea', - imports: [CommonModule, FormsModule, MatInputModule], - styleUrls: ['./translatable-textarea.component.scss'], - templateUrl: './translatable-textarea.component.html' + imports: [CommonModule, FormsModule, MatIconModule, MatInputModule], + styleUrls: ['../abstract-translatable-field/abstract-translatable-field.component.scss'], + templateUrl: './translatable-textarea.component.html', + encapsulation: ViewEncapsulation.None }) export class TranslatableTextareaComponent extends AbstractTranslatableFieldComponent {} diff --git a/src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html b/src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html index e663364d8af..86df60ecc39 100644 --- a/src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html +++ b/src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html @@ -87,7 +87,7 @@ " class="content-item" fxLayout="row wrap" - fxLayoutAlign="start center" + fxLayoutAlign="start start" >
-
+
-
+
Position Date: Wed, 26 Jun 2024 13:12:58 -0700 Subject: [PATCH 60/90] feat(Translation): Support hints for translatable inputs and textareas (#1848) --- ...abstract-translatable-field.component.scss | 5 +- .../abstract-translatable-field.component.ts | 1 + .../translatable-input.component.html | 53 ++++++++------ .../translatable-textarea.component.html | 59 ++++++++------- ...og-guidance-computer-avatar.component.html | 73 ++++++++++--------- ...og-guidance-computer-avatar.component.scss | 70 ++++++++++-------- ...alog-guidance-computer-avatar.component.ts | 3 +- src/messages.xlf | 32 ++++---- 8 files changed, 164 insertions(+), 132 deletions(-) diff --git a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.scss b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.scss index bdda1607fb1..c060ef98373 100644 --- a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.scss +++ b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.scss @@ -3,7 +3,9 @@ .mat-mdc-form-field-hint-wrapper { position: relative; - margin: -16px 0 4px; + margin: -20px 0 4px; + flex-direction: column; + align-items: flex-start; } .mat-mdc-form-field-hint-spacer { @@ -12,5 +14,6 @@ .source-language { padding: 4px 8px; + margin-top: 4px; } } \ No newline at end of file diff --git a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts index ebb3234acd1..04c2c368bf3 100644 --- a/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts +++ b/src/assets/wise5/authoringTool/components/abstract-translatable-field/abstract-translatable-field.component.ts @@ -14,6 +14,7 @@ export abstract class AbstractTranslatableFieldComponent { private currentTranslations$ = toObservable(this.projectTranslationService.currentTranslations); protected defaultLanguage: Language = this.projectService.getLocale().getDefaultLanguage(); @Output() defaultLanguageTextChanged: Subject = new Subject(); + @Input() hint: string; protected i18nId: string; @Input() key: string; @Input() label: string; diff --git a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html index f3a07cf2d77..a630eebe53c 100644 --- a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html +++ b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html @@ -1,22 +1,31 @@ - - {{ label }} - - - - {{ label }} ({{ currentLanguage().language }}) - - - translate {{ defaultLanguage.language }}: - {{ content[key] }} - - +@if (!showTranslationInput()) { + + {{ label }} + + @if (hint) { + {{ hint }} + } + +} @else { + + {{ label }} ({{ currentLanguage().language }}) + + @if (hint) { + {{ hint }} + } + + translate {{ defaultLanguage.language }}: + {{ content[key] }} + + +} diff --git a/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.html b/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.html index dbe5b032b29..f7f8a7387a9 100644 --- a/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.html +++ b/src/assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component.html @@ -1,25 +1,34 @@ - - {{ label }} - - - - {{ label }} ({{ currentLanguage().language }}) - - - translate {{ defaultLanguage.language }}: - {{ content[key] }} - - +@if (!showTranslationInput()) { + + {{ label }} + + @if (hint) { + {{ hint }} + } + +} @if (showTranslationInput()) { + + {{ label }} ({{ currentLanguage().language }}) + + @if (hint) { + {{ hint }} + } + + translate {{ defaultLanguage.language }}: + {{ content[key] }} + + +} diff --git a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html index 69135e12a06..5dce961cc8c 100644 --- a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html +++ b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html @@ -1,4 +1,4 @@ -
+
Use Global Computer Avatar - - Computer Avatar Label - - This is what the computer avatar will be referred as - - - Computer Avatar Prompt - - This text will introduce the avatar selection task - - - Computer Avatar Initial Response - - Computer avatar will initiate dialog with this text - + + +
Computer avatars students can choose:
diff --git a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.scss b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.scss index 584d18e2d18..761963286bd 100644 --- a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.scss +++ b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.scss @@ -1,39 +1,47 @@ -.avatar-label { - max-width: 400px; -} +.edit-dialog-guidance { + .avatar-label { + max-width: 400px; + } -.avatars { - margin: 16px 0; -} + .avatars { + margin: 16px 0; + } -/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ -.mat-button-toggle-group { - margin-top: 16px; -} + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + .mat-button-toggle-group { + margin-top: 16px; + } -/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ -/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ -.mat-button-toggle-group-appearance-standard { /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - .mat-button-toggle, .mat-button-toggle + .mat-button-toggle { - border-left: 0 none; + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + .mat-button-toggle-group-appearance-standard { + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + .mat-button-toggle, .mat-button-toggle + .mat-button-toggle { + border-left: 0 none; + } } -} -/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ -.mat-button-toggle-checked { - background-color: transparent; -} + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + .mat-button-toggle-checked { + background-color: transparent; + } -.avatar-image { - width: 88px; - margin: 0 auto; - height: auto; - border-radius: 50%; - padding: 8px 0; -} + .avatar-image { + width: 88px; + margin: 0 auto; + height: auto; + border-radius: 50%; + padding: 8px 0; + } -.name { - line-height: 1; - padding-bottom: 8px; -} + .name { + line-height: 1; + padding-bottom: 8px; + } + + translatable-input { + .mat-mdc-form-field { + width: 100%; + } + } +} \ No newline at end of file diff --git a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.ts b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.ts index af341660f42..0d116872156 100644 --- a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.ts +++ b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.ts @@ -1,10 +1,11 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { ComputerAvatar } from '../../../common/computer-avatar/ComputerAvatar'; import { ComputerAvatarService } from '../../../services/computerAvatarService'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { ComputerAvatarSettings } from '../../../common/computer-avatar/ComputerAvatarSettings'; @Component({ + encapsulation: ViewEncapsulation.None, selector: 'edit-dialog-guidance-computer-avatar', styleUrls: ['edit-dialog-guidance-computer-avatar.component.scss'], templateUrl: './edit-dialog-guidance-computer-avatar.component.html' diff --git a/src/messages.xlf b/src/messages.xlf index f664914636a..a9abbc4706b 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -9908,7 +9908,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 92 + 93 src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html @@ -17195,18 +17195,18 @@ Category Name: Computer Avatar Label src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 10 + 12 Thought Buddy src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 15 + 14 - - This is what the computer avatar will be referred as + + This is what the computer avatar will be referred to as src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 18 @@ -17216,7 +17216,7 @@ Category Name: Computer Avatar Prompt src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 21 + 24 @@ -17230,21 +17230,21 @@ Category Name: This text will introduce the avatar selection task src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 31 + 30 Computer Avatar Initial Response src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 34 + 36 Hi there! It's nice to meet you. What do you think about... src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 39 + 38 @@ -17258,49 +17258,49 @@ Category Name: Select all avatars src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 51 + 52 Select All src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 54,56 + 55,57 Select no avatars src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 61 + 62 Select None src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 64,66 + 65,67 Avatars available to students src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 71 + 72 Toggle src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 79 + 80 Not selected src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html - 99 + 100 From 77da11df8685830b03035c42518393d6411db98e Mon Sep 17 00:00:00 2001 From: Jonathan Lim-Breitbart Date: Fri, 28 Jun 2024 11:24:46 -0700 Subject: [PATCH 61/90] feat(Translation): Display current language in language chooser (#1850) --- .../project-language-chooser.component.html | 4 ++-- .../project-language-chooser.component.scss | 3 +++ .../project-language-chooser.component.ts | 3 ++- .../components/top-bar/top-bar.component.html | 2 +- src/messages.xlf | 10 +++++----- 5 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 src/app/common/project-language-chooser/project-language-chooser.component.scss diff --git a/src/app/common/project-language-chooser/project-language-chooser.component.html b/src/app/common/project-language-chooser/project-language-chooser.component.html index cd22be90f95..fe241ae7ed9 100644 --- a/src/app/common/project-language-chooser/project-language-chooser.component.html +++ b/src/app/common/project-language-chooser/project-language-chooser.component.html @@ -1,5 +1,5 @@ -
diff --git a/src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html b/src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html index 2986122178c..d3bdc504f48 100644 --- a/src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html +++ b/src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html @@ -61,13 +61,11 @@
mat-raised-button color="primary" (click)="import(getSelectedNodesToImport())" - [disabled]="getSelectedNodesToImport().length == 0" - matTooltip="Submit" - i18n-matTooltip - matTooltipPosition="above" - i18n + [disabled]="getSelectedNodesToImport().length == 0 || submitting" + class="button--progress" > - Submit + + Submit
diff --git a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.spec.ts b/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.spec.ts index 413db39b484..d00151f3976 100644 --- a/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.spec.ts +++ b/src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.spec.ts @@ -7,8 +7,7 @@ import { PreviewComponentComponent } from '../../../assets/wise5/authoringTool/c import { ClassroomMonitorTestingModule } from '../../../assets/wise5/classroomMonitor/classroom-monitor-testing.module'; import { NodeInfoComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component'; import { OpenResponseStudent } from '../../../assets/wise5/components/openResponse/open-response-student/open-response-student.component'; -import { ComponentHeader } from '../../../assets/wise5/directives/component-header/component-header.component'; -import { PromptComponent } from '../../../assets/wise5/directives/prompt/prompt.component'; +import { ComponentHeaderComponent } from '../../../assets/wise5/directives/component-header/component-header.component'; import { NotebookService } from '../../../assets/wise5/services/notebookService'; import { ProjectService } from '../../../assets/wise5/services/projectService'; import { TeacherDataService } from '../../../assets/wise5/services/teacherDataService'; @@ -40,24 +39,19 @@ const node: any = { title: stepTitle }; -describe('ShowNodeInfoDialogComponent', () => { +describe('ShowNodeInfoDialogComponents', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ - ComponentHeader, - NodeInfoComponent, - OpenResponseStudent, - PreviewComponentComponent, - PromptComponent, - ShowNodeInfoDialogComponent - ], + declarations: [NodeInfoComponent, OpenResponseStudent, ShowNodeInfoDialogComponent], imports: [ ClassroomMonitorTestingModule, + ComponentHeaderComponent, ComponentTypeServiceModule, MatCardModule, MatDialogModule, MatIconModule, - MatToolbarModule + MatToolbarModule, + PreviewComponentComponent ], providers: [ { provide: MAT_DIALOG_DATA, useValue: nodeId1 }, diff --git a/src/app/classroom-monitor/status-icon/status-icon.component.html b/src/app/classroom-monitor/status-icon/status-icon.component.html index 27276757d8f..2d9ba937c0e 100644 --- a/src/app/classroom-monitor/status-icon/status-icon.component.html +++ b/src/app/classroom-monitor/status-icon/status-icon.component.html @@ -1,9 +1,3 @@ - - {{ iconName }} + + {{ name }} diff --git a/src/app/classroom-monitor/status-icon/status-icon.component.ts b/src/app/classroom-monitor/status-icon/status-icon.component.ts index 27a46e306ae..81c8095b477 100644 --- a/src/app/classroom-monitor/status-icon/status-icon.component.ts +++ b/src/app/classroom-monitor/status-icon/status-icon.component.ts @@ -1,21 +1,15 @@ import { Component, Input } from '@angular/core'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ + imports: [MatIconModule, MatTooltipModule], selector: 'status-icon', + standalone: true, templateUrl: 'status-icon.component.html' }) export class StatusIconComponent { - @Input() - iconClass: string; - - @Input() - iconLabel: string; - - @Input() - iconName: string; - - @Input() - iconTooltip: string; - - constructor() {} + @Input() class: string; + @Input() name: string; + @Input() tooltip: string; } diff --git a/src/app/classroom-monitor/step-info/step-info.component.html b/src/app/classroom-monitor/step-info/step-info.component.html index 78990395f55..4c0739420cd 100644 --- a/src/app/classroom-monitor/step-info/step-info.component.html +++ b/src/app/classroom-monitor/step-info/step-info.component.html @@ -1,20 +1,18 @@
- +    {{ stepTitle }} + [class]="alertIconClass" + [name]="alertIconName" + [tooltip]="alertIconLabel" + /> + class="info" + name="info" + [tooltip]="rubricIconLabel" + /> New
diff --git a/src/app/discourse-feed/discourse-feed.component.ts b/src/app/discourse-feed/discourse-feed.component.ts index b8c413b5f53..c43f051a3a3 100644 --- a/src/app/discourse-feed/discourse-feed.component.ts +++ b/src/app/discourse-feed/discourse-feed.component.ts @@ -3,36 +3,26 @@ import { Directive, Input } from '@angular/core'; @Directive() export abstract class DiscourseFeedComponent { - @Input() - baseUrl: string; - - @Input() - category: string; - - @Input() - queryString: string; - - topics: any; - isLoaded: boolean = false; + @Input() baseUrl: string; + @Input() category: string; + protected isLoaded: boolean; + @Input() queryString: string; + protected topics: any; constructor(protected http: HttpClient) {} - ngOnInit() { - const url = this.getUrl(); - this.http - .get(url) - .subscribe(({ topic_list, users }: any) => { - this.topics = topic_list.topics - .filter((topic) => { - return !topic.pinned_globally; - }) - .slice(0, 3); - this.isLoaded = true; - }); + ngOnInit(): void { + this.http.get(this.getUrl()).subscribe(({ topic_list }: any) => { + this.topics = topic_list.topics + .filter((topic) => { + return !topic.pinned_globally; + }) + .slice(0, 3); + this.isLoaded = true; + }); } - getUrl(): string { - return `${this.baseUrl}/${this.category}.json${ - this.queryString ? `?${this.queryString}` : ``}`; + private getUrl(): string { + return `${this.baseUrl}/${this.category}.json${this.queryString ? `?${this.queryString}` : ``}`; } } diff --git a/src/app/domain/archiveProjectResponse.ts b/src/app/domain/archiveProjectResponse.ts index 4f3570fe080..60b6f5130e7 100644 --- a/src/app/domain/archiveProjectResponse.ts +++ b/src/app/domain/archiveProjectResponse.ts @@ -1,9 +1,13 @@ +import { Tag } from './tag'; + export class ArchiveProjectResponse { archived: boolean; id: number; + tag: Tag; - constructor(id: number, archived: boolean) { + constructor(id: number, archived: boolean, tag: Tag) { this.id = id; this.archived = archived; + this.tag = tag; } } diff --git a/src/app/domain/project.ts b/src/app/domain/project.ts index 255f002ae2b..c50ea39e3d5 100644 --- a/src/app/domain/project.ts +++ b/src/app/domain/project.ts @@ -1,5 +1,6 @@ import { Run } from './run'; import { User } from '../domain/user'; +import { Tag } from './tag'; export class Project { archived: boolean; @@ -17,7 +18,7 @@ export class Project { run: Run; sharedOwners: User[] = []; selected: boolean; - tags: string[]; + tags: Tag[]; thumbStyle: any; uri: String; wiseVersion: number; @@ -93,16 +94,25 @@ export class Project { return metadata; } - hasTag(tag: string): boolean { - return this.tags.includes(tag); + hasTagWithText(tagText: string): boolean { + return this.tags.some((tag: Tag) => tag.text === tagText); } - updateArchivedStatus(archived: boolean): void { + hasTag(tag: Tag): boolean { + return this.tags.some((projectTag: Tag) => projectTag.id === tag.id); + } + + updateArchivedStatus(archived: boolean, tag: Tag): void { this.archived = archived; - if (archived) { - this.tags.push('archived'); - } else { - this.tags.splice(this.tags.indexOf('archived'), 1); - } + archived ? this.addTag(tag) : this.removeTag(tag); + } + + addTag(tag: Tag): void { + this.tags.push(tag); + this.tags.sort((a, b) => a.text.toLowerCase().localeCompare(b.text.toLowerCase())); + } + + removeTag(tag: Tag): void { + this.tags = this.tags.filter((projectTag: Tag) => projectTag.id !== tag.id); } } diff --git a/src/app/domain/projectAndTagsResponse.ts b/src/app/domain/projectAndTagsResponse.ts new file mode 100644 index 00000000000..4217b984a2c --- /dev/null +++ b/src/app/domain/projectAndTagsResponse.ts @@ -0,0 +1,6 @@ +import { Tag } from './tag'; + +export interface ProjectAndTagsResponse { + projectId: number; + tags: Tag[]; +} diff --git a/src/app/domain/tag.ts b/src/app/domain/tag.ts new file mode 100644 index 00000000000..a76f803c83a --- /dev/null +++ b/src/app/domain/tag.ts @@ -0,0 +1,7 @@ +export interface Tag { + color: string; + id: number; + numProjectsWithTag?: number; + selected?: boolean; + text: string; +} diff --git a/src/app/features/features-routing.module.ts b/src/app/features/features-routing.module.ts deleted file mode 100644 index 7a4515b28ad..00000000000 --- a/src/app/features/features-routing.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { FeaturesComponent } from './features.component'; - -const featuresRoutes: Routes = [{ path: '', component: FeaturesComponent }]; - -@NgModule({ - imports: [RouterModule.forChild(featuresRoutes)], - exports: [RouterModule] -}) -export class FeaturesRoutingModule {} diff --git a/src/app/features/features.component.spec.ts b/src/app/features/features.component.spec.ts index 4241a71ebad..4e0ac8b769a 100644 --- a/src/app/features/features.component.spec.ts +++ b/src/app/features/features.component.spec.ts @@ -1,18 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; - import { FeaturesComponent } from './features.component'; +import { provideRouter } from '@angular/router'; describe('FeaturesComponent', () => { let component: FeaturesComponent; let fixture: ComponentFixture; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [FeaturesComponent], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [FeaturesComponent], + providers: [provideRouter([])] + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(FeaturesComponent); diff --git a/src/app/features/features.component.ts b/src/app/features/features.component.ts index b547fbbb097..3cdd15c6c5c 100644 --- a/src/app/features/features.component.ts +++ b/src/app/features/features.component.ts @@ -1,12 +1,23 @@ -import { Component, OnInit } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { Component } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatIconModule } from '@angular/material/icon'; +import { RouterModule } from '@angular/router'; @Component({ + imports: [ + CommonModule, + FlexLayoutModule, + MatButtonModule, + MatDividerModule, + MatIconModule, + RouterModule + ], selector: 'app-features', - templateUrl: './features.component.html', - styleUrls: ['./features.component.scss'] + standalone: true, + styleUrl: './features.component.scss', + templateUrl: './features.component.html' }) -export class FeaturesComponent implements OnInit { - constructor() {} - - ngOnInit() {} -} +export class FeaturesComponent {} diff --git a/src/app/features/features.module.spec.ts b/src/app/features/features.module.spec.ts deleted file mode 100644 index 33d10d08d6a..00000000000 --- a/src/app/features/features.module.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { FeaturesModule } from './features.module'; - -describe('FeaturesModule', () => { - let featuresModule: FeaturesModule; - - beforeEach(() => { - featuresModule = new FeaturesModule(); - }); - - it('should create an instance', () => { - expect(featuresModule).toBeTruthy(); - }); -}); diff --git a/src/app/features/features.module.ts b/src/app/features/features.module.ts deleted file mode 100644 index 5de6395816d..00000000000 --- a/src/app/features/features.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FlexLayoutModule } from '@angular/flex-layout'; -import { MatDividerModule } from '@angular/material/divider'; -import { MatIconModule } from '@angular/material/icon'; -import { FeaturesComponent } from './features.component'; -import { FeaturesRoutingModule } from './features-routing.module'; -import { SharedModule } from '../modules/shared/shared.module'; - -@NgModule({ - imports: [ - CommonModule, - FlexLayoutModule, - MatDividerModule, - MatIconModule, - FeaturesRoutingModule, - SharedModule - ], - declarations: [FeaturesComponent], - exports: [FeaturesComponent, SharedModule] -}) -export class FeaturesModule {} diff --git a/src/app/forgot/forgot-home/forgot-home.component.spec.ts b/src/app/forgot/forgot-home/forgot-home.component.spec.ts index bf65a1a1865..df833972b95 100644 --- a/src/app/forgot/forgot-home/forgot-home.component.spec.ts +++ b/src/app/forgot/forgot-home/forgot-home.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ForgotHomeComponent } from './forgot-home.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { provideRouter } from '@angular/router'; describe('ForgotHomeComponent', () => { let component: ForgotHomeComponent; @@ -8,12 +8,9 @@ describe('ForgotHomeComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [ForgotHomeComponent], - schemas: [NO_ERRORS_SCHEMA] + imports: [ForgotHomeComponent], + providers: [provideRouter([])] }); - }); - - beforeEach(() => { fixture = TestBed.createComponent(ForgotHomeComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/src/app/forgot/forgot-home/forgot-home.component.ts b/src/app/forgot/forgot-home/forgot-home.component.ts index 913a40599cb..daa93a14a49 100644 --- a/src/app/forgot/forgot-home/forgot-home.component.ts +++ b/src/app/forgot/forgot-home/forgot-home.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { CallToActionComponent } from '../../modules/shared/call-to-action/call-to-action.component'; @Component({ - selector: 'app-forgot-home', - templateUrl: './forgot-home.component.html', - styleUrls: ['./forgot-home.component.scss'] + imports: [CallToActionComponent, FlexLayoutModule], + standalone: true, + styleUrl: './forgot-home.component.scss', + templateUrl: './forgot-home.component.html' }) -export class ForgotHomeComponent implements OnInit { - constructor() {} - - ngOnInit() {} -} +export class ForgotHomeComponent {} diff --git a/src/app/forgot/forgot.component.scss b/src/app/forgot/forgot.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/forgot/forgot.component.spec.ts b/src/app/forgot/forgot.component.spec.ts index b8defcdaa0e..a602cf0ce7c 100644 --- a/src/app/forgot/forgot.component.spec.ts +++ b/src/app/forgot/forgot.component.spec.ts @@ -1,20 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - import { ForgotComponent } from './forgot.component'; -import { RouterTestingModule } from '@angular/router/testing'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { provideRouter } from '@angular/router'; describe('ForgotComponent', () => { let component: ForgotComponent; let fixture: ComponentFixture; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule], - declarations: [ForgotComponent], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ForgotComponent], + providers: [provideRouter([])] + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(ForgotComponent); diff --git a/src/app/forgot/forgot.component.ts b/src/app/forgot/forgot.component.ts index d6fd11a1e5b..00fe79b0414 100644 --- a/src/app/forgot/forgot.component.ts +++ b/src/app/forgot/forgot.component.ts @@ -1,12 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; @Component({ - selector: 'app-forgot', - templateUrl: './forgot.component.html', - styleUrls: ['./forgot.component.scss'] + imports: [RouterModule], + standalone: true, + templateUrl: './forgot.component.html' }) -export class ForgotComponent implements OnInit { - constructor() {} - - ngOnInit() {} -} +export class ForgotComponent {} diff --git a/src/app/forgot/forgot.module.ts b/src/app/forgot/forgot.module.ts index 7d0ec3c6da8..c3334710cb7 100644 --- a/src/app/forgot/forgot.module.ts +++ b/src/app/forgot/forgot.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - import { ForgotRoutingModule } from './forgot-routing.module'; import { ForgotHomeComponent } from './forgot-home/forgot-home.component'; import { ForgotComponent } from './forgot.component'; @@ -21,10 +20,16 @@ import { ForgotTeacherPasswordChangeComponent } from './teacher/forgot-teacher-p import { ForgotTeacherPasswordVerifyComponent } from './teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component'; import { PasswordModule } from '../password/password.module'; import { ForgotUserPasswordCompleteComponent } from './forgot-user-password-complete/forgot-user-password-complete.component'; +import { CallToActionComponent } from '../modules/shared/call-to-action/call-to-action.component'; @NgModule({ imports: [ + CallToActionComponent, CommonModule, + ForgotComponent, + ForgotHomeComponent, + ForgotStudentComponent, + ForgotTeacherComponent, ForgotRoutingModule, FormsModule, MatDividerModule, @@ -34,10 +39,6 @@ import { ForgotUserPasswordCompleteComponent } from './forgot-user-password-comp SharedModule ], declarations: [ - ForgotComponent, - ForgotHomeComponent, - ForgotStudentComponent, - ForgotTeacherComponent, ForgotStudentPasswordComponent, ForgotStudentUsernameComponent, ForgotTeacherUsernameComponent, diff --git a/src/app/forgot/student/forgot-student/forgot-student.component.spec.ts b/src/app/forgot/student/forgot-student/forgot-student.component.spec.ts index 85eef61ac5d..ea7b0bce08d 100644 --- a/src/app/forgot/student/forgot-student/forgot-student.component.spec.ts +++ b/src/app/forgot/student/forgot-student/forgot-student.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ForgotStudentComponent } from './forgot-student.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { provideRouter } from '@angular/router'; describe('ForgotStudentComponent', () => { let component: ForgotStudentComponent; @@ -8,12 +8,9 @@ describe('ForgotStudentComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [ForgotStudentComponent], - schemas: [NO_ERRORS_SCHEMA] + imports: [ForgotStudentComponent], + providers: [provideRouter([])] }); - }); - - beforeEach(() => { fixture = TestBed.createComponent(ForgotStudentComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/src/app/forgot/student/forgot-student/forgot-student.component.ts b/src/app/forgot/student/forgot-student/forgot-student.component.ts index 03ed7ace36c..385a75da952 100644 --- a/src/app/forgot/student/forgot-student/forgot-student.component.ts +++ b/src/app/forgot/student/forgot-student/forgot-student.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { CallToActionComponent } from '../../../modules/shared/call-to-action/call-to-action.component'; @Component({ - selector: 'app-forgot-student', - templateUrl: './forgot-student.component.html', - styleUrls: ['./forgot-student.component.scss'] + imports: [CallToActionComponent, FlexLayoutModule], + standalone: true, + styleUrl: './forgot-student.component.scss', + templateUrl: './forgot-student.component.html' }) -export class ForgotStudentComponent implements OnInit { - constructor() {} - - ngOnInit() {} -} +export class ForgotStudentComponent {} diff --git a/src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.spec.ts b/src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.spec.ts index 0c94e4fc2cf..095cce0a5e9 100644 --- a/src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.spec.ts +++ b/src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ForgotTeacherComponent } from './forgot-teacher.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { provideRouter } from '@angular/router'; describe('ForgotTeacherComponent', () => { let component: ForgotTeacherComponent; @@ -8,8 +8,8 @@ describe('ForgotTeacherComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [ForgotTeacherComponent], - schemas: [NO_ERRORS_SCHEMA] + imports: [ForgotTeacherComponent], + providers: [provideRouter([])] }); fixture = TestBed.createComponent(ForgotTeacherComponent); component = fixture.componentInstance; diff --git a/src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.ts b/src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.ts index 8b6979b2c13..30d44252cdf 100644 --- a/src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.ts +++ b/src/app/forgot/teacher/forgot-teacher/forgot-teacher.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { CallToActionComponent } from '../../../modules/shared/call-to-action/call-to-action.component'; @Component({ - selector: 'app-forgot-teacher', - templateUrl: './forgot-teacher.component.html', - styleUrls: ['./forgot-teacher.component.scss'] + imports: [FlexLayoutModule, CallToActionComponent], + standalone: true, + styleUrl: './forgot-teacher.component.scss', + templateUrl: './forgot-teacher.component.html' }) -export class ForgotTeacherComponent implements OnInit { - constructor() {} - - ngOnInit() {} -} +export class ForgotTeacherComponent {} diff --git a/src/app/help/faq/getting-started/getting-started.component.spec.ts b/src/app/help/faq/getting-started/getting-started.component.spec.ts index a1d74d99b39..11158f2286d 100644 --- a/src/app/help/faq/getting-started/getting-started.component.spec.ts +++ b/src/app/help/faq/getting-started/getting-started.component.spec.ts @@ -1,10 +1,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - import { GettingStartedComponent } from './getting-started.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ConfigService } from '../../../services/config.service'; import { Config } from '../../../domain/config'; import { Observable } from 'rxjs'; +import { provideRouter } from '@angular/router'; export class MockConfigService { getConfig(): Observable { @@ -13,7 +12,7 @@ export class MockConfigService { logOutURL: '/logout', currentTime: new Date('2018-10-24T15:05:40.214').getTime() }; - return Observable.create((observer) => { + return new Observable((observer) => { observer.next(config); observer.complete(); }); @@ -27,9 +26,8 @@ describe('GettingStartedComponent', () => { beforeEach( waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [GettingStartedComponent], - providers: [{ provide: ConfigService, useClass: MockConfigService }], - schemas: [NO_ERRORS_SCHEMA] + imports: [GettingStartedComponent], + providers: [{ provide: ConfigService, useClass: MockConfigService }, provideRouter([])] }).compileComponents(); }) ); diff --git a/src/app/help/faq/getting-started/getting-started.component.ts b/src/app/help/faq/getting-started/getting-started.component.ts index 7c9dff486aa..b6e93eb3e0e 100644 --- a/src/app/help/faq/getting-started/getting-started.component.ts +++ b/src/app/help/faq/getting-started/getting-started.component.ts @@ -1,9 +1,13 @@ -import { Component, OnInit } from '@angular/core'; -import { ConfigService } from '../../../services/config.service'; +import { Component } from '@angular/core'; import { FaqComponent } from '../faq.component'; +import { MatDividerModule } from '@angular/material/divider'; +import { CallToActionComponent } from '../../../modules/shared/call-to-action/call-to-action.component'; +import { MatIconModule } from '@angular/material/icon'; +import { FlexLayoutModule } from '@angular/flex-layout'; @Component({ - selector: 'app-getting-started', + imports: [CallToActionComponent, FlexLayoutModule, MatDividerModule, MatIconModule], + standalone: true, templateUrl: './getting-started.component.html' }) export class GettingStartedComponent extends FaqComponent {} diff --git a/src/app/help/faq/student-faq/student-faq.component.spec.ts b/src/app/help/faq/student-faq/student-faq.component.spec.ts index 510f802e99b..5ec3f4a213c 100644 --- a/src/app/help/faq/student-faq/student-faq.component.spec.ts +++ b/src/app/help/faq/student-faq/student-faq.component.spec.ts @@ -1,10 +1,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - import { StudentFaqComponent } from './student-faq.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ConfigService } from '../../../services/config.service'; import { Observable } from 'rxjs'; import { Config } from '../../../domain/config'; +import { provideRouter } from '@angular/router'; export class MockConfigService { getConfig(): Observable { @@ -13,7 +12,7 @@ export class MockConfigService { logOutURL: '/logout', currentTime: new Date('2018-10-24T15:05:40.214').getTime() }; - return Observable.create((observer) => { + return new Observable((observer) => { observer.next(config); observer.complete(); }); @@ -27,9 +26,8 @@ describe('StudentFaqComponent', () => { beforeEach( waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [StudentFaqComponent], - providers: [{ provide: ConfigService, useClass: MockConfigService }], - schemas: [NO_ERRORS_SCHEMA] + imports: [StudentFaqComponent], + providers: [{ provide: ConfigService, useClass: MockConfigService }, provideRouter([])] }).compileComponents(); }) ); diff --git a/src/app/help/faq/student-faq/student-faq.component.ts b/src/app/help/faq/student-faq/student-faq.component.ts index de943d33c5c..16f56463c6c 100644 --- a/src/app/help/faq/student-faq/student-faq.component.ts +++ b/src/app/help/faq/student-faq/student-faq.component.ts @@ -1,8 +1,14 @@ import { Component } from '@angular/core'; import { FaqComponent } from '../faq.component'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatIconModule } from '@angular/material/icon'; +import { CallToActionComponent } from '../../../modules/shared/call-to-action/call-to-action.component'; +import { RouterModule } from '@angular/router'; @Component({ - selector: 'app-student-faq', + imports: [CallToActionComponent, FlexLayoutModule, MatDividerModule, MatIconModule, RouterModule], + standalone: true, templateUrl: './student-faq.component.html' }) export class StudentFaqComponent extends FaqComponent {} diff --git a/src/app/help/faq/teacher-faq/teacher-faq.component.spec.ts b/src/app/help/faq/teacher-faq/teacher-faq.component.spec.ts index 83dfa30c6c4..a9fcd57cb9d 100644 --- a/src/app/help/faq/teacher-faq/teacher-faq.component.spec.ts +++ b/src/app/help/faq/teacher-faq/teacher-faq.component.spec.ts @@ -1,10 +1,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - import { TeacherFaqComponent } from './teacher-faq.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ConfigService } from '../../../services/config.service'; import { Observable } from 'rxjs'; import { Config } from '../../../domain/config'; +import { provideRouter } from '@angular/router'; export class MockConfigService { getConfig(): Observable { @@ -13,7 +12,7 @@ export class MockConfigService { logOutURL: '/logout', currentTime: new Date('2018-10-24T15:05:40.214').getTime() }; - return Observable.create((observer) => { + return new Observable((observer) => { observer.next(config); observer.complete(); }); @@ -27,9 +26,8 @@ describe('TeacherFaqComponent', () => { beforeEach( waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [TeacherFaqComponent], - providers: [{ provide: ConfigService, useClass: MockConfigService }], - schemas: [NO_ERRORS_SCHEMA] + imports: [TeacherFaqComponent], + providers: [{ provide: ConfigService, useClass: MockConfigService }, provideRouter([])] }).compileComponents(); }) ); diff --git a/src/app/help/faq/teacher-faq/teacher-faq.component.ts b/src/app/help/faq/teacher-faq/teacher-faq.component.ts index 19ecd9b9ced..89506d9f74b 100644 --- a/src/app/help/faq/teacher-faq/teacher-faq.component.ts +++ b/src/app/help/faq/teacher-faq/teacher-faq.component.ts @@ -1,8 +1,14 @@ import { Component } from '@angular/core'; import { FaqComponent } from '../faq.component'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatIconModule } from '@angular/material/icon'; +import { CallToActionComponent } from '../../../modules/shared/call-to-action/call-to-action.component'; +import { RouterModule } from '@angular/router'; @Component({ - selector: 'app-teacher-faq', + imports: [CallToActionComponent, FlexLayoutModule, MatDividerModule, MatIconModule, RouterModule], + standalone: true, templateUrl: './teacher-faq.component.html' }) export class TeacherFaqComponent extends FaqComponent {} diff --git a/src/app/help/help-home/help-home.component.spec.ts b/src/app/help/help-home/help-home.component.spec.ts index 4dd149391fe..01e9f3af702 100644 --- a/src/app/help/help-home/help-home.component.spec.ts +++ b/src/app/help/help-home/help-home.component.spec.ts @@ -1,18 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - import { HelpHomeComponent } from './help-home.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { provideRouter } from '@angular/router'; describe('HelpHomeComponent', () => { let component: HelpHomeComponent; let fixture: ComponentFixture; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [HelpHomeComponent], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [HelpHomeComponent], + providers: [provideRouter([])] + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(HelpHomeComponent); diff --git a/src/app/help/help-home/help-home.component.ts b/src/app/help/help-home/help-home.component.ts index cfa48329abd..52ecc34a90c 100644 --- a/src/app/help/help-home/help-home.component.ts +++ b/src/app/help/help-home/help-home.component.ts @@ -1,12 +1,12 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; +import { CallToActionComponent } from '../../modules/shared/call-to-action/call-to-action.component'; +import { FlexLayoutModule } from '@angular/flex-layout'; @Component({ + imports: [CallToActionComponent, FlexLayoutModule], selector: 'app-help-home', - templateUrl: './help-home.component.html', - styleUrls: ['./help-home.component.scss'] + standalone: true, + styleUrl: './help-home.component.scss', + templateUrl: './help-home.component.html' }) -export class HelpHomeComponent implements OnInit { - constructor() {} - - ngOnInit() {} -} +export class HelpHomeComponent {} diff --git a/src/app/help/help.component.spec.ts b/src/app/help/help.component.spec.ts index c43721612a7..03b2286713d 100644 --- a/src/app/help/help.component.spec.ts +++ b/src/app/help/help.component.spec.ts @@ -1,18 +1,17 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - import { HelpComponent } from './help.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; describe('HelpComponent', () => { let component: HelpComponent; let fixture: ComponentFixture; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [HelpComponent], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [HelpComponent] + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(HelpComponent); diff --git a/src/app/help/help.component.ts b/src/app/help/help.component.ts index 91273708e52..317dd17d03b 100644 --- a/src/app/help/help.component.ts +++ b/src/app/help/help.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; @Component({ + imports: [RouterModule], selector: 'app-help', - templateUrl: './help.component.html', - styleUrls: ['./help.component.scss'] + standalone: true, + styleUrl: './help.component.scss', + templateUrl: './help.component.html' }) -export class HelpComponent implements OnInit { - constructor() {} - - ngOnInit() {} -} +export class HelpComponent {} diff --git a/src/app/help/help.module.ts b/src/app/help/help.module.ts index 6c70bf443ce..6d530c058a3 100644 --- a/src/app/help/help.module.ts +++ b/src/app/help/help.module.ts @@ -1,22 +1,19 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { HelpComponent } from './help.component'; import { HelpRoutingModule } from './help-routing.module'; -import { SharedModule } from '../modules/shared/shared.module'; import { GettingStartedComponent } from './faq/getting-started/getting-started.component'; import { TeacherFaqComponent } from './faq/teacher-faq/teacher-faq.component'; import { StudentFaqComponent } from './faq/student-faq/student-faq.component'; import { HelpHomeComponent } from './help-home/help-home.component'; -import { MatDividerModule } from '@angular/material/divider'; @NgModule({ - imports: [CommonModule, HelpRoutingModule, MatDividerModule, SharedModule], - declarations: [ - HelpComponent, + imports: [ GettingStartedComponent, - TeacherFaqComponent, + HelpComponent, + HelpHomeComponent, + HelpRoutingModule, StudentFaqComponent, - HelpHomeComponent + TeacherFaqComponent ] }) export class HelpModule {} diff --git a/src/app/discourse-feed/discourse-feed.component.spec.ts b/src/app/home/discourse-latest-news/discourse-latest-news.component.spec.ts similarity index 51% rename from src/app/discourse-feed/discourse-feed.component.spec.ts rename to src/app/home/discourse-latest-news/discourse-latest-news.component.spec.ts index 27567ffdbe7..e5528077e77 100644 --- a/src/app/discourse-feed/discourse-feed.component.spec.ts +++ b/src/app/home/discourse-latest-news/discourse-latest-news.component.spec.ts @@ -1,9 +1,11 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { TestBed } from '@angular/core/testing'; -import { DiscourseFeedComponent } from './discourse-feed.component'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DiscourseLatestNewsComponent } from './discourse-latest-news.component'; +import { By } from '@angular/platform-browser'; -describe('DiscourseFeedComponent', () => { - let component: DiscourseFeedComponent; +describe('DiscourseLatestNewsComponent', () => { + let component: DiscourseLatestNewsComponent; + let fixture: ComponentFixture; let http: HttpTestingController; const sampleLatestResponse = { users: [], @@ -15,13 +17,15 @@ describe('DiscourseFeedComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule], - providers: [DiscourseFeedComponent] + providers: [DiscourseLatestNewsComponent] }); - component = TestBed.inject(DiscourseFeedComponent); http = TestBed.inject(HttpTestingController); + fixture = TestBed.createComponent(DiscourseLatestNewsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); }); - it('should create and show 3 latest topics', () => { + it('should show 3 latest topics', () => { component.baseUrl = 'http://localhost:9292'; component.category = 'c/news/1'; component.queryString = 'order=latest'; @@ -29,6 +33,7 @@ describe('DiscourseFeedComponent', () => { http .expectOne(`${component.baseUrl}/${component.category}.json?${component.queryString}`) .flush(sampleLatestResponse); - expect(component.topics.length).toEqual(3); + fixture.detectChanges(); + expect(fixture.debugElement.queryAll(By.css('li')).length).toEqual(3); }); }); diff --git a/src/app/home/discourse-latest-news/discourse-latest-news.component.ts b/src/app/home/discourse-latest-news/discourse-latest-news.component.ts index 7f691c3600c..234269c0afc 100644 --- a/src/app/home/discourse-latest-news/discourse-latest-news.component.ts +++ b/src/app/home/discourse-latest-news/discourse-latest-news.component.ts @@ -2,23 +2,26 @@ import { HttpClient } from '@angular/common/http'; import { Component } from '@angular/core'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { DiscourseFeedComponent } from '../../discourse-feed/discourse-feed.component'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatIconModule } from '@angular/material/icon'; @Component({ + imports: [CommonModule, FlexLayoutModule, MatIconModule], selector: 'discourse-latest-news', - templateUrl: 'discourse-latest-news.component.html', - styleUrls: ['discourse-latest-news.component.scss'] + standalone: true, + styleUrl: 'discourse-latest-news.component.scss', + templateUrl: 'discourse-latest-news.component.html' }) export class DiscourseLatestNewsComponent extends DiscourseFeedComponent { - smallScreen: boolean = false; - xsScreen: boolean = false; + protected smallScreen: boolean; + protected xsScreen: boolean; constructor(protected http: HttpClient, private breakpointObserver: BreakpointObserver) { super(http); - this.breakpointObserver.observe([Breakpoints.XSmall, Breakpoints.Small]).subscribe((result) => { this.smallScreen = result.matches; }); - this.breakpointObserver.observe([Breakpoints.XSmall]).subscribe((result) => { this.xsScreen = result.matches; }); diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 2d0020bcf94..4bd7029fc51 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -43,8 +43,7 @@ [baseUrl]="discourseUrl" [category]="discourseNewsCategory" queryString="order=latest" - > - + />
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index f5846902368..91c82328313 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -8,18 +8,21 @@ import { SharedModule } from '../modules/shared/shared.module'; import { DiscourseLatestNewsComponent } from './discourse-latest-news/discourse-latest-news.component'; import { BlurbComponent } from '../modules/shared/blurb/blurb.component'; import { HeroSectionComponent } from '../modules/shared/hero-section/hero-section.component'; +import { CallToActionComponent } from '../modules/shared/call-to-action/call-to-action.component'; @NgModule({ imports: [ BlurbComponent, + CallToActionComponent, CommonModule, + DiscourseLatestNewsComponent, HeroSectionComponent, HomeRoutingModule, LibraryModule, SharedModule, RouterModule ], - declarations: [HomeComponent, DiscourseLatestNewsComponent], + declarations: [HomeComponent], exports: [HomeComponent, SharedModule] }) export class HomeModule {} diff --git a/src/app/login/login.module.ts b/src/app/login/login.module.ts index 831ccf84236..15e34aea8d7 100644 --- a/src/app/login/login.module.ts +++ b/src/app/login/login.module.ts @@ -12,7 +12,6 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { GoogleSignInModule } from '../modules/google-sign-in/google-sign-in.module'; const materialModules = [ MatButtonModule, @@ -28,7 +27,6 @@ const materialModules = [ CommonModule, FlexLayoutModule, FormsModule, - GoogleSignInModule, LoginRoutingModule, ReactiveFormsModule, materialModules, diff --git a/src/app/modules/google-sign-in/google-sign-in-button/google-sign-in-button.component.html b/src/app/modules/google-sign-in/google-sign-in-button/google-sign-in-button.component.html deleted file mode 100644 index 7cfe053690f..00000000000 --- a/src/app/modules/google-sign-in/google-sign-in-button/google-sign-in-button.component.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/src/app/modules/google-sign-in/google-sign-in-button/google-sign-in-button.component.ts b/src/app/modules/google-sign-in/google-sign-in-button/google-sign-in-button.component.ts index 7f6fd3a00ef..1d83080232c 100644 --- a/src/app/modules/google-sign-in/google-sign-in-button/google-sign-in-button.component.ts +++ b/src/app/modules/google-sign-in/google-sign-in-button/google-sign-in-button.component.ts @@ -15,15 +15,16 @@ import { ConfigService } from '../../../services/config.service'; import { GoogleUser } from '../GoogleUser'; @Component({ + encapsulation: ViewEncapsulation.None, selector: 'google-sign-in-button', - styleUrls: ['google-sign-in-button.component.scss'], - templateUrl: 'google-sign-in-button.component.html', - encapsulation: ViewEncapsulation.None + standalone: true, + styleUrl: 'google-sign-in-button.component.scss', + template: '
' }) export class GoogleSignInButtonComponent implements AfterViewInit { + @ViewChild('googleButton') private googleButton: ElementRef; @Output() signedIn = new EventEmitter(); @Input() text: string = 'signin_with'; - @ViewChild('googleButton') private googleButton: ElementRef; constructor(private configService: ConfigService, private ngZone: NgZone) {} diff --git a/src/app/modules/google-sign-in/google-sign-in.module.ts b/src/app/modules/google-sign-in/google-sign-in.module.ts deleted file mode 100644 index 791f56cf6da..00000000000 --- a/src/app/modules/google-sign-in/google-sign-in.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NgModule } from '@angular/core'; -import { GoogleSignInButtonComponent } from './google-sign-in-button/google-sign-in-button.component'; - -@NgModule({ - declarations: [GoogleSignInButtonComponent], - exports: [GoogleSignInButtonComponent] -}) -export class GoogleSignInModule {} diff --git a/src/app/modules/header/header-account-menu/header-account-menu.component.spec.ts b/src/app/modules/header/header-account-menu/header-account-menu.component.spec.ts index 292e41c7e9d..416f5a4f3e3 100644 --- a/src/app/modules/header/header-account-menu/header-account-menu.component.spec.ts +++ b/src/app/modules/header/header-account-menu/header-account-menu.component.spec.ts @@ -5,8 +5,8 @@ import { MatMenuModule } from '@angular/material/menu'; import { ConfigService } from '../../../services/config.service'; import { Observable } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { Config } from '../../../domain/config'; +import { provideRouter } from '@angular/router'; export class MockConfigService { getConfig(): Observable { @@ -29,10 +29,8 @@ describe('HeaderAccountMenuComponent', () => { beforeEach( waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [HeaderAccountMenuComponent], - imports: [HttpClientTestingModule, MatMenuModule], - providers: [{ provide: ConfigService, useClass: MockConfigService }], - schemas: [NO_ERRORS_SCHEMA] + imports: [HeaderAccountMenuComponent, HttpClientTestingModule, MatMenuModule], + providers: [{ provide: ConfigService, useClass: MockConfigService }, provideRouter([])] }).compileComponents(); }) ); diff --git a/src/app/modules/header/header-account-menu/header-account-menu.component.ts b/src/app/modules/header/header-account-menu/header-account-menu.component.ts index bda905c3461..be17107f5f4 100644 --- a/src/app/modules/header/header-account-menu/header-account-menu.component.ts +++ b/src/app/modules/header/header-account-menu/header-account-menu.component.ts @@ -1,37 +1,48 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, OnInit, Input, SimpleChanges } from '@angular/core'; import { ConfigService } from '../../../services/config.service'; import { User } from '../../../domain/user'; import { HttpClient } from '@angular/common/http'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatDividerModule } from '@angular/material/divider'; +import { RouterModule } from '@angular/router'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; @Component({ selector: 'app-header-account-menu', templateUrl: './header-account-menu.component.html', - styleUrls: ['./header-account-menu.component.scss'] + styleUrl: './header-account-menu.component.scss', + standalone: true, + imports: [ + CommonModule, + FlexLayoutModule, + MatButtonModule, + MatIconModule, + MatMenuModule, + MatDividerModule, + RouterModule + ] }) export class HeaderAccountMenuComponent implements OnInit { - @Input() - user: User; + protected firstName: string = ''; + protected isPreviousAdmin: boolean; + protected lastName: string = ''; + protected logOutURL: string; + protected roles: string[] = []; + private switchToOriginalUserURL = '/api/logout/impersonate'; + @Input() user: User; - firstName: string = ''; - lastName: string = ''; - roles: string[] = []; - isPreviousAdmin: boolean = false; - logOutURL: string; - switchToOriginalUserURL = '/api/logout/impersonate'; + constructor(private configService: ConfigService, private http: HttpClient) {} - constructor(private configService: ConfigService, private http: HttpClient) { - this.configService = configService; - } - - ngOnInit() { + ngOnInit(): void { this.configService.getConfig().subscribe((config) => { - if (config != null) { - this.logOutURL = config.logOutURL; - } + this.logOutURL = config.logOutURL; }); } - ngOnChanges(changes) { + ngOnChanges(changes: SimpleChanges): void { if (changes.user) { const user = changes.user.currentValue; if (user) { @@ -43,17 +54,17 @@ export class HeaderAccountMenuComponent implements OnInit { } } - switchToAdmin() { + protected switchToAdmin(): void { window.location.href = '/admin'; } - switchToOriginalUser() { + protected switchToOriginalUser(): void { this.http.post(this.switchToOriginalUserURL, {}).subscribe(() => { window.location.href = '/teacher'; }); } - logOut() { + protected logOut(): void { this.http.get(this.logOutURL).subscribe(() => { window.location.href = '/'; }); diff --git a/src/app/modules/header/header.component.html b/src/app/modules/header/header.component.html index 271dd86e14f..4d0ffd45c7a 100644 --- a/src/app/modules/header/header.component.html +++ b/src/app/modules/header/header.component.html @@ -14,18 +14,21 @@ - - - + + @if (roles.length > 0) { + + } + @if (!location) { + + }
diff --git a/src/app/modules/header/header.component.spec.ts b/src/app/modules/header/header.component.spec.ts index 85fa808fcaf..c17b2f2ccb9 100644 --- a/src/app/modules/header/header.component.spec.ts +++ b/src/app/modules/header/header.component.spec.ts @@ -1,19 +1,17 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HeaderComponent } from './header.component'; -import { Component, Input } from '@angular/core'; import { User } from '../../domain/user'; -import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Observable } from 'rxjs'; import { ConfigService } from '../../services/config.service'; import { UserService } from '../../services/user.service'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { Config } from '../../domain/config'; import { UtilService } from '../../services/util.service'; +import { provideRouter } from '@angular/router'; export class MockUserService { getUser(): Observable { - return Observable.create((observer) => { + return new Observable((observer) => { const user: User = new User(); observer.next(user); observer.complete(); @@ -32,35 +30,30 @@ export class MockConfigService { logOutURL: '/logout', currentTime: new Date('2018-10-17T00:00:00.0').getTime() }; - return Observable.create((observer) => { + return new Observable((observer) => { observer.next(config); observer.complete(); }); } } -@Component({ selector: 'app-header-account-menu', template: '' }) -class HeaderAccountMenuStubComponent { - @Input() - user: User; -} - describe('HeaderComponent', () => { let component: HeaderComponent; let fixture: ComponentFixture; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, RouterTestingModule], - declarations: [HeaderComponent], - providers: [ - { provide: UserService, useClass: MockUserService }, - { provide: ConfigService, useClass: MockConfigService }, - { provide: UtilService, useClass: MockUtilService } - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [HeaderComponent, HttpClientTestingModule], + providers: [ + provideRouter([]), + { provide: UserService, useClass: MockUserService }, + { provide: ConfigService, useClass: MockConfigService }, + { provide: UtilService, useClass: MockUtilService } + ] + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(HeaderComponent); diff --git a/src/app/modules/header/header.component.ts b/src/app/modules/header/header.component.ts index 1fcd64888b8..d7d4716f85e 100644 --- a/src/app/modules/header/header.component.ts +++ b/src/app/modules/header/header.component.ts @@ -1,56 +1,70 @@ import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { User } from '../../domain/user'; import { UserService } from '../../services/user.service'; import { UtilService } from '../../services/util.service'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { HeaderLinksComponent } from './header-links/header-links.component'; +import { HeaderAccountMenuComponent } from './header-account-menu/header-account-menu.component'; +import { MatToolbarModule } from '@angular/material/toolbar'; @Component({ + imports: [ + CommonModule, + FlexLayoutModule, + HeaderAccountMenuComponent, + HeaderLinksComponent, + MatButtonModule, + MatIconModule, + MatToolbarModule, + RouterModule + ], selector: 'app-header', - templateUrl: './header.component.html', - styleUrls: ['./header.component.scss'] + standalone: true, + styleUrl: './header.component.scss', + templateUrl: './header.component.html' }) export class HeaderComponent implements OnInit { - user: User; - - location: string = ''; // current location - roles: string[] = []; - url: string = ''; + protected location: string = ''; + protected roles: string[] = []; + protected user: User; constructor( private router: Router, private userService: UserService, private utilService: UtilService ) { - this.router = router; - this.router.events.subscribe((event) => { + this.router.events.subscribe(() => { this.setLocation(); }); } - ngOnInit() { + ngOnInit(): void { this.getUser(); this.setLocation(); } - getUser() { + private getUser(): void { this.userService.getUser().subscribe((user) => { this.user = user; this.roles = user.roles ? user.roles : []; }); } - setLocation() { - this.url = this.router.url; - if (this.url.match(/^\/teacher/)) { + private setLocation(): void { + if (this.router.url.match(/^\/teacher/)) { this.location = 'teacher'; - } else if (this.url.match(/^\/student/)) { + } else if (this.router.url.match(/^\/student/)) { this.location = 'student'; } else { this.location = ''; } } - showMobileMenu() { + protected showMobileMenu(): void { this.utilService.showMobileMenu(); } } diff --git a/src/app/modules/header/header.module.ts b/src/app/modules/header/header.module.ts deleted file mode 100644 index cf605036d6a..00000000000 --- a/src/app/modules/header/header.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FlexLayoutModule } from '@angular/flex-layout'; -import { AppRoutingModule } from '../../app-routing.module'; -import { MatButtonModule } from '@angular/material/button'; -import { MatDividerModule } from '@angular/material/divider'; -import { MatIconModule } from '@angular/material/icon'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatToolbarModule } from '@angular/material/toolbar'; -import { HeaderComponent } from './header.component'; -import { HeaderLinksComponent } from './header-links/header-links.component'; -import { HeaderAccountMenuComponent } from './header-account-menu/header-account-menu.component'; -import { ConfigService } from '../../services/config.service'; -import { UserService } from '../../services/user.service'; - -const materialModules = [ - MatButtonModule, - MatDividerModule, - MatIconModule, - MatMenuModule, - MatToolbarModule -]; - -@NgModule({ - imports: [ - CommonModule, - HeaderLinksComponent, - FlexLayoutModule, - AppRoutingModule, - materialModules - ], - declarations: [HeaderComponent, HeaderAccountMenuComponent], - providers: [ConfigService, UserService], - exports: [HeaderComponent] -}) -export class HeaderModule {} diff --git a/src/app/modules/library/community-library/community-library.component.html b/src/app/modules/library/community-library/community-library.component.html index 154b14457e8..7a692fb0044 100644 --- a/src/app/modules/library/community-library/community-library.component.html +++ b/src/app/modules/library/community-library/community-library.component.html @@ -19,7 +19,7 @@ fxFlex.sm="50" fxFlex.md="33" fxFlex.gt-md="25" - > + />
No community designed units found. diff --git a/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.html b/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.html index 60b761cded9..c37231f93f3 100644 --- a/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.html +++ b/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.html @@ -1,16 +1,20 @@ - - -

- forum  - - Discuss ({{ postCount }}{{ hasMoreTopics ? '+' : '' }}) - -

-
    -
  • - - {{ topic.title }} - -
    • +@if (validCategoryURL) { + +

    + forum  + + Discuss ({{ postCount }}{{ hasMoreTopics ? '+' : '' }}) + +

    +@if (topics.length > 0) { + - +} +} diff --git a/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.spec.ts b/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.spec.ts index 3ef854adfab..4d936e40e6d 100644 --- a/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.spec.ts +++ b/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.spec.ts @@ -1,6 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DiscourseCategoryActivityComponent } from './discourse-category-activity.component'; +import { By } from '@angular/platform-browser'; let component: DiscourseCategoryActivityComponent; let http: HttpTestingController; @@ -25,34 +26,23 @@ describe('DiscourseCategoryActivityComponent', () => { http = TestBed.inject(HttpTestingController); fixture = TestBed.createComponent(DiscourseCategoryActivityComponent); component = fixture.componentInstance; - fixture.detectChanges(); }); afterEach(() => { fixture.destroy(); }); - retrieveCategory(); + ngOnInit(); }); -function retrieveCategory() { - xdescribe('retrieveCategory()', () => { - it('should set discussion links and post count when request succeeds', () => { - component.categoryURL = 'http://localhost:9292'; - component.retrieveCategory(); +function ngOnInit() { + describe('ngOnInit()', () => { + it('should make request to fetch posts and show discussion links', () => { + component.categoryURL = 'http://localhost:9292/c/7'; + component.ngOnInit(); http.expectOne(`${component.categoryURL}.json?order=latest`).flush(sampleDiscourseResponse); - expect(component.isValidCategoryURL).toBeTrue(); - expect(component.topics.length).toEqual(3); - expect(component.postCount).toEqual(8); - }); - - it('should set isValidCategoryURL to false on network error', () => { - component.categoryURL = 'http://invalid_url'; - component.retrieveCategory(); - http - .expectOne(`${component.categoryURL}.json?order=latest`) - .error(new ErrorEvent('404 error')); - expect(component.isValidCategoryURL).toBeFalse(); + fixture.detectChanges(); + expect(fixture.debugElement.queryAll(By.css('a')).length).toEqual(4); }); }); } diff --git a/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.ts b/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.ts index d927acc5d22..14a9e3ffc82 100644 --- a/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.ts +++ b/src/app/modules/library/discourse-category-activity/discourse-category-activity.component.ts @@ -1,44 +1,40 @@ +import { CommonModule } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, Input } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatIconModule } from '@angular/material/icon'; @Component({ + imports: [CommonModule, FlexLayoutModule, MatDividerModule, MatIconModule], selector: 'discourse-category-activity', - templateUrl: 'discourse-category-activity.component.html', - styleUrls: ['discourse-category-activity.component.scss'] + standalone: true, + styleUrl: 'discourse-category-activity.component.scss', + templateUrl: 'discourse-category-activity.component.html' }) export class DiscourseCategoryActivityComponent { - @Input() - categoryURL: string = ''; - - discourseBaseUrl: string = ''; - hasMoreTopics: boolean = false; - isValidCategoryURL: boolean = false; - postCount: number = 0; - topics: any[] = []; + @Input() categoryURL: string = ''; + protected discourseBaseUrl: string = ''; + protected hasMoreTopics: boolean; + protected postCount: number = 0; + protected topics: any[] = []; + protected validCategoryURL: boolean; constructor(private http: HttpClient) {} - ngOnInit() { + ngOnInit(): void { this.retrieveCategory(); } - retrieveCategory(): void { + private retrieveCategory(): void { this.http.get(`${this.categoryURL}.json?order=latest`).subscribe(({ topic_list }: any) => { if (topic_list.topics) { - this.isValidCategoryURL = true; + this.validCategoryURL = true; this.topics = topic_list.topics; - this.postCount = this.countPosts(); + this.postCount = this.topics.reduce((sum, topic) => sum + topic.posts_count, 0); this.discourseBaseUrl = this.categoryURL.match(/(.+)\/c\/.+/)[1]; this.hasMoreTopics = topic_list.more_topics_url ? true : false; } }); } - - countPosts(): number { - let postCount = 0; - this.topics.forEach((topic) => { - postCount += topic.posts_count; - }); - return postCount; - } } diff --git a/src/app/modules/library/home-page-project-library/home-page-project-library.component.html b/src/app/modules/library/home-page-project-library/home-page-project-library.component.html index 15b755ddca3..b079fdf51d9 100644 --- a/src/app/modules/library/home-page-project-library/home-page-project-library.component.html +++ b/src/app/modules/library/home-page-project-library/home-page-project-library.component.html @@ -1,14 +1,14 @@
    -
    - +
    +
    Explore suggested WISE curricula for the given grade levels or search for specific units that address your needs.
    - +
    diff --git a/src/app/modules/library/home-page-project-library/home-page-project-library.component.scss b/src/app/modules/library/home-page-project-library/home-page-project-library.component.scss index 463ca918a0c..e1f2fafa0f0 100644 --- a/src/app/modules/library/home-page-project-library/home-page-project-library.component.scss +++ b/src/app/modules/library/home-page-project-library/home-page-project-library.component.scss @@ -18,3 +18,8 @@ max-width: none; } +.content-block { + padding: 16px; + border-radius: 0; +} + diff --git a/src/app/modules/library/home-page-project-library/home-page-project-library.component.ts b/src/app/modules/library/home-page-project-library/home-page-project-library.component.ts index ca796e1f9ce..c74264aa10b 100644 --- a/src/app/modules/library/home-page-project-library/home-page-project-library.component.ts +++ b/src/app/modules/library/home-page-project-library/home-page-project-library.component.ts @@ -3,8 +3,8 @@ import { LibraryService } from '../../../services/library.service'; @Component({ selector: 'app-home-page-project-library', - templateUrl: './home-page-project-library.component.html', - styleUrls: ['./home-page-project-library.component.scss', '../library/library.component.scss'] + styleUrls: ['./home-page-project-library.component.scss', '../library/library.component.scss'], + templateUrl: './home-page-project-library.component.html' }) export class HomePageProjectLibraryComponent { constructor(private libraryService: LibraryService) { diff --git a/src/app/modules/library/library-filters/library-filters.component.html b/src/app/modules/library/library-filters/library-filters.component.html index 9cd2f27d35c..ba65750b5a4 100644 --- a/src/app/modules/library/library-filters/library-filters.component.html +++ b/src/app/modules/library/library-filters/library-filters.component.html @@ -32,12 +32,7 @@ (NGSS). Reset
    -
    +
    - + />
    - + />
    - + />
    diff --git a/src/app/modules/library/library-filters/library-filters.component.ts b/src/app/modules/library/library-filters/library-filters.component.ts index 48cb7dd342d..d670e812f41 100644 --- a/src/app/modules/library/library-filters/library-filters.component.ts +++ b/src/app/modules/library/library-filters/library-filters.component.ts @@ -3,8 +3,6 @@ import { OnInit, Input, SimpleChanges, - Output, - EventEmitter, ViewEncapsulation } from '@angular/core'; import { LibraryProject } from '../libraryProject'; @@ -15,10 +13,10 @@ import { ProjectFilterValues } from '../../../domain/projectFilterValues'; import { UtilService } from '../../../services/util.service'; @Component({ + encapsulation: ViewEncapsulation.None, selector: 'app-library-filters', - templateUrl: './library-filters.component.html', - styleUrls: ['./library-filters.component.scss'], - encapsulation: ViewEncapsulation.None + styleUrl: './library-filters.component.scss', + templateUrl: './library-filters.component.html' }) export class LibraryFiltersComponent implements OnInit { @Input() diff --git a/src/app/modules/library/library-project-details/library-project-details.component.html b/src/app/modules/library/library-project-details/library-project-details.component.html index daa84fd4955..6ae1b7b8f72 100644 --- a/src/app/modules/library/library-project-details/library-project-details.component.html +++ b/src/app/modules/library/library-project-details/library-project-details.component.html @@ -31,7 +31,7 @@ *ngIf="isTeacher && project.wiseVersion !== 4" [project]="project" [isRun]="isRunProject" - > + />
@@ -75,11 +75,12 @@ >{{ isLast ? '' : ' / ' }}

+
+ />
CC BY-SA  diff --git a/src/app/modules/library/library-project-details/library-project-details.component.scss b/src/app/modules/library/library-project-details/library-project-details.component.scss index ba49c1c4b85..b3efae3700a 100644 --- a/src/app/modules/library/library-project-details/library-project-details.component.scss +++ b/src/app/modules/library/library-project-details/library-project-details.component.scss @@ -59,7 +59,7 @@ } } -discourse-category-activity { +discourse-category-activity, unit-tags { margin-bottom: 12px; display: block; } diff --git a/src/app/modules/library/library-project-menu/library-project-menu.component.spec.ts b/src/app/modules/library/library-project-menu/library-project-menu.component.spec.ts index ea88096cdc3..5cbc83ae2d1 100644 --- a/src/app/modules/library/library-project-menu/library-project-menu.component.spec.ts +++ b/src/app/modules/library/library-project-menu/library-project-menu.component.spec.ts @@ -49,6 +49,7 @@ export class MockConfigService { } } +const archivedTag = { id: 1, text: 'archived', color: null }; let component: LibraryProjectMenuComponent; let fixture: ComponentFixture; let harness: LibraryProjectMenuHarness; @@ -108,7 +109,7 @@ function showsArchiveButton() { function showsRestoreButton() { describe('project has archived tag', () => { beforeEach(() => { - component.project.tags = ['archived']; + component.project.tags = [archivedTag]; component.ngOnInit(); }); it('shows restore button', async () => { diff --git a/src/app/modules/library/library-project-menu/library-project-menu.component.ts b/src/app/modules/library/library-project-menu/library-project-menu.component.ts index 7868496e2cb..56305d4e1ee 100644 --- a/src/app/modules/library/library-project-menu/library-project-menu.component.ts +++ b/src/app/modules/library/library-project-menu/library-project-menu.component.ts @@ -10,8 +10,8 @@ import { ArchiveProjectService } from '../../../services/archive-project.service @Component({ selector: 'app-library-project-menu', - templateUrl: './library-project-menu.component.html', - styleUrls: ['./library-project-menu.component.scss'] + styleUrl: './library-project-menu.component.scss', + templateUrl: './library-project-menu.component.html' }) export class LibraryProjectMenuComponent { @Input() @@ -40,7 +40,7 @@ export class LibraryProjectMenuComponent { this.isCanShare = this.isOwner() && !this.isRun; this.editLink = `${this.configService.getContextPath()}/teacher/edit/unit/${this.project.id}`; this.isChild = this.project.isChild(); - this.archived = this.project.hasTag('archived'); + this.archived = this.project.hasTagWithText('archived'); } isOwner() { diff --git a/src/app/modules/library/library-project/library-project.component.html b/src/app/modules/library/library-project/library-project.component.html index 69946a8411b..3845f319eb6 100644 --- a/src/app/modules/library/library-project/library-project.component.html +++ b/src/app/modules/library/library-project/library-project.component.html @@ -22,7 +22,7 @@ (click)="selectProject($event)" >
- +
Shared by {{ project.owner.displayName }}

+
+ +
diff --git a/src/app/modules/library/library-project/library-project.component.scss b/src/app/modules/library/library-project/library-project.component.scss index dece9d4baab..2713de8647b 100644 --- a/src/app/modules/library/library-project/library-project.component.scss +++ b/src/app/modules/library/library-project/library-project.component.scss @@ -85,6 +85,11 @@ $config: mat.define-typography-config(); .mat-mdc-checkbox.library-project__checkbox { position: absolute; top: 0; - z-index: 1; + z-index: 100; border-end-end-radius: $button-border-radius; +} + +.tags { + max-height: 86px; + overflow-y: auto; } \ No newline at end of file diff --git a/src/app/modules/library/library-project/library-project.component.spec.ts b/src/app/modules/library/library-project/library-project.component.spec.ts index 99341300534..ec406902ce0 100644 --- a/src/app/modules/library/library-project/library-project.component.spec.ts +++ b/src/app/modules/library/library-project/library-project.component.spec.ts @@ -3,22 +3,26 @@ import { LibraryProjectComponent } from './library-project.component'; import { LibraryProject } from '../libraryProject'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { MatDialogModule } from '@angular/material/dialog'; -import { Router } from '@angular/router'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { RouterTestingModule } from '@angular/router/testing'; import { OverlayModule } from '@angular/cdk/overlay'; +import { ProjectTagService } from '../../../../assets/wise5/services/projectTagService'; +import { provideRouter } from '@angular/router'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; describe('LibraryProjectComponent', () => { let component: LibraryProjectComponent; let fixture: ComponentFixture; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [LibraryProjectComponent], - imports: [BrowserAnimationsModule, RouterTestingModule, OverlayModule, MatDialogModule], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [LibraryProjectComponent], + imports: [BrowserAnimationsModule, HttpClientTestingModule, MatDialogModule, OverlayModule], + providers: [ProjectTagService, provideRouter([])], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(LibraryProjectComponent); diff --git a/src/app/modules/library/library-project/library-project.component.ts b/src/app/modules/library/library-project/library-project.component.ts index 887db754a84..f1b4c3d29e0 100644 --- a/src/app/modules/library/library-project/library-project.component.ts +++ b/src/app/modules/library/library-project/library-project.component.ts @@ -5,25 +5,33 @@ import { LibraryProject } from '../libraryProject'; import { LibraryProjectDetailsComponent } from '../library-project-details/library-project-details.component'; import { flash } from '../../../animations'; import { ProjectSelectionEvent } from '../../../domain/projectSelectionEvent'; +import { Subscription } from 'rxjs'; +import { ProjectTagService } from '../../../../assets/wise5/services/projectTagService'; +import { Tag } from '../../../domain/tag'; @Component({ - selector: 'app-library-project', - templateUrl: './library-project.component.html', - styleUrls: ['./library-project.component.scss'], + animations: [flash], encapsulation: ViewEncapsulation.None, - animations: [flash] + selector: 'app-library-project', + styleUrl: './library-project.component.scss', + templateUrl: './library-project.component.html' }) export class LibraryProjectComponent implements OnInit { + animateDelay: string = '0s'; + animateDuration: string = '0s'; @Input() checked: boolean = false; @Input() myUnit: boolean = false; @Input() project: LibraryProject = new LibraryProject(); @Output() - projectSelectionEvent: EventEmitter = new EventEmitter(); - - animateDuration: string = '0s'; - animateDelay: string = '0s'; + projectSelectionEvent: EventEmitter = + new EventEmitter(); + private subscriptions: Subscription = new Subscription(); - constructor(public dialog: MatDialog, private sanitizer: DomSanitizer) {} + constructor( + private dialog: MatDialog, + private projectTagService: ProjectTagService, + private sanitizer: DomSanitizer + ) {} ngOnInit() { this.project.thumbStyle = this.getThumbStyle(this.project.projectThumb); @@ -34,6 +42,35 @@ export class LibraryProjectComponent implements OnInit { this.project.isHighlighted = false; }, 7000); } + this.subscribeToTagUpdated(); + this.subscribeToTagDeleted(); + } + + private subscribeToTagUpdated(): void { + this.subscriptions.add( + this.projectTagService.tagUpdated$.subscribe((updatedTag: Tag) => { + const projectTag = this.project.tags.find((tag: Tag) => tag.id === updatedTag.id); + if (projectTag != null) { + projectTag.text = updatedTag.text; + projectTag.color = updatedTag.color; + this.projectTagService.sortTags(this.project.tags); + } + }) + ); + } + + private subscribeToTagDeleted(): void { + this.subscriptions.add( + this.projectTagService.tagDeleted$.subscribe((tag: Tag) => { + if (this.project.hasTag(tag)) { + this.project.removeTag(tag); + } + }) + ); + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); } /** diff --git a/src/app/modules/library/library.module.ts b/src/app/modules/library/library.module.ts index f882c569933..f1dd58dad72 100644 --- a/src/app/modules/library/library.module.ts +++ b/src/app/modules/library/library.module.ts @@ -48,9 +48,14 @@ import { ShareProjectDialogComponent } from './share-project-dialog/share-projec import { CopyProjectDialogComponent } from './copy-project-dialog/copy-project-dialog.component'; import { LibraryPaginatorIntl } from './libraryPaginatorIntl'; import { DiscourseCategoryActivityComponent } from './discourse-category-activity/discourse-category-activity.component'; -import { SelectAllItemsCheckboxComponent } from './select-all-items-checkbox/select-all-items-checkbox.component'; import { ArchiveProjectsButtonComponent } from '../../teacher/archive-projects-button/archive-projects-button.component'; import { SearchBarComponent } from '../shared/search-bar/search-bar.component'; +import { SelectAllItemsCheckboxComponent } from './select-all-items-checkbox/select-all-items-checkbox.component'; +import { ApplyTagsButtonComponent } from '../../teacher/apply-tags-button/apply-tags-button.component'; +import { SelectTagsComponent } from '../../teacher/select-tags/select-tags.component'; +import { MatChipsModule } from '@angular/material/chips'; +import { SelectMenuComponent } from '../shared/select-menu/select-menu.component'; +import { UnitTagsComponent } from '../../teacher/unit-tags/unit-tags.component'; const materialModules = [ MatAutocompleteModule, @@ -58,6 +63,7 @@ const materialModules = [ MatButtonModule, MatCardModule, MatCheckboxModule, + MatChipsModule, MatDialogModule, MatDividerModule, MatExpansionModule, @@ -75,8 +81,10 @@ const materialModules = [ @NgModule({ imports: [ + ApplyTagsButtonComponent, ArchiveProjectsButtonComponent, CommonModule, + DiscourseCategoryActivityComponent, FlexLayoutModule, FormsModule, LibraryProjectDisciplinesComponent, @@ -84,8 +92,12 @@ const materialModules = [ RouterModule, materialModules, SearchBarComponent, + SelectAllItemsCheckboxComponent, + SelectMenuComponent, + SelectTagsComponent, SharedModule, - TimelineModule + TimelineModule, + UnitTagsComponent ], declarations: [ LibraryGroupThumbsComponent, @@ -101,15 +113,14 @@ const materialModules = [ CommunityLibraryDetailsComponent, PersonalLibraryComponent, PersonalLibraryDetailsComponent, - SelectAllItemsCheckboxComponent, ShareProjectDialogComponent, - CopyProjectDialogComponent, - DiscourseCategoryActivityComponent + CopyProjectDialogComponent ], exports: [ HomePageProjectLibraryComponent, ReactiveFormsModule, TeacherProjectLibraryComponent, + UnitTagsComponent, materialModules ], providers: [LibraryService, { provide: MatPaginatorIntl, useClass: LibraryPaginatorIntl }] diff --git a/src/app/modules/library/library/library.component.scss b/src/app/modules/library/library/library.component.scss index 59bd460b4e2..2dcf4fe592f 100644 --- a/src/app/modules/library/library/library.component.scss +++ b/src/app/modules/library/library/library.component.scss @@ -8,7 +8,6 @@ .library { text-align: left; border-radius: $card-border-radius; - overflow: hidden; h2 { font-weight: 400; diff --git a/src/app/modules/library/official-library/official-library.component.html b/src/app/modules/library/official-library/official-library.component.html index 2cbc54b73d1..ab30bf0359f 100644 --- a/src/app/modules/library/official-library/official-library.component.html +++ b/src/app/modules/library/official-library/official-library.component.html @@ -27,7 +27,7 @@ fxFlex.md="{{ isSplitScreen ? 50 : 33 }}" fxFlex.gt-md="{{ isSplitScreen ? 33 : 25 }}" > - +
diff --git a/src/app/modules/library/personal-library/personal-library.component.html b/src/app/modules/library/personal-library/personal-library.component.html index 51e2f7dc4dc..7299f0f3619 100644 --- a/src/app/modules/library/personal-library/personal-library.component.html +++ b/src/app/modules/library/personal-library/personal-library.component.html @@ -2,8 +2,9 @@
What are My Units? + - View + View Active Archived @@ -14,7 +15,7 @@
+ @if (selectedProjects().length > 0) { + + }
+ />
No owned or shared units found. diff --git a/src/app/modules/library/personal-library/personal-library.component.spec.ts b/src/app/modules/library/personal-library/personal-library.component.spec.ts index 8bf70b05959..d220771a067 100644 --- a/src/app/modules/library/personal-library/personal-library.component.spec.ts +++ b/src/app/modules/library/personal-library/personal-library.component.spec.ts @@ -24,7 +24,9 @@ import { of } from 'rxjs'; import { MatPaginatorModule } from '@angular/material/paginator'; import { ArchiveProjectsButtonComponent } from '../../../teacher/archive-projects-button/archive-projects-button.component'; import { HttpClient } from '@angular/common/http'; +import { ProjectTagService } from '../../../../assets/wise5/services/projectTagService'; +const archivedTag = { id: 1, text: 'archived', color: null }; let archiveProjectService: ArchiveProjectService; let component: PersonalLibraryComponent; let fixture: ComponentFixture; @@ -52,14 +54,11 @@ describe('PersonalLibraryComponent', () => { MatPaginatorModule, MatSelectModule, MatSnackBarModule, - OverlayModule - ], - declarations: [ - LibraryProjectComponent, - PersonalLibraryComponent, + OverlayModule, SelectAllItemsCheckboxComponent ], - providers: [ArchiveProjectService, LibraryService], + declarations: [LibraryProjectComponent, PersonalLibraryComponent], + providers: [ArchiveProjectService, LibraryService, ProjectTagService], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); }) @@ -92,12 +91,12 @@ function setUpFiveProjects() { new LibraryProject({ id: projectId1, metadata: { title: 'Hello' }, - tags: ['archived'] + tags: [archivedTag] }), new LibraryProject({ id: projectId2, metadata: { title: 'Hello World' }, - tags: ['archived'] + tags: [archivedTag] }), new LibraryProject({ id: projectId3, @@ -150,7 +149,10 @@ function archiveMultipleProjects() { it('archives multiple projects', async () => { await harness.selectProjects([projectId4, projectId3]); spyOn(http, 'put').and.returnValue( - of([new ArchiveProjectResponse(4, true), new ArchiveProjectResponse(3, true)]) + of([ + new ArchiveProjectResponse(4, true, archivedTag), + new ArchiveProjectResponse(3, true, archivedTag) + ]) ); await (await harness.getArchiveButton()).click(); expect(await harness.getProjectIdsInView()).toEqual([projectId5]); @@ -166,7 +168,10 @@ function restoreMultipleProjects() { await harness.showArchivedView(); await harness.selectProjects([projectId2, projectId1]); spyOn(http, 'delete').and.returnValue( - of([new ArchiveProjectResponse(2, false), new ArchiveProjectResponse(1, false)]) + of([ + new ArchiveProjectResponse(2, false, archivedTag), + new ArchiveProjectResponse(1, false, archivedTag) + ]) ); await (await harness.getUnarchiveButton()).click(); expect(await harness.getProjectIdsInView()).toEqual([]); diff --git a/src/app/modules/library/personal-library/personal-library.component.ts b/src/app/modules/library/personal-library/personal-library.component.ts index 7945841daa4..c62e8e44f42 100644 --- a/src/app/modules/library/personal-library/personal-library.component.ts +++ b/src/app/modules/library/personal-library/personal-library.component.ts @@ -7,11 +7,13 @@ import { ProjectFilterValues } from '../../../domain/projectFilterValues'; import { ArchiveProjectService } from '../../../services/archive-project.service'; import { PageEvent } from '@angular/material/paginator'; import { ProjectSelectionEvent } from '../../../domain/projectSelectionEvent'; +import { Tag } from '../../../domain/tag'; +import { Project } from '../../../domain/project'; @Component({ selector: 'app-personal-library', - templateUrl: './personal-library.component.html', - styleUrls: ['./personal-library.component.scss'] + styleUrl: './personal-library.component.scss', + templateUrl: './personal-library.component.html' }) export class PersonalLibraryComponent extends LibraryComponent { filteredProjects: LibraryProject[] = []; @@ -25,8 +27,9 @@ export class PersonalLibraryComponent extends LibraryComponent { }, {}) ); projects: LibraryProject[] = []; - protected projectsLabel: string = $localize`units`; + protected projectsLabel: string = $localize`Select all units`; protected selectedProjects: WritableSignal = signal([]); + protected selectedTags: Tag[] = []; protected sharedProjects: LibraryProject[] = []; protected showArchivedView: boolean = false; @@ -113,8 +116,13 @@ export class PersonalLibraryComponent extends LibraryComponent { public filterUpdated(filterValues: ProjectFilterValues = null): void { super.filterUpdated(filterValues); this.filteredProjects = this.filteredProjects.filter( - (project) => project.hasTag('archived') == this.showArchivedView + (project) => project.hasTagWithText('archived') == this.showArchivedView ); + if (this.selectedTags.length > 0) { + this.filteredProjects = this.filteredProjects.filter((project: Project) => + this.selectedTags.some((tag: Tag) => project.hasTag(tag)) + ); + } this.numProjectsInView = this.getProjectsInView().length; this.unselectAllProjects(); } @@ -130,16 +138,14 @@ export class PersonalLibraryComponent extends LibraryComponent { } protected updateSelectedProjects(event: ProjectSelectionEvent): void { + const selectedProjects = this.selectedProjects(); if (event.selected) { - this.selectedProjects.update((selectedProjects) => { - return [...selectedProjects, event.project]; - }); + selectedProjects.push(event.project); } else { - this.selectedProjects.update((selectedProjects) => { - selectedProjects.splice(selectedProjects.indexOf(event.project), 1); - return [...selectedProjects]; - }); + selectedProjects.splice(selectedProjects.indexOf(event.project), 1); } + // create a new array to trigger change detection + this.selectedProjects.set([...selectedProjects]); } protected unselectAllProjects(): void { @@ -162,6 +168,16 @@ export class PersonalLibraryComponent extends LibraryComponent { protected archiveProjects(archive: boolean): void { this.archiveProjectService.archiveProjects(this.selectedProjects(), archive); } + + protected selectTags(tags: Tag[]): void { + this.selectedTags = tags; + this.filterUpdated(); + } + + protected removeTag(tag: Tag): void { + this.selectedTags = this.selectedTags.filter((selectedTag: Tag) => selectedTag.id !== tag.id); + this.filterUpdated(); + } } @Component({ diff --git a/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.html b/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.html index e5451dcd2d7..f518102e148 100644 --- a/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.html +++ b/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.html @@ -1,9 +1,12 @@ +> + + diff --git a/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.scss b/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.scss new file mode 100644 index 00000000000..0b3fa2aa38b --- /dev/null +++ b/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.scss @@ -0,0 +1,3 @@ +.checkbox { + width: 100%; +} diff --git a/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.spec.ts b/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.spec.ts index e484654b25b..3eb2c99fef3 100644 --- a/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.spec.ts +++ b/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.spec.ts @@ -1,7 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SelectAllItemsCheckboxComponent } from './select-all-items-checkbox.component'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatTooltipModule } from '@angular/material/tooltip'; describe('SelectAllItemsCheckboxComponent', () => { let component: SelectAllItemsCheckboxComponent; @@ -9,8 +7,7 @@ describe('SelectAllItemsCheckboxComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [SelectAllItemsCheckboxComponent], - imports: [MatCheckboxModule, MatTooltipModule] + imports: [SelectAllItemsCheckboxComponent] }); fixture = TestBed.createComponent(SelectAllItemsCheckboxComponent); component = fixture.componentInstance; diff --git a/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.ts b/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.ts index 7243ca97307..179c6453f65 100644 --- a/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.ts +++ b/src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.ts @@ -1,20 +1,24 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { MAT_CHECKBOX_DEFAULT_OPTIONS } from '@angular/material/checkbox'; +import { MAT_CHECKBOX_DEFAULT_OPTIONS, MatCheckboxModule } from '@angular/material/checkbox'; +import { MatTooltipModule } from '@angular/material/tooltip'; type SelectAllItemsStatus = 'none' | 'some' | 'all'; @Component({ + imports: [MatCheckboxModule, MatTooltipModule], + providers: [{ provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }], selector: 'select-all-items-checkbox', - templateUrl: './select-all-items-checkbox.component.html', - providers: [{ provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }] + standalone: true, + styleUrl: 'select-all-items-checkbox.component.scss', + templateUrl: './select-all-items-checkbox.component.html' }) export class SelectAllItemsCheckboxComponent { @Output() allSelectedEvent: EventEmitter = new EventEmitter(); - @Input() label: string = $localize`items`; @Output() noneSelectedEvent: EventEmitter = new EventEmitter(); @Input() numAllItems: number; @Input() numSelectedItems: number; protected status: SelectAllItemsStatus; + @Input() tooltip: string; ngOnChanges(): void { if (this.numSelectedItems == 0) { diff --git a/src/app/modules/library/teacher-project-library/teacher-project-library.component.html b/src/app/modules/library/teacher-project-library/teacher-project-library.component.html index 1a14a7599d1..7a9b24fdf64 100644 --- a/src/app/modules/library/teacher-project-library/teacher-project-library.component.html +++ b/src/app/modules/library/teacher-project-library/teacher-project-library.component.html @@ -1,6 +1,6 @@
-
- +
+
- - - + + +
diff --git a/src/app/modules/library/teacher-project-library/teacher-project-library.component.scss b/src/app/modules/library/teacher-project-library/teacher-project-library.component.scss index 340cbe07ed5..9f68504ab1a 100644 --- a/src/app/modules/library/teacher-project-library/teacher-project-library.component.scss +++ b/src/app/modules/library/teacher-project-library/teacher-project-library.component.scss @@ -12,6 +12,12 @@ } } +.filters { + padding: 16px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} + .library-teacher__header { h3 { font-weight: 500; diff --git a/src/app/modules/shared/call-to-action/call-to-action.component.spec.ts b/src/app/modules/shared/call-to-action/call-to-action.component.spec.ts index 6c63fc9b916..01cc2494df9 100644 --- a/src/app/modules/shared/call-to-action/call-to-action.component.spec.ts +++ b/src/app/modules/shared/call-to-action/call-to-action.component.spec.ts @@ -1,18 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CallToActionComponent } from './call-to-action.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { provideRouter } from '@angular/router'; describe('CallToActionComponent', () => { let component: CallToActionComponent; let fixture: ComponentFixture; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [CallToActionComponent], - imports: [], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [CallToActionComponent], + providers: [provideRouter([])] + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(CallToActionComponent); diff --git a/src/app/modules/shared/call-to-action/call-to-action.component.ts b/src/app/modules/shared/call-to-action/call-to-action.component.ts index fd78f8d39cc..892dad0044e 100644 --- a/src/app/modules/shared/call-to-action/call-to-action.component.ts +++ b/src/app/modules/shared/call-to-action/call-to-action.component.ts @@ -1,48 +1,27 @@ -import { - Component, - ContentChild, - Input, - OnInit, - TemplateRef, - ViewEncapsulation -} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { Component, ContentChild, Input, TemplateRef, ViewEncapsulation } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { RouterModule } from '@angular/router'; @Component({ + encapsulation: ViewEncapsulation.None, + imports: [CommonModule, FlexLayoutModule, MatButtonModule, MatIconModule, RouterModule], selector: 'app-call-to-action', - templateUrl: './call-to-action.component.html', - styleUrls: ['./call-to-action.component.scss'], - encapsulation: ViewEncapsulation.None + standalone: true, + styleUrl: './call-to-action.component.scss', + templateUrl: './call-to-action.component.html' }) -export class CallToActionComponent implements OnInit { - @Input() - destination: string; - - @Input() - isOutsideLink: boolean = false; - - @Input() - linkTarget: string; - - @Input() - icon: string; - - @Input() - isSvgIcon: boolean = false; - - @Input() - iconColor: string; - - @Input() - headline: string; - - @ContentChild('headlineTemplate', { static: false }) headlineRef: TemplateRef; - - @Input() - content: string; - +export class CallToActionComponent { + @Input() content: string; @ContentChild('contentTemplate', { static: false }) contentRef: TemplateRef; - - constructor() {} - - ngOnInit() {} + @Input() destination: string; + @Input() headline: string; + @ContentChild('headlineTemplate', { static: false }) headlineRef: TemplateRef; + @Input() icon: string; + @Input() iconColor: string; + @Input() isOutsideLink: boolean = false; + @Input() isSvgIcon: boolean = false; + @Input() linkTarget: string; } diff --git a/src/app/modules/shared/search-bar/search-bar.component.html b/src/app/modules/shared/search-bar/search-bar.component.html index 3aac8ef63b1..12762f5a3d8 100644 --- a/src/app/modules/shared/search-bar/search-bar.component.html +++ b/src/app/modules/shared/search-bar/search-bar.component.html @@ -1,12 +1,17 @@ - + {{ placeholderText }} search - +
diff --git a/src/app/student/vle/student-vle.module.ts b/src/app/student/vle/student-vle.module.ts index 6ead2160060..3911921645b 100644 --- a/src/app/student/vle/student-vle.module.ts +++ b/src/app/student/vle/student-vle.module.ts @@ -14,7 +14,6 @@ import { ProjectService } from '../../../assets/wise5/services/projectService'; import { StudentDataService } from '../../../assets/wise5/services/studentDataService'; import { NavigationComponent } from '../../../assets/wise5/themes/default/navigation/navigation.component'; import { StepToolsComponent } from '../../../assets/wise5/themes/default/themeComponents/stepTools/step-tools.component'; -import { NavItemComponent } from '../../../assets/wise5/vle/nav-item/nav-item.component'; import { NodeModule } from '../../../assets/wise5/vle/node/node.module'; import { StudentAssetsDialogModule } from '../../../assets/wise5/vle/studentAsset/student-assets-dialog/student-assets-dialog.module'; import { VLEComponent } from '../../../assets/wise5/vle/vle.component'; @@ -34,30 +33,31 @@ import { GroupTabsComponent } from '../../../assets/wise5/directives/group-tabs/ import { StudentPeerGroupService } from '../../../assets/wise5/services/studentPeerGroupService'; import { PeerGroupService } from '../../../assets/wise5/services/peerGroupService'; import { TopBarComponent } from '../top-bar/top-bar.component'; +import { NodeStatusIconComponent } from '../../../assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component'; @NgModule({ declarations: [ ChooseBranchPathDialogComponent, GenerateImageDialogComponent, GroupTabsComponent, - NavigationComponent, - NavItemComponent, NodeNavigationComponent, RunEndedAndLockedMessageComponent, SafeUrl, - StepToolsComponent, VLEComponent, VLEParentComponent ], imports: [ - StudentTeacherCommonModule, CommonModule, ComponentStudentModule, MatDialogModule, + NavigationComponent, NodeModule, + NodeStatusIconComponent, SimpleDialogModule, + StepToolsComponent, StudentAssetsDialogModule, StudentComponentModule, + StudentTeacherCommonModule, StudentVLERoutingModule, SummaryDisplayModule, TopBarComponent diff --git a/src/app/teacher/abstract-tags-menu/abstract-tags-menu.component.ts b/src/app/teacher/abstract-tags-menu/abstract-tags-menu.component.ts new file mode 100644 index 00000000000..4e00b6ed069 --- /dev/null +++ b/src/app/teacher/abstract-tags-menu/abstract-tags-menu.component.ts @@ -0,0 +1,86 @@ +import { Directive } from '@angular/core'; +import { Tag } from '../../domain/tag'; +import { Subscription } from 'rxjs'; +import { MatDialog } from '@angular/material/dialog'; +import { ProjectTagService } from '../../../assets/wise5/services/projectTagService'; +import { ManageTagsDialogComponent } from '../manage-tags-dialog/manage-tags-dialog.component'; + +@Directive() +export class AbstractTagsMenuComponent { + protected filteredTags: Tag[] = []; + protected searchText: string = ''; + private subscriptions: Subscription = new Subscription(); + protected tags: Tag[] = []; + + constructor( + private dialog: MatDialog, + protected projectTagService: ProjectTagService + ) {} + + ngOnInit(): void { + this.retrieveUserTags(); + this.subscribeToTagUpdated(); + this.subscribeToNewTag(); + this.subscribeToTagDeleted(); + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } + + private retrieveUserTags(): void { + this.projectTagService.retrieveUserTags().subscribe((tags: Tag[]) => { + this.tags = tags; + this.filteredTags = tags; + this.afterRetrieveUserTags(); + }); + } + + protected afterRetrieveUserTags(): void {} + + private subscribeToTagUpdated(): void { + this.subscriptions.add( + this.projectTagService.tagUpdated$.subscribe((updatedTag: Tag) => { + const tag = this.tags.find((t: Tag) => t.id === updatedTag.id); + tag.text = updatedTag.text; + tag.color = updatedTag.color; + this.projectTagService.sortTags(this.tags); + }) + ); + } + + private subscribeToNewTag(): void { + this.subscriptions.add( + this.projectTagService.newTag$.subscribe((tag: Tag) => { + this.tags.push(tag); + this.projectTagService.sortTags(this.tags); + this.filterTags(this.searchText); + this.afterNewTag(tag); + }) + ); + } + + protected afterNewTag(tag: Tag): void {} + + private subscribeToTagDeleted(): void { + this.subscriptions.add( + this.projectTagService.tagDeleted$.subscribe((deletedTag: Tag) => { + this.tags = this.tags.filter((tag: Tag) => tag.id !== deletedTag.id); + this.filterTags(this.searchText); + }) + ); + } + + protected filterTags(searchText: string): void { + this.searchText = searchText; + this.filteredTags = this.tags.filter((tag: Tag) => + tag.text.toLowerCase().includes(searchText.trim().toLowerCase()) + ); + } + + protected manageTags(): void { + this.dialog.open(ManageTagsDialogComponent, { + panelClass: 'dialog-md' + }); + } +} diff --git a/src/app/teacher/apply-tags-button/apply-tags-button.component.html b/src/app/teacher/apply-tags-button/apply-tags-button.component.html new file mode 100644 index 00000000000..c940359f35a --- /dev/null +++ b/src/app/teacher/apply-tags-button/apply-tags-button.component.html @@ -0,0 +1,27 @@ + + +
Apply tags
+ + @for (tag of filteredTags; track tag.id) { +
+ + + +
+ } + +
Manage Tags
+ diff --git a/src/app/teacher/apply-tags-button/apply-tags-button.component.scss b/src/app/teacher/apply-tags-button/apply-tags-button.component.scss new file mode 100644 index 00000000000..52d7a8062b3 --- /dev/null +++ b/src/app/teacher/apply-tags-button/apply-tags-button.component.scss @@ -0,0 +1,3 @@ +.menu-info { + margin: 16px; +} diff --git a/src/app/teacher/apply-tags-button/apply-tags-button.component.spec.ts b/src/app/teacher/apply-tags-button/apply-tags-button.component.spec.ts new file mode 100644 index 00000000000..3937e833c83 --- /dev/null +++ b/src/app/teacher/apply-tags-button/apply-tags-button.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ApplyTagsButtonComponent } from './apply-tags-button.component'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { ProjectTagService } from '../../../assets/wise5/services/projectTagService'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; + +describe('ApplyTagsButtonComponent', () => { + let component: ApplyTagsButtonComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ApplyTagsButtonComponent, + BrowserAnimationsModule, + HttpClientTestingModule, + MatSnackBarModule + ], + providers: [ProjectTagService] + }); + fixture = TestBed.createComponent(ApplyTagsButtonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/teacher/apply-tags-button/apply-tags-button.component.ts b/src/app/teacher/apply-tags-button/apply-tags-button.component.ts new file mode 100644 index 00000000000..5c01a175a68 --- /dev/null +++ b/src/app/teacher/apply-tags-button/apply-tags-button.component.ts @@ -0,0 +1,91 @@ +import { Component, Input } from '@angular/core'; +import { Project } from '../../domain/project'; +import { Tag } from '../../domain/tag'; +import { MAT_CHECKBOX_DEFAULT_OPTIONS } from '@angular/material/checkbox'; +import { CommonModule } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatIconModule } from '@angular/material/icon'; +import { MatDividerModule } from '@angular/material/divider'; +import { SelectAllItemsCheckboxComponent } from '../../modules/library/select-all-items-checkbox/select-all-items-checkbox.component'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { AbstractTagsMenuComponent } from '../abstract-tags-menu/abstract-tags-menu.component'; +import { SearchBarComponent } from '../../modules/shared/search-bar/search-bar.component'; +import { TagComponent } from '../tag/tag.component'; +import { MatDialog } from '@angular/material/dialog'; +import { ProjectTagService } from '../../../assets/wise5/services/projectTagService'; +import { MatSnackBar } from '@angular/material/snack-bar'; + +@Component({ + imports: [ + CommonModule, + MatButtonModule, + MatDividerModule, + MatIconModule, + MatMenuModule, + MatTooltipModule, + SearchBarComponent, + SelectAllItemsCheckboxComponent, + TagComponent + ], + providers: [{ provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }], + selector: 'apply-tags-button', + standalone: true, + styleUrl: './apply-tags-button.component.scss', + templateUrl: './apply-tags-button.component.html' +}) +export class ApplyTagsButtonComponent extends AbstractTagsMenuComponent { + @Input() selectedProjects: Project[] = []; + + constructor( + dialog: MatDialog, + protected projectTagService: ProjectTagService, + private snackBar: MatSnackBar + ) { + super(dialog, projectTagService); + } + + ngOnChanges(): void { + this.updateAllTagsCheckedValues(); + } + + protected afterRetrieveUserTags(): void { + this.updateAllTagsCheckedValues(); + } + + private updateAllTagsCheckedValues(): void { + for (const tag of this.tags) { + this.updateTagCheckedValue(tag); + } + } + + protected afterNewTag(tag: Tag): void { + this.updateTagCheckedValue(tag); + } + + private updateTagCheckedValue(tag: Tag): void { + tag.numProjectsWithTag = this.selectedProjects.filter((project) => + project.tags.some((projectTag) => projectTag.id === tag.id) + ).length; + } + + protected addTagToProjects(tag: Tag): void { + this.projectTagService.applyTagToProjects(tag, this.selectedProjects).subscribe(() => { + for (const project of this.selectedProjects) { + project.addTag(tag); + } + this.updateTagCheckedValue(tag); + this.snackBar.open($localize`Successfully applied tag`); + }); + } + + protected removeTagFromProjects(tag: Tag): void { + this.projectTagService.removeTagFromProjects(tag, this.selectedProjects).subscribe(() => { + for (const project of this.selectedProjects) { + project.tags = project.tags.filter((projectTag: Tag) => projectTag.id !== tag.id); + } + this.updateTagCheckedValue(tag); + this.snackBar.open($localize`Successfully removed tag`); + }); + } +} diff --git a/src/app/teacher/authoring-tool.module.ts b/src/app/teacher/authoring-tool.module.ts index d90453abb8d..656ab2164d3 100644 --- a/src/app/teacher/authoring-tool.module.ts +++ b/src/app/teacher/authoring-tool.module.ts @@ -5,14 +5,12 @@ import { AddYourOwnNode } from '../../assets/wise5/authoringTool/addNode/add-you import { ChooseNewNodeTemplate } from '../../assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component'; import { AdvancedProjectAuthoringComponent } from '../../assets/wise5/authoringTool/advanced/advanced-project-authoring.component'; import { CardSelectorComponent } from '../../assets/wise5/authoringTool/components/card-selector/card-selector.component'; -import { RequiredErrorLabelComponent } from '../../assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component'; import { RubricAuthoringComponent } from '../../assets/wise5/authoringTool/rubric/rubric-authoring.component'; import { NodeIconChooserDialog } from '../../assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component'; import { ChooseNewComponent } from '../authoring-tool/add-component/choose-new-component/choose-new-component.component'; import { ChooseImportStepComponent } from '../authoring-tool/import-step/choose-import-step/choose-import-step.component'; import { ComponentAuthoringModule } from './component-authoring.module'; import { ComponentStudentModule } from '../../assets/wise5/components/component/component-student.module'; -import { PreviewComponentModule } from '../../assets/wise5/authoringTool/components/preview-component/preview-component.module'; import { StudentTeacherCommonModule } from '../student-teacher-common.module'; import { RecoveryAuthoringComponent } from '../../assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component'; import { AddLessonConfigureComponent } from '../../assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component'; @@ -37,7 +35,6 @@ import { ProjectListComponent } from '../../assets/wise5/authoringTool/project-l import { AddProjectComponent } from '../../assets/wise5/authoringTool/add-project/add-project.component'; import { MatBadgeModule } from '@angular/material/badge'; import { AuthoringToolBarComponent } from '../../assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component'; -import { StepToolsModule } from '../../assets/wise5/themes/default/themeComponents/stepTools/step-tools.module'; import { ProjectAuthoringComponent } from '../../assets/wise5/authoringTool/project-authoring/project-authoring.component'; import { AuthoringToolComponent } from '../../assets/wise5/authoringTool/authoring-tool.component'; import { ChooseMoveNodeLocationComponent } from '../../assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component'; @@ -51,8 +48,6 @@ import { ChooseImportUnitComponent } from '../authoring-tool/import-step/choose- import { NodeAuthoringParentComponent } from '../../assets/wise5/authoringTool/node/node-authoring-parent/node-authoring-parent.component'; import { AddLessonChooseTemplateComponent } from '../../assets/wise5/authoringTool/addLesson/add-lesson-choose-template/add-lesson-choose-template.component'; import { ComponentTypeButtonComponent } from '../../assets/wise5/authoringTool/components/component-type-button/component-type-button.component'; -import { ComponentInfoDialogComponent } from '../../assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component'; -import { ComponentTypeSelectorComponent } from '../../assets/wise5/authoringTool/components/component-type-selector/component-type-selector.component'; import { EditNodeTitleComponent } from '../../assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component'; import { EditProjectLanguageSettingComponent } from '../../assets/wise5/authoringTool/project-info/edit-project-language-setting/edit-project-language-setting.component'; import { AddComponentButtonComponent } from '../../assets/wise5/authoringTool/node/add-component-button/add-component-button.component'; @@ -66,10 +61,11 @@ import { TranslatableInputComponent } from '../../assets/wise5/authoringTool/com import { TranslatableTextareaComponent } from '../../assets/wise5/authoringTool/components/translatable-textarea/translatable-textarea.component'; import { TranslatableRichTextEditorComponent } from '../../assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component'; import { AddStepButtonComponent } from '../../assets/wise5/authoringTool/add-step-button/add-step-button.component'; +import { PreviewComponentButtonComponent } from '../../assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component'; +import { StepToolsComponent } from '../../assets/wise5/common/stepTools/step-tools.component'; @NgModule({ declarations: [ - AddComponentButtonComponent, AddLessonChooseTemplateComponent, AddLessonConfigureComponent, AddProjectComponent, @@ -87,9 +83,6 @@ import { AddStepButtonComponent } from '../../assets/wise5/authoringTool/add-ste ChooseNewNodeTemplate, ChooseMoveNodeLocationComponent, ChooseSimulationComponent, - ComponentInfoDialogComponent, - ComponentTypeButtonComponent, - ComponentTypeSelectorComponent, ConcurrentAuthorsMessageComponent, ConfigureAutomatedAssessmentComponent, CopyComponentButtonComponent, @@ -101,7 +94,6 @@ import { AddStepButtonComponent } from '../../assets/wise5/authoringTool/add-ste NodeAuthoringComponent, NodeAuthoringParentComponent, NodeIconChooserDialog, - NodeIconAndTitleComponent, NodeWithMoveAfterButtonComponent, NotebookAuthoringComponent, ProjectInfoAuthoringComponent, @@ -110,30 +102,32 @@ import { AddStepButtonComponent } from '../../assets/wise5/authoringTool/add-ste ProjectAuthoringLessonComponent, ProjectAuthoringStepComponent, RecoveryAuthoringComponent, - RequiredErrorLabelComponent, RubricAuthoringComponent, - TeacherNodeIconComponent, TopBarComponent, ProjectListComponent ], imports: [ + AddComponentButtonComponent, AddLessonButtonComponent, AddStepButtonComponent, StudentTeacherCommonModule, ComponentAuthoringModule, ComponentStudentModule, + ComponentTypeButtonComponent, MatBadgeModule, MatChipsModule, ImportComponentModule, NgSelectModule, NodeAdvancedAuthoringModule, - PreviewComponentModule, + NodeIconAndTitleComponent, + PreviewComponentButtonComponent, ProjectAssetAuthoringModule, ProjectLanguageChooserComponent, RouterModule, SaveIndicatorComponent, - StepToolsModule, + StepToolsComponent, StructureAuthoringModule, + TeacherNodeIconComponent, TranslatableInputComponent, TranslatableRichTextEditorComponent, TranslatableTextareaComponent, diff --git a/src/app/teacher/classroom-monitor.module.ts b/src/app/teacher/classroom-monitor.module.ts index b0a09389d82..c69518d9857 100644 --- a/src/app/teacher/classroom-monitor.module.ts +++ b/src/app/teacher/classroom-monitor.module.ts @@ -13,7 +13,6 @@ import { HighchartsChartModule } from 'highcharts-angular'; import { StudentTeacherCommonModule } from '../student-teacher-common.module'; import { NodeInfoComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component'; import { ComponentStudentModule } from '../../assets/wise5/components/component/component-student.module'; -import { PreviewComponentModule } from '../../assets/wise5/authoringTool/components/preview-component/preview-component.module'; import { NotebookWorkgroupGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component'; import { ProjectProgressComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component'; import { PauseScreensMenuComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component'; @@ -34,9 +33,10 @@ import { MilestoneModule } from './milestone/milestone.module'; import { GradingCommonModule } from './grading-common.module'; import { ManageStudentsModule } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-students.module'; import { DataExportModule } from '../../assets/wise5/classroomMonitor/dataExport/data-export.module'; -import { StepToolsModule } from '../../assets/wise5/themes/default/themeComponents/stepTools/step-tools.module'; import { RouterModule } from '@angular/router'; import { SaveIndicatorComponent } from '../../assets/wise5/common/save-indicator/save-indicator.component'; +import { PreviewComponentComponent } from '../../assets/wise5/authoringTool/components/preview-component/preview-component.component'; +import { StepToolsComponent } from '../../assets/wise5/common/stepTools/step-tools.component'; @NgModule({ declarations: [ @@ -52,7 +52,6 @@ import { SaveIndicatorComponent } from '../../assets/wise5/common/save-indicator NotebookWorkgroupGradingComponent, NotificationsMenuComponent, PauseScreensMenuComponent, - ProjectProgressComponent, ShowNodeInfoDialogComponent, StepInfoComponent, StepItemComponent, @@ -62,8 +61,7 @@ import { SaveIndicatorComponent } from '../../assets/wise5/common/save-indicator TeacherSummaryDisplay, ToolBarComponent, TopBarComponent, - ViewComponentRevisionsComponent, - NavItemScoreComponent + ViewComponentRevisionsComponent ], imports: [ StudentTeacherCommonModule, @@ -74,12 +72,14 @@ import { SaveIndicatorComponent } from '../../assets/wise5/common/save-indicator HighchartsChartModule, ManageStudentsModule, MilestoneModule, + NavItemScoreComponent, PeerGroupGradingModule, - PreviewComponentModule, + PreviewComponentComponent, + ProjectProgressComponent, RouterModule, SaveIndicatorComponent, SelectPeriodModule, - StepToolsModule + StepToolsComponent ] }) export class ClassroomMonitorModule {} diff --git a/src/app/teacher/color-chooser/color-chooser.component.html b/src/app/teacher/color-chooser/color-chooser.component.html new file mode 100644 index 00000000000..7377628800e --- /dev/null +++ b/src/app/teacher/color-chooser/color-chooser.component.html @@ -0,0 +1,13 @@ + + @for (color of colors; track color) { + +
+ + } + diff --git a/src/app/teacher/color-chooser/color-chooser.component.scss b/src/app/teacher/color-chooser/color-chooser.component.scss new file mode 100644 index 00000000000..5854076152a --- /dev/null +++ b/src/app/teacher/color-chooser/color-chooser.component.scss @@ -0,0 +1,10 @@ +@import 'style/abstracts/variables'; + +.color-choice { + border-radius: $button-border-radius; + width: 32px; +} + +.color-option-div { + width: 10px; +} diff --git a/src/app/teacher/color-chooser/color-chooser.component.spec.ts b/src/app/teacher/color-chooser/color-chooser.component.spec.ts new file mode 100644 index 00000000000..a5c95929ac0 --- /dev/null +++ b/src/app/teacher/color-chooser/color-chooser.component.spec.ts @@ -0,0 +1,20 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ColorChooserComponent } from './color-chooser.component'; + +describe('ColorChooserComponent', () => { + let component: ColorChooserComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ColorChooserComponent] + }); + fixture = TestBed.createComponent(ColorChooserComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/teacher/color-chooser/color-chooser.component.ts b/src/app/teacher/color-chooser/color-chooser.component.ts new file mode 100644 index 00000000000..71617fc074c --- /dev/null +++ b/src/app/teacher/color-chooser/color-chooser.component.ts @@ -0,0 +1,29 @@ +import { CommonModule } from '@angular/common'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { MatChipsModule } from '@angular/material/chips'; + +@Component({ + imports: [CommonModule, MatChipsModule], + selector: 'color-chooser', + standalone: true, + styleUrl: './color-chooser.component.scss', + templateUrl: './color-chooser.component.html' +}) +export class ColorChooserComponent { + @Output() chooseColorEvent: EventEmitter = new EventEmitter(); + @Input() chosenColor: string; + protected colors: string[] = [ + '#66BB6A', + '#009688', + '#00B0FF', + '#1565C0', + '#673AB7', + '#AB47BC', + '#E91E63', + '#D50000', + '#F57C00', + '#FBC02D', + '#795548', + '#757575' + ]; +} diff --git a/src/app/teacher/component-authoring.module.ts b/src/app/teacher/component-authoring.module.ts index 4447dbcc9b4..f274264dd57 100644 --- a/src/app/teacher/component-authoring.module.ts +++ b/src/app/teacher/component-authoring.module.ts @@ -78,7 +78,6 @@ import { EditQuestionBankRulesComponent } from '../authoring-tool/edit-question- import { SelectStepAndComponentComponent } from '../authoring-tool/select-step-and-component/select-step-and-component.component'; import { EditComponentConstraintsComponent } from '../authoring-tool/edit-component-constraints/edit-component-constraints.component'; import { ComponentConstraintAuthoringComponent } from '../../assets/wise5/authoringTool/constraint/component-constraint-authoring/component-constraint-authoring.component'; -import { ConstraintAuthoringModule } from '../../assets/wise5/authoringTool/constraint/constraint-authoring.module'; import { EditComponentAdvancedComponent } from '../authoring-tool/edit-component-advanced/edit-component-advanced.component'; import { ComponentAuthoringComponent } from '../../assets/wise5/authoringTool/components/component-authoring.component'; import { WiseTinymceEditorModule } from '../../assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.module'; @@ -90,6 +89,8 @@ import { TranslatableRichTextEditorComponent } from '../../assets/wise5/authorin import { TranslatableAssetChooserComponent } from '../../assets/wise5/authoringTool/components/translatable-asset-chooser/translatable-asset-chooser.component'; import { AiChatAuthoringComponent } from '../../assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component'; import { EditAiChatAdvancedComponent } from '../../assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component'; +import { RequiredErrorLabelComponent } from '../../assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component'; +import { EditConstraintRemovalCriteriaComponent } from '../../assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component'; @NgModule({ declarations: [ @@ -108,7 +109,6 @@ import { EditAiChatAdvancedComponent } from '../../assets/wise5/components/aiCha EditAnimationAdvancedComponent, EditAudioOscillatorAdvancedComponent, EditCommonAdvancedComponent, - EditComponentAdvancedButtonComponent, EditComponentAdvancedComponent, EditComponentAddToNotebookButtonComponent, EditComponentConstraintsComponent, @@ -177,10 +177,12 @@ import { EditAiChatAdvancedComponent } from '../../assets/wise5/components/aiCha WiseLinkAuthoringDialogComponent ], imports: [ - ConstraintAuthoringModule, + EditConstraintRemovalCriteriaComponent, + EditComponentAdvancedButtonComponent, + PeerGroupingAuthoringModule, + RequiredErrorLabelComponent, SelectStepAndComponentComponent, StudentTeacherCommonModule, - PeerGroupingAuthoringModule, TranslatableAssetChooserComponent, TranslatableInputComponent, TranslatableRichTextEditorComponent, diff --git a/src/app/teacher/component-grading.module.ts b/src/app/teacher/component-grading.module.ts index 251b0808543..4fe4fe3de6a 100644 --- a/src/app/teacher/component-grading.module.ts +++ b/src/app/teacher/component-grading.module.ts @@ -1,5 +1,4 @@ import { NgModule } from '@angular/core'; -import { ComponentStateInfoModule } from '../../assets/wise5/common/component-state-info/component-state-info.module'; import { AnimationGradingModule } from '../../assets/wise5/components/animation/animation-grading/animation-grading.module'; import { AudioOscillatorGradingModule } from '../../assets/wise5/components/audioOscillator/audio-oscillator-grading/audio-oscillator-grading.module'; import { ConceptMapGradingModule } from '../../assets/wise5/components/conceptMap/concept-map-grading/concept-map-grading.module'; @@ -18,6 +17,7 @@ import { TableGradingModule } from '../../assets/wise5/components/table/table-gr import { ComponentGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component'; import { ShowMyWorkGradingModule } from '../../assets/wise5/components/showMyWork/show-my-work-grading/show-my-work-grading.module'; import { AiChatGradingModule } from '../../assets/wise5/components/aiChat/ai-chat-grading/ai-chat-grading.module'; +import { ComponentStateInfoComponent } from '../../assets/wise5/common/component-state-info/component-state-info.component'; @NgModule({ declarations: [ComponentGradingComponent], @@ -25,7 +25,7 @@ import { AiChatGradingModule } from '../../assets/wise5/components/aiChat/ai-cha AiChatGradingModule, AnimationGradingModule, AudioOscillatorGradingModule, - ComponentStateInfoModule, + ComponentStateInfoComponent, ConceptMapGradingModule, DialogGuidanceGradingModule, DiscussionGradingModule, @@ -46,7 +46,7 @@ import { AiChatGradingModule } from '../../assets/wise5/components/aiChat/ai-cha AnimationGradingModule, AudioOscillatorGradingModule, ComponentGradingComponent, - ComponentStateInfoModule, + ComponentStateInfoComponent, ConceptMapGradingModule, DialogGuidanceGradingModule, DiscussionGradingModule, diff --git a/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.html b/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.html index ae1de27de75..6167bf9d86b 100644 --- a/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.html +++ b/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.html @@ -21,7 +21,7 @@

{{ topic.title }} - ({{ topic.last_posted_at | date : 'MMM dd y' }}) + ({{ topic.last_posted_at | date: 'MMM dd y' }}) diff --git a/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.ts b/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.ts index 81add8d73d8..550af79203a 100644 --- a/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.ts +++ b/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.ts @@ -1,10 +1,14 @@ import { Component } from '@angular/core'; import { DiscourseFeedComponent } from '../../discourse-feed/discourse-feed.component'; +import { CommonModule } from '@angular/common'; +import { MatIconModule } from '@angular/material/icon'; +import { FlexLayoutModule } from '@angular/flex-layout'; @Component({ + imports: [CommonModule, FlexLayoutModule, MatIconModule], selector: 'discourse-recent-activity', - templateUrl: 'discourse-recent-activity.component.html', - styleUrls: ['discourse-recent-activity.component.scss'] + standalone: true, + styleUrl: 'discourse-recent-activity.component.scss', + templateUrl: 'discourse-recent-activity.component.html' }) -export class DiscourseRecentActivityComponent extends DiscourseFeedComponent { -} +export class DiscourseRecentActivityComponent extends DiscourseFeedComponent {} diff --git a/src/app/teacher/edit-tag/edit-tag.component.html b/src/app/teacher/edit-tag/edit-tag.component.html new file mode 100644 index 00000000000..e14be165b6a --- /dev/null +++ b/src/app/teacher/edit-tag/edit-tag.component.html @@ -0,0 +1,40 @@ +
+
+ +
+
+ + Tag Name + + @if (nameControl.errors?.required) { + Required + } @else if (nameControl.errors?.archivedNotAllowed) { + Archived tag not allowed + } @else if (nameControl.errors?.tagAlreadyExists) { + Tag already exists + } + + + Color + + @if (colorControl.errors?.required) { + Required + } + +
+
+
+ + +
+ + +
+
diff --git a/src/app/teacher/edit-tag/edit-tag.component.scss b/src/app/teacher/edit-tag/edit-tag.component.scss new file mode 100644 index 00000000000..17f523357f6 --- /dev/null +++ b/src/app/teacher/edit-tag/edit-tag.component.scss @@ -0,0 +1,9 @@ +@import 'style/abstracts/variables'; + +.tag-preview { + margin-bottom: 12px; +} + +.color-input { + width: 120px; +} diff --git a/src/app/teacher/edit-tag/edit-tag.component.spec.ts b/src/app/teacher/edit-tag/edit-tag.component.spec.ts new file mode 100644 index 00000000000..6d1d76cce87 --- /dev/null +++ b/src/app/teacher/edit-tag/edit-tag.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { EditTagComponent } from './edit-tag.component'; +import { ProjectTagService } from '../../../assets/wise5/services/projectTagService'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { ColorService } from '../../../assets/wise5/services/colorService'; + +describe('EditTagComponent', () => { + let component: EditTagComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [BrowserAnimationsModule, EditTagComponent, HttpClientTestingModule], + providers: [ColorService, ProjectTagService] + }); + fixture = TestBed.createComponent(EditTagComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/teacher/edit-tag/edit-tag.component.ts b/src/app/teacher/edit-tag/edit-tag.component.ts new file mode 100644 index 00000000000..5265237f18e --- /dev/null +++ b/src/app/teacher/edit-tag/edit-tag.component.ts @@ -0,0 +1,161 @@ +import { CommonModule } from '@angular/common'; +import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { + AbstractControl, + FormControl, + FormsModule, + ReactiveFormsModule, + ValidationErrors, + ValidatorFn, + Validators +} from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { ProjectTagService } from '../../../assets/wise5/services/projectTagService'; +import { Tag } from '../../domain/tag'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { ColorChooserComponent } from '../color-chooser/color-chooser.component'; +import { TagComponent } from '../tag/tag.component'; + +@Component({ + imports: [ + ColorChooserComponent, + CommonModule, + FormsModule, + FlexLayoutModule, + MatButtonModule, + MatFormFieldModule, + MatInputModule, + ReactiveFormsModule, + TagComponent + ], + selector: 'edit-tag', + standalone: true, + styleUrl: './edit-tag.component.scss', + templateUrl: './edit-tag.component.html' +}) +export class EditTagComponent { + @Output() closeEvent: EventEmitter = new EventEmitter(); + @ViewChild('nameInput') nameInput: ElementRef; + protected submitLabel: string = $localize`Create`; + @Input() tag: Tag; + private tags: Tag[] = []; + + protected colorControl = new FormControl('', [Validators.required]); + protected nameControl = new FormControl('', [ + Validators.required, + this.createArchivedTagValidator(), + this.createUniqueTagValidator() + ]); + + constructor(private projectTagService: ProjectTagService, private snackBar: MatSnackBar) {} + + ngOnInit(): void { + if (this.tag != null) { + this.nameControl.setValue(this.tag.text); + this.colorControl.setValue(this.tag.color); + this.submitLabel = $localize`Save`; + } + this.projectTagService.retrieveUserTags().subscribe((tags: Tag[]) => { + this.tags = tags; + if (this.tag != null) { + this.tags = this.tags.filter((tag: Tag) => tag.id !== this.tag.id); + } + }); + } + + ngAfterViewInit(): void { + setTimeout(() => { + this.nameInput.nativeElement.focus(); + }); + } + + private createArchivedTagValidator(): ValidatorFn { + return (control: AbstractControl): ValidationErrors | null => { + if (control.value?.toLowerCase() === 'archived') { + control.markAsTouched(); + return { archivedNotAllowed: true }; + } else { + return null; + } + }; + } + + private createUniqueTagValidator(): ValidatorFn { + return (control: AbstractControl): ValidationErrors | null => { + if (this.doesTagAlreadyExist(control.value)) { + control.markAsTouched(); + return { tagAlreadyExists: true }; + } else { + return null; + } + }; + } + private doesTagAlreadyExist(tagText: string): boolean { + return this.tags.some((tag: Tag) => tag.text.toLowerCase() === tagText.toLowerCase().trim()); + } + + protected enterKeyPressed(): void { + if (this.nameControl.valid) { + this.submit(); + } + } + + protected chooseColor(color: string): void { + this.colorControl.setValue(color); + } + + protected submit(): void { + if (this.tag == null) { + this.createTag(); + } else { + this.updateTag(); + } + } + + private getNameValue(): string { + return this.nameControl.value.trim(); + } + + private getColorValue(): string { + return this.colorControl.value.trim(); + } + + private createTag(): void { + this.projectTagService.createTag(this.getNameValue(), this.getColorValue()).subscribe({ + next: () => { + this.snackBar.open($localize`Tag created`); + this.close(); + }, + error: ({ error }) => { + this.handleError(error); + } + }); + } + + private updateTag(): void { + this.tag.text = this.getNameValue(); + this.tag.color = this.getColorValue(); + this.projectTagService.updateTag(this.tag).subscribe({ + next: () => { + this.snackBar.open($localize`Tag updated`); + this.close(); + }, + error: ({ error }) => { + this.handleError(error); + } + }); + } + + private handleError(error: any): void { + if (error.messageCode === 'tagAlreadyExists') { + this.nameControl.setErrors({ tagAlreadyExists: true }); + } + } + + protected close(): void { + this.closeEvent.emit(); + } +} diff --git a/src/app/teacher/grading-common.module.ts b/src/app/teacher/grading-common.module.ts index c3017daa8c7..39b2c01db38 100644 --- a/src/app/teacher/grading-common.module.ts +++ b/src/app/teacher/grading-common.module.ts @@ -14,17 +14,20 @@ import { StudentTeacherCommonModule } from '../student-teacher-common.module'; import { ComponentGradingModule } from './component-grading.module'; import { StatusIconComponent } from '../classroom-monitor/status-icon/status-icon.component'; import { NavItemProgressComponent } from '../classroom-monitor/nav-item-progress/nav-item-progress.component'; -import { SaveIndicatorComponent } from '../../assets/wise5/common/save-indicator/save-indicator.component'; @NgModule({ - imports: [ComponentGradingModule, IntersectionObserverModule, StudentTeacherCommonModule], + imports: [ + ComponentGradingModule, + IntersectionObserverModule, + StatusIconComponent, + StudentTeacherCommonModule + ], declarations: [ EditComponentAnnotationsComponent, EditComponentCommentComponent, EditComponentScoreComponent, GradingEditComponentMaxScoreComponent, NavItemProgressComponent, - StatusIconComponent, WorkgroupComponentGradingComponent, WorkgroupInfoComponent, WorkgroupItemComponent, diff --git a/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html b/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html new file mode 100644 index 00000000000..2ffaeb14d09 --- /dev/null +++ b/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html @@ -0,0 +1,58 @@ +

Manage Tags

+ +
+ @if (showCreateTag) { + + } @else { +
+ +
+ } + + @for (tag of tags; track tag.id; let tagIndex = $index; let last = $last) { +
+ +
+ @if (idToEditing[tag.id]) { +
+ +
+ } @else { + + + + + } +
+ + @if (!last) { + + } +
+ } + +
+ + + + diff --git a/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.scss b/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.scss new file mode 100644 index 00000000000..1c29f635cc5 --- /dev/null +++ b/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.scss @@ -0,0 +1,31 @@ +@import 'style/abstracts/variables'; + +.edit-tag { + width: 100%; + padding: 16px 0; +} + +.tag-name { + border-radius: $card-border-radius; + padding: 12px; +} + +.mat-icon { + margin: 0px; +} + +.mdc-list { + padding: 0; +} + +.mdc-list-item { + padding: 0 12px; +} + +.mat-divider { + margin: 0; +} + +.mdc-list-item.mdc-list-item--with-one-line { + height: auto; +} diff --git a/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.spec.ts b/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.spec.ts new file mode 100644 index 00000000000..47f9491c32d --- /dev/null +++ b/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ManageTagsDialogComponent } from './manage-tags-dialog.component'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { StudentTeacherCommonServicesModule } from '../../student-teacher-common-services.module'; +import { ProjectTagService } from '../../../assets/wise5/services/projectTagService'; +import { TeacherService } from '../teacher.service'; +import { ColorService } from '../../../assets/wise5/services/colorService'; + +describe('ManageTagsDialogComponent', () => { + let component: ManageTagsDialogComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientTestingModule, + ManageTagsDialogComponent, + StudentTeacherCommonServicesModule + ], + providers: [ColorService, ProjectTagService, TeacherService] + }); + fixture = TestBed.createComponent(ManageTagsDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts b/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts new file mode 100644 index 00000000000..f6e1d39fe8c --- /dev/null +++ b/src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts @@ -0,0 +1,101 @@ +import { Component, OnInit } from '@angular/core'; +import { Tag } from '../../domain/tag'; +import { Subject, Subscription } from 'rxjs'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { ProjectTagService } from '../../../assets/wise5/services/projectTagService'; +import { MatIconModule } from '@angular/material/icon'; +import { TeacherService } from '../teacher.service'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { EditTagComponent } from '../edit-tag/edit-tag.component'; +import { Project } from '../../domain/project'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatListModule } from '@angular/material/list'; +import { TagComponent } from '../tag/tag.component'; + +@Component({ + imports: [ + CommonModule, + EditTagComponent, + FlexLayoutModule, + FormsModule, + MatButtonModule, + MatDialogModule, + MatDividerModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatListModule, + MatTooltipModule, + TagComponent + ], + selector: 'manage-tags-dialog', + standalone: true, + styleUrl: './manage-tags-dialog.component.scss', + templateUrl: './manage-tags-dialog.component.html' +}) +export class ManageTagsDialogComponent implements OnInit { + protected idToEditing: { [id: string]: boolean } = {}; + protected inputChanged: Subject = new Subject(); + private projects: Project[]; + protected showCreateTag: boolean; + private subscriptions: Subscription = new Subscription(); + protected tags: Tag[] = []; + + constructor( + private projectTagService: ProjectTagService, + private snackBar: MatSnackBar, + private teacherService: TeacherService + ) {} + + ngOnInit(): void { + this.teacherService.getPersonalAndSharedProjects().subscribe((projects) => { + this.projects = projects; + }); + this.subscriptions.add( + this.projectTagService.retrieveUserTags().subscribe((tags: Tag[]) => { + this.tags = tags; + }) + ); + this.subscriptions.add( + this.projectTagService.newTag$.subscribe((tag: Tag) => { + this.tags.push(tag); + this.projectTagService.sortTags(this.tags); + }) + ); + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } + + protected cancelEditing(tag: Tag): void { + this.idToEditing[tag.id] = false; + } + + protected delete(tag: Tag): void { + if (confirm(this.getDeleteMessage(tag))) { + this.projectTagService.deleteTag(tag).subscribe((tag: Tag) => { + this.tags = this.tags.filter((t) => t.id !== tag.id); + this.snackBar.open($localize`Tag deleted`); + }); + } + } + + private getDeleteMessage(tag: Tag): string { + const numProjectsWithTag = this.projects.filter((project: Project) => + project.tags.some((projectTag: Tag) => projectTag.id === tag.id) + ).length; + const numberOfProjectsMessage = + numProjectsWithTag === 1 + ? $localize`There is ${numProjectsWithTag} unit with this tag.` + : $localize`There are ${numProjectsWithTag} units with this tag.`; + return $localize`Are you sure you want to delete this tag? ` + numberOfProjectsMessage; + } +} diff --git a/src/app/teacher/run-menu/run-menu.component.spec.ts b/src/app/teacher/run-menu/run-menu.component.spec.ts index 647e2aa2078..d05d420938d 100644 --- a/src/app/teacher/run-menu/run-menu.component.spec.ts +++ b/src/app/teacher/run-menu/run-menu.component.spec.ts @@ -67,6 +67,7 @@ export class MockConfigService { } } +const archivedTag = { id: 1, text: 'archived', color: null }; let archiveProjectService: ArchiveProjectService; let component: RunMenuComponent; let fixture: ComponentFixture; @@ -137,20 +138,22 @@ function setRun(archived: boolean): void { function archive() { describe('archive()', () => { it('should archive a run', async () => { - spyOn(http, 'put').and.returnValue(of(new ArchiveProjectResponse(runId1, true))); + spyOn(http, 'put').and.returnValue(of(new ArchiveProjectResponse(runId1, true, archivedTag))); await runMenuHarness.clickArchiveMenuButton(); expect(component.run.project.archived).toEqual(true); const snackBar = await getSnackBar(); expect(await snackBar.getMessage()).toEqual('Successfully archived unit.'); }); it('should archive a run and then undo', async () => { - spyOn(http, 'put').and.returnValue(of(new ArchiveProjectResponse(runId1, true))); + spyOn(http, 'put').and.returnValue(of(new ArchiveProjectResponse(runId1, true, archivedTag))); await runMenuHarness.clickArchiveMenuButton(); expect(component.run.project.archived).toEqual(true); let snackBar = await getSnackBar(); expect(await snackBar.getMessage()).toEqual('Successfully archived unit.'); expect(await snackBar.getActionDescription()).toEqual('Undo'); - spyOn(http, 'delete').and.returnValue(of(new ArchiveProjectResponse(runId1, false))); + spyOn(http, 'delete').and.returnValue( + of(new ArchiveProjectResponse(runId1, false, archivedTag)) + ); await snackBar.dismissWithAction(); expect(component.run.project.archived).toEqual(false); snackBar = await getSnackBar(); @@ -164,7 +167,9 @@ function unarchive() { it('should unarchive a run', async () => { setRun(true); component.ngOnInit(); - spyOn(http, 'delete').and.returnValue(of(new ArchiveProjectResponse(runId1, false))); + spyOn(http, 'delete').and.returnValue( + of(new ArchiveProjectResponse(runId1, false, archivedTag)) + ); await runMenuHarness.clickUnarchiveMenuButton(); expect(component.run.project.archived).toEqual(false); const snackBar = await getSnackBar(); @@ -173,13 +178,15 @@ function unarchive() { it('should unarchive a run and then undo', async () => { setRun(true); component.ngOnInit(); - spyOn(http, 'delete').and.returnValue(of(new ArchiveProjectResponse(runId1, false))); + spyOn(http, 'delete').and.returnValue( + of(new ArchiveProjectResponse(runId1, false, archivedTag)) + ); await runMenuHarness.clickUnarchiveMenuButton(); expect(component.run.project.archived).toEqual(false); let snackBar = await getSnackBar(); expect(await snackBar.getMessage()).toEqual('Successfully restored unit.'); expect(await snackBar.getActionDescription()).toEqual('Undo'); - spyOn(http, 'put').and.returnValue(of(new ArchiveProjectResponse(runId1, true))); + spyOn(http, 'put').and.returnValue(of(new ArchiveProjectResponse(runId1, true, archivedTag))); await snackBar.dismissWithAction(); expect(component.run.project.archived).toEqual(true); snackBar = await getSnackBar(); diff --git a/src/app/teacher/run-menu/run-menu.component.ts b/src/app/teacher/run-menu/run-menu.component.ts index 2bb73952461..e75fb35309a 100644 --- a/src/app/teacher/run-menu/run-menu.component.ts +++ b/src/app/teacher/run-menu/run-menu.component.ts @@ -12,8 +12,8 @@ import { ArchiveProjectService } from '../../services/archive-project.service'; @Component({ selector: 'app-run-menu', - templateUrl: './run-menu.component.html', - styleUrls: ['./run-menu.component.scss'] + styleUrl: './run-menu.component.scss', + templateUrl: './run-menu.component.html' }) export class RunMenuComponent implements OnInit { private editLink: string = ''; diff --git a/src/app/teacher/select-tags/select-tags.component.html b/src/app/teacher/select-tags/select-tags.component.html new file mode 100644 index 00000000000..f22c13de485 --- /dev/null +++ b/src/app/teacher/select-tags/select-tags.component.html @@ -0,0 +1,31 @@ + + + + + + + + + + + + + diff --git a/src/app/teacher/select-tags/select-tags.component.scss b/src/app/teacher/select-tags/select-tags.component.scss new file mode 100644 index 00000000000..975127ea8d0 --- /dev/null +++ b/src/app/teacher/select-tags/select-tags.component.scss @@ -0,0 +1,38 @@ +.ng-select { + padding-bottom: 0; + + &.select-tags { + &.ng-select-multiple .ng-select-container { + .ng-value-container { + .ng-value { + background-color: transparent; + padding: 2px 0; + } + } + } + + .ng-select-container { + width: auto; + } + + div { + box-sizing: unset; + } + } +} + +.ng-dropdown-panel { + &.ng-select-bottom { + top: 100%; + width: auto; + } + + &.ng-select-top { + bottom: calc(100% - .04375em); + width: auto; + } + + .mdc-checkbox .mdc-checkbox__background { + box-sizing: border-box; + } +} diff --git a/src/app/teacher/select-tags/select-tags.component.spec.ts b/src/app/teacher/select-tags/select-tags.component.spec.ts new file mode 100644 index 00000000000..0b1a2491b22 --- /dev/null +++ b/src/app/teacher/select-tags/select-tags.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { SelectTagsComponent } from './select-tags.component'; +import { ProjectTagService } from '../../../assets/wise5/services/projectTagService'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + +describe('SelectTagsComponent', () => { + let component: SelectTagsComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [BrowserAnimationsModule, HttpClientTestingModule, SelectTagsComponent], + providers: [ProjectTagService] + }); + fixture = TestBed.createComponent(SelectTagsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/teacher/select-tags/select-tags.component.ts b/src/app/teacher/select-tags/select-tags.component.ts new file mode 100644 index 00000000000..e15f4a1fa6e --- /dev/null +++ b/src/app/teacher/select-tags/select-tags.component.ts @@ -0,0 +1,47 @@ +import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatDividerModule } from '@angular/material/divider'; +import { Tag } from '../../domain/tag'; +import { AbstractTagsMenuComponent } from '../abstract-tags-menu/abstract-tags-menu.component'; +import { SearchBarComponent } from '../../modules/shared/search-bar/search-bar.component'; +import { MatSelectModule } from '@angular/material/select'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatButtonModule } from '@angular/material/button'; +import { NgSelectModule } from '@ng-select/ng-select'; +import { TagComponent } from '../tag/tag.component'; +import { FormsModule } from '@angular/forms'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { FlexLayoutModule } from '@angular/flex-layout'; + +@Component({ + imports: [ + CommonModule, + FlexLayoutModule, + FormsModule, + MatButtonModule, + MatCheckboxModule, + MatDividerModule, + MatFormFieldModule, + MatSelectModule, + NgSelectModule, + SearchBarComponent, + TagComponent + ], + encapsulation: ViewEncapsulation.None, + selector: 'select-tags', + standalone: true, + styleUrl: './select-tags.component.scss', + templateUrl: './select-tags.component.html' +}) +export class SelectTagsComponent extends AbstractTagsMenuComponent { + @Input() selectedTags: Tag[] = []; + @Output() selectTagEvent: EventEmitter = new EventEmitter(); + + protected tagSearch(term: string, item: Tag): boolean { + return item.text.toLowerCase().includes(term.toLowerCase()); + } + + protected isSelected(tag: Tag): boolean { + return this.selectedTags.some((selectedTag) => selectedTag.text === tag.text); + } +} diff --git a/src/app/teacher/tag/tag.component.html b/src/app/teacher/tag/tag.component.html new file mode 100644 index 00000000000..0410491d97c --- /dev/null +++ b/src/app/teacher/tag/tag.component.html @@ -0,0 +1,15 @@ + + {{ text }} + @if (allowRemove) { + + + } + diff --git a/src/app/teacher/tag/tag.component.scss b/src/app/teacher/tag/tag.component.scss new file mode 100644 index 00000000000..0fa5e34605c --- /dev/null +++ b/src/app/teacher/tag/tag.component.scss @@ -0,0 +1,27 @@ +.tag { + padding: .3rem .6rem; + border-radius: 1rem; + min-height: 1rem; + font-weight: 400; + display: inline-flex; + align-items: center; +} + +.divider { + margin: 0 .2rem; +} + +.remove-tag { + padding: 0; + height: 16px; + width: 16px; +} + +.remove-icon { + width: 16px; + height: 16px; + font-size: 16px; + position: absolute; + top: 0; + left: 0; +} \ No newline at end of file diff --git a/src/app/teacher/tag/tag.component.spec.ts b/src/app/teacher/tag/tag.component.spec.ts new file mode 100644 index 00000000000..5f0cbffa5ae --- /dev/null +++ b/src/app/teacher/tag/tag.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { TagComponent } from './tag.component'; +import { ColorService } from '../../../assets/wise5/services/colorService'; + +describe('TagComponent', () => { + let component: TagComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TagComponent], + providers: [ColorService] + }).compileComponents(); + + fixture = TestBed.createComponent(TagComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/teacher/tag/tag.component.ts b/src/app/teacher/tag/tag.component.ts new file mode 100644 index 00000000000..880f64a604e --- /dev/null +++ b/src/app/teacher/tag/tag.component.ts @@ -0,0 +1,29 @@ +import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; +import { ColorService } from '../../../assets/wise5/services/colorService'; +import { CommonModule } from '@angular/common'; +import { MatIconModule } from '@angular/material/icon'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDividerModule } from '@angular/material/divider'; + +@Component({ + imports: [CommonModule, MatButtonModule, MatDividerModule, MatIconModule], + selector: 'tag', + standalone: true, + templateUrl: './tag.component.html', + styleUrl: './tag.component.scss' +}) +export class TagComponent implements OnChanges { + @Input() allowRemove: boolean; + @Input() color: string; + @Output() removeTagEvent: EventEmitter = new EventEmitter(); + @Input() text: string; + protected textColor: string; + + constructor(private colorService: ColorService) {} + + ngOnChanges(changes: SimpleChanges): void { + if (changes.color?.currentValue) { + this.textColor = this.colorService.getContrastColor(this.color); + } + } +} diff --git a/src/app/teacher/teacher-home/teacher-home.component.html b/src/app/teacher/teacher-home/teacher-home.component.html index 49b40e03a8c..038c447c9f9 100644 --- a/src/app/teacher/teacher-home/teacher-home.component.html +++ b/src/app/teacher/teacher-home/teacher-home.component.html @@ -21,7 +21,7 @@ queryString="order=activity" fxFlex="100%" fxFlex.gt-sm="0 0 auto" - > + />

diff --git a/src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.ts b/src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.ts index bff5f2fedee..15caeb376c0 100644 --- a/src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.ts +++ b/src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.ts @@ -16,6 +16,7 @@ export class AddYourOwnNode { }); protected componentTypes: any[]; protected initialComponents: string[] = []; + protected submitting: boolean; protected targetId: string; constructor( @@ -44,6 +45,7 @@ export class AddYourOwnNode { } protected submit(): void { + this.submitting = true; const newNode = this.projectService.createNode(this.addNodeFormGroup.controls['title'].value); if (this.isGroupNode(this.targetId)) { this.projectService.createNodeInside(newNode, this.targetId); diff --git a/src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html b/src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html index 9fdb7ef4f04..2f7c83f99b6 100644 --- a/src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html +++ b/src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html @@ -51,11 +51,12 @@
Interactive Simulation
diff --git a/src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html b/src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html index e1f495b72b0..556db5715c4 100644 --- a/src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html +++ b/src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html @@ -39,6 +39,15 @@
Customize Feedback (optional)
- +
diff --git a/src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html b/src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html index 75a8f8ea484..7e140747966 100644 --- a/src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html +++ b/src/assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component.html @@ -14,7 +14,7 @@
Choose a new location by clicking one of the buttons below
[ngStyle]="{ 'background-color': getBackgroundColor(nodeId) }" >
- + Unused Lessons
There are no Unused Lessons
- + diff --git a/src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html b/src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html index 054b6fdf0f8..08e4d1ea281 100644 --- a/src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html +++ b/src/assets/wise5/authoringTool/choose-node-location/choose-move-node-location/choose-move-node-location.component.html @@ -18,7 +18,7 @@
Choose a new location by clicking one of the buttons below
[ngStyle]="{ 'background-color': getBackgroundColor(nodeId) }" >
- + Unused Lessons
There are no Unused Lessons
- + -   - {{ getNodePosition(nodeId) }}: +   + @if (showPosition) { + {{ getNodePosition(nodeId) }}: + } {{ getNodeTitle(nodeId) }}
diff --git a/src/assets/wise5/authoringTool/choose-node-location/node-icon-and-title/node-icon-and-title.component.ts b/src/assets/wise5/authoringTool/choose-node-location/node-icon-and-title/node-icon-and-title.component.ts index 7bb408c0ec5..c201873296e 100644 --- a/src/assets/wise5/authoringTool/choose-node-location/node-icon-and-title/node-icon-and-title.component.ts +++ b/src/assets/wise5/authoringTool/choose-node-location/node-icon-and-title/node-icon-and-title.component.ts @@ -1,8 +1,13 @@ import { Component, Input } from '@angular/core'; import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { NodeIconComponent } from '../../../vle/node-icon/node-icon.component'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { CommonModule } from '@angular/common'; @Component({ + imports: [CommonModule, FlexLayoutModule, NodeIconComponent], selector: 'node-icon-and-title', + standalone: true, templateUrl: './node-icon-and-title.component.html' }) export class NodeIconAndTitleComponent { diff --git a/src/assets/wise5/authoringTool/choose-node-location/node-with-move-after-button/node-with-move-after-button.component.html b/src/assets/wise5/authoringTool/choose-node-location/node-with-move-after-button/node-with-move-after-button.component.html index 3ee98647a49..e5da1f069ad 100644 --- a/src/assets/wise5/authoringTool/choose-node-location/node-with-move-after-button/node-with-move-after-button.component.html +++ b/src/assets/wise5/authoringTool/choose-node-location/node-with-move-after-button/node-with-move-after-button.component.html @@ -1,5 +1,5 @@
- + Component Info + />

Description:

{{ description }}

- +

Example:

- - - - - - + @if (previewComponents.length === 1) { + + } @else if (previewComponents.length > 1) { + + @for (component of previewComponents; track component; let i = $index) { + + + + } + + } diff --git a/src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.spec.ts b/src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.spec.ts index 24a4553f3aa..ff2bdb22e7b 100644 --- a/src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.spec.ts +++ b/src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.spec.ts @@ -1,27 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentInfoDialogComponent } from './component-info-dialog.component'; -import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; -import { MatDividerModule } from '@angular/material/divider'; -import { PreviewComponentModule } from '../preview-component/preview-component.module'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { PreviewComponentComponent } from '../preview-component/preview-component.component'; import { ProjectService } from '../../../services/projectService'; import { ComponentInfoService } from '../../../services/componentInfoService'; -import { MatIconModule } from '@angular/material/icon'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatSelectModule } from '@angular/material/select'; -import { MatButtonModule } from '@angular/material/button'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ComponentTypeSelectorComponent } from '../component-type-selector/component-type-selector.component'; import { ComponentInfoDialogHarness } from './component-info-dialog.harness'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatTabsModule } from '@angular/material/tabs'; import { MultipleChoiceInfo } from '../../../components/multipleChoice/MultipleChoiceInfo'; import { OutsideUrlInfo } from '../../../components/outsideURL/OutsideUrlInfo'; import { OpenResponseInfo } from '../../../components/openResponse/OpenResponseInfo'; import { ComponentInfo } from '../../../components/ComponentInfo'; -import { MatCardModule } from '@angular/material/card'; import { ComponentTypeServiceModule } from '../../../services/componentTypeService.module'; +import { ComponentStudentModule } from '../../../../../assets/wise5/components/component/component-student.module'; let component: ComponentInfoDialogComponent; let fixture: ComponentFixture; @@ -33,24 +24,12 @@ let outsideUrlInfo = new OutsideUrlInfo(); describe('ComponentInfoDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ - ComponentInfoDialogComponent, - ComponentTypeSelectorComponent, - PreviewComponentComponent - ], imports: [ BrowserAnimationsModule, + ComponentInfoDialogComponent, + ComponentStudentModule, ComponentTypeServiceModule, - HttpClientTestingModule, - MatButtonModule, - MatCardModule, - MatDialogModule, - MatDividerModule, - MatFormFieldModule, - MatIconModule, - MatSelectModule, - MatTabsModule, - PreviewComponentModule + HttpClientTestingModule ], providers: [ComponentInfoService, { provide: MAT_DIALOG_DATA, useValue: 'OpenResponse' }] }).compileComponents(); diff --git a/src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.ts b/src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.ts index cc2be5a1d33..5717a5228f2 100644 --- a/src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.ts +++ b/src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.ts @@ -1,17 +1,34 @@ import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { ComponentInfoService } from '../../../services/componentInfoService'; -import { ComponentInfo } from '../../../components/ComponentInfo'; import { ComponentFactory } from '../../../common/ComponentFactory'; import { Component as WISEComponent } from '../../../common/Component'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { ComponentTypeSelectorComponent } from '../component-type-selector/component-type-selector.component'; +import { PreviewComponentComponent } from '../preview-component/preview-component.component'; +import { MatCardModule } from '@angular/material/card'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDividerModule } from '@angular/material/divider'; @Component({ - selector: 'component-info-dialog', - templateUrl: './component-info-dialog.component.html', - styleUrls: ['./component-info-dialog.component.scss'] + imports: [ + CommonModule, + ComponentTypeSelectorComponent, + FlexLayoutModule, + MatButtonModule, + MatCardModule, + MatDialogModule, + MatDividerModule, + MatTabsModule, + PreviewComponentComponent + ], + standalone: true, + styleUrl: './component-info-dialog.component.scss', + templateUrl: './component-info-dialog.component.html' }) export class ComponentInfoDialogComponent { - private componentInfo: ComponentInfo; protected description: string; protected previewComponents: WISEComponent[] = []; protected previewExamples: any[] = []; @@ -25,10 +42,10 @@ export class ComponentInfoDialogComponent { this.displayComponent(this.componentType); } - protected displayComponent(componentType: any): void { - this.componentInfo = this.componentInfoService.getInfo(componentType); - this.description = this.componentInfo.getDescription(); - this.previewExamples = this.componentInfo.getPreviewExamples(); + protected displayComponent(componentType: string): void { + const componentInfo = this.componentInfoService.getInfo(componentType); + this.description = componentInfo.getDescription(); + this.previewExamples = componentInfo.getPreviewExamples(); this.previewComponents = this.previewExamples.map((example: any) => { return new ComponentFactory().getComponent(example.content, 'node1'); }); diff --git a/src/assets/wise5/authoringTool/components/component-type-button/component-type-button.component.html b/src/assets/wise5/authoringTool/components/component-type-button/component-type-button.component.html index c4abbde01b8..945984f0d27 100644 --- a/src/assets/wise5/authoringTool/components/component-type-button/component-type-button.component.html +++ b/src/assets/wise5/authoringTool/components/component-type-button/component-type-button.component.html @@ -1,6 +1,6 @@
- - - {{ componentTypeOption.name }} - + @for (componentTypeOption of componentTypes; track componentTypeOption.type) { + {{ componentTypeOption.name }} + } diff --git a/src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.ts b/src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.ts index 9adda2f57f7..7e448c0111b 100644 --- a/src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.ts +++ b/src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.ts @@ -1,23 +1,25 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { PreviewComponentDialogComponent } from '../preview-component-dialog/preview-component-dialog.component'; import { ProjectService } from '../../../services/projectService'; import { ComponentFactory } from '../../../common/ComponentFactory'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatButtonModule } from '@angular/material/button'; @Component({ + imports: [MatButtonModule, MatIconModule, MatTooltipModule], selector: 'preview-component-button', + standalone: true, templateUrl: 'preview-component-button.component.html' }) -export class PreviewComponentButtonComponent implements OnInit { +export class PreviewComponentButtonComponent { @Input() componentId: string; @Input() nodeId: string; constructor(private dialog: MatDialog, private projectService: ProjectService) {} - ngOnInit(): void {} - - protected popUpComponentPreview(event: any): void { - event.stopPropagation(); + protected popUpComponentPreview(): void { const content = this.projectService.injectAssetPaths( this.projectService.getComponent(this.nodeId, this.componentId) ); diff --git a/src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html b/src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html index 6afc83c7ded..60a2b446e5d 100644 --- a/src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html +++ b/src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html @@ -1,21 +1,20 @@

Preview Component

- - +@if (canSaveStarterState) { + - - + /> +} + - + /> - + diff --git a/src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.ts b/src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.ts index 79ef8810428..22c6282b003 100644 --- a/src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.ts +++ b/src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.ts @@ -1,10 +1,24 @@ import { Component, Inject, OnInit } from '@angular/core'; import { Component as WISEComponent } from '../../../common/Component'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; +import { MatDividerModule } from '@angular/material/divider'; +import { SaveStarterStateComponent } from '../save-starter-state/save-starter-state.component'; +import { PreviewComponentComponent } from '../preview-component/preview-component.component'; +import { MatButtonModule } from '@angular/material/button'; +import { CommonModule } from '@angular/common'; @Component({ - templateUrl: 'preview-component-dialog.component.html', - styleUrls: ['preview-component-dialog.component.scss'] + imports: [ + CommonModule, + MatButtonModule, + MatDialogModule, + MatDividerModule, + PreviewComponentComponent, + SaveStarterStateComponent + ], + standalone: true, + styleUrl: 'preview-component-dialog.component.scss', + templateUrl: 'preview-component-dialog.component.html' }) export class PreviewComponentDialogComponent implements OnInit { protected canSaveStarterState: boolean; @@ -19,7 +33,7 @@ export class PreviewComponentDialogComponent implements OnInit { ); } - updateStarterState(starterState: any): void { + protected updateStarterState(starterState: any): void { this.starterState = starterState; } } diff --git a/src/assets/wise5/authoringTool/components/preview-component/preview-component.component.ts b/src/assets/wise5/authoringTool/components/preview-component/preview-component.component.ts index 9b8d5058775..afa07216356 100644 --- a/src/assets/wise5/authoringTool/components/preview-component/preview-component.component.ts +++ b/src/assets/wise5/authoringTool/components/preview-component/preview-component.component.ts @@ -15,6 +15,7 @@ import { components } from '../../../components/Components'; @Component({ selector: 'preview-component', + standalone: true, template: '
' }) export class PreviewComponentComponent { @@ -36,7 +37,11 @@ export class PreviewComponentComponent { } } - renderComponent(): void { + ngOnDestroy(): void { + this.componentRef.destroy(); + } + + private renderComponent(): void { this.componentRef = createComponent(components[this.component.content.type].student, { hostElement: this.componentElementRef.nativeElement, environmentInjector: this.injector @@ -49,8 +54,4 @@ export class PreviewComponentComponent { }); this.applicationRef.attachView(this.componentRef.hostView); } - - ngOnDestroy(): void { - this.componentRef.destroy(); - } } diff --git a/src/assets/wise5/authoringTool/components/preview-component/preview-component.module.ts b/src/assets/wise5/authoringTool/components/preview-component/preview-component.module.ts deleted file mode 100644 index 2a4efd47a8f..00000000000 --- a/src/assets/wise5/authoringTool/components/preview-component/preview-component.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { PreviewComponentButtonComponent } from '../preview-component-button/preview-component-button.component'; -import { PreviewComponentDialogComponent } from '../preview-component-dialog/preview-component-dialog.component'; -import { SaveStarterStateComponent } from '../save-starter-state/save-starter-state.component'; -import { ComponentStudentModule } from '../../../../../assets/wise5/components/component/component-student.module'; -import { StudentTeacherCommonModule } from '../../../../../app/student-teacher-common.module'; - -@NgModule({ - declarations: [ - PreviewComponentButtonComponent, - PreviewComponentDialogComponent, - SaveStarterStateComponent - ], - exports: [PreviewComponentButtonComponent], - imports: [StudentTeacherCommonModule, ComponentStudentModule] -}) -export class PreviewComponentModule {} diff --git a/src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.html b/src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.html index c39dae1b34a..b0f1da904ed 100644 --- a/src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.html +++ b/src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.html @@ -4,19 +4,19 @@ {{ viewName }} - + @if (showStepTools) { + + }
done diff --git a/src/assets/wise5/authoringTool/constraint/constraint-authoring.module.ts b/src/assets/wise5/authoringTool/constraint/constraint-authoring.module.ts deleted file mode 100644 index 8ec3d027809..00000000000 --- a/src/assets/wise5/authoringTool/constraint/constraint-authoring.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { EditConstraintRemovalCriteriaComponent } from './edit-constraint-removal-criteria/edit-constraint-removal-criteria.component'; -import { StudentTeacherCommonModule } from '../../../../app/student-teacher-common.module'; - -@NgModule({ - declarations: [EditConstraintRemovalCriteriaComponent], - exports: [EditConstraintRemovalCriteriaComponent], - imports: [StudentTeacherCommonModule] -}) -export class ConstraintAuthoringModule {} diff --git a/src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html b/src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html index f13a26b82e3..f988e9dd66a 100644 --- a/src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html +++ b/src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html @@ -10,7 +10,9 @@ - + @if (constraint.action === '') { + + }
Removal Conditional @@ -29,11 +31,7 @@ class="criteria-div" fxLayoutGap="16px" > - +
Add Removal Criteria diff --git a/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html b/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html index d1cd15a0e3d..3703daf547d 100644 --- a/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html +++ b/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html @@ -15,287 +15,268 @@ Removal Criteria Name - - {{ criterion.text }} - + @for (criterion of removalCriteria; track criterion; let criterionIndex = $index) { + + {{ criterion.text }} + + } - + @if (criteria.name === '') { + + }
-
-
- - {{ param.text }} - - - Please Choose a Step - - - {{ getNodePosition(nodeId) + ':' }} {{ getNodeTitle(nodeId) }} ({{ nodeId }}) + @if (param.value === 'nodeId') { +
+ + {{ param.text }} + - - - - -
-
- - {{ param.text }} - - - Please Choose a Component - - - - {{ componentIndex + 1 }}. {{ component.type }} (Prompt: {{ component.prompt }}) - - - - - -
-
- - {{ param.text }} - - - Please Select a From Step - - - {{ getNodePosition(nodeId) + ':' }} {{ getNodeTitle(nodeId) }} ({{ nodeId }}) - - - - - -
-
- - {{ param.text }} - - - Please Select a To Step - - - {{ getNodePosition(nodeId) + ':' }} {{ getNodeTitle(nodeId) }} ({{ nodeId }}) - - - - - -
-
- - {{ param.text }} - - - - -
-
- - {{ param.text }} - - - - -
-
+ Please Choose a Step + + @for (nodeId of nodeIds; track nodeId) { + + {{ getNodePosition(nodeId) + ':' }} {{ getNodeTitle(nodeId) }} ({{ + nodeId + }}) + + } + + + @if (criteria.params.nodeId === '') { + + } +
+ } @else if (param.value === 'componentId') { +
+ + {{ param.text }} + + + Please Choose a Component + + @for ( + component of getComponents(criteria.params.nodeId); + track component; + let componentIndex = $index + ) { + @if (componentIdToIsSelectable[component.id]) { + + {{ componentIndex + 1 }}. {{ component.type }} (Prompt: + {{ component.prompt }}) + + } + } + + + @if (criteria.params.componentId === '') { + + } +
+ } @else if (param.value === 'fromNodeId') { +
+ + {{ param.text }} + + + Please Select a From Step + + @for (nodeId of nodeIds; track nodeId) { + + {{ getNodePosition(nodeId) + ':' }} {{ getNodeTitle(nodeId) }} ({{ nodeId }}) + + + } + + + @if (criteria.params.fromNodeId == null || criteria.params.fromNodeId === '') { + + } +
+ } @else if (param.value === 'toNodeId') { +
+ + {{ param.text }} + + + Please Select a To Step + + @for (nodeId of nodeIds; track nodeId) { + + {{ getNodePosition(nodeId) + ':' }} {{ getNodeTitle(nodeId) }} ({{ + nodeId + }}) + + } + + + @if (criteria.params.toNodeId == null || criteria.params.toNodeId === '') { + + } +
+ } @else if (param.value === 'scores') { +
+ + {{ param.text }} + + + @if ( + criteria.params.scores.length === 0 || + (criteria.params.scores.length === 1 && criteria.params.scores[0] === '') + ) { + + } +
+ } @else if (param.value === 'requiredSubmitCount') { +
+ @if (param.value === 'requiredSubmitCount') { + + {{ param.text }} + + + } + @if ( + criteria.params.requiredSubmitCount == null || criteria.params.requiredSubmitCount === '' + ) { + + } +
+ } @else if ( param.value === 'choiceIds' && getChoiceType(criteria.params.nodeId, criteria.params.componentId) === 'radio' - " - fxLayout="row wrap" - fxLayoutAlign="start center" - fxLayoutGap="16px" - > - - {{ param.text }} - - - - Please Select a Choice - - - - {{ choice.text }} - - - - -
-
+ + {{ param.text }} + + + + Please Select a Choice + + + @for ( + choice of getChoices(criteria.params.nodeId, criteria.params.componentId); + track choice.id + ) { + + {{ choice.text }} + + } + + + @if (criteria.params.choiceIds === '') { + + } +
+ } @else if ( param.value === 'choiceIds' && getChoiceType(criteria.params.nodeId, criteria.params.componentId) === 'checkbox' - " - fxLayout="row wrap" - fxLayoutAlign="start center" - fxLayoutGap="16px" - > - - {{ param.text }} - + + {{ param.text }} + + + + @if (criteria.params.choiceIds.length === 0) { + + } +
+ } @else if (param.value === 'requiredNumberOfWords') { +
+ + {{ param.text }} + + + @if ( + criteria.params.requiredNumberOfWords == null || + criteria.params.requiredNumberOfWords === '' + ) { + + } +
+ } @else if (param.value === 'requiredNumberOfNotes') { +
+ + {{ param.text }} + + + @if ( + criteria.params.requiredNumberOfNotes == null || + criteria.params.requiredNumberOfNotes === '' + ) { + + } +
+ } @else if (param.value === 'requiredNumberOfFilledRows') { +
+ + {{ param.text }} + + + @if ( + criteria.params.requiredNumberOfFilledRows == null || + criteria.params.requiredNumberOfFilledRows === '' + ) { + + } +
+ } @else if (param.value === 'tableHasHeaderRow') { + - {{ choice.text }} - - - -
-
- - {{ param.text }} - + } @else if (param.value === 'requireAllCellsInARowToBeFilled') { + - - - -
-
- - {{ param.text }} - - - - -
-
- - {{ param.text }} - - - - + > + {{ param.text }} + + }
- - {{ param.text }} - - - {{ param.text }} - -
+} diff --git a/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.spec.ts b/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.spec.ts index bc59b2e7c8b..a207c3354dd 100644 --- a/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.spec.ts +++ b/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.spec.ts @@ -1,19 +1,11 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormsModule } from '@angular/forms'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatIconModule } from '@angular/material/icon'; -import { MatSelectModule } from '@angular/material/select'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { Constraint } from '../../../../../app/domain/constraint'; import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module'; import { TeacherProjectService } from '../../../services/teacherProjectService'; -import { RequiredErrorLabelComponent } from '../../node/advanced/required-error-label/required-error-label.component'; import { EditConstraintRemovalCriteriaComponent } from './edit-constraint-removal-criteria.component'; import { ComponentContent } from '../../../common/ComponentContent'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; let component: EditConstraintRemovalCriteriaComponent; const componentId1: string = 'component1'; @@ -31,19 +23,13 @@ const nodeId2: string = 'node2'; const nodeId3: string = 'node3'; let removalCriteria: any; -// TODO- use component harness -xdescribe('EditConstraintRemovalCriteriaComponent', () => { +describe('EditConstraintRemovalCriteriaComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [EditConstraintRemovalCriteriaComponent, RequiredErrorLabelComponent], imports: [ BrowserAnimationsModule, - FormsModule, + EditConstraintRemovalCriteriaComponent, HttpClientTestingModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatSelectModule, StudentTeacherCommonServicesModule ], providers: [TeacherProjectService] @@ -86,8 +72,9 @@ xdescribe('EditConstraintRemovalCriteriaComponent', () => { fixture.detectChanges(); }); - deleteRemovalCriteria(); - nameChanged(); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); function createNode(id: string, components: any[]): any { @@ -97,235 +84,3 @@ function createNode(id: string, components: any[]): any { function createComponent(id: string, type: string): ComponentContent { return { id, type }; } - -function deleteRemovalCriteria() { - describe('deleteRemovalCriteria()', () => { - it('should delete removal criteria', () => { - expect(component.constraint.removalCriteria.length).toEqual(1); - spyOn(window, 'confirm').and.returnValue(true); - component.deleteRemovalCriteria(); - expect(component.constraint.removalCriteria.length).toEqual(0); - }); - }); -} - -function nameChanged() { - describe('nameChanged()', () => { - nameChanged_IsCompleted(); - nameChanged_Score(); - nameChanged_BranchPathTaken(); - nameChanged_ChoiceChosen(); - nameChanged_IsCorrect(); - nameChanged_UsedXSubmits(); - nameChanged_IsVisible(); - nameChanged_IsVisitable(); - nameChanged_IsVisited(); - nameChanged_WroteXNumberWords(); - nameChanged_AddXNumberNotes(); - nameChanged_FillXNumberRows(); - nameChanged_TeacherRemoval(); - }); -} - -function nameChanged_IsCompleted() { - it('should handle removal criteria name changed to isCompleted', () => { - setRemovalCriteriaName('isCompleted'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - }); -} - -function nameChanged_Score() { - it('should handle removal criteria name changed to score', () => { - setRemovalCriteriaName('score'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - expectEmptyRemovalCriterialParamValue('componentId', 'scores'); - }); -} - -function nameChanged_BranchPathTaken() { - it('should handle removal criteria name changed to branch path taken', () => { - setRemovalCriteriaName('branchPathTaken'); - expectEmptyRemovalCriterialParamValue('fromNodeId', 'toNodeId'); - }); -} - -function nameChanged_ChoiceChosen() { - choiceChosen_StepsWithAndWithoutMultipleChoice_ShouldOnlyShowStepsWithMultipleChoice(); - choiceChosen_StepWithAndWithoutMultipleChoice_ShouldOnlyShowMultipleChoiceComponents(); - choiceChosen_WithOneMultipleChoiceComponent_ShouldAutomaticallySelect(); - choiceChosen_WithTwoMultipleChoiceComponents_ShouldNotAutomaticallySelect(); -} - -function choiceChosen_StepsWithAndWithoutMultipleChoice_ShouldOnlyShowStepsWithMultipleChoice() { - describe('there are steps with and without Multiple Choice components', () => { - it('should only show the steps with Multiple Choice components', () => { - chooseSelectOptionByLabel('Removal Criteria Name', 'Choice Chosen'); - clickSelectElement('Step'); - expectOptions(['', nodeId1, nodeId2]); - }); - }); -} - -function choiceChosen_StepWithAndWithoutMultipleChoice_ShouldOnlyShowMultipleChoiceComponents() { - describe('choose a step with and without Multiple Choice components', () => { - it('should only show the Multiple Choice components', () => { - chooseSelectOptionByLabel('Removal Criteria Name', 'Choice Chosen'); - chooseSelectOptionByValue('Step', nodeId1); - clickSelectElement('Component'); - expectOptions(['', componentId1]); - }); - }); -} - -function choiceChosen_WithOneMultipleChoiceComponent_ShouldAutomaticallySelect() { - describe('choose step with one Multiple Choice component', () => { - it('should automatically select the one Multiple Choice component', () => { - chooseSelectOptionByLabel('Removal Criteria Name', 'Choice Chosen'); - chooseSelectOptionByValue('Step', nodeId1); - expectComponentIdToEqual(componentId1); - expectEmptyRemovalCriterialParamValue('choiceIds'); - }); - }); -} - -function choiceChosen_WithTwoMultipleChoiceComponents_ShouldNotAutomaticallySelect() { - describe('choose step with two Multiple Choice components', () => { - it('should not automatically select a Multiple Choice compoennt', () => { - chooseSelectOptionByLabel('Removal Criteria Name', 'Choice Chosen'); - chooseSelectOptionByValue('Step', nodeId2); - expectComponentIdToEqual(''); - expectEmptyRemovalCriterialParamValue('choiceIds'); - }); - }); -} - -function nameChanged_IsCorrect() { - it('should handle removal criteria name changed to isCorrect', () => { - setRemovalCriteriaName('isCorrect'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - expectEmptyRemovalCriterialParamValue('componentId'); - }); -} - -function nameChanged_UsedXSubmits() { - it('should handle removal criteria name changed to usedXSubmits', () => { - setRemovalCriteriaName('usedXSubmits'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - expectEmptyRemovalCriterialParamValue('componentId', 'requiredSubmitCount'); - }); -} - -function nameChanged_IsVisible() { - it('should handle removal criteria name changed to isVisible', () => { - setRemovalCriteriaName('isVisible'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - }); -} - -function nameChanged_IsVisitable() { - it('should handle removal criteria name changed to isVisitable', () => { - setRemovalCriteriaName('isVisitable'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - }); -} - -function nameChanged_IsVisited() { - it('should handle removal criteria name changed to isVisited', () => { - setRemovalCriteriaName('isVisited'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - }); -} - -function nameChanged_WroteXNumberWords() { - it('should handle removal criteria name changed to wroteXNumberOfWords', () => { - setRemovalCriteriaName('wroteXNumberOfWords'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - expectComponentIdToEqual(componentId2); - expectEmptyRemovalCriterialParamValue('requiredNumberOfWords'); - }); -} - -function nameChanged_AddXNumberNotes() { - it('should handle removal criteria name changed to addXNumberOfNotesOnThisStep', () => { - setRemovalCriteriaName('addXNumberOfNotesOnThisStep'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - expectEmptyRemovalCriterialParamValue('requiredNumberOfNotes'); - }); -} - -function nameChanged_FillXNumberRows() { - it('should handle removal criteria name changed to fillXNumberOfRows', () => { - setRemovalCriteriaName('fillXNumberOfRows'); - expectRemovalCriteriaNodeIdValueToEqualNode1(); - expectComponentIdToEqual(componentId3); - expect(removalCriteria.params['requiredNumberOfFilledRows']).toEqual(''); - expect(removalCriteria.params['tableHasHeaderRow']).toEqual(true); - expect(removalCriteria.params['requireAllCellsInARowToBeFilled']).toEqual(true); - }); -} - -function nameChanged_TeacherRemoval() { - it('should handle removal criteria name changed to teacherRemoval', () => { - setRemovalCriteriaName('teacherRemoval'); - expect(removalCriteria.params['nodeId']).toBeUndefined(); - }); -} - -function setRemovalCriteriaName(name: string): any { - removalCriteria = component.constraint.removalCriteria[0]; - removalCriteria.name = name; - component.nameChanged(removalCriteria); -} - -function expectEmptyRemovalCriterialParamValue(...paramNames: string[]): void { - paramNames.forEach((paramName) => { - expect(removalCriteria.params[paramName]).toEqual(''); - }); -} - -function expectRemovalCriteriaNodeIdValueToEqualNode1(): void { - expect(removalCriteria.params['nodeId']).toEqual('node1'); -} - -function expectComponentIdToEqual(componentId: string): void { - expect(removalCriteria.params['componentId']).toEqual(componentId); -} - -function expectOptions(expectedOptionValues: string[]): void { - const options = fixture.debugElement.queryAll(By.css('.mat-option')); - options.forEach((option, index) => { - expect(option.attributes['ng-reflect-value']).toEqual(expectedOptionValues[index]); - }); -} - -function chooseSelectOptionByLabel(selectLabel: string, optionLabel: string): void { - clickSelectElement(selectLabel); - fixture.debugElement - .queryAll(By.css('.mat-option')) - .find((element) => element.nativeElement.textContent === optionLabel) - .nativeElement.click(); - fixture.detectChanges(); -} - -function chooseSelectOptionByValue(selectLabel: string, optionValue: string): void { - clickSelectElement(selectLabel); - fixture.debugElement - .query(By.css(`.mat-option[ng-reflect-value='${optionValue}']`)) - .nativeElement.click(); - fixture.detectChanges(); -} - -function clickSelectElement(label: string): void { - getSelectElement(label).query(By.css('.mat-select-trigger')).nativeElement.click(); - fixture.detectChanges(); -} - -function getSelectElement(label: string): DebugElement { - return fixture.debugElement - .queryAll(By.css('.mat-form-field')) - .find((element) => - element - .queryAll(By.css('mat-label')) - .find((matLabel) => matLabel.nativeElement.textContent === label) - ); -} diff --git a/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts b/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts index 43cec7ee9da..33f81969544 100644 --- a/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts +++ b/src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts @@ -5,15 +5,38 @@ import { RemovalCriteriaParam } from '../../../../../app/domain/removalCriteriaP import { ComponentContent } from '../../../common/ComponentContent'; import { MultipleChoiceContent } from '../../../components/multipleChoice/MultipleChoiceContent'; import { EditConstraintRemovalCriteriaHelper } from './edit-constraint-removal-criteria-helper'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { FormsModule } from '@angular/forms'; +import { MatIconModule } from '@angular/material/icon'; +import { RequiredErrorLabelComponent } from '../../node/advanced/required-error-label/required-error-label.component'; +import { MatButtonModule } from '@angular/material/button'; @Component({ + imports: [ + FlexLayoutModule, + FormsModule, + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatSelectModule, + MatTooltipModule, + RequiredErrorLabelComponent + ], selector: 'edit-constraint-removal-criteria', - styleUrls: ['./edit-constraint-removal-criteria.component.scss'], + standalone: true, + styleUrl: './edit-constraint-removal-criteria.component.scss', templateUrl: './edit-constraint-removal-criteria.component.html' }) export class EditConstraintRemovalCriteriaComponent implements OnInit { private allNodeIds: string[]; - private componentIdToIsSelectable: { [componentId: string]: boolean } = {}; + protected componentIdToIsSelectable: { [componentId: string]: boolean } = {}; private componentParam: RemovalCriteriaParam = new RemovalCriteriaParam( 'componentId', $localize`Component` @@ -21,7 +44,7 @@ export class EditConstraintRemovalCriteriaComponent implements OnInit { @Input() constraint: any; @Input() criteria: any; @Input() node: any; - nodeIds: string[]; + protected nodeIds: string[]; private removalCriteriaHelper: EditConstraintRemovalCriteriaHelper; private stepParam: RemovalCriteriaParam = new RemovalCriteriaParam('nodeId', $localize`Step`); @@ -110,7 +133,7 @@ export class EditConstraintRemovalCriteriaComponent implements OnInit { ); } - deleteRemovalCriteria(): void { + protected deleteRemovalCriteria(): void { if (confirm($localize`Are you sure you want to delete this removal criteria?`)) { const removalCriteria = this.constraint.removalCriteria; removalCriteria.splice(removalCriteria.indexOf(this.criteria), 1); @@ -118,7 +141,7 @@ export class EditConstraintRemovalCriteriaComponent implements OnInit { } } - nameChanged(criteria: any): void { + protected nameChanged(criteria: any): void { criteria.params = {}; const params = this.getParamsByName(criteria.name); for (const paramObject of params) { diff --git a/src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.spec.ts b/src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.spec.ts index 1fb0162df4d..12bdb7b5c9a 100644 --- a/src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.spec.ts @@ -1,15 +1,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AddComponentButtonComponent } from './add-component-button.component'; -import { MatDialog, MatDialogModule } from '@angular/material/dialog'; +import { MatDialog } from '@angular/material/dialog'; import { TeacherProjectService } from '../../../services/teacherProjectService'; -import { RouterTestingModule } from '@angular/router/testing'; -import { MatIconModule } from '@angular/material/icon'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing'; import { MatButtonHarness } from '@angular/material/button/testing'; import { ChooseNewComponent } from '../../../../../app/authoring-tool/add-component/choose-new-component/choose-new-component.component'; import { of } from 'rxjs'; import { Node } from '../../../common/Node'; +import { provideRouter } from '@angular/router'; class MockTeacherProjectService { createComponent() {} @@ -22,9 +21,11 @@ describe('AddComponentButtonComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [AddComponentButtonComponent], - imports: [MatDialogModule, MatIconModule, RouterTestingModule], - providers: [{ provide: TeacherProjectService, useClass: MockTeacherProjectService }] + imports: [AddComponentButtonComponent], + providers: [ + { provide: TeacherProjectService, useClass: MockTeacherProjectService }, + provideRouter([]) + ] }); fixture = TestBed.createComponent(AddComponentButtonComponent); component = fixture.componentInstance; diff --git a/src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts b/src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts index f822bfd5033..a52c9b7c023 100644 --- a/src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts +++ b/src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts @@ -5,9 +5,14 @@ import { ChooseNewComponent } from '../../../../../app/authoring-tool/add-compon import { filter } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { Node } from '../../../common/Node'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ + imports: [MatButtonModule, MatIconModule, MatTooltipModule], selector: 'add-component-button', + standalone: true, templateUrl: './add-component-button.component.html' }) export class AddComponentButtonComponent { diff --git a/src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring.module.ts b/src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring.module.ts index 4973d1cdf28..46263b78846 100644 --- a/src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring.module.ts +++ b/src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring.module.ts @@ -7,11 +7,12 @@ import { NodeAdvancedAuthoringComponent } from './node-advanced-authoring/node-a import { NodeAdvancedPathAuthoringComponent } from './path/node-advanced-path-authoring.component'; import { StudentTeacherCommonModule } from '../../../../../app/student-teacher-common.module'; import { NodeConstraintAuthoringComponent } from '../../constraint/node-constraint-authoring/node-constraint-authoring.component'; -import { ConstraintAuthoringModule } from '../../constraint/constraint-authoring.module'; import { EditNodeRubricComponent } from '../editRubric/edit-node-rubric.component'; import { WiseTinymceEditorModule } from '../../../directives/wise-tinymce-editor/wise-tinymce-editor.module'; import { RouterModule } from '@angular/router'; import { TranslatableRichTextEditorComponent } from '../../components/translatable-rich-text-editor/translatable-rich-text-editor.component'; +import { RequiredErrorLabelComponent } from './required-error-label/required-error-label.component'; +import { EditConstraintRemovalCriteriaComponent } from '../../constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component'; @NgModule({ declarations: [ @@ -35,7 +36,8 @@ import { TranslatableRichTextEditorComponent } from '../../components/translatab NodeConstraintAuthoringComponent ], imports: [ - ConstraintAuthoringModule, + EditConstraintRemovalCriteriaComponent, + RequiredErrorLabelComponent, RouterModule, StudentTeacherCommonModule, TranslatableRichTextEditorComponent, diff --git a/src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.spec.ts b/src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.spec.ts index 819113148b0..a138020d391 100644 --- a/src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.spec.ts @@ -1,6 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatIconModule } from '@angular/material/icon'; - import { RequiredErrorLabelComponent } from './required-error-label.component'; describe('RequiredErrorLabelComponent', () => { @@ -9,8 +7,7 @@ describe('RequiredErrorLabelComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [MatIconModule], - declarations: [RequiredErrorLabelComponent] + imports: [RequiredErrorLabelComponent] }).compileComponents(); }); diff --git a/src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.ts b/src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.ts index 119759ea4c9..28e006d665c 100644 --- a/src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.ts +++ b/src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.ts @@ -1,12 +1,12 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatIconModule } from '@angular/material/icon'; @Component({ + imports: [FlexLayoutModule, MatIconModule], selector: 'required-error-label', - templateUrl: './required-error-label.component.html', - styleUrls: ['./required-error-label.component.scss'] + standalone: true, + styleUrl: './required-error-label.component.scss', + templateUrl: './required-error-label.component.html' }) -export class RequiredErrorLabelComponent implements OnInit { - constructor() {} - - ngOnInit(): void {} -} +export class RequiredErrorLabelComponent {} diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html index 20e64cbaaef..4f017c36dc1 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html @@ -1,6 +1,6 @@
- +
diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts index b506521c7f5..7ab09f86465 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts @@ -15,7 +15,6 @@ import { FormsModule } from '@angular/forms'; import { TeacherNodeIconComponent } from '../../teacher-node-icon/teacher-node-icon.component'; import { ComponentAuthoringModule } from '../../../../../app/teacher/component-authoring.module'; import { ProjectAssetService } from '../../../../../app/services/projectAssetService'; -import { PreviewComponentModule } from '../../components/preview-component/preview-component.module'; import { DebugElement } from '@angular/core'; import { DragDropModule } from '@angular/cdk/drag-drop'; import { RouterTestingModule } from '@angular/router/testing'; @@ -29,6 +28,7 @@ import { ProjectLocale } from '../../../../../app/domain/projectLocale'; import { TeacherProjectTranslationService } from '../../../services/teacherProjectTranslationService'; import { ComponentTypeServiceModule } from '../../../services/componentTypeService.module'; import { DeleteTranslationsService } from '../../../services/deleteTranslationsService'; +import { PreviewComponentButtonComponent } from '../../components/preview-component-button/preview-component-button.component'; let component: NodeAuthoringComponent; let component1: any; @@ -45,14 +45,9 @@ let saveProjectSpy: jasmine.Spy; describe('NodeAuthoringComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ - AddComponentButtonComponent, - CopyComponentButtonComponent, - EditNodeTitleComponent, - NodeAuthoringComponent, - TeacherNodeIconComponent - ], + declarations: [CopyComponentButtonComponent, EditNodeTitleComponent, NodeAuthoringComponent], imports: [ + AddComponentButtonComponent, BrowserAnimationsModule, ComponentAuthoringModule, ComponentTypeServiceModule, @@ -62,9 +57,10 @@ describe('NodeAuthoringComponent', () => { MatCheckboxModule, MatIconModule, MatInputModule, - PreviewComponentModule, + PreviewComponentButtonComponent, RouterTestingModule, - StudentTeacherCommonServicesModule + StudentTeacherCommonServicesModule, + TeacherNodeIconComponent ], providers: [ ClassroomStatusService, diff --git a/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html b/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html index 0fd9bb5d122..8037d637bc2 100644 --- a/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html +++ b/src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html @@ -13,7 +13,7 @@ aria-label="Select lesson" i18n-aria-label > - +
{ beforeEach(async () => { TestBed.configureTestingModule({ - declarations: [ - NodeIconAndTitleComponent, - ProjectAuthoringLessonComponent, - ProjectAuthoringStepComponent - ], + declarations: [ProjectAuthoringLessonComponent, ProjectAuthoringStepComponent], imports: [ AddStepButtonComponent, FormsModule, @@ -49,7 +44,7 @@ describe('ProjectAuthoringLessonComponent', () => { MatDialogModule, MatIconModule, MatMenuModule, - NodeIconComponent, + NodeIconAndTitleComponent, StudentTeacherCommonServicesModule ], providers: [ diff --git a/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html b/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html index 9c26e9611a2..4a712e19183 100644 --- a/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html +++ b/src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html @@ -15,7 +15,7 @@ aria-label="Select step" i18n-aria-label > - +
{ beforeEach(() => { TestBed.configureTestingModule({ - declarations: [NodeIconAndTitleComponent, ProjectAuthoringStepComponent], + declarations: [ProjectAuthoringStepComponent], imports: [ FormsModule, HttpClientTestingModule, MatCheckboxModule, MatDialogModule, MatIconModule, - NodeIconComponent, + NodeIconAndTitleComponent, StudentTeacherCommonServicesModule ], providers: [ diff --git a/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.spec.ts b/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.spec.ts index a95e3d7e86d..3be19d6fdef 100644 --- a/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.spec.ts +++ b/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.spec.ts @@ -24,7 +24,6 @@ import { copy } from '../../common/object/object'; import { ProjectAuthoringLessonComponent } from '../project-authoring-lesson/project-authoring-lesson.component'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { NodeIconAndTitleComponent } from '../choose-node-location/node-icon-and-title/node-icon-and-title.component'; -import { NodeIconComponent } from '../../vle/node-icon/node-icon.component'; import { ProjectAuthoringStepComponent } from '../project-authoring-step/project-authoring-step.component'; import { MatTooltipModule } from '@angular/material/tooltip'; import { ProjectAuthoringHarness } from './project-authoring.harness'; @@ -55,11 +54,9 @@ describe('ProjectAuthoringComponent', () => { declarations: [ ConcurrentAuthorsMessageComponent, NodeAuthoringComponent, - NodeIconAndTitleComponent, ProjectAuthoringComponent, ProjectAuthoringLessonComponent, - ProjectAuthoringStepComponent, - TeacherNodeIconComponent + ProjectAuthoringStepComponent ], imports: [ AddLessonButtonComponent, @@ -75,7 +72,7 @@ describe('ProjectAuthoringComponent', () => { MatInputModule, MatMenuModule, MatTooltipModule, - NodeIconComponent, + NodeIconAndTitleComponent, StudentTeacherCommonServicesModule ], providers: [ diff --git a/src/assets/wise5/authoringTool/project-list/project-list.component.ts b/src/assets/wise5/authoringTool/project-list/project-list.component.ts index 3bf7794f559..b239d5d94d4 100644 --- a/src/assets/wise5/authoringTool/project-list/project-list.component.ts +++ b/src/assets/wise5/authoringTool/project-list/project-list.component.ts @@ -6,7 +6,6 @@ import { MatDialog } from '@angular/material/dialog'; import { DialogWithSpinnerComponent } from '../../directives/dialog-with-spinner/dialog-with-spinner.component'; import { SessionService } from '../../services/sessionService'; import { Router } from '@angular/router'; -import { tap } from 'rxjs'; @Component({ selector: 'project-list-authoring', @@ -68,15 +67,13 @@ export class ProjectListComponent implements OnInit { } private highlightNewProject(projectId: number): void { - this.configService.retrieveConfig(`/api/author/config`).pipe( - tap(() => { - this.projects = this.configService.getConfigParam('projects'); - // wait for new element to appear on the page - setTimeout(() => { - temporarilyHighlightElement(projectId.toString(), 3000); - }); - }) - ); + this.configService.retrieveConfig(`/api/author/config`).subscribe(() => { + this.projects = this.configService.getConfigParam('projects'); + // wait for new element to appear on the page + setTimeout(() => { + temporarilyHighlightElement(projectId.toString(), 3000); + }); + }); } private showMessageInModalDialog(message: string): void { diff --git a/src/assets/wise5/authoringTool/structure/configure-structure.component.ts b/src/assets/wise5/authoringTool/structure/configure-structure.component.ts index ed5805fe87f..67cf555ae88 100644 --- a/src/assets/wise5/authoringTool/structure/configure-structure.component.ts +++ b/src/assets/wise5/authoringTool/structure/configure-structure.component.ts @@ -12,6 +12,7 @@ export abstract class ConfigureStructureComponent { protected target: string; private structure: any = {}; private structureDir: string = 'assets/wise5/authoringTool/structure'; + protected submitting: boolean; constructor( private http: HttpClient, @@ -58,6 +59,7 @@ export abstract class ConfigureStructureComponent { } protected submit(): void { + this.submitting = true; this.structure = this.injectUniqueIds(this.structure); this.addNodesToProject(this.structure.nodes); const target = history.state.target; diff --git a/src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html b/src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html index 3031b99ad6c..c8e40929b69 100644 --- a/src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html +++ b/src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html @@ -23,6 +23,15 @@
Jigsaw
- +
diff --git a/src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html b/src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html index 84885e6ab2a..1e7c7c03706 100644 --- a/src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html +++ b/src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html @@ -14,6 +14,15 @@
KI Lesson with OER
- +
diff --git a/src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html b/src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html index 06ee00ca888..5a3325599ff 100644 --- a/src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html +++ b/src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html @@ -12,6 +12,15 @@
Peer Review & Revision
- + diff --git a/src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html b/src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html index 4419a66eab6..d85da7bd87e 100644 --- a/src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html +++ b/src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html @@ -13,6 +13,15 @@
Self-Directed Investigation
- + diff --git a/src/assets/wise5/authoringTool/teacher-node-icon/teacher-node-icon.component.ts b/src/assets/wise5/authoringTool/teacher-node-icon/teacher-node-icon.component.ts index a0655ea797e..cf534b23d88 100644 --- a/src/assets/wise5/authoringTool/teacher-node-icon/teacher-node-icon.component.ts +++ b/src/assets/wise5/authoringTool/teacher-node-icon/teacher-node-icon.component.ts @@ -3,18 +3,36 @@ import { ProjectService } from '../../services/projectService'; import { NodeIconComponent } from '../../vle/node-icon/node-icon.component'; import { NodeIconChooserDialog } from '../../common/node-icon-chooser-dialog/node-icon-chooser-dialog.component'; import { Component } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { CommonModule } from '@angular/common'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatIconModule } from '@angular/material/icon'; +import { MatBadgeModule } from '@angular/material/badge'; @Component({ + imports: [ + CommonModule, + FlexLayoutModule, + MatBadgeModule, + MatButtonModule, + MatIconModule, + MatTooltipModule + ], selector: 'teacher-node-icon', - templateUrl: '../../vle/node-icon/node-icon.component.html', - styleUrls: ['../../vle/node-icon/node-icon.component.scss'] + standalone: true, + styleUrl: '../../vle/node-icon/node-icon.component.scss', + templateUrl: '../../vle/node-icon/node-icon.component.html' }) export class TeacherNodeIconComponent extends NodeIconComponent { - constructor(protected dialog: MatDialog, protected projectService: ProjectService) { + constructor( + protected dialog: MatDialog, + protected projectService: ProjectService + ) { super(dialog, projectService); } - openNodeIconChooserDialog() { + protected openNodeIconChooserDialog(): void { this.dialog.open(NodeIconChooserDialog, { data: { node: this.node }, panelClass: 'dialog-md' diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html index 2f7a37e446f..f8bc5f82129 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html @@ -6,10 +6,9 @@ + [tooltip]="alertLabel" + [name]="alertIconName" + [class]="alertIconClass" + /> New diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.html index bb5dbf7d1b3..604ef7280d9 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.html @@ -84,24 +84,22 @@ + [class]="alertIconClass" + [name]="alertIconName" + [tooltip]="alertIconLabel" + /> + [class]="rubricIconClass" + [name]="rubricIconName" + [tooltip]="rubricIconLabel" + /> + /> +@if (showScore) { + grade {{ averageScoreDisplay }} +} diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItemScore/nav-item-score.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItemScore/nav-item-score.component.ts index ca62948bab9..ed67f7694f7 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItemScore/nav-item-score.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/navItemScore/nav-item-score.component.ts @@ -1,26 +1,23 @@ -'use strict'; - import { Component, Inject, Input, LOCALE_ID } from '@angular/core'; -import { formatNumber } from '@angular/common'; +import { CommonModule, formatNumber } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatIconModule } from '@angular/material/icon'; @Component({ + imports: [CommonModule, FlexLayoutModule, MatIconModule], selector: 'nav-item-score', + standalone: true, templateUrl: 'nav-item-score.component.html' }) export class NavItemScoreComponent { - @Input() - averageScore: any; - - averageScoreDisplay: string = ''; - - @Input() - maxScore: any; - - showScore: boolean = false; + @Input() averageScore: number | string; + protected averageScoreDisplay: string = ''; + @Input() maxScore: number; + protected showScore: boolean; constructor(@Inject(LOCALE_ID) private locale: string) {} - ngOnChanges(changes) { + ngOnChanges(): void { if (typeof this.maxScore === 'number' || typeof this.averageScore === 'number') { this.showScore = true; this.averageScoreDisplay = this.getAverageScoreDisplay(); @@ -29,16 +26,14 @@ export class NavItemScoreComponent { } } - getAverageScoreDisplay(): string { + private getAverageScoreDisplay(): string { const averageScore = this.formatAverageScore(this.averageScore); - if (typeof this.maxScore === 'number') { - return `${averageScore}/${this.maxScore}`; - } else { - return `${averageScore}/0`; - } + return typeof this.maxScore === 'number' + ? `${averageScore}/${this.maxScore}` + : `${averageScore}/0`; } - formatAverageScore(averageScore: any): string { + private formatAverageScore(averageScore: number | string): number | string { if (typeof averageScore === 'number') { if (averageScore % 1 !== 0) { averageScore = formatNumber(averageScore, this.locale, '1.1-1').toString(); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html index 48b3c010485..7a4e12f17c5 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html @@ -19,8 +19,7 @@ > {{ component.assessmentItemIndex + '. ' + component.typeLabel }}  - - + menu {{ viewName }} - + @if (showStepTools) { + + } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.html index 0415e37e57a..54dc444b671 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.html @@ -6,8 +6,7 @@ matTooltipPosition="above" i18n-matTooltip > - - + {{ percent }}% diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.scss b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.spec.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.spec.ts index 4dec5f85da3..171f20d5b60 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.spec.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.spec.ts @@ -1,8 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import { ProjectProgressComponent } from './project-progress.component'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatTooltipModule } from '@angular/material/tooltip'; describe('ProjectProgressComponent', () => { let component: ProjectProgressComponent; @@ -10,8 +7,7 @@ describe('ProjectProgressComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ProjectProgressComponent], - imports: [MatProgressBarModule, MatTooltipModule] + imports: [ProjectProgressComponent] }).compileComponents(); }); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.ts index 6a993f3d48a..df409d94219 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/project-progress/project-progress.component.ts @@ -1,17 +1,17 @@ -import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, Input, ViewEncapsulation } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ + encapsulation: ViewEncapsulation.None, + imports: [FlexLayoutModule, MatProgressBarModule, MatTooltipModule], selector: 'project-progress', - templateUrl: './project-progress.component.html', - styleUrls: ['./project-progress.component.scss'], - encapsulation: ViewEncapsulation.None + standalone: true, + templateUrl: './project-progress.component.html' }) -export class ProjectProgressComponent implements OnInit { +export class ProjectProgressComponent { @Input() completed: number; @Input() percent: number; @Input() total: number; - - constructor() {} - - ngOnInit(): void {} } diff --git a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html index 6367f676dcc..1c76a077e73 100644 --- a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html +++ b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html @@ -81,8 +81,7 @@ [completed]="student.completion.completedItems" [total]="student.completion.totalItems" [percent]="student.completion.completionPct" - > - + />
{{ icons.prev }} -   +  
- + {{ getNodePositionAndTitle(nodeId) }} @@ -44,8 +40,6 @@ diff --git a/src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.ts b/src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.ts index 16bedfb07d0..525018efe28 100644 --- a/src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.ts +++ b/src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.ts @@ -1,17 +1,14 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; @Component({ + imports: [MatButtonModule, MatIconModule], selector: 'add-to-notebook-button', + standalone: true, templateUrl: 'add-to-notebook-button.component.html' }) -export class AddToNotebookButton { - @Input() - isDisabled: boolean; - - @Output() - snipImage = new EventEmitter(); - - addToNotebook() { - this.snipImage.next(); - } +export class AddToNotebookButtonComponent { + @Input() isDisabled: boolean; + @Output() snipImage = new EventEmitter(); } diff --git a/src/assets/wise5/directives/component-header/component-header.component.spec.ts b/src/assets/wise5/directives/component-header/component-header.component.spec.ts index 11431d39f1b..977d8dfda7d 100644 --- a/src/assets/wise5/directives/component-header/component-header.component.spec.ts +++ b/src/assets/wise5/directives/component-header/component-header.component.spec.ts @@ -1,19 +1,24 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ComponentHeader } from './component-header.component'; +import { ComponentHeaderComponent } from './component-header.component'; import { DomSanitizer } from '@angular/platform-browser'; -import { PromptComponent } from '../prompt/prompt.component'; -import { DynamicPromptComponent } from '../dynamic-prompt/dynamic-prompt.component'; import { ComponentContent } from '../../common/ComponentContent'; import { Component } from '../../common/Component'; +import { StudentTeacherCommonServicesModule } from '../../../../app/student-teacher-common-services.module'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { ProjectService } from '../../services/projectService'; -let component: ComponentHeader; -let fixture: ComponentFixture; +let component: ComponentHeaderComponent; +let fixture: ComponentFixture; describe('ComponentHeaderComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [ComponentHeader, DynamicPromptComponent, PromptComponent], + imports: [ + ComponentHeaderComponent, + HttpClientTestingModule, + StudentTeacherCommonServicesModule + ], providers: [ { provide: DomSanitizer, @@ -24,10 +29,11 @@ describe('ComponentHeaderComponent', () => { ], schemas: [NO_ERRORS_SCHEMA] }); + spyOn(TestBed.inject(ProjectService), 'getThemeSettings').and.returnValue({}); }); it('should show prompt', () => { - fixture = TestBed.createComponent(ComponentHeader); + fixture = TestBed.createComponent(ComponentHeaderComponent); component = fixture.componentInstance; component.component = new Component( { diff --git a/src/assets/wise5/directives/component-header/component-header.component.ts b/src/assets/wise5/directives/component-header/component-header.component.ts index fcd22335185..2ce0f130739 100644 --- a/src/assets/wise5/directives/component-header/component-header.component.ts +++ b/src/assets/wise5/directives/component-header/component-header.component.ts @@ -3,26 +3,31 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; import { Component as WISEComponent } from '../../common/Component'; import { FeedbackRule } from '../../components/common/feedbackRule/FeedbackRule'; import { DynamicPrompt } from '../dynamic-prompt/DynamicPrompt'; +import { PossibleScoreComponent } from '../../../../app/possible-score/possible-score.component'; +import { PromptComponent } from '../prompt/prompt.component'; +import { FlexLayoutModule } from '@angular/flex-layout'; @Component({ + imports: [FlexLayoutModule, PossibleScoreComponent, PromptComponent], selector: 'component-header', - styleUrls: ['component-header.component.scss'], + standalone: true, + styleUrl: 'component-header.component.scss', templateUrl: 'component-header.component.html' }) -export class ComponentHeader { +export class ComponentHeaderComponent { @Input() component: WISEComponent; - dynamicPrompt: DynamicPrompt; + protected dynamicPrompt: DynamicPrompt; @Output() dynamicPromptChanged: EventEmitter = new EventEmitter(); - prompt: SafeHtml; + protected prompt: SafeHtml; constructor(protected sanitizer: DomSanitizer) {} - ngOnInit() { + ngOnInit(): void { this.prompt = this.sanitizer.bypassSecurityTrustHtml(this.component.content.prompt); this.dynamicPrompt = new DynamicPrompt(this.component.content.dynamicPrompt); } - onDynamicPromptChanged(feedbackRule: FeedbackRule): void { + protected onDynamicPromptChanged(feedbackRule: FeedbackRule): void { this.dynamicPromptChanged.emit(feedbackRule); } } diff --git a/src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.html b/src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.html index 2710a3f35c7..1b1961997df 100644 --- a/src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.html +++ b/src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.html @@ -3,7 +3,7 @@ *ngIf="isSaveButtonVisible" mat-raised-button color="primary" - (click)="save()" + (click)="saveButtonClicked.next()" [disabled]="isDisabled || !isDirty" i18n > @@ -13,7 +13,7 @@ *ngIf="isSubmitButtonVisible" mat-raised-button color="primary" - (click)="submit()" + (click)="submitButtonClicked.next()" [disabled]="isSubmitButtonDisabled || isDisabled || !isSubmitDirty" i18n > diff --git a/src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.ts b/src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.ts index 7477aba01aa..3545823a9d3 100644 --- a/src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.ts +++ b/src/assets/wise5/directives/component-save-submit-buttons/component-save-submit-buttons.component.ts @@ -1,44 +1,25 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ComponentState } from '../../../../app/domain/componentState'; +import { CommonModule } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; +import { ComponentStateInfoComponent } from '../../common/component-state-info/component-state-info.component'; +import { FlexLayoutModule } from '@angular/flex-layout'; @Component({ + imports: [CommonModule, FlexLayoutModule, ComponentStateInfoComponent, MatButtonModule], selector: 'component-save-submit-buttons', - styleUrls: ['component-save-submit-buttons.component.scss'], + standalone: true, + styleUrl: 'component-save-submit-buttons.component.scss', templateUrl: 'component-save-submit-buttons.component.html' }) -export class ComponentSaveSubmitButtons { - @Input() - isDirty: boolean; - - @Input() - isDisabled: boolean; - - @Input() - isSaveButtonVisible: boolean; - - @Input() - isSubmitButtonDisabled: boolean; - - @Input() - isSubmitButtonVisible: boolean; - - @Input() - isSubmitDirty: boolean; - - @Input() - componentState: ComponentState; - - @Output() - saveButtonClicked = new EventEmitter(); - - @Output() - submitButtonClicked = new EventEmitter(); - - save() { - this.saveButtonClicked.next(); - } - - submit() { - this.submitButtonClicked.next(); - } +export class ComponentSaveSubmitButtonsComponent { + @Input() componentState: ComponentState; + @Input() isDirty: boolean; + @Input() isDisabled: boolean; + @Input() isSaveButtonVisible: boolean; + @Input() isSubmitButtonDisabled: boolean; + @Input() isSubmitButtonVisible: boolean; + @Input() isSubmitDirty: boolean; + @Output() saveButtonClicked = new EventEmitter(); + @Output() submitButtonClicked = new EventEmitter(); } diff --git a/src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts b/src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts index b0bafe63c78..c4db5c67f92 100644 --- a/src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts +++ b/src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts @@ -1,74 +1,58 @@ -'use strict'; - import { Component, Input, SimpleChanges } from '@angular/core'; import { SafeHtml } from '@angular/platform-browser'; -import { Subscription } from 'rxjs'; import { WiseLinkService } from '../../../../app/services/wiseLinkService'; import { ConfigService } from '../../services/configService'; import { StudentDataService } from '../../services/studentDataService'; import { VLEProjectService } from '../../vle/vleProjectService'; +import { CommonModule } from '@angular/common'; +import { SaveTimeMessageComponent } from '../../common/save-time-message/save-time-message.component'; +import { MatCardModule } from '@angular/material/card'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatIconModule } from '@angular/material/icon'; @Component({ + imports: [CommonModule, FlexLayoutModule, MatCardModule, MatIconModule, SaveTimeMessageComponent], selector: 'component-annotations', - styleUrls: ['component-annotations.component.scss'], + standalone: true, + styleUrl: 'component-annotations.component.scss', templateUrl: 'component-annotations.component.html' }) export class ComponentAnnotationsComponent { - @Input() - annotations: any; - - @Input() - maxScore: string; - - @Input() - nodeId: string; - - @Input() - componentId: string; - - comment: SafeHtml; - icon: string = 'person'; - isNew: boolean; - label: string; - latestAnnotationTime: any = null; - maxScoreDisplay: string; - showComment: boolean = true; - showScore: boolean = true; - studentWorkSavedToServerSubscription: Subscription; + @Input() annotations: any; + protected comment: SafeHtml; + @Input() componentId: string; + protected icon: string = 'person'; + protected label: string; + protected latestAnnotationTime: any = null; + @Input() maxScore: string; + protected maxScoreDisplay: string; + @Input() nodeId: string; + protected showComment: boolean = true; + protected showScore: boolean = true; constructor( private configService: ConfigService, + private dataService: StudentDataService, private projectService: VLEProjectService, - private studentDataService: StudentDataService, private wiseLinkService: WiseLinkService ) {} - ngOnInit() { + ngOnInit(): void { this.maxScoreDisplay = parseInt(this.maxScore) > 0 ? '/' + this.maxScore : ''; - this.studentWorkSavedToServerSubscription = this.studentDataService.studentWorkSavedToServer$.subscribe( - (componentState) => { - if ( - componentState.nodeId === this.nodeId && - componentState.componentId === this.componentId - ) { - this.isNew = false; - } - } - ); this.processAnnotations(); } - ngAfterViewInit() { + ngAfterViewInit(): void { this.processAnnotations(); } - ngOnChanges(changes: SimpleChanges) { + ngOnChanges(changes: SimpleChanges): void { if (!changes.annotations.isFirstChange()) { this.processAnnotations(); } } - processAnnotations(): void { + private processAnnotations(): void { if (this.annotations.comment || this.annotations.score) { this.nodeId = this.getNodeId(this.annotations); this.componentId = this.getComponentId(this.annotations); @@ -82,45 +66,45 @@ export class ComponentAnnotationsComponent { this.latestAnnotationTime = this.getLatestAnnotationTime(); } - getNodeId(annotations: any): string { + private getNodeId(annotations: any): string { return this.hasCommentAnnotation(annotations) ? annotations.comment.nodeId : annotations.score.nodeId; } - getComponentId(annotations: any): string { + private getComponentId(annotations: any): string { return this.hasCommentAnnotation(annotations) ? annotations.comment.componentId : annotations.score.componentId; } - isShowScore(annotations: any): boolean { + private isShowScore(annotations: any): boolean { return ( this.hasScoreAnnotation(annotations) && this.projectService.displayAnnotation(annotations.score) ); } - isShowComment(annotations: any): boolean { + private isShowComment(annotations: any): boolean { return ( this.hasCommentAnnotation(annotations) && this.projectService.displayAnnotation(this.annotations.comment) ); } - hasCommentAnnotation(annotations: any): boolean { + private hasCommentAnnotation(annotations: any): boolean { return annotations.comment != null; } - hasScoreAnnotation(annotations: any): boolean { + private hasScoreAnnotation(annotations: any): boolean { return annotations.score != null; } - getCommentHtml(commentAnnotation: any): SafeHtml { + private getCommentHtml(commentAnnotation: any): SafeHtml { return this.wiseLinkService.generateHtmlWithWiseLink(commentAnnotation.data.value); } - getLatestAnnotation() { + private getLatestAnnotation(): any { let latest = null; if (this.annotations.comment || this.annotations.score) { const commentSaveTime = this.getSaveTime(this.annotations.comment); @@ -134,7 +118,7 @@ export class ComponentAnnotationsComponent { return latest; } - getSaveTime(annotation: any): number { + private getSaveTime(annotation: any): number { let saveTime = null; if (annotation != null) { if (annotation.serverSaveTime != null) { @@ -147,7 +131,7 @@ export class ComponentAnnotationsComponent { return saveTime; } - getLatestAnnotationTime() { + private getLatestAnnotationTime(): any { const latest = this.getLatestAnnotation(); if (latest) { return this.configService.convertToClientTimestamp(this.getSaveTime(latest)); @@ -155,8 +139,8 @@ export class ComponentAnnotationsComponent { return null; } - getLatestVisitTime() { - let nodeEvents = this.studentDataService.getEventsByNodeId(this.nodeId); + private getLatestVisitTime(): any { + let nodeEvents = this.dataService.getEventsByNodeId(this.nodeId); let n = nodeEvents.length - 1; let visitTime = null; for (let i = n; i > 0; i--) { @@ -169,8 +153,8 @@ export class ComponentAnnotationsComponent { return visitTime; } - getLatestSaveTime() { - const latestState = this.studentDataService.getLatestComponentStateByNodeIdAndComponentId( + private getLatestSaveTime(): any { + const latestState = this.dataService.getLatestComponentStateByNodeIdAndComponentId( this.nodeId, this.componentId ); @@ -181,7 +165,7 @@ export class ComponentAnnotationsComponent { return saveTime; } - isNewAnnotation() { + protected isNewAnnotation(): boolean { let latestVisitTime = this.getLatestVisitTime(); let latestSaveTime = this.getLatestSaveTime(); let latestAnnotationTime = this.getLatestAnnotationTime(); @@ -195,7 +179,7 @@ export class ComponentAnnotationsComponent { return isNew; } - setLabelAndIcon() { + private setLabelAndIcon(): void { const latest = this.getLatestAnnotation(); if (latest) { if (latest.type === 'autoComment' || latest.type === 'autoScore') { diff --git a/src/assets/wise5/directives/dynamic-prompt/dynamic-prompt.component.spec.ts b/src/assets/wise5/directives/dynamic-prompt/dynamic-prompt.component.spec.ts index d5d016d5f1c..8c04b50b39c 100644 --- a/src/assets/wise5/directives/dynamic-prompt/dynamic-prompt.component.spec.ts +++ b/src/assets/wise5/directives/dynamic-prompt/dynamic-prompt.component.spec.ts @@ -25,8 +25,12 @@ const promptScore2: string = 'This is the prompt when you get a score of 2.'; describe('DynamicPromptComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [DynamicPromptComponent], - imports: [HttpClientTestingModule, MatDialogModule, StudentTeacherCommonServicesModule] + imports: [ + DynamicPromptComponent, + HttpClientTestingModule, + MatDialogModule, + StudentTeacherCommonServicesModule + ] }).compileComponents(); }); diff --git a/src/assets/wise5/directives/dynamic-prompt/dynamic-prompt.component.ts b/src/assets/wise5/directives/dynamic-prompt/dynamic-prompt.component.ts index 9dc5ccbf439..5c229884e58 100644 --- a/src/assets/wise5/directives/dynamic-prompt/dynamic-prompt.component.ts +++ b/src/assets/wise5/directives/dynamic-prompt/dynamic-prompt.component.ts @@ -10,39 +10,31 @@ import { ConstraintService } from '../../services/constraintService'; import { DynamicPromptOpenResponseEvaluator } from './DynamicPromptOpenResponseEvaluator'; import { DynamicPromptMultipleChoiceEvaluator } from './DynamicPromptMultipleChoiceEvaluator'; import { PeerGroup } from '../../components/peerChat/PeerGroup'; +import { CommonModule } from '@angular/common'; @Component({ + imports: [CommonModule], selector: 'dynamic-prompt', - templateUrl: './dynamic-prompt.component.html', - styleUrls: ['./dynamic-prompt.component.scss'] + standalone: true, + styleUrl: './dynamic-prompt.component.scss', + templateUrl: './dynamic-prompt.component.html' }) export class DynamicPromptComponent implements OnInit { - annotationService: AnnotationService; @Input() componentId: string; - configService: ConfigService; - constraintService: ConstraintService; - dataService: StudentDataService; @Input() dynamicPrompt: DynamicPrompt; @Output() dynamicPromptChanged: EventEmitter = new EventEmitter(); @Input() nodeId: string; - peerGroup: PeerGroup; - peerGroupService: PeerGroupService; - prompt: string; + public peerGroup: PeerGroup; + public prompt: string; constructor( - annotationService: AnnotationService, - configService: ConfigService, - constraintService: ConstraintService, - dataService: StudentDataService, - peerGroupService: PeerGroupService, + public annotationService: AnnotationService, + public configService: ConfigService, + public constraintService: ConstraintService, + public dataService: StudentDataService, + public peerGroupService: PeerGroupService, private projectService: ProjectService - ) { - this.annotationService = annotationService; - this.configService = configService; - this.constraintService = constraintService; - this.dataService = dataService; - this.peerGroupService = peerGroupService; - } + ) {} ngOnInit(): void { const referenceComponent = this.projectService.getReferenceComponent(this.dynamicPrompt); diff --git a/src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html b/src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html index 6bd906e560d..92748751c32 100644 --- a/src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html +++ b/src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html @@ -26,4 +26,4 @@ [nodeId]="componentState.nodeId" [componentId]="componentState.componentId" [componentState]="componentState" -> +/> diff --git a/src/assets/wise5/directives/prompt/prompt.component.spec.ts b/src/assets/wise5/directives/prompt/prompt.component.spec.ts index e1a0e534d94..e1b1ec85469 100644 --- a/src/assets/wise5/directives/prompt/prompt.component.spec.ts +++ b/src/assets/wise5/directives/prompt/prompt.component.spec.ts @@ -4,7 +4,6 @@ import { MatDialogModule } from '@angular/material/dialog'; import { StudentTeacherCommonServicesModule } from '../../../../app/student-teacher-common-services.module'; import { ComponentContent } from '../../common/ComponentContent'; import { ProjectService } from '../../services/projectService'; -import { DynamicPromptComponent } from '../dynamic-prompt/dynamic-prompt.component'; import { DynamicPrompt } from '../dynamic-prompt/DynamicPrompt'; import { PromptComponent } from './prompt.component'; @@ -17,8 +16,12 @@ describe('PromptComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [PromptComponent, DynamicPromptComponent], - imports: [HttpClientTestingModule, MatDialogModule, StudentTeacherCommonServicesModule] + imports: [ + HttpClientTestingModule, + MatDialogModule, + PromptComponent, + StudentTeacherCommonServicesModule + ] }).compileComponents(); }); diff --git a/src/assets/wise5/directives/prompt/prompt.component.ts b/src/assets/wise5/directives/prompt/prompt.component.ts index feeebc6f16a..c2c76c3af13 100644 --- a/src/assets/wise5/directives/prompt/prompt.component.ts +++ b/src/assets/wise5/directives/prompt/prompt.component.ts @@ -1,24 +1,24 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FeedbackRule } from '../../components/common/feedbackRule/FeedbackRule'; import { DynamicPrompt } from '../dynamic-prompt/DynamicPrompt'; +import { CommonModule } from '@angular/common'; +import { DynamicPromptComponent } from '../dynamic-prompt/dynamic-prompt.component'; @Component({ + imports: [CommonModule, DynamicPromptComponent], selector: 'prompt', - templateUrl: './prompt.component.html', - styleUrls: ['./prompt.component.scss'] + standalone: true, + styleUrl: './prompt.component.scss', + templateUrl: './prompt.component.html' }) -export class PromptComponent implements OnInit { +export class PromptComponent { @Input() componentId: string; @Input() dynamicPrompt: DynamicPrompt; @Output() dynamicPromptChanged: EventEmitter = new EventEmitter(); @Input() nodeId: string; @Input() prompt: string; - constructor() {} - - ngOnInit(): void {} - - onDynamicPromptChanged(feedbackRule: FeedbackRule): void { + protected onDynamicPromptChanged(feedbackRule: FeedbackRule): void { this.dynamicPromptChanged.emit(feedbackRule); } } diff --git a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.spec.ts b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.spec.ts index 707976e6123..bb50a6a7313 100644 --- a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.spec.ts +++ b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.spec.ts @@ -1,9 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialogModule } from '@angular/material/dialog'; import { StudentTeacherCommonServicesModule } from '../../../../app/student-teacher-common-services.module'; import { WiseTinymceEditorComponent } from './wise-tinymce-editor.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; let component: WiseTinymceEditorComponent; let fixture: ComponentFixture; @@ -11,9 +9,11 @@ let fixture: ComponentFixture; describe('WiseTinymceEditorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [WiseTinymceEditorComponent], - imports: [HttpClientTestingModule, MatDialogModule, StudentTeacherCommonServicesModule], - schemas: [NO_ERRORS_SCHEMA] + imports: [ + HttpClientTestingModule, + StudentTeacherCommonServicesModule, + WiseTinymceEditorComponent + ] }).compileComponents(); fixture = TestBed.createComponent(WiseTinymceEditorComponent); component = fixture.componentInstance; diff --git a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts index eb9221e5acc..0493aa5a198 100644 --- a/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts +++ b/src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, Output, SimpleChanges, ViewChild } from import { debounceTime } from 'rxjs/operators'; import { Subject, Subscription } from 'rxjs'; import { NotebookService } from '../../services/notebookService'; +import { EditorModule } from '@tinymce/tinymce-angular'; import 'tinymce'; import { EditorComponent } from '@tinymce/tinymce-angular'; import { Language } from '../../../../app/domain/language'; @@ -10,32 +11,26 @@ declare let tinymce: any; @Component({ selector: 'wise-tinymce-editor', - styleUrls: ['wise-tinymce-editor.component.scss'], - templateUrl: 'wise-tinymce-editor.component.html' + styleUrl: 'wise-tinymce-editor.component.scss', + templateUrl: 'wise-tinymce-editor.component.html', + standalone: true, + imports: [EditorModule] }) export class WiseTinymceEditorComponent { - @ViewChild(EditorComponent) editorComponent: EditorComponent; - public editor: any; public config: any; + private debouncer: Subject = new Subject(); @Input() disabled: boolean; - private previousContent: string; - + public editor: any; + @ViewChild(EditorComponent) editorComponent: EditorComponent; + @Input() isAddNoteButtonAvailable: boolean; @Input() language: Language; - - @Input() - model: string; - - @Input() - isAddNoteButtonAvailable: boolean; - - @Output() - modelChange: EventEmitter = new EventEmitter(); - - @Output() - openNotebook: EventEmitter = new EventEmitter(); - - private debouncer: Subject = new Subject(); - subscriptions: Subscription = new Subscription(); + @Input() model: any; + @Output() modelChange: EventEmitter = new EventEmitter(); + @Output() openNotebook: EventEmitter = new EventEmitter(); + private previousContent: string; + private subscriptions: Subscription = new Subscription(); + protected toolbar: string = `undo redo | bold italic underline | numlist bullist`; + protected toolbarGroups: any; protected aValidAttributes: string = 'a[href|download|referrerpolicy|rel|target|type|style|' + @@ -46,7 +41,6 @@ export class WiseTinymceEditorComponent { 'onmouseover|onmouseup|style|tabindex|title|type|value|wiselink|node-id|component-id|' + 'link-text]'; protected extendedValidElements: string = `${this.aValidAttributes},${this.buttonValidAttributes}`; - protected plugins: string[] = [ 'advlist', 'anchor', @@ -85,10 +79,7 @@ export class WiseTinymceEditorComponent { 'wordcount' ]; - protected toolbar: string = `undo redo | bold italic underline | numlist bullist`; - protected toolbarGroups: any; - - constructor(private NotebookService: NotebookService) { + constructor(private notebookService: NotebookService) { this.subscriptions.add( this.debouncer.pipe(debounceTime(1000)).subscribe((value) => { this.modelChange.emit(value); @@ -99,7 +90,7 @@ export class WiseTinymceEditorComponent { ngOnInit(): void { if (this.isAddNoteButtonAvailable) { this.subscriptions.add( - this.NotebookService.notebookItemChosen$.subscribe(({ requester, notebookItem }) => { + this.notebookService.notebookItemChosen$.subscribe(({ requester, notebookItem }) => { if (requester === 'report') { this.insertWISENote(notebookItem); } @@ -135,7 +126,7 @@ export class WiseTinymceEditorComponent { this.plugins.push(pluginName); } - initializeTinyMCE(): void { + protected initializeTinyMCE(): void { this.config = { base_url: '/tinymce', suffix: '.min', @@ -180,7 +171,7 @@ export class WiseTinymceEditorComponent { }; } - initializeInsertWISENotePlugin(): void { + private initializeInsertWISENotePlugin(): void { const thisWiseTinymceEditorComponent = this; tinymce.PluginManager.add('wisenote', function (editor: any, url: string) { thisWiseTinymceEditorComponent.editor = editor; @@ -194,7 +185,7 @@ export class WiseTinymceEditorComponent { }); } - insertWISENote(notebookItem: any): void { + private insertWISENote(notebookItem: any): void { const attachmentURLs = this.getAttachmentURLs(notebookItem); const text = this.getText(notebookItem); let noteContent = this.getAttachmentsHTML(attachmentURLs, text); @@ -235,7 +226,7 @@ export class WiseTinymceEditorComponent { return attachmentURLs; } - getText(notebookItem: any): string { + private getText(notebookItem: any): string { return notebookItem.content.text; } @@ -243,7 +234,7 @@ export class WiseTinymceEditorComponent { this.subscriptions.unsubscribe(); } - onChange(event: any): void { + protected onChange(event: any): void { const newContent = event.editor.getContent(); if (this.isContentChanged(this.previousContent, newContent)) { this.debouncer.next(newContent); @@ -251,7 +242,7 @@ export class WiseTinymceEditorComponent { } } - isContentChanged(previousContent: string, newContent: string): boolean { + private isContentChanged(previousContent: string, newContent: string): boolean { return previousContent !== newContent; } @@ -266,7 +257,7 @@ export class WiseTinymceEditorComponent { return content; } - getAudioSourceHTML(src: string, mime: string): string { + private getAudioSourceHTML(src: string, mime: string): string { let content = ''; content += ` = new Subject(); + public newTag$: Observable = this.newTagSource.asObservable(); + private tagDeletedSource: Subject = new Subject(); + public tagDeleted$: Observable = this.tagDeletedSource.asObservable(); + private tagUpdatedSource: Subject = new Subject(); + public tagUpdated$: Observable = this.tagUpdatedSource.asObservable(); + + constructor(protected http: HttpClient) {} + + retrieveUserTags(): Observable { + return this.http + .get(`/api/user/tags`) + .pipe(map((tags) => tags.filter((tag) => tag.text !== 'archived'))); + } + + applyTagToProjects(tag: Tag, projects: Project[]): Observable { + const projectIds = projects.map((project) => project.id); + return this.http.put(`/api/projects/tag/${tag.id}`, projectIds); + } + + removeTagFromProjects(tag: Tag, projects: Project[]): Observable { + let params = new HttpParams(); + for (const project of projects) { + params = params.append('projectIds', project.id); + } + return this.http.delete(`/api/projects/tag/${tag.id}`, { + params: params + }); + } + + updateTag(tag: Tag): Observable { + return this.http.put(`/api/user/tag/${tag.id}`, tag).pipe( + tap((tag) => { + this.tagUpdatedSource.next(tag); + }) + ); + } + + createTag(tagName: string, color: string): Observable { + return this.http.post(`/api/user/tag`, { text: tagName, color: color }).pipe( + tap((tag: Tag) => { + this.newTagSource.next(tag); + }) + ); + } + + sortTags(tags: Tag[]): Tag[] { + return tags.sort((a, b) => a.text.toLowerCase().localeCompare(b.text.toLowerCase())); + } + + deleteTag(tag: Tag): Observable { + return this.http.delete(`/api/user/tag/${tag.id}`).pipe( + tap((tag: Tag) => { + this.tagDeletedSource.next(tag); + }) + ); + } +} diff --git a/src/assets/wise5/services/tagService.ts b/src/assets/wise5/services/tagService.ts index f6166dfee56..dad97205668 100644 --- a/src/assets/wise5/services/tagService.ts +++ b/src/assets/wise5/services/tagService.ts @@ -8,7 +8,7 @@ import { ProjectService } from './projectService'; @Injectable() export class TagService { - tags: any[] = []; + private tags: any[] = []; constructor( protected http: HttpClient, diff --git a/src/assets/wise5/services/teacherProjectService.ts b/src/assets/wise5/services/teacherProjectService.ts index 1b5c144cd95..9076dad02be 100644 --- a/src/assets/wise5/services/teacherProjectService.ts +++ b/src/assets/wise5/services/teacherProjectService.ts @@ -1645,7 +1645,7 @@ export class TeacherProjectService extends ProjectService { } // remove the transition to the node we are removing - transitions.splice(t, 1); + const transitionRemoved = transitions.splice(t, 1)[0]; if (transitionsCopy != null) { let insertIndex = t; @@ -1686,6 +1686,9 @@ export class TeacherProjectService extends ProjectService { ) { this.addToTransition(node, this.getGroupStartId(toNodeId)); } else { + if (transitionRemoved.criteria != null) { + transitionCopy.criteria = transitionRemoved.criteria; + } transitions.splice(insertIndex, 0, transitionCopy); insertIndex++; } @@ -2698,7 +2701,7 @@ export class TeacherProjectService extends ProjectService { if (groupIdWeAreMoving === toNodeIdParentGroupId) { // the transition is to a child in the group we are moving - if (groupNode.startId == null) { + if (groupNode.startId == null || groupNode.startId === '') { // change the transition to point to the after group transitionFromChild.to = firstNodeToRemoveTransitionToNodeId; } else { diff --git a/src/assets/wise5/themes/default/navigation/navigation.component.spec.ts b/src/assets/wise5/themes/default/navigation/navigation.component.spec.ts index ce0c5b443d9..c0b4cf3eb02 100644 --- a/src/assets/wise5/themes/default/navigation/navigation.component.spec.ts +++ b/src/assets/wise5/themes/default/navigation/navigation.component.spec.ts @@ -1,6 +1,5 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialogModule } from '@angular/material/dialog'; import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module'; import { NavigationComponent } from './navigation.component'; @@ -10,8 +9,7 @@ describe('NavigationComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, MatDialogModule, StudentTeacherCommonServicesModule], - declarations: [NavigationComponent] + imports: [HttpClientTestingModule, NavigationComponent, StudentTeacherCommonServicesModule] }).compileComponents(); }); diff --git a/src/assets/wise5/themes/default/navigation/navigation.component.ts b/src/assets/wise5/themes/default/navigation/navigation.component.ts index 0cbc3a8ebc2..1041f16b268 100644 --- a/src/assets/wise5/themes/default/navigation/navigation.component.ts +++ b/src/assets/wise5/themes/default/navigation/navigation.component.ts @@ -1,21 +1,26 @@ import { Component, Input } from '@angular/core'; import { Subscription } from 'rxjs'; import { StudentDataService } from '../../../services/studentDataService'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { NavItemComponent } from '../../../vle/nav-item/nav-item.component'; @Component({ + imports: [CommonModule, FlexLayoutModule, NavItemComponent], selector: 'navigation', - templateUrl: './navigation.component.html', - styleUrls: ['./navigation.component.scss'] + standalone: true, + styleUrl: './navigation.component.scss', + templateUrl: './navigation.component.html' }) export class NavigationComponent { - navItemIsExpanded: any = {}; - navItemIsExpandedSubscription: Subscription; + protected navItemIsExpanded: { [nodeId: string]: boolean } = {}; + private navItemIsExpandedSubscription: Subscription; @Input() rootNode: any; - constructor(private studentDataService: StudentDataService) {} + constructor(private dataService: StudentDataService) {} ngAfterViewInit(): void { - this.navItemIsExpandedSubscription = this.studentDataService.navItemIsExpanded$.subscribe( + this.navItemIsExpandedSubscription = this.dataService.navItemIsExpanded$.subscribe( ({ nodeId, isExpanded }) => { this.navItemIsExpanded[nodeId] = isExpanded; } diff --git a/src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts b/src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts index c8d606fb31d..e0580b78e6f 100644 --- a/src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts +++ b/src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts @@ -1,14 +1,17 @@ -'use strict'; - import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { DialogWithCloseComponent } from '../../../../directives/dialog-with-close/dialog-with-close.component'; import { WiseLinkService } from '../../../../../../app/services/wiseLinkService'; import { VLEProjectService } from '../../../../vle/vleProjectService'; +import { CommonModule } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; @Component({ + imports: [CommonModule, MatButtonModule, MatIconModule], selector: 'help-icon', - styleUrls: ['help-icon.component.scss'], + standalone: true, + styleUrl: 'help-icon.component.scss', templateUrl: 'help-icon.component.html' }) export class HelpIconComponent { @@ -24,7 +27,7 @@ export class HelpIconComponent { private wiseLinkService: WiseLinkService ) {} - showRubric() { + protected showRubric(): void { this.dialog.open(DialogWithCloseComponent, { data: { content: this.wiseLinkService.generateHtmlWithWiseLink( diff --git a/src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.module.ts b/src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.module.ts deleted file mode 100644 index 91aa70a7e93..00000000000 --- a/src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; -import { HelpIconComponent } from './help-icon.component'; - -@NgModule({ - declarations: [HelpIconComponent], - imports: [CommonModule, MatButtonModule, MatIconModule], - exports: [HelpIconComponent] -}) -export class HelpIconModule {} diff --git a/src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.ts b/src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.ts index b43ab920a73..fd7e740f474 100644 --- a/src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.ts +++ b/src/assets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.ts @@ -1,18 +1,22 @@ import { Component, Input } from '@angular/core'; import { NodeStatusService } from '../../../../services/nodeStatusService'; +import { CommonModule } from '@angular/common'; +import { MatIconModule } from '@angular/material/icon'; @Component({ + imports: [CommonModule, MatIconModule], selector: 'node-status-icon', - styleUrls: ['node-status-icon.component.scss'], + standalone: true, + styleUrl: 'node-status-icon.component.scss', templateUrl: 'node-status-icon.component.html' }) -export class NodeStatusIcon { +export class NodeStatusIconComponent { @Input() nodeId: string; - nodeStatus: any; + protected nodeStatus: any; constructor(private nodeStatusService: NodeStatusService) {} - ngOnChanges() { + ngOnChanges(): void { this.nodeStatus = this.nodeStatusService.getNodeStatusByNodeId(this.nodeId); } } diff --git a/src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html b/src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html index 88e2245d573..aff929afab4 100644 --- a/src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html +++ b/src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html @@ -12,8 +12,9 @@ {{ icons.prev }}
- -
  + +
+   {{ getNodePositionAndTitle(nodeId) }} - - -
- - - {{ - getNodePositionAndTitle(nodeId) - }} -
- - + @for (nodeId of nodeIds; track nodeId) { + @if (nodeStatuses[nodeId].isVisible) { + +
+ + {{ + getNodePositionAndTitle(nodeId) + }} +
+ + } + }
- +
- + diff --git a/src/assets/wise5/vle/node/node.component.html b/src/assets/wise5/vle/node/node.component.html index fb41668e9c8..80d48a473e4 100644 --- a/src/assets/wise5/vle/node/node.component.html +++ b/src/assets/wise5/vle/node/node.component.html @@ -10,7 +10,7 @@ fxLayout="row" fxLayoutAlign="center center" > - +
- + />
- +
{ MatToolbarModule, MatSelectModule, MatSidenavModule, + NavigationComponent, NodeIconComponent, + NodeStatusIconComponent, + StepToolsComponent, StudentTeacherCommonServicesModule, TopBarComponent ], - declarations: [ - NavigationComponent, - NodeComponent, - NodeStatusIcon, - NotebookNotesComponent, - SafeUrl, - StepToolsComponent, - VLEComponent - ], + declarations: [NodeComponent, NotebookNotesComponent, SafeUrl, VLEComponent], providers: [ InitializeVLEService, PauseScreenService, diff --git a/src/locale/messages.ar.xlf b/src/locale/messages.ar.xlf index 7a838b3c352..ffc6599160e 100644 --- a/src/locale/messages.ar.xlf +++ b/src/locale/messages.ar.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.de.xlf b/src/locale/messages.de.xlf index 3aa0baaeff1..de84eb46c72 100644 --- a/src/locale/messages.de.xlf +++ b/src/locale/messages.de.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.el.xlf b/src/locale/messages.el.xlf index 883f29bce21..dbd19ca0b7b 100644 --- a/src/locale/messages.el.xlf +++ b/src/locale/messages.el.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.es.xlf b/src/locale/messages.es.xlf index a15b3fd10ba..d4c30367354 100644 --- a/src/locale/messages.es.xlf +++ b/src/locale/messages.es.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Incrementar la participación en ciencias @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE brinda a más docentes y estudiantes la oportunidad de hacer ciencia basada en la investigación. Nuestras unidades hacen que conceptos difíciles sean accesibles tanto para que los docentes enseñen como para que los estudiantes aprendan. Los planes de estudio de WISE ayudan a los estudiantes a verse a sí mismos como capaces de hacer ciencia y a darse cuenta de que, sin importar sus antecedentes, la ciencia puede ser una carrera potencial. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accesible a todos y todas @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE es gratuito y de código abierto! WISE subsiste gracias al generoso apoyo de la National Science Foundation, lo que significa que está disponible para cualquier persona con conexión a Internet. Impulsado por una comunidad activa de desarrolladores, WISE se amplía y mejora continuamente. ¡Llevar la investigación científica al aula, al museo, al entorno extraescolar o al hogar-escuela! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE en la computadora de cada estudiante @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 Investigador/a WISE @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 Docentes e investigadores WISE @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 Desarrolladores y docentes WISE @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Atrás @@ -1750,39 +1754,11 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Biblioteca de Unidades - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Paso - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo (Este componente) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Paso + New @@ -2148,7 +2152,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/app/register/register-home/register-home.component.html - 27 + 30 Docente @@ -2260,11 +2264,11 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Falló el recaptcha. Por favor recargue la página y pruebe nuevamente! @@ -2740,7 +2744,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/app/register/register-home/register-home.component.html - 17 + 20 Estudiante @@ -2884,11 +2888,11 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 Este sitio está protegido por reCAPTCHA y las Polítivcas de Privacidad de Google y los Términos del servicio que aplican. @@ -5176,7 +5180,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 Las ventajas de WISE @@ -5184,7 +5188,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Oferta de currículum @@ -5192,7 +5196,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 ¿Le interesa probar WISE con sus estudiantes? @@ -5200,7 +5204,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Sign up for free! src/app/home/home.component.html - 113 + 112 ¡Regístrese gratis! @@ -5208,7 +5212,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Connect src/app/home/home.component.html - 129 + 128 Conectar @@ -5216,7 +5220,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 ¡Únase! Discutamos los asuntos de WISE. @@ -5280,7 +5284,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo View tutorials and common questions. src/app/home/home.component.html - 189 + 188 Ver tutoriales y preguntas comunes. @@ -5300,7 +5304,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 ¿Quieres ponerse en contacto? Envíanos un mensaje. @@ -5440,11 +5444,31 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Iniciar sesión con Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 ¿Olvidó su usuario o contraseña? @@ -5452,7 +5476,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 ¿No tienes cuenta en WISE? Unirse ahora @@ -5490,13 +5514,17 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Crear cuenta @@ -6708,7 +6736,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Buscar @@ -6906,7 +6934,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Feedback del Docente @@ -7642,11 +7670,19 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Perdón, tu ID de usuario de Google no fue encontrado en WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Crear cuenta de WISE @@ -7654,7 +7690,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Los estudiantes pueden ver y completar unidades de WISE que ofrecen los docentes. @@ -7662,10 +7698,34 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Los docentes pueden seleccionar, crear y ejecutar unidades de WISE con sus estudiantes. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 Al hacer clic en "Crear Cuenta", usted acepta nuestra Política de Privacidad & Términos de Uso. @@ -7794,11 +7854,11 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Registrarse + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 Acepto laPolítica de Privacidad &y Términos de Uso de WISE * @@ -8014,7 +8086,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 Debe aceptar las Políticas de Privacidad & Términos de Uso @@ -9456,6 +9528,10 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + Todos @@ -10834,12 +10910,16 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Avanzado - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 ¿Seguro que desea borrar la fecha de inicio? @@ -10870,7 +10950,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 ¿Seguro que desea borrar la fecha de inicio? Esto también cerrará la ventana de vista previa. @@ -12849,7 +12929,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 ¿Está seguro de que desea quitar este componente? @@ -12858,7 +12938,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 ¿Seguro de eliminar estos componentes? @@ -13186,7 +13266,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (Ninguno seleccionado) @@ -13194,7 +13274,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Elegir lógica de armado de grupos de pares @@ -13202,7 +13282,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Elegir @@ -13262,19 +13342,27 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Equipos por Grupo de pares: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Arrastrar imagen o archivo acá o clic para subir + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Arrastrar archivo o imagen aquí o hacer clic para cargar! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 Estás usando de un total de (%) @@ -13282,7 +13370,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Ordenar activos @@ -13290,7 +13378,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 Nombre de archivo A->Z @@ -13298,7 +13386,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 Nombre del archivo Z->A @@ -13306,7 +13394,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 Tamaño de archivo pequeño -> grande @@ -13314,7 +13402,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 Tamaño de archivo grande -> pequeño @@ -13322,7 +13410,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Elegir @@ -13330,7 +13418,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Sin Usar) @@ -13338,7 +13426,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Bajar @@ -13359,7 +13447,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 El archivo que estás intentando subir es mayor de 500 KB. Recomendamos usar archivos más pequeños para que se carguen más rápido para los estudiantes. ¿Estás seguro de que quieres subir este archivo grande? @@ -13369,7 +13457,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 Uno de los archivos que estás intentando subir es mayor de 500 KB. Recomendamos el uso de archivos más pequeños para que se cargen más rápido para los estudiantes. ¿Estás seguro de que quieres subir el archivo grande? @@ -13379,7 +13467,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 de los archivos que estás intentando subir son mayores de 500 KB. Te recomendamos usar archivos más pequeños para que se cargen más rápido para los estudiantes. ¿Estás seguro de que quieres subir estos archivos grandes? @@ -13388,7 +13476,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Subido con éxito: @@ -13396,7 +13484,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error subiendo: @@ -13580,7 +13668,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 ¿Está seguro de que desea eliminar el elemento seleccionado? @@ -13588,7 +13676,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 ¿Seguro que desea eliminar los items seleccionados? @@ -15360,7 +15448,7 @@ Hacer clic en "Cancelar" para mantener abierto el JSON no válido y solucionarlo Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Info del item @@ -15532,7 +15620,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15556,43 +15644,31 @@ Are you sure you want to proceed? Exportar un grupo por fila - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Exportar el último trabajo - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Exportar el último trabajo - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Exportar todos los trabajos + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Exportar todos los trabajos + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Exportar eventos @@ -15600,7 +15676,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Exportar eventos @@ -15608,7 +15684,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Exportar los últimos items del Cuaderno @@ -15616,7 +15692,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Exportar los últimos items del Cuaderno @@ -15624,7 +15700,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Exportar todos los items del Cuaderno @@ -15632,7 +15708,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Exportar todos los items del Cuaderno @@ -15640,7 +15716,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Exportar notificaciones @@ -15648,7 +15724,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Exportar notificaciones @@ -15656,7 +15732,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Exportar Cosas de Estudiantes @@ -15664,7 +15740,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Exportar Cosas de Estudiantes @@ -15672,7 +15748,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15684,7 +15760,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Exportar dato del item @@ -15692,7 +15768,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15704,7 +15780,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Exportar datos crudos @@ -15712,7 +15788,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Exportar visitas de paso @@ -15720,305 +15796,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Exportar visitas de paso - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Por defecto + Incluir eventos de estudiantes - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Todo + Incluir eventos de docentes - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Incluir trabajo de estudiante + Incluir Nombres - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Incluir ID de estudiantes - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Incluir nombres de estudiantes + Exportar - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Incluir registro del momento en que trabajaron los estudiantes - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Incluir la ramificación tomada + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Incluir el ID de nodo de la ramificación elegida + Incluir columnas de corrección - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Incluir título del paso de ramificación elegida + Incluir solo envíos - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Incluir puntajes + Bajar a disco revisiones - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Incluir tiempos de puntaje + Bajar a disco últimas revisiones exportadas - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Incluir comentarios - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Incluir tiempo de comentarios + Última - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Incluir nombres de estudiantes + Clave de columna de corrección: 0 = Incorrecto, 1 = Correcto, 2 = Cubo correcto pero posición incorrecta - - Export + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Exportar + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Exportar + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancelar + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Clave de columna de corrección: 0 = Incorrecto, 1 = Correcto, 2 = Cubo correcto pero posición incorrecta + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - Un grupo de trabajo por fila + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Últimos trabajos de estudiante + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - Todos los trabajos del estudiante + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Eventos + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Incluir eventos de estudiantes + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Incluir eventos de docentes + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Incluir Nombres + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Exportar + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Incluir nombres de estudiantes - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Incluir columnas de corrección - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Incluir solo envíos - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Bajar a disco revisiones + Exportar - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Bajar a disco últimas revisiones exportadas + Por defecto - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Última + Todo Include Student Work @@ -16026,7 +16046,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 19,21 - Incluir trabajo de estudiante + Include Student Work Include Annotations @@ -16556,6 +16576,30 @@ Are you sure you want to proceed? Completado + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Agregar respuesta... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Enviar + @@ -16750,7 +16794,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Enviado @@ -16758,7 +16802,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Guardado @@ -16766,7 +16810,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Guardado @@ -16830,6 +16874,160 @@ Are you sure you want to proceed? Paso Siguiente + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Habilitar avatar de computadora + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Respuesta guiada automatizada + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Respuesta de estudiante + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16966,7 +17164,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18558,7 +18756,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Retroalimentación @@ -18872,78 +19070,6 @@ Nombre de la categoría: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Habilitar avatar de computadora - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Agregar respuesta... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Enviar - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Respuesta de estudiante - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Respuesta guiada automatizada - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discutir tu respuesta con un compañero! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - ¡Hola! Mucho gusto. ¿Qué pensás acerca de... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Compañero de reflexión - Use Global Computer Avatar @@ -19240,7 +19366,7 @@ Nombre de la categoría: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Compartir con clase... @@ -19248,7 +19374,7 @@ Nombre de la categoría: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Quitar archivo @@ -19256,7 +19382,7 @@ Nombre de la categoría: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Agregar imagen @@ -19264,7 +19390,7 @@ Nombre de la categoría: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Publicar @@ -20514,7 +20640,7 @@ Nombre de la categoría: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Agregar al Cuaderno digital @@ -22395,14 +22521,6 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Miembros del Chat: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Enviar - Make this message viewable to students again @@ -23601,7 +23719,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 Archivo @@ -23609,7 +23727,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insertar desde Notebook @@ -23617,7 +23735,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insertar nota + @@ -23625,7 +23743,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Imágenes del cuaderno digital @@ -23633,7 +23751,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23642,7 +23760,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23651,7 +23769,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23660,7 +23778,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23669,7 +23787,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23678,7 +23796,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23687,7 +23805,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23696,7 +23814,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23705,7 +23823,7 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23714,11 +23832,35 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discutir tu respuesta con un compañero! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + ¡Hola! Mucho gusto. ¿Qué pensás acerca de... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Compañero de reflexión + Student @@ -24323,18 +24465,6 @@ Si este problema continúa, informale a tu docente y continuá con la siguiente Quitar archivo - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Arrastrar archivo o imagen aquí o hacer clic para cargar! - Share with Class diff --git a/src/locale/messages.fa.xlf b/src/locale/messages.fa.xlf index 09bd9a484e5..fccb04f20c4 100644 --- a/src/locale/messages.fa.xlf +++ b/src/locale/messages.fa.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.fr.xlf b/src/locale/messages.fr.xlf index 7a87ba1fc1d..98aa3efca6e 100644 --- a/src/locale/messages.fr.xlf +++ b/src/locale/messages.fr.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.he.xlf b/src/locale/messages.he.xlf index 89b4e93221d..2adead1c21d 100644 --- a/src/locale/messages.he.xlf +++ b/src/locale/messages.he.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.it.xlf b/src/locale/messages.it.xlf index db0ce3ae2a8..9d23e3f43b5 100644 --- a/src/locale/messages.it.xlf +++ b/src/locale/messages.it.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessibile a tutti @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Indietro @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Insegnante @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Studente @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Iscriviti gratis! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Vuoi contattarci? Inviaci un messaggio. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Accedi con Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Hai dimenticato il nome utente o la password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Crea account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Cerca @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.ja.xlf b/src/locale/messages.ja.xlf index f03d1cf56a2..57351598727 100644 --- a/src/locale/messages.ja.xlf +++ b/src/locale/messages.ja.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + 戻る @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. ライブラリのユニット - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 教師 @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 学生 @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 無料で新規登録 @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 アカウント作成 @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 検索 @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 アカウント作成 @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.ko.xlf b/src/locale/messages.ko.xlf index 74ac9b01846..12ebfde9f58 100644 --- a/src/locale/messages.ko.xlf +++ b/src/locale/messages.ko.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.nl.xlf b/src/locale/messages.nl.xlf index 1b142b1e6f3..1218289fc92 100644 --- a/src/locale/messages.nl.xlf +++ b/src/locale/messages.nl.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.pt.xlf b/src/locale/messages.pt.xlf index 7badbe9b47b..25b83ae9781 100644 --- a/src/locale/messages.pt.xlf +++ b/src/locale/messages.pt.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Inscreva-se gratuitamente! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Criar Conta @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.th.xlf b/src/locale/messages.th.xlf index 0b8bc401d6c..1f5fd33ccaf 100644 --- a/src/locale/messages.th.xlf +++ b/src/locale/messages.th.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 นักวิจัย WISE @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 ครูผู้สอนและนักวิจัย WISE @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 นักพัฒนาและครูผู้สอน WISE @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + ย้อนหลัง @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.tr.xlf b/src/locale/messages.tr.xlf index cb8e3a3e15e..63b6f4d4e51 100644 --- a/src/locale/messages.tr.xlf +++ b/src/locale/messages.tr.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Fene Katılımı Artırın @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Herkese Erişime Açık @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 Öğrenci bilgisayarında WISE @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE araştırmacısı @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE öğretmenleri ve araştırmacı @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE geliştiricileri ve öğretmenleri @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Geri @@ -1750,39 +1754,11 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/app/register/register-home/register-home.component.html - 27 + 30 Öğretmen @@ -2260,11 +2264,11 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/app/register/register-home/register-home.component.html - 17 + 20 Öğrenci @@ -2884,11 +2888,11 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Sınıfta WISE'ı denemeye hazır mısın? @@ -5200,7 +5204,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Sign up for free! src/app/home/home.component.html - 113 + 112 Ücretsiz kaydol! @@ -5208,7 +5212,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Connect src/app/home/home.component.html - 129 + 128 Bağlan @@ -5216,7 +5220,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Bize katılın! WISE ile ilgili her şeyi tartışın. @@ -5280,7 +5284,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 Öğreticileri ve genel soruları görüntüleyin. @@ -5300,7 +5304,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 İletişimde mi kalmak istiyorsunuz? Bize bir mesaj gönderin. @@ -5440,11 +5444,31 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Google ile Giriş Yapın + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Kullanıcı adı veya parolanızı unuttunuz mu? @@ -5452,7 +5476,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 WISE'da yeni misiniz? Ücretsiz katılın! @@ -5490,13 +5514,17 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Hesap Oluştur @@ -6708,7 +6736,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Ara @@ -6906,7 +6934,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 WISE Hesabı Oluşturun @@ -7654,7 +7690,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Öğrenciler öğretmenleri tarafından önerilen WISE derslerini görüntüleyebilir ve tamamlayabilirler. @@ -7662,10 +7698,34 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Kaydol + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Seç @@ -13264,19 +13344,27 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Geçesiz JSON'u açık tutup düzeltebilmek için "İptal"e tıkla. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - İptal + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Yanıt ekle... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Gönder + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Sonraki Adım + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Bu yanıtla ilgili geri bildirim almaya hazır mısınız? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Geri bildirim @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Yanıt ekle... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Gönder - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Sınıfla Paylaş... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Dosyayı kaldır @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Resim ekle @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Gönder @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Not Defterine Ekle @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Doğru @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Yanlış @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Gönder - Make this message viewable to students again @@ -23606,7 +23724,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 Dosya @@ -23614,7 +23732,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Not Defterinden Ekle @@ -23622,7 +23740,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Not Ekle + @@ -23630,7 +23748,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ Bu sorun devam ederse, öğretmeninize bildirin ve bir sonraki etkinliğe geçin Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.vi.xlf b/src/locale/messages.vi.xlf index 00c07fc82ef..9bdc77d8857 100644 --- a/src/locale/messages.vi.xlf +++ b/src/locale/messages.vi.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 Increase Participation in Science @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 Accessible to All @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE on student computer @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE researcher @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE teachers and researcher @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE developers and teacher @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + Back @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Library Units - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - Step - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + Step + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 Teacher @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 Student @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Ready to try WISE in the Classroom? @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign up for free! src/app/home/home.component.html - 113 + 112 Sign up for free! @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Connect src/app/home/home.component.html - 129 + 128 Connect @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. View tutorials and common questions. src/app/home/home.component.html - 189 + 188 View tutorials and common questions. @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 Want to get in touch? Send us a message. @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign in with Google + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 Forgot username or password? @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 New to WISE? Join for free! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 Create Account @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 Search @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 Create WISE Account @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 Students can view and complete WISE lessons offered by teachers. @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 Teachers can select, author, and run WISE lessons with their students. + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.   src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sign Up + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 You must agree to the Privacy Policy & Terms of Use @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 Correct @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 Incorrect @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 File @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 Insert from Notebook @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 Insert note + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 Image from notebook @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.zh-Hans.xlf b/src/locale/messages.zh-Hans.xlf index da061b6f1a5..3eb147f0cc2 100644 --- a/src/locale/messages.zh-Hans.xlf +++ b/src/locale/messages.zh-Hans.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 提高科学学习的参与度 @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 所有人都可以使用 @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 学生电脑端的WISE @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE研究人员 @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE教师和研究人员 @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE开发者和教师 @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + 返回 @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. 库项目 - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - 步骤 - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (此组件) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + 步骤 + New @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 教师 @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 学生 @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 准备在课堂上尝试使用WISE了吗？ @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Sign up for free! src/app/home/home.component.html - 113 + 112 免费注册！ @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Connect src/app/home/home.component.html - 129 + 128 连接 @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 加入我们！讨论与WISE有关的所有问题。 @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.View tutorials and common questions. src/app/home/home.component.html - 189 + 188 查看教程和常见问题。 @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 想要取得联系吗？ 请给我们发送消息。 @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. 使用谷歌账户登录 + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 忘记用户名和密码？ @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 您是WISE新用户吗? 请免费加入! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 创建账户 @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 搜索 @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 教师反馈 @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 创建WISE账户 @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 学生可以查看和完成教师提供的WISE课程。 @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 教师可以选择、制作WISE课程，并和学生一起运行WISE课程。 + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.  src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. 注册 + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 您必须同意我们的隐私政策和使用条款 @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -12849,7 +12929,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -13188,7 +13268,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.(None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 (None Selected) @@ -13196,7 +13276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 Select Grouping Logic @@ -13204,7 +13284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 选择 @@ -13264,19 +13344,27 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Teams Per Group: - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 - Drop image or file here or click to upload! + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 + + Drop image or file here or click to upload! You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 You are using out of (%) @@ -13284,7 +13372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 Sort Assets @@ -13292,7 +13380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 File Name A->Z @@ -13300,7 +13388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 File Name Z->A @@ -13308,7 +13396,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 File Size Small -> Large @@ -13316,7 +13404,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 File Size Large -> Small @@ -13324,7 +13412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 Choose @@ -13332,7 +13420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.(Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 (Not Used) @@ -13340,7 +13428,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 Download @@ -13361,7 +13449,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? @@ -13371,7 +13459,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? @@ -13381,7 +13469,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? @@ -13390,7 +13478,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 Successfully uploaded: @@ -13398,7 +13486,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 Error uploading: @@ -13582,7 +13670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -15364,7 +15452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 Item Info @@ -15536,7 +15624,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15560,43 +15648,31 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 Export Events @@ -15604,7 +15680,7 @@ Are you sure you want to proceed? Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,7 +15688,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 Export Latest Notebook Items @@ -15620,7 +15696,7 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,7 +15704,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 Export All Notebook Items @@ -15636,7 +15712,7 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,7 +15720,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 Export Notifications @@ -15652,7 +15728,7 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,7 +15736,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 Export Student Assets @@ -15668,7 +15744,7 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 Export Student Assets @@ -15676,7 +15752,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html @@ -15688,7 +15764,7 @@ Are you sure you want to proceed? Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 Export Item Data @@ -15696,7 +15772,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html @@ -15708,7 +15784,7 @@ Are you sure you want to proceed? Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 Export Raw Data @@ -15716,7 +15792,7 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 Export Step Visits @@ -15724,305 +15800,249 @@ Are you sure you want to proceed? Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 Export Step Visits - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + Include Student Events - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + Include Teacher Events - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + Include Names - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + Export - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + Include Correctness Columns - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + Include Only Submits - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + Download All Revisions Export - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + Download Latest Revisions Export - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + Latest - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - Cancel + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + Export - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + Default - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + Everything Include Student Work @@ -16560,6 +16580,30 @@ Are you sure you want to proceed? Completion + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + Add response... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + Send + @@ -16754,7 +16798,7 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Submitted @@ -16762,7 +16806,7 @@ Are you sure you want to proceed? Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Auto Saved @@ -16770,7 +16814,7 @@ Are you sure you want to proceed? Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Saved @@ -16834,6 +16878,160 @@ Are you sure you want to proceed? Next Step + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + Students chat with an AI bot. + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI Chat + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + Toggle system prompt instructions + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + System Prompt Instructions + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + + Example System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 + + Example System Prompt + + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. + + + System Prompt + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 + + System Prompt + + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 + + + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 + + Enable Computer Avatar + + + Automated guidance response + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + + Automated guidance response + + + + + + + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 + + + + + Student response + + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 + + + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + + Student response + + + An error occurred. + + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + + An error occurred. + + + Model + + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 + + Model + Students watch an animation. @@ -16970,7 +17168,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -18562,7 +18760,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 反馈 @@ -18876,78 +19074,6 @@ Category Name: Item ID - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy - Use Global Computer Avatar @@ -19244,7 +19370,7 @@ Category Name: Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 Share with class... @@ -19252,7 +19378,7 @@ Category Name: Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 Remove file @@ -19260,7 +19386,7 @@ Category Name: Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 Add picture @@ -19268,7 +19394,7 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 Post @@ -20518,7 +20644,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 Add to Notebook @@ -21304,7 +21430,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 正确 @@ -21316,7 +21442,7 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 不正确 @@ -21498,7 +21624,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21632,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -22400,14 +22526,6 @@ If this problem continues, let your teacher know and move on to the next activit Chat members: - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send - Make this message viewable to students again @@ -23606,7 +23724,7 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 文件 @@ -23614,7 +23732,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 从笔记本中插入 @@ -23622,7 +23740,7 @@ If this problem continues, let your teacher know and move on to the next activit Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 插入笔记 + @@ -23630,7 +23748,7 @@ If this problem continues, let your teacher know and move on to the next activit Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 来自笔记中的图像 @@ -23638,7 +23756,7 @@ If this problem continues, let your teacher know and move on to the next activit Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar Ermina @@ -23647,7 +23765,7 @@ If this problem continues, let your teacher know and move on to the next activit Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar Alyx @@ -23656,7 +23774,7 @@ If this problem continues, let your teacher know and move on to the next activit Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar Kai @@ -23665,7 +23783,7 @@ If this problem continues, let your teacher know and move on to the next activit Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar Morgan @@ -23674,7 +23792,7 @@ If this problem continues, let your teacher know and move on to the next activit Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar Parker @@ -23683,7 +23801,7 @@ If this problem continues, let your teacher know and move on to the next activit Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar Milan @@ -23692,7 +23810,7 @@ If this problem continues, let your teacher know and move on to the next activit Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar Emery @@ -23701,7 +23819,7 @@ If this problem continues, let your teacher know and move on to the next activit Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar Yuna @@ -23710,7 +23828,7 @@ If this problem continues, let your teacher know and move on to the next activit Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar Ada @@ -23719,11 +23837,35 @@ If this problem continues, let your teacher know and move on to the next activit Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar Nico + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + Discuss your answer with a thought buddy! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + Thought Buddy + Student @@ -24328,18 +24470,6 @@ If this problem continues, let your teacher know and move on to the next activit Remove File - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - Drop image or file here or click to upload! - Share with Class diff --git a/src/locale/messages.zh-Hant.xlf b/src/locale/messages.zh-Hant.xlf index 2a0e4adc680..5ef9623d15c 100644 --- a/src/locale/messages.zh-Hant.xlf +++ b/src/locale/messages.zh-Hant.xlf @@ -230,7 +230,7 @@ Increase Participation in Science src/app/about/about.component.html - 281 + 282 提高科學學習的參與度 @@ -238,7 +238,7 @@ WISE gives more teachers and students the opportunity to do inquiry-based science. Our units make difficult concepts accessible both for teachers to teach and students to learn. WISE curricula help students see themselves as capable of doing science and realize that, no matter their backgrounds, science can be a potential career. src/app/about/about.component.html - 282,287 + 283,288 WISE 提供更多教師和學生進行基於探究的科學教學的機會。我們的單元使難懂的概念對教師來教和學生來學變得更容易。WISE 課程幫助學生認識到自己能夠從事科學，並意識到無論他們的背景如何，科學都是一個潛在的職業選擇。 @@ -246,7 +246,7 @@ Accessible to All src/app/about/about.component.html - 295 + 297 所有人都可以存取 @@ -254,7 +254,7 @@ WISE is free and open source! WISE subsists on generous support from the National Science Foundation, which means it's available to anyone with an internet connection. Driven by an active community of developers, WISE is continually being expanded and improved. Bring science inquiry into the classroom, the museum, the after-school, or the home-school environment! src/app/about/about.component.html - 296,302 + 298,304 WISE 是 免費 和 開源！WISE 的運作依賴於國家科學基金會的慷慨支持，這意味著任何擁有網路連接的人都可以使用。在一個積極的開發者社群的推動下，WISE 不斷擴展和改進。將科學探究引入教室、博物館、課後活動或家庭學校環境中！ @@ -262,7 +262,7 @@ WISE on student computer src/app/about/about.component.html - 326 + 328 WISE在學生電腦上 @@ -270,7 +270,7 @@ WISE researcher src/app/about/about.component.html - 347 + 349 WISE研究員 @@ -278,7 +278,7 @@ WISE teachers and researcher src/app/about/about.component.html - 368 + 370 WISE教師和研究人員 @@ -286,7 +286,7 @@ WISE developers and teacher src/app/about/about.component.html - 389 + 391 WISE開發人員和教師 @@ -298,7 +298,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html - 106 + 111 src/app/classroom-monitor/show-node-info-dialog/show-node-info-dialog.component.html @@ -330,7 +330,7 @@ src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -408,7 +408,7 @@ src/app/authoring-tool/add-component/choose-new-component/choose-new-component.component.html 1 - Add New Component + 添加新组件 Select the component type you want to add or @@ -560,14 +560,6 @@ src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 30 - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 212 - - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 231 - src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 96 @@ -746,7 +738,7 @@ src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 86 + 85 src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html @@ -878,7 +870,7 @@ src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html 1 - Advanced Settings + 進階設定 Add Visibility Constraint @@ -1216,6 +1208,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html 39 + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 10 + src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 15 @@ -1424,7 +1420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.html 106 - add_circle + add_circle Are you sure you want to delete this question rule? @@ -1456,7 +1452,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html 15 - Custom Label + 自定義標籤 Question Bank @@ -1468,7 +1464,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html 19 - Question Bank + 試題庫 Student can select questions to use in Peer Chat @@ -1556,6 +1552,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 111 + + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 6 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 6 @@ -1568,6 +1568,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 8 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 6 + 上一步 @@ -1608,7 +1612,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html 11,13 - Back + 上一步 Submit @@ -1750,39 +1754,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. 庫單元 - - Step - - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 2 - - - src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html - 5 - - - src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html - 62 - - - src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html - 455 - - - src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html - 498 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 8 - - 步驟 - Component - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 10 + src/app/authoring-tool/select-component/select-component.component.html + 2 src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html @@ -1801,8 +1777,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (This Component) - src/app/authoring-tool/select-step-and-component/select-step-and-component.component.html - 16 + src/app/authoring-tool/select-component/select-component.component.html + 10 src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html @@ -1822,6 +1798,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. (這個組件) + + Step + + src/app/authoring-tool/select-step/select-step.component.html + 2 + + + src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html + 5 + + + src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html + 62 + + + src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html + 455 + + + src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html + 498 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 8 + + 步驟 + New @@ -1886,7 +1890,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/classroom-monitor/milestones/milestones.component.html 41 - ~ Report Available ~ + ~ 報告可用 ~ % completed (All periods) @@ -2148,7 +2152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 27 + 30 教師 @@ -2260,11 +2264,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 152 + 155 src/app/register/register-teacher-form/register-teacher-form.component.html - 175 + 178 Recaptcha failed. Please reload the page and try again! @@ -2740,7 +2744,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-home/register-home.component.html - 17 + 20 學生 @@ -2884,11 +2888,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/register/register-student-form/register-student-form.component.html - 145,149 + 148,152 src/app/register/register-teacher-form/register-teacher-form.component.html - 168,172 + 171,175 This site is protected by reCAPTCHA and the Google Privacy Policy and Terms of Service apply. @@ -5176,7 +5180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 The WISE Advantage @@ -5184,7 +5188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Curriculum Offerings @@ -5192,7 +5196,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 準備在課堂上嘗試使用WISE了嗎？ @@ -5200,7 +5204,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Sign up for free! src/app/home/home.component.html - 113 + 112 免費註冊 @@ -5208,7 +5212,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Connect src/app/home/home.component.html - 129 + 128 聯繫我們 @@ -5216,7 +5220,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -5228,7 +5232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -5240,7 +5244,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -5252,7 +5256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -5272,7 +5276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Join us! Discuss all things WISE. @@ -5280,7 +5284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -5292,7 +5296,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.View tutorials and common questions. src/app/home/home.component.html - 189 + 188 瀏覽課程和常見問題。 @@ -5300,7 +5304,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -5312,7 +5316,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 想要聯繫我們嗎？ 歡迎您傳送信息。 @@ -5440,11 +5444,31 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. 使用 Google 登入 + + Sign in with Microsoft + + src/app/login/login-home/login-home.component.html + 84 + + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 16 + + + src/app/register/register-student-complete/register-student-complete.component.html + 34 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 32 + + Sign in with Microsoft + Forgot username or password? src/app/login/login-home/login-home.component.html - 80 + 91 忘記帳號和密碼？ @@ -5452,7 +5476,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.New to WISE? Join for free! src/app/login/login-home/login-home.component.html - 81,82 + 92,93 第一次使用WISE? 免費加入! @@ -5490,13 +5514,17 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html 3 + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 6 + src/app/register/register-student-form/register-student-form.component.html - 164 + 167 src/app/register/register-teacher-form/register-teacher-form.component.html - 187 + 190 建立帳戶 @@ -6708,7 +6736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Search src/app/modules/shared/search-bar/search-bar.component.ts - 21 + 37 搜尋 @@ -6906,7 +6934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 Teacher Feedback @@ -7642,11 +7670,19 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Sorry, your Google User ID was not found in WISE. + + Sorry, your Microsoft User ID was not found in WISE. + + src/app/register/register-home/register-home.component.html + 5,7 + + Sorry, your Microsoft User ID was not found in WISE. + Create WISE Account src/app/register/register-home/register-home.component.html - 5 + 8 建立WISE帳號 @@ -7654,7 +7690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Students can view and complete WISE lessons offered by teachers. src/app/register/register-home/register-home.component.html - 19 + 22 學生可以查看並完成老師提供的WISE課程。 @@ -7662,10 +7698,34 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Teachers can select, author, and run WISE lessons with their students. src/app/register/register-home/register-home.component.html - 29 + 32 老師可以與學生一起選擇，建立和執行WISE課程。 + + Hi! This Microsoft user already has a WISE account. + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 7 + + Hi! This Microsoft user already has a WISE account. + + + Microsoft logo + + src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html + 15 + + + src/app/register/register-student-complete/register-student-complete.component.html + 33 + + + src/app/register/register-teacher-complete/register-teacher-complete.component.html + 31 + + Microsoft logo + Your WISE account has been created! @@ -7786,7 +7846,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. src/app/register/register-student-form/register-student-form.component.html - 141,144 + 144,147 By clicking "Create Account", you agree to our Privacy Policy & Terms of Use. @@ -7794,11 +7854,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.  src/app/register/register-student-form/register-student-form.component.html - 154 + 157 src/app/register/register-teacher-form/register-teacher-form.component.html - 177 + 180   @@ -7838,6 +7898,18 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. 註冊 + + Sign up with Microsoft + + src/app/register/register-student/register-student.component.html + 40 + + + src/app/register/register-teacher/register-teacher.component.html + 34 + + Sign up with Microsoft + You should receive an email with your account details shortly. @@ -8006,7 +8078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.I agree to the WISE Privacy Policy & Terms of Use * src/app/register/register-teacher-form/register-teacher-form.component.html - 156,158 + 159,161 I agree to the WISE Privacy Policy & Terms of Use * @@ -8014,7 +8086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.You must agree to the Privacy Policy & Terms of Use src/app/register/register-teacher-form/register-teacher-form.component.html - 164 + 167 您必須同意我們的隱私政策和使用條款 @@ -8084,7 +8156,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/services/archive-project.service.ts 123 - Undo + 復原 Action undone. @@ -8664,7 +8736,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/student/top-bar/top-bar.component.html 34 - View alerts + 查看提醒 Unit percent completed @@ -9328,7 +9400,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/teacher/run-settings-dialog/run-settings-dialog.component.ts 64 - 不允許您減少每組的學生人數，因為該課程已經有超過1個學生的小組。 + 選擇要匯入的單元，然後選擇要匯入的組件。 You do not have permission to change the dates for this unit. @@ -9456,6 +9528,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 85 + + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 15 + All @@ -10146,7 +10222,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html 64,66 - Back + 上一步 Submit @@ -10562,7 +10638,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/authoring-tool.component.ts 92 - Advanced Settings + 進階設定 Unit List @@ -10834,12 +10910,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Advanced - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + Preview component + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10862,7 +10942,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to save the starter state? @@ -10870,7 +10950,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 Are you sure you want to delete the starter state? This will also close this preview window. @@ -11056,7 +11136,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/PeerGroupingLogic.ts 21 - Any + 任何 Are you sure you want to delete this constraint? @@ -11258,7 +11338,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.ts 25 - Choice Chosen + 選擇的選項 Choices @@ -11278,7 +11358,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts 393 - Choices + 選項 Is Correct @@ -11286,7 +11366,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts 45 - Is Correct + 正確 Used X Submits @@ -11478,7 +11558,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 3 - Choose a unit to import from and then choose which component(s) to import + 選擇要匯入的單元，接著選擇要匯入的組件。 @@ -11492,7 +11572,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 28,35 - + After you have chosen the component(s) you want to import, click this button to import them @@ -11500,7 +11580,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 42,43 - After you have chosen the component(s) you want to import, click this button to import them + 選擇要匯入的組件後，點擊此按鈕進行匯入。 Preview Project @@ -11508,7 +11588,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html 62 - Preview Project + 預覽專案 Please select a component to import. @@ -11516,7 +11596,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.ts 81 - Please select a component to import. + 請選擇要匯入的組件。 Milestones Authoring @@ -11524,7 +11604,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 2 - Milestones Authoring + 里程碑編輯 Enable Milestones @@ -11532,7 +11612,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 10,12 - Enable Milestones + 啟用里程碑 Add Milestone @@ -11544,7 +11624,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 572 - Add Milestone + 新增里程碑 Click to Collapse @@ -11556,7 +11636,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 327 - Click to Collapse + 點擊收合 Click to Expand @@ -11568,7 +11648,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 337 - Click to Expand + 點擊以展開 Milestone @@ -11576,7 +11656,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 49 - Milestone + 里程碑 Delete Milestone @@ -11584,7 +11664,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 54 - Delete Milestone + 刪除里程碑 Milestone Name @@ -11592,7 +11672,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 63 - Milestone Name + 里程碑名稱 Milestone Description @@ -11600,7 +11680,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 69 - Milestone Description + 里程碑描述 Enable Satisfy Criteria @@ -11608,7 +11688,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 85,87 - Enable Satisfy Criteria + 啟用滿足條件 Satisfy Criteria @@ -11616,7 +11696,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 90 - Satisfy Criteria + 滿足條件 Satisfy Minimum Percentage @@ -11624,7 +11704,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 93 - Satisfy Minimum Percentage + 滿足最低百分比 Satisfy Minimum Number Of Workgroups @@ -11632,7 +11712,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 102 - Satisfy Minimum Number Of Workgroups + 滿足最少作業小組數量 Satisfy Conditional @@ -11644,7 +11724,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 361 - Satisfy Conditional + 滿足條件式 Any @@ -11668,7 +11748,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 96 - Any + 任何 Add Milestone Satisfy Criteria @@ -11680,7 +11760,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 202 - Add Milestone Satisfy Criteria + 新增里程碑滿足條件 Milestone Satisfy Criteria @@ -11688,7 +11768,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 132 - Milestone Satisfy Criteria + 里程碑滿足條件里程碑滿足條件 Delete Milestone Satisfy Criteria @@ -11696,7 +11776,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 137 - Delete Milestone Satisfy Criteria + 刪除里程碑滿足條件 Node ID @@ -11712,7 +11792,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 405 - Node ID + 節點 ID Component ID @@ -11728,7 +11808,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 415 - Component ID + 組件 ID Copy Node ID and Component ID to Milestone @@ -11736,7 +11816,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 190 - Copy Node ID and Component ID to Milestone + 複製節點ID和組件ID至里程碑 Report @@ -11748,7 +11828,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 46 - Report + 報告 Add Report Location @@ -11760,7 +11840,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 266 - Add Report Location + 新增報告位置 Location @@ -11768,7 +11848,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 222 - Location + 位置 Delete Location @@ -11776,7 +11856,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 253 - Delete Location + 刪除位置 Custom Score Values @@ -11788,7 +11868,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 296 - Custom Score Values + 自訂分數值 Delete Custom Score Values @@ -11796,7 +11876,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 284 - Delete Custom Score Values + 刪除自訂分數值 Custom Score Key @@ -11804,7 +11884,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 292 - Custom Score Key + 自訂分數鍵值 Add Custom Score Values @@ -11812,7 +11892,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 305 - Add Custom Score Values + 新增自訂分數值 Add Template @@ -11824,7 +11904,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 561 - Add Template + 新增範本 Template @@ -11832,7 +11912,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 342 - Template + 範本 Delete Template @@ -11840,7 +11920,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 347 - Delete Template + 刪除範本 Add Template Satisfy Criteria @@ -11852,7 +11932,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 503 - Add Template Satisfy Criteria + 新增範本滿足條件 Template Satisfy Criteria @@ -11860,7 +11940,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 392 - Template Satisfy Criteria + 範本滿足條件 Delete Template Satisfy Criteria @@ -11868,7 +11948,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 397 - Delete Template Satisfy Criteria + 刪除範本滿足條件 Function @@ -11876,7 +11956,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 443 - Function + 功能 Percent Threshold @@ -11884,7 +11964,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 459 - Percent Threshold + 百分比門檻 Target Variable @@ -11892,7 +11972,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 478 - Target Variable + 目標變數 Value @@ -11900,7 +11980,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 486 - Value + 值 Content @@ -11908,7 +11988,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 521 - Content + 內容 Content Preview @@ -11916,7 +11996,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 531 - Content Preview + 內容預覽 Recommendations @@ -11924,7 +12004,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 537 - Recommendations + 推薦 Recommendations Preview @@ -11932,7 +12012,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.html 547 - Recommendations Preview + 推薦預覽 Percent of Scores Less Than @@ -11940,7 +12020,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 16 - Percent of Scores Less Than + 小於分數百分比 Percent of Scores Less Than or Equal To @@ -11948,7 +12028,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 20 - Percent of Scores Less Than or Equal To + 小於或等於分數百分比 Percent of Scores Greater Than @@ -11956,7 +12036,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 24 - Percent of Scores Greater Than + 大於分數百分比 Percent of Scores Greater Than or Equal To @@ -11964,7 +12044,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 28 - Percent of Scores Greater Than or Equal To + 大於或等於分數百分比 Percent of Scores Equal To @@ -11972,7 +12052,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 32 - Percent of Scores Equal To + 等於分數百分比 Are you sure you want to delete Milestone ? @@ -11980,7 +12060,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 162 - Are you sure you want to delete Milestone ? + 您確定要刪除里程碑 嗎？ Are you sure you want to delete Milestone Satisfy Criteria ? @@ -11988,7 +12068,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 206,208 - Are you sure you want to delete Milestone Satisfy Criteria ? + 確定要刪除里程碑滿足條件 嗎？ Are you sure you want to copy the Node ID and Component ID to the rest of this Milestone? @@ -11996,7 +12076,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 225 - Are you sure you want to copy the Node ID and Component ID to the rest of this Milestone? + 確定要將節點ID和組件ID複製到此里程碑的其餘部分嗎？ Are you sure you want to delete this location? @@ -12004,7 +12084,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 306 - Are you sure you want to delete this location? + 您確定要刪除此位置嗎？ Error: Key must not be empty @@ -12012,7 +12092,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 331 - Error: Key must not be empty + 錯誤：鍵值不能為空 Error: Values must not be empty @@ -12020,7 +12100,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 334 - Error: Values must not be empty + 錯誤：值不能為空 Are you sure you want to delete this custom score value? @@ -12028,7 +12108,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 356 - Are you sure you want to delete this custom score value? + 您確定要刪除此自訂分數值嗎？ Are you sure you want to delete Template ? @@ -12036,7 +12116,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 393 - Are you sure you want to delete Template ? + 您確定要刪除範本 嗎？ Are you sure you want to delete Template Satisfy Criteria ? @@ -12044,7 +12124,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/milestones-authoring/milestones-authoring.component.ts 443 - Are you sure you want to delete Template Satisfy Criteria ? + 確定要刪除範本滿足條件 嗎？ Add a new component @@ -12052,7 +12132,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.html 4 - Add a new component + 新增組件 Create Branch @@ -12064,7 +12144,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 61 - Create Branch + 建立分支 Number of Branch Paths @@ -12072,7 +12152,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 5 - Number of Branch Paths + 分支路徑數量 Remove Branch @@ -12088,7 +12168,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 20 - How to Choose Among Paths + 如何在路徑之間進行選擇 Choose Step @@ -12096,7 +12176,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 41 - Choose Step + 選擇步驟 Choose Component @@ -12104,7 +12184,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 58 - Choose Component + 選擇組件 . () Prompt: @@ -12112,7 +12192,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 68,71 - . () Prompt: + . () 提示： Score ID (Optional) @@ -12120,7 +12200,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 79 - Score ID (Optional) + 分數 ID (選填) Branch Path @@ -12128,7 +12208,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 85 - Branch Path + 分支路徑 Workgroup ID @@ -12136,7 +12216,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 87 - Workgroup ID + 作業小組ID Score @@ -12168,7 +12248,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 97 - Choice Chosen + 選擇的選項 (), Is Correct: , Feedback: @@ -12176,7 +12256,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 99,102 - (), Is Correct: , Feedback: + ()，是否正確：，回饋： Random @@ -12184,7 +12264,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 105 - Random + 隨機 Close Branch Path Steps Chooser @@ -12196,7 +12276,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 139,141 - Close Branch Path Steps Chooser + 關閉分支路徑 步驟選擇器 Open Branch Path Steps Chooser @@ -12204,7 +12284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 116,118 - Open Branch Path Steps Chooser + 開啟分支路徑 步驟選擇器 Choose Steps in Path @@ -12212,7 +12292,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 122 - Choose Steps in Path + 選擇路徑中的步驟 Open Branch Path Steps Chooser @@ -12220,7 +12300,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 142,144 - Open Branch Path Steps Chooser + 開啟分支路徑 步驟選擇器 Choose Merge Point @@ -12228,7 +12308,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.html 149 - Choose Merge Point + 選擇合併點 Workgroup ID @@ -12240,7 +12320,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 18 - Workgroup ID + 作業小組ID Random @@ -12260,7 +12340,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts 4 - Random + 隨機 Tag @@ -12276,7 +12356,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 50 - Tag + 標籤 Error: You can't have 0 branch paths @@ -12284,7 +12364,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.ts 170 - Error: You can't have 0 branch paths + 錯誤：分支路徑數量不能為0 Are you sure you want to reduce the number of branches to ? @@ -12292,7 +12372,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.ts 174 - Are you sure you want to reduce the number of branches to ? + 確定要將分支數量減少到 嗎？ Are you sure you want to remove the branch? @@ -12300,7 +12380,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.ts 645 - Are you sure you want to remove the branch? + 您確定要移除該分支嗎？ Constraint @@ -12308,7 +12388,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html 24 - Constraint + 限制 Show Save Button @@ -12332,7 +12412,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/json/node-advanced-json-authoring.component.html 3 - Edit Step JSON + 編輯步驟JSON General Advanced @@ -12340,7 +12420,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 17 - General Advanced + 一般進階設定 Edit Step Rubric @@ -12352,7 +12432,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.html 1 - Edit Step Rubric + 編輯步驟評分標準 Edit Transitions @@ -12360,7 +12440,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 39 - Edit Transitions + 編輯轉換 Edit Constraints @@ -12368,7 +12448,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html 50 - Edit Constraints + 編輯限制 Paths @@ -12376,7 +12456,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 2 - Paths + 路徑 Add a path @@ -12384,7 +12464,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 7 - Add a path + 新增路徑 There are no paths out of this step @@ -12393,7 +12473,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 14,16 - There are no paths out of this step + 此步驟沒有任何路徑 @@ -12402,7 +12482,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 24 - Path + 路徑 Delete path @@ -12410,7 +12490,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 29 - Delete path + 刪除路徑 Which step this path leads to @@ -12418,7 +12498,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 38 - Which step this path leads to + 此路徑通往哪個步驟 Requirements @@ -12426,7 +12506,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 52 - Requirements + 需求 Add a requirement for this path @@ -12434,7 +12514,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 57 - Add a requirement for this path + 為此路徑新增要求 There are no requirements for this transition @@ -12442,7 +12522,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 64,66 - There are no requirements for this transition + 此轉換沒有任何要求 The student needs to @@ -12450,7 +12530,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 73 - The student needs to + 學生需要 Delete this requirement @@ -12458,7 +12538,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 94 - Delete this requirement + 刪除此要求 The student needs to choose this choice @@ -12466,7 +12546,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 168 - The student needs to choose this choice + 學生需要選擇此選項 The student needs to choose these choices @@ -12474,7 +12554,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 196 - The student needs to choose these choices + 學生需要選擇這些選項 Tag @@ -12482,7 +12562,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 216 - Tag + 標籤 How to choose among available paths @@ -12490,7 +12570,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 229 - How to choose among available paths + 如何在可用路徑間進行選擇 When to choose path @@ -12498,7 +12578,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 246 - When to choose path + 何時選擇該路徑 Can change path @@ -12506,7 +12586,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 263 - Can change path + 可以變更路徑 Max paths visitable @@ -12514,7 +12594,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.html 281 - Max paths visitable + 最多可訪問路徑數 True @@ -12522,7 +12602,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 13 - True + 是 False @@ -12530,7 +12610,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 14 - False + 否 First Available @@ -12538,7 +12618,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 19 - First Available + 第一個可用的 Last Available @@ -12546,7 +12626,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 20 - Last Available + 最後可用 Get a specific score on a component @@ -12554,7 +12634,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 30 - Get a specific score on a component + 在組件上獲得特定分數 Node ID @@ -12566,7 +12646,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 42 - Node ID + 節點 ID Component ID @@ -12578,7 +12658,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 43 - Component ID + 組件 ID Scores(s) @@ -12594,7 +12674,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 35 - Score ID (Optional) + 分數 ID (選填) Choose a specific choice on a component @@ -12602,7 +12682,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 40 - Choose a specific choice on a component + 在組件上選擇特定選項 Have Tag Assigned To Workgroup @@ -12610,7 +12690,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 49 - Have Tag Assigned To Workgroup + 將標籤指派給作業小組 Enter Node @@ -12618,7 +12698,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 54 - Enter Node + 進入節點 Exit Node @@ -12626,7 +12706,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 55 - Exit Node + 結束節點 Score Changed @@ -12634,7 +12714,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 56 - Score Changed + 分數改變 Student Data Changed @@ -12642,7 +12722,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 57 - Student Data Changed + 學生資料改變 Are you sure you want to delete this requirement? @@ -12650,7 +12730,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 135 - Are you sure you want to delete this requirement? + 您確定要刪除此需求嗎？ Are you sure you want to delete this path to ""? @@ -12658,7 +12738,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts 203 - Are you sure you want to delete this path to ""? + 您確定要刪除此通往 ""的路徑嗎？ Required @@ -12666,7 +12746,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.html 3 - Required + 必填 Choose the new location by clicking one of the buttons below @@ -12674,7 +12754,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/chooseComponentLocation/choose-component-location.component.html 3 - Choose the new location by clicking one of the buttons below + 點擊下方按鈕選擇新位置 Insert As First Component @@ -12702,7 +12782,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.html 5 - Copy Component + 複製組件 Step Title : @@ -12710,7 +12790,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.html 2 - Step Title : + 步驟標題 ： Lesson Title : @@ -12718,7 +12798,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.html 3 - Lesson Title : + 課程標題 ： Title @@ -12746,7 +12826,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 242 - Title + 標題 Back to unit @@ -12754,7 +12834,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 21 - Back to unit + 返回單元 Components @@ -12762,7 +12842,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 35 - Components + 組件 Move Components @@ -12770,7 +12850,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 45 - Move Components + 移動組件 Copy Components @@ -12778,7 +12858,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 55 - Copy Components + 複製組件 Delete Components @@ -12786,7 +12866,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 65 - Delete Components + 刪除組件 + Expand All @@ -12794,7 +12874,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 80,82 - + Expand All + + 全部展開 - Collapse All @@ -12802,7 +12882,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 89,91 - - Collapse All + - 摺疊全部 This step does not have any components. Click the + button to add a component. @@ -12810,7 +12890,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 96 - This step does not have any components. Click the + button to add a component. + 此步驟沒有任何組件。點擊+按鈕新增組件。 Toggle component authoring @@ -12818,7 +12898,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 118 - Toggle component authoring + 切換組件編輯模式 Select component @@ -12826,7 +12906,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 135 - Select component + 選擇組件 Click to expand/collapse @@ -12834,7 +12914,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 146 - Click to expand/collapse + 點擊展開/收合 Delete Component @@ -12842,14 +12922,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html 180 - Delete Component + 刪除組件 Are you sure you want to delete this component? src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 199 + 200 Are you sure you want to delete this component? @@ -12859,7 +12939,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts - 200 + 201 Are you sure you want to delete these components? @@ -12890,7 +12970,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 192 - Notebook Label + 筆記本標籤 Enable Note @@ -13002,7 +13082,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/notebook-authoring/notebook-authoring.component.html 262 - Starter Text + 起始文字 Teacher Notebook @@ -13098,7 +13178,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 25 - Mode + 模式 Teams Per Group @@ -13110,7 +13190,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 38 - Teams Per Group + 每組小組數 Create @@ -13126,7 +13206,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 63 - Create + 建立 Edit Peer Grouping @@ -13134,7 +13214,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 1 - Edit Peer Grouping + 編輯同儕分組 Used in @@ -13142,7 +13222,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 44 - Used in + 使用於 Not used in any steps. @@ -13150,7 +13230,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 49 - Not used in any steps. + 未在任何步驟中使用。 Delete @@ -13166,7 +13246,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.html 67 - Update + 更新 Are you sure you want to delete this Peer Grouping? @@ -13174,7 +13254,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/edit-peer-grouping-dialog/edit-peer-grouping-dialog.component.ts 69 - Are you sure you want to delete this Peer Grouping? + 確定要刪除此同儕分組嗎? Grouping Logic: @@ -13182,29 +13262,29 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html 2 - Grouping Logic: + 分組邏輯: (None Selected) src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 4 + 3 - (None Selected) + (未選取) Select Grouping Logic src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 11 + 9 - Select Grouping Logic + 選擇分組邏輯 Select src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-authoring/select-peer-grouping-authoring.component.html - 15,17 + 13,15 Select @@ -13214,7 +13294,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 1 - Select Peer Grouping + 選擇同儕分組 Choose a Peer Grouping to use for this component: @@ -13222,7 +13302,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 3 - Choose a Peer Grouping to use for this component: + 為此組件選擇要使用的同儕分組: (There are no Peer Groupings. Please create a new one.) @@ -13230,7 +13310,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 4,6 - (There are no Peer Groupings. Please create a new one.) + (沒有同儕分組。請建立新分組。) New Grouping @@ -13238,7 +13318,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html 21 - New Grouping + 新分組 Steps Used In: @@ -13246,7 +13326,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 14 - Steps Used In: + 使用於步驟： Logic: @@ -13254,7 +13334,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 21 - Logic: + 邏輯： Teams Per Group: @@ -13262,87 +13342,95 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 24 - Teams Per Group: + 每組小組數： - - Drop image or file here or click to upload! + + Drop image or file here or click to upload! src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 8,17 + 8 + + + src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html + 48 + + + src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html + 24 - Drop image or file here or click to upload! + 使用拖曳或點擊來上傳檔案 You are using out of (%) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 20,23 + 19,22 - You are using out of (%) + 您正在使用 ，上限為 (%) Sort Assets src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 43 + 42 - Sort Assets + 排序資產 File Name A->Z src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 45 + 44 - File Name A->Z + 檔案名稱 A->Z File Name Z->A src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 46 + 45 - File Name Z->A + 檔案名稱 Z->A File Size Small -> Large src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 47 + 46 - File Size Small -> Large + 檔案大小 小 -> 大 File Size Large -> Small src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 48 + 47 - File Size Large -> Small + 檔案大小 大 -> 小 Choose src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 66,68 + 65,67 - Choose + 選擇 (Not Used) src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 71 + 70 - (Not Used) + (未使用) Download src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html - 77 + 76 - Download + 下載 Are you sure you want to delete this file? @@ -13352,18 +13440,16 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts 130 - Are you sure you want to delete this file? - - + 您確定要刪除此檔案 嗎？ The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 192 + 193 - The file you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload this large file? + 您正嘗試上傳的檔案大於500 KB。我們建議使用較小的檔案，以加快學生載入速度。確定要上傳這個大型檔案嗎? @@ -13371,9 +13457,9 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 194 + 195 - One of the files you are trying to upload is larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload the large file? + 您正嘗試上傳的其中一個檔案大於500 KB。我們建議使用較小的檔案，以加快學生載入速度。確定要上傳這個大型檔案嗎? @@ -13381,26 +13467,26 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 196 + 197 - of the files you are trying to upload are larger than 500 KB. We recommend using smaller files so they load faster for students. Are you sure you want to upload these large files? + 您正嘗試上傳的 個檔案大於500 KB。我們建議使用較小的檔案，以加快學生載入速度。確定要上傳這些大型檔案嗎? Successfully uploaded: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 225 + 226 - Successfully uploaded: + 成功上傳： Error uploading: src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.ts - 234 + 235 - Error uploading: + 上傳錯誤： Select lesson @@ -13408,7 +13494,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 13 - Select lesson + 選擇課程 Click to expand/collapse lesson @@ -13416,7 +13502,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 20 - Click to expand/collapse lesson + 點擊展開/摺疊課程 Edit lesson @@ -13424,7 +13510,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 29 - Edit lesson + 編輯課程 Move lesson @@ -13432,7 +13518,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 39 - Move lesson + 移動課程 Delete lesson @@ -13440,7 +13526,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 49 - Delete lesson + 刪除課程 This lesson has no steps @@ -13448,7 +13534,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.html 82 - This lesson has no steps + 此課程沒有任何步驟 Are you sure you want to delete this lesson? @@ -13456,7 +13542,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts 60 - Are you sure you want to delete this lesson? + 您確定要刪除此課程嗎？ Select step @@ -13464,7 +13550,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 15 - Select step + 選擇步驟 Branch point with paths based on @@ -13488,7 +13574,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 44 - Has Rubric + 有評分標準 Click to enter step @@ -13496,7 +13582,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 52 - Click to enter step + 點擊輸入步驟 Move step @@ -13504,7 +13590,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 63 - Move step + 移動步驟 Copy step @@ -13512,7 +13598,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 73 - Copy step + 複製步驟 Delete step @@ -13520,7 +13606,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.html 83 - Delete step + 刪除步驟 Are you sure you want to delete this step? @@ -13528,7 +13614,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring-step/project-authoring-step.component.ts 112 - Are you sure you want to delete this step? + 您確定要刪除此步驟嗎？ Move @@ -13536,7 +13622,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 7 - Move + 移動 + Expand All @@ -13544,7 +13630,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 42,44 - + Expand All + + 全部展開 - Collapse All @@ -13552,7 +13638,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html 51,53 - - Collapse All + - 摺疊全部 There are no lessons @@ -13582,7 +13668,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete the selected item? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 89 + 90 Are you sure you want to delete the selected item? @@ -13590,7 +13676,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to delete the selected items? src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts - 90 + 91 Are you sure you want to delete the selected items? @@ -13772,7 +13858,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 33 - Potential Problems + 潛在問題 This group references the node ID but the node does not exist: @@ -13796,7 +13882,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html 44 - This node has a transition to null + 此節點有轉換至null Edit Unit Rubric @@ -13804,7 +13890,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/rubric/rubric-authoring.component.html 1 - Edit Unit Rubric + 編輯單元評分標準 Jigsaw @@ -13830,7 +13916,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 8 - Choose number of groups in this Jigsaw activity: + 選擇此拼圖式活動的小組數量: Two groups @@ -13838,7 +13924,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 14 - Two groups + 兩個小組 Three groups @@ -13846,7 +13932,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 15 - Three groups + 三個小組 Four groups @@ -13854,7 +13940,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html 16 - Four groups + 四個小組 KI Lesson with OER @@ -13871,7 +13957,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html 2,8 - The KI Lesson with OER guides you to embed an open educational resource (OER) of your choice in a lesson structure that promotes knowledge integration (KI). The structure suggests different step types that engage students in eliciting their ideas, discovering new ideas through use of the OER, distinguishing among their initial and new ideas, and making connections to form integrated understanding. + 帶有OER的KI課程將引導您在一個促進知識整合的課程結構中嵌入自選的開放教育資源。該結構建議使用不同類型的步驟，讓學生引出自己的想法、透過使用OER發現新想法、區分最初和新想法，並建立連接形成整合的理解。 @@ -13916,7 +14002,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 1 - Create a WISE Link + 建立WISE連結 Choose a Step @@ -13924,7 +14010,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 8 - Choose a Step + 選擇步驟 Component (Optional) @@ -13932,7 +14018,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 20 - Component (Optional) + 組件(可選) Choose a Component @@ -13940,7 +14026,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 23 - Choose a Component + 選擇組件 Link Text @@ -13948,7 +14034,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 37 - Link Text + 連結文字 Link @@ -13960,7 +14046,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 82 - Link + 連結 Button @@ -13968,7 +14054,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.html 44 - Button + 按鈕 You must select a step. @@ -13976,7 +14062,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.ts 53 - You must select a step. + 您必須選擇一個步驟。 You must enter text. @@ -13984,7 +14070,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/wise-link-authoring-dialog/wise-link-authoring-dialog.component.ts 55 - You must enter text. + 您必須輸入文字。 Classroom Monitor @@ -13992,7 +14078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroom-monitor.component.ts 34 - Classroom Monitor + 課堂監控 Grade by Step @@ -14004,7 +14090,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 47 - Grade by Step + 按步驟評分 Grade by Student @@ -14016,7 +14102,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 46 - Grade by Student + 按學生評分 Manage Students @@ -14028,7 +14114,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 43 - Manage Students + 管理學生 Student Notebooks @@ -14040,7 +14126,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 45 - Student Notebooks + 學生筆記本 Data Export @@ -14052,7 +14138,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.ts 42 - Data Export + 資料匯出 Error: Data is not being saved! Check your internet connection. @@ -14072,7 +14158,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html 136 - Auto Comment + 自動批註 No feedback given for this version @@ -14080,7 +14166,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-annotations/edit-component-annotations.component.html 57,59 - No feedback given for this version + 此版本沒有回饋 Teacher Comment: @@ -14088,7 +14174,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-comment/edit-component-comment.component.html 2 - Teacher Comment: + 教師評論： Enter comment here @@ -14104,7 +14190,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-comment/edit-component-comment.component.ts 74 - Saved comment + 已儲存評論 Auto Score @@ -14112,7 +14198,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html 4 - Auto Score + 自動評分 Teacher Score: @@ -14120,7 +14206,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html 8 - Teacher Score: + 教師評分： Item Score: @@ -14128,7 +14214,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.html 9 - Item Score: + 項目分數： Saved score @@ -14136,7 +14222,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/edit-component-score/edit-component-score.component.ts 65 - Saved score + 已儲存分數 Create a new team @@ -14144,7 +14230,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-button/add-team-button.component.html 4 - Create a new team + 建立新小組 New Team @@ -14152,7 +14238,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-button/add-team-button.component.html 9 - New Team + 新小組 Create New Team (Period ) @@ -14160,7 +14246,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 1 - Create New Team (Period ) + 建立新小組 (班級) Select students to add to the new team: @@ -14168,7 +14254,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 3 - Select students to add to the new team: + 選擇要加入新小組的學生： No team members added @@ -14176,7 +14262,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 6 - No team members added + 沒有新加入的成員 Delete team member @@ -14184,7 +14270,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 24 - Delete team member + 刪除小組成員 Select to add student to new team @@ -14192,7 +14278,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.html 39 - Select to add student to new team + 選取以加入學生至新小組 stop = Student without a current team @@ -14208,7 +14294,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/add-team-dialog/add-team-dialog.component.ts 83 - New Team has been created. + 新小組 已建立。 Error: Could not create team. @@ -14224,7 +14310,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 1 - Change Student Password + 變更學生密碼 Change password for @@ -14248,7 +14334,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 3 - Student + 學生 Teacher Password @@ -14256,7 +14342,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 12 - Teacher Password + 教師密碼 Teacher Password required @@ -14264,7 +14350,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 15 - Teacher Password required + 需要教師密碼 Teacher Password is incorrect @@ -14272,7 +14358,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.html 20,22 - Teacher Password is incorrect + 教師密碼不正確 Confirm @@ -14284,7 +14370,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 38 - Confirm + 確認 Confirm New Student Password @@ -14292,7 +14378,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts 20 - Confirm New Student Password + 確認新學生密碼 New Student Password @@ -14300,7 +14386,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts 23 - New Student Password + 新學生密碼 Changed password for (). @@ -14308,7 +14394,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts 71 - Changed password for (). + 已為()變更密碼。 Changed password for Student . @@ -14316,7 +14402,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts 72 - Changed password for Student . + 已為學生變更密碼。 Change Period @@ -14328,7 +14414,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html 22 - Change Period + 班級 Select a new period for Team : @@ -14336,7 +14422,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 5,6 - Select a new period for Team : + 為小組 選擇新班級: Moved Team to Period . @@ -14344,7 +14430,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.ts 55 - Moved Team to Period . + 已將小組移至班級。 Period @@ -14356,7 +14442,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-period/peer-group-period.component.html 4 - Period + 第班級 Students: | Teams: @@ -14364,7 +14450,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-period/manage-period.component.html 11,13 - Students: | Teams: + 學生: | 小組: Empty Teams @@ -14372,7 +14458,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-period/manage-period.component.html 28 - Empty Teams + 空的小組 Student ID @@ -14380,7 +14466,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 9 - Student ID + 學生 ID Most Recent Login @@ -14388,7 +14474,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 17 - Most Recent Login + 最近登入時間 Registration Date @@ -14396,7 +14482,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 24 - Registration Date + 註冊日期 Number of Logins @@ -14404,7 +14490,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-show-student-info/manage-show-student-info.component.html 30 - Number of Logins + 登入次數 Tip: Drag a student to change teams within current period. @@ -14412,7 +14498,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-students/manage-students.component.html 4 - Tip: Drag a student to change teams within current period. + 提示: 拖曳學生以在目前班級內變更小組。 Students without a team @@ -14420,7 +14506,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html 12 - Students without a team + 沒有小組的學生 Team @@ -14428,7 +14514,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html 13 - Team + 小組 No students @@ -14436,7 +14522,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html 24 - No students + 沒有學生 Moved student to Team . @@ -14444,7 +14530,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.ts 104 - Moved student to Team . + 已將學生移至小組 。 Error: Could not move student. @@ -14452,7 +14538,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.ts 109 - Error: Could not move student. + 錯誤: 無法移動學生。 View student info @@ -14460,7 +14546,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 7 - View student info + 檢視學生資訊 Student signs in with Google @@ -14468,7 +14554,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 18 - Student signs in with Google + 學生使用Google帳號登入 Change student password @@ -14476,7 +14562,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 28 - Change student password + 變更學生密碼 Remove student @@ -14488,7 +14574,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.html 41 - Remove student + 移除學生 Removed () from unit. @@ -14496,7 +14582,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.ts 59 - Removed () from unit. + 已將()從單元移除。 Error: Could not remove () from unit. @@ -14504,7 +14590,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-user/manage-user.component.ts 66 - Error: Could not remove () from unit. + 錯誤: 無法將()從單元移除。 Move Student @@ -14512,7 +14598,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 2 - Move Student + 移動學生 Warning: Removing a student from a team will result in the student losing all the work they completed with that team. @@ -14520,7 +14606,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 10,13 - Warning: Removing a student from a team will result in the student losing all the work they completed with that team. + 警告: 將學生從小組中移除將導致他們失去在該小組中完成的所有作業。 The student will adopt the work of their new team. @@ -14528,7 +14614,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/move-user-confirm-dialog/move-user-confirm-dialog.component.html 14 - The student will adopt the work of their new team. + 學生將採用新小組的作業。 Remove Student @@ -14536,7 +14622,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 1 - Remove Student + 移除學生 Are you sure you want to remove from the unit? @@ -14544,7 +14630,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 4,7 - Are you sure you want to remove from the unit? + 確定要將從單元中移除嗎? Warning: All of the students' work in the unit will be deleted and they will be removed from the class. @@ -14552,7 +14638,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 8,11 - Warning: All of the students' work in the unit will be deleted and they will be removed from the class. + 警告: 所有學生在單元中的作業都將被刪除，他們也將從班級中移除。 If you would like to move a student to a different team, drag them to that team. You can also create a new team and add the student there. @@ -14560,7 +14646,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 12,15 - If you would like to move a student to a different team, drag them to that team. You can also create a new team and add the student there. + 如果您想將學生移至其他小組，請將他們拖曳到該小組。您也可以建立新小組並將學生加入。 *Note that removing a student does not delete their WISE account, only their association with this unit. @@ -14568,7 +14654,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/remove-user-confirm-dialog/remove-user-confirm-dialog.component.html 16,19 - *Note that removing a student does not delete their WISE account, only their association with this unit. + *注意，移除學生不會刪除他們的WISE帳號，只會刪除他們與此單元的關聯。 Milestone: @@ -14576,7 +14662,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details-dialog/milestone-details-dialog.component.html 1 - Milestone: + 里程碑: Description: @@ -14584,7 +14670,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 14 - Description: + 描述： Requirements: @@ -14592,7 +14678,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 18 - Requirements: + 需求： Item Location: @@ -14600,7 +14686,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 25 - Item Location: + 項目位置： Step Info @@ -14620,7 +14706,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/vle/node/node.component.html 13 - Step Info + 步驟資訊 Class Report @@ -14628,7 +14714,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 34 - Class Report + 班級報告 This milestone includes automated reports that analyze student progress. Reports become available for each period once the following conditions are met: @@ -14636,7 +14722,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 36,39 - This milestone includes automated reports that analyze student progress. Reports become available for each period once the following conditions are met: + 此里程碑包含自動化報告，用於分析學生進度。一旦滿足以下條件，每個班級的報告就會生效： At least team(s) or % of the class have completed the milestone @@ -14644,7 +14730,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 40,43 - At least team(s) or % of the class have completed the milestone + 至少有個小組或%的班級完成了里程碑 At least team(s) and % of the class have completed the milestone @@ -14652,7 +14738,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 44,47 - At least team(s) and % of the class have completed the milestone + 至少有個小組且%的班級完成了里程碑 Recommendation @@ -14660,7 +14746,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 58 - Recommendation + 推薦 Student Work @@ -14672,7 +14758,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 72 - Student Work + 學生作品 Student Completion @@ -14680,7 +14766,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 77 - Student Completion + 學生完成情況 Team @@ -14700,7 +14786,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 52 - Team + 團隊 Not Completed @@ -14708,7 +14794,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html 109 - Not Completed + 未完成 Expand All @@ -14720,7 +14806,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 18 - Expand All + 全部展開 + Expand All @@ -14732,7 +14818,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 34,36 - + Expand All + + 全部展開 Collapse All @@ -14744,7 +14830,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 29 - Collapse All + 全部收合 Sort by team @@ -14756,7 +14842,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 115 - Sort by team + 按小組排序 Sort by completion @@ -14768,7 +14854,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 78 - Sort by completion + 依完成度排序 Status @@ -14784,7 +14870,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 81 - Status + 狀態 Sort by score @@ -14800,7 +14886,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 97 - Sort by score + 依分數排序 Sort by score on Step @@ -14812,7 +14898,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 109 - Sort by score on Step + 按第步驟分數排序 Sort by score on Step @@ -14824,7 +14910,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 132 - Sort by score on Step + 按第步驟分數排序 Sort by change in score @@ -14836,7 +14922,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 156 - Sort by change in score + 按分數變化排序 +/- @@ -14844,7 +14930,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-grading-view/milestone-grading-view.component.html 160 - +/- + +/- Show/hide team's work for this step @@ -14860,7 +14946,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.html 12 - Show/hide team's work for this step + 顯示/隱藏此步驟的小組作業 Step @@ -14868,7 +14954,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html 73 - Step + 第步驟 Step @@ -14876,7 +14962,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html 95 - Step + 第步驟 Not Assigned @@ -14892,7 +14978,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 78 - Not Assigned + 未指派 Completed @@ -14924,7 +15010,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 90 - Partially Completed + 部分完成 Not Completed @@ -14932,7 +15018,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.ts 151 - Not Completed + 未完成 No Work @@ -14948,7 +15034,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 95 - No Work + 沒有作業 Completion @@ -14960,7 +15046,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 13 - Completion + 完成度 N/A @@ -14968,7 +15054,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 24 - N/A + 不適用 Mean Score @@ -14976,7 +15062,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 30 - Mean Score + 平均分數 Peer Groups @@ -14984,7 +15070,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 57 - Peer Groups + 同儕群組 Info + Tips () @@ -14992,7 +15078,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 64 - Info + Tips () + 資訊 + 提示 () Expand all teams @@ -15000,7 +15086,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 83 - Expand all teams + 展開所有小組 + Expand all @@ -15008,7 +15094,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 88,90 - + Expand all + + 展開全部 Collapse all teams @@ -15016,7 +15102,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 93 - Collapse all teams + 收合所有小組 - Collapse all @@ -15024,7 +15110,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 98,100 - - Collapse all + - 摺疊全部 This step doesn't require any student work @@ -15040,7 +15126,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading-view/node-grading-view.component.html 134 - Sorty by completion + 依完成度排序 Visited @@ -15052,7 +15138,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 85 - Visited + 已訪問 Not Visited @@ -15064,7 +15150,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentGrading/step-item/step-item.component.ts 97 - Not Visited + 未訪問 (Team ) @@ -15076,7 +15162,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 8 - (Team ) + (小組 ) @@ -15094,7 +15180,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 239 - has been locked for . + 已為鎖定。 has been unlocked for . @@ -15102,7 +15188,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 240 - has been unlocked for . + 已為解鎖。 All Periods @@ -15130,7 +15216,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component.ts 97 - Period: + 班級: Unlock for @@ -15138,7 +15224,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 356 - Unlock for + 為解鎖 Lock for @@ -15146,7 +15232,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nav-item/nav-item.component.ts 357 - Lock for + 為鎖定 Show/hide team's notebook contents @@ -15154,7 +15240,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/notebook/notebook-workgroup-grading/notebook-workgroup-grading.component.html 7 - Show/hide team's notebook contents + 顯示/隱藏小組筆記本內容 Latest Work: @@ -15186,7 +15272,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 95 - Notes + 註記 Pause Student Screens @@ -15198,7 +15284,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html 65 - Pause Student Screens + 暫停學生螢幕 Pause student screens (Period: All Periods) @@ -15206,7 +15292,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html 16 - Pause student screens (Period: All Periods) + 暫停學生畫面 (所有班級) All Periods @@ -15214,7 +15300,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html 21,23 - All Periods + 所有班級 Pause student screens (Period: ) @@ -15222,7 +15308,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/pause-screens-menu/pause-screens-menu.component.html 28 - Pause student screens (Period: ) + 暫停學生畫面 (班級: ) Period: @@ -15238,7 +15324,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html 2 - Groupings for + 的分組 Tip: Drag students to change groups for this peer grouping. @@ -15246,7 +15332,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html 7 - Tip: Drag students to change groups for this peer grouping. + 提示: 拖曳學生以變更此同儕分組的分組。 Group @@ -15254,7 +15340,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-grouping/peer-group-grouping.component.html 3 - Group + 第組 Change Grouping @@ -15262,7 +15348,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 2 - Change Grouping + 變更分組 Warning: If you remove students from a Peer Group, they will no longer see any contributions they made to that group. @@ -15270,7 +15356,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 11,14 - Warning: If you remove students from a Peer Group, they will no longer see any contributions they made to that group. + 警告: 如果將學生從同儕分組中移除，他們將無法看到在該組中做出的任何貢獻。 Are you sure you want to move this team? @@ -15278,7 +15364,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-move-workgroup-confirm-dialog/peer-group-move-workgroup-confirm-dialog.component.html 17 - Are you sure you want to move this team? + 您確定要移動這個小組嗎？ Create a new group @@ -15364,9 +15450,9 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 - Item Info + 項目資訊 Alerts @@ -15382,7 +15468,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 9 - Alerts + 提醒 Clear all notifications @@ -15418,7 +15504,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.ts 35 - Are you sure you want to clear all your alerts? + 您確定要刪除所有提醒? Clear all alerts @@ -15426,7 +15512,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/notifications-menu/notifications-menu.component.ts 36 - Clear all alerts + 清除所有提醒 Main Menu @@ -15536,7 +15622,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 421 + 132 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts @@ -15550,7 +15636,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 8 - Export One Workgroup Per Row + 每列匯出一個作業小組 Export One Workgroup Per Row @@ -15560,51 +15646,39 @@ Are you sure you want to proceed? Export One Workgroup Per Row - - Export Latest Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html 19 - Export Latest Work - - - Export Latest Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 22,24 - - Export Latest Work - - - Export All Work - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 30 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 12 - Export All Work + Export Student Work - - Export All Work + + Export Student Work src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 33,35 + 22,24 - Export All Work + Export Student Work Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 41 + 30 - Export Events + 匯出事件 Export Events src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 44,46 + 33,35 Export Events @@ -15612,15 +15686,15 @@ Are you sure you want to proceed? Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 52 + 41 - Export Latest Notebook Items + 匯出最新筆記本項目 Export Latest Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 55,57 + 44,46 Export Latest Notebook Items @@ -15628,15 +15702,15 @@ Are you sure you want to proceed? Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 63 + 52 - Export All Notebook Items + 匯出所有筆記本項目 Export All Notebook Items src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 66,68 + 55,57 Export All Notebook Items @@ -15644,15 +15718,15 @@ Are you sure you want to proceed? Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 74 + 63 - Export Notifications + 匯出通知 Export Notifications src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 77,79 + 66,68 Export Notifications @@ -15660,369 +15734,313 @@ Are you sure you want to proceed? Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 85 + 74 - Export Student Assets + 匯出學生資產 Export Student Assets src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 88,90 + 77,79 - Export Student Assets + 匯出學生資產 Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 96 + 85 src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html 12 - Export Item Data + 匯出項目資料 Export Item Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 99,101 + 88,90 - Export Item Data + 匯出項目資料 Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 107 + 96 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 12 - Export Raw Data + 匯出原始資料 Export Raw Data src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 110,112 + 99,101 - Export Raw Data + 匯出原始資料 Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 118 + 107 - Export Step Visits + 匯出步驟訪問記錄 Export Step Visits src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 121,123 + 110,112 - Export Step Visits + 匯出步驟訪問記錄 - - Default - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 136 - + + Include Student Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 15 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 13,15 - Default + 包含學生事件 - - Everything - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 137 - + + Include Teacher Events - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 16 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 16,18 - Everything + 包含教師事件 - - Include Student Work + + Include Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 140,142 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 19 - Include Student Work + 包含姓名 - - Include Student Work IDs + + Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 145,147 + src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html + 28,30 - Include Student Work IDs - - - Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 150,152 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 35,37 - Include Student Names + 匯出 - - Include Student Work Timestamps + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 155,157 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 20,22 - Include Student Work Timestamps - - - Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 160,162 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 24,26 - Include Branch Path Taken + Include Student Names - - Include Branch Path Taken Node ID + + Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 165,167 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 25,27 - Include Branch Path Taken Node ID + 包含正解欄位 - - Include Branch Path Taken Step Title + + Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 170,172 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 30,32 - Include Branch Path Taken Step Title + 僅包含提交項 - - Include Scores + + Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 175,177 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 80 - Include Scores + 下載所有修訂匯出 - - Include Score Timestamps + + Download Latest Revisions Export - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 180,182 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 93 - Include Score Timestamps + 下載最新修訂匯出 - - Include Comments + + Latest - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 185,187 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html + 98 - Include Comments - - - Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 190,192 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 14 - Include Comment Timestamps + 最新 - - Include Student Names + + Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 201,203 + src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts + 41 - Include Student Names + 正確欄位鍵值說明: 0=不正確、1=正確、2=正確但位置錯誤 - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206 - + + Export Gradebook - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225 - - - src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 42 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 52 - - - src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 12 - Export + Export Gradebook - - Export - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 206,208 - + + Include Student Work - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 225,227 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 14,16 - Export + Include Student Work - - Cancel - - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 215,217 - + + Include Student Work IDs - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.html - 234,236 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 19,21 - 取消 + Include Student Work IDs - - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + + Include Student Names - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 101 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 24,26 - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.ts - 41 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 18,20 - Correctness column key: 0 = Incorrect, 1 = Correct, 2 = Correct bucket but wrong position + Include Student Names - - One Workgroup Per Row + + Include Student Work Timestamps - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 124 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 29,31 - One Workgroup Per Row + Include Student Work Timestamps - - Latest Student Work + + Include Branch Path Taken - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 126 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 34,36 - Latest Student Work + Include Branch Path Taken - - All Student Work + + Include Branch Path Taken Node ID - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 128 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 39,41 - All Student Work + Include Branch Path Taken Node ID - - Events + + Include Branch Path Taken Step Title - src/assets/wise5/classroomMonitor/dataExport/data-export/data-export.component.ts - 130 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 44,46 - Events + Include Branch Path Taken Step Title - - Include Student Events + + Include Scores - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 13,15 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 49 - Include Student Events + Include Scores - - Include Teacher Events + + Include Score Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 16,18 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 52,54 - Include Teacher Events + Include Score Timestamps - - Include Names + + Include Comments - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 19 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 57,59 - Include Names + Include Comments - - Export + + Include Comment Timestamps - src/assets/wise5/classroomMonitor/dataExport/export-events/export-events.component.html - 28,30 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 62,64 - Export + Include Comment Timestamps - - Include Student Names + + Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 20,22 + src/assets/wise5/classroomMonitor/dataExport/export-one-workgroup-per-row/export-one-workgroup-per-row.component.html + 72 src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html - 24,26 + 42 - Include Student Names - - - Include Correctness Columns - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 25,27 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 52 - Include Correctness Columns - - - Include Only Submits - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 30,32 + src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html + 80 - Include Only Submits - - - Download All Revisions Export - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 80 + src/assets/wise5/classroomMonitor/dataExport/export-student-work/export-student-work.component.html + 32 - Download All Revisions Export + 匯出 - - Download Latest Revisions Export + + Default - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 93 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 15 - Download Latest Revisions Export + 預設 - - Latest + + Everything - src/assets/wise5/classroomMonitor/dataExport/export-item/export-item.component.html - 98 + src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html + 16 - Latest + 所有 Include Student Work @@ -16038,7 +16056,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 29,31 - Include Annotations + 包含註釋 Include Events @@ -16046,7 +16064,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-raw-data/export-raw-data.component.html 34 - Include Events + 包含事件 Export Step Visit Events @@ -16054,7 +16072,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 14 - Export Step Visit Events + 匯出步驟訪問事件 Hide Column Explanations @@ -16066,7 +16084,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 35,37 - Hide Column Explanations + 隱藏欄位說明 Show Column Explanations @@ -16074,7 +16092,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 20 - Show Column Explanations + 顯示欄位說明 Column Name @@ -16082,7 +16100,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 26 - Column Name + 欄位名稱 Explanation @@ -16090,7 +16108,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 27 - Explanation + 說明 Include Student Names @@ -16098,7 +16116,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 46 - Include Student Names + 包含學生姓名 Choose Steps @@ -16106,7 +16124,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 48 - Choose Steps + 選擇步驟 Select All @@ -16118,7 +16136,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 21 - Select All + 全選 Deselect All @@ -16130,7 +16148,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 31 - Deselect All + 取消全選 Include Deleted Steps (If Any) @@ -16138,7 +16156,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 76 - Include Deleted Steps (If Any) + 包含已刪除步驟(若有) Back To Top @@ -16146,7 +16164,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.html 86 - Back To Top + 回到頂端 The row number. @@ -16154,7 +16172,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 117 - The row number. + 列號。 The ID of the group. @@ -16162,7 +16180,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 118 - The ID of the group. + 作業小組ID The User ID of the first student in the group. This ID follows the student for all runs. @@ -16170,7 +16188,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 121 - The User ID of the first student in the group. This ID follows the student for all runs. + 作業小組中第一位學生的用戶ID，此ID將跟隨該學生所有單元。 The name of the first student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. @@ -16178,7 +16196,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 125 - The name of the first student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. + 第一位學生姓名。僅在您有權查看學生姓名並勾選「包含學生姓名」選項時顯示。 The UserID of the second student in the group. This ID follows the student for all runs. @@ -16186,7 +16204,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 129 - The UserID of the second student in the group. This ID follows the student for all runs. + 作業小組中第二位學生的用戶ID，這個 ID 在所有課程中都會跟隨該學生。 The name of the second student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. @@ -16194,7 +16212,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 133 - The name of the second student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. + 第二位學生姓名。僅在您有權查看學生姓名並勾選「包含學生姓名」選項時顯示。 The User ID of the third student in the group. This ID follows the student for all runs. @@ -16202,7 +16220,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 137 - The User ID of the third student in the group. This ID follows the student for all runs. + 作業小組中第三位學生的用戶ID，這個 ID 在所有課程中都會跟隨該學生。 The name of the third student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. @@ -16210,7 +16228,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 141 - The name of the third student. This only shows up if you have permission to view the student names and you enabled the 'Include Student Names' checkbox. + 第三位學生姓名。僅在您有權查看學生姓名並勾選「包含學生姓名」選項時顯示。 The ID of the run. @@ -16218,7 +16236,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 143 - The ID of the run. + 執行ID The ID of the project. @@ -16226,7 +16244,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 144 - The ID of the project. + 專案ID The name of the project. @@ -16234,7 +16252,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 145 - The name of the project. + 專案名稱。 The ID of the period that this student is in. @@ -16242,7 +16260,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 146 - The ID of the period that this student is in. + 學生所在班級ID The period name that this student is in. This name is chosen by the teacher that created the run. @@ -16250,7 +16268,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 149 - The period name that this student is in. This name is chosen by the teacher that created the run. + 學生所在班級名稱，由建立執行的教師命名。 The start date of the run. @@ -16258,7 +16276,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 151 - The start date of the run. + 執行開始日期 The end date of the run. @@ -16266,7 +16284,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 152 - The end date of the run. + 執行結束日期 The ID of the step. Each step in a unit has a unique Node ID. @@ -16274,7 +16292,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 155 - The ID of the step. Each step in a unit has a unique Node ID. + 步驟ID，單元中每個步驟都有獨特的節點ID。 The title of the step. @@ -16282,7 +16300,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 157 - The title of the step. + 步驟標題。 The timestamp when the student entered the step. @@ -16290,7 +16308,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 160 - The timestamp when the student entered the step. + 學生進入步驟的時間戳記 The timestamp when the student exited the step. This value can be empty if WISE did not get the chance to save a step exit event. This can happen if the student closes their laptop without signing out of WISE or if they refresh the WISE page. @@ -16298,7 +16316,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 164 - The timestamp when the student exited the step. This value can be empty if WISE did not get the chance to save a step exit event. This can happen if the student closes their laptop without signing out of WISE or if they refresh the WISE page. + 學生退出步驟的時間戳記。此值可能為空，如果WISE沒有機會儲存步驟退出事件。這可能發生在學生未登出WISE就關閉筆記型電腦或重新整理WISE頁面的情況下。 The amount of time the student spent on the step during this visit measured in seconds. @@ -16306,7 +16324,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 168 - The amount of time the student spent on the step during this visit measured in seconds. + 學生在此次訪問中花在該步驟上的秒數 The number of times the student has visited this step so far. @@ -16314,7 +16332,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 172 - The number of times the student has visited this step so far. + 學生到目前為止訪問該步驟的次數。 The number of times the student has revisited this step so far. This will always be 1 less than the 'Visit Counter' for a given visit. @@ -16322,7 +16340,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 176 - The number of times the student has revisited this step so far. This will always be 1 less than the 'Visit Counter' for a given visit. + 學生到目前為止重新訪問該步驟的次數。對於給定的訪問，這個值通常會比"訪問計數器"少1。 The Node ID of the step the student was on before visiting this step. @@ -16330,7 +16348,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 180 - The Node ID of the step the student was on before visiting this step. + 學生訪問此步驟前所在步驟的節點ID The step title of the step the student was on before visiting this step. @@ -16338,7 +16356,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 184 - The step title of the step the student was on before visiting this step. + 學生訪問此步驟前所在步驟的標題 A list of Node IDs that contain the steps the student visited before revisiting this step. This cell will only contain values if they revisit a step. For example if the student navigated to node1, then node2, then node3, then node1. For the second visit to node1, the 'Node IDs Since Last Visit' will show node2, node3. @@ -16346,7 +16364,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 188 - A list of Node IDs that contain the steps the student visited before revisiting this step. This cell will only contain values if they revisit a step. For example if the student navigated to node1, then node2, then node3, then node1. For the second visit to node1, the 'Node IDs Since Last Visit' will show node2, node3. + 學生在重新訪問該步驟前經歷的節點ID列表。只有在重新訪問步驟時，此單元格才會有值。例如，如果學生依序導覽到節點1、節點2、節點3、節點1，則第二次訪問節點1時，"自上次訪問以來的節點ID"將顯示節點2、節點3。 A list of step numbers that contain the steps the student visited before revisiting this step. This cell will only contain values if they revisit a step. For example if the student navigated to 1.1, then 1.2, then 1.3, then 1.1. For the second visit to 1.1, the 'Steps Since Last Visit' will show 1.2, 1.3. @@ -16354,7 +16372,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/export-step-visits/export-step-visits.component.ts 192 - A list of step numbers that contain the steps the student visited before revisiting this step. This cell will only contain values if they revisit a step. For example if the student navigated to 1.1, then 1.2, then 1.3, then 1.1. For the second visit to 1.1, the 'Steps Since Last Visit' will show 1.2, 1.3. + 學生在重新訪問該步驟前經歷的步驟號列表。只有在重新訪問步驟時，此單元格才會有值。例如，如果學生依序導覽到1.1、1.2、1.3、1.1，則第二次訪問1.1時，"自上次訪問以來的步驟"將顯示1.2、1.3。 Export All Steps @@ -16362,7 +16380,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 8,10 - Export All Steps + 匯出所有步驟 Select Steps To Export @@ -16370,7 +16388,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 11,13 - Select Steps To Export + 選擇要匯出的步驟 Select All @@ -16378,7 +16396,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 24,26 - Select All + 全選 Deselect All @@ -16386,7 +16404,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 34,36 - Deselect All + 取消全選 Item @@ -16394,7 +16412,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/dataExport/select-step-and-component-checkboxes/select-step-and-component-checkboxes.component.html 61 - Item + 項目 + Expand All @@ -16402,7 +16420,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 23,25 - + Expand All + + 全部展開 - Collapse All @@ -16410,7 +16428,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 34,36 - - Collapse All + - 摺疊全部 Team ID @@ -16418,7 +16436,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 45 - Team ID + 小組 ID Sort By Team @@ -16426,7 +16444,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 48 - Sort By Team + 按小組排序 Names @@ -16438,7 +16456,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 72 - Names + 名稱 Sort By Student @@ -16446,7 +16464,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 67 - Sort By Student + 按學生排序 Sort by number of notes @@ -16454,7 +16472,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/notebook-grading/notebook-grading.component.html 89 - Sort by number of notes + 依筆記數量排序 Total Score @@ -16466,7 +16484,7 @@ Are you sure you want to proceed? src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 38 - Total Score + 總分 Expand all @@ -16474,7 +16492,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 29 - Expand all + 全部展開 Collapse all @@ -16482,7 +16500,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 40 - Collapse all + 全部收合 - Collapse All @@ -16490,7 +16508,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 45,47 - - Collapse All + - 摺疊全部 Sort by step @@ -16498,7 +16516,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html 59 - Sort by step + 按步驟排序 Sort by @@ -16506,7 +16524,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/student-progress/student-progress.component.html 7 - Sort by + 按排序 Team @@ -16514,7 +16532,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 24 - Team + 團隊 Student @@ -16550,7 +16568,7 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 44 - Location + 位置 Completion @@ -16558,7 +16576,31 @@ Are you sure you want to proceed? src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts 49 - Completion + 完成度 + + + Add response... + + src/assets/wise5/common/chat-input/chat-input.component.html + 6 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 6 + + 新增回覆... + + + Send + + src/assets/wise5/common/chat-input/chat-input.component.html + 18,20 + + + src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html + 21,23 + + 發送 @@ -16568,7 +16610,7 @@ Are you sure you want to proceed? src/assets/wise5/common/main-menu/main-menu.component.html 2 - + Selected icon @@ -16580,7 +16622,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 24 - Selected icon + 選擇圖示 Choose an Icon @@ -16588,7 +16630,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 27 - Choose an Icon + 選擇一個圖示 Use a Knowledge Integration (KI) icon: @@ -16604,7 +16646,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 35 - More about WISE and Knowledge Integration + 關於WISE和知識整合的更多資訊 Select a KI icon @@ -16612,7 +16654,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 44 - Select a KI icon + 或選擇您自己的圖示: Or choose your own icon: @@ -16620,7 +16662,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 64 - Or choose your own icon: + 選取圖示 Select an icon @@ -16628,7 +16670,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 65 - Select an icon + 顏色： Color: @@ -16636,7 +16678,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 80 - Color: + 選擇顏色 Select a color @@ -16644,7 +16686,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html 81 - Select a color + 儲存 Save @@ -16668,7 +16710,7 @@ Are you sure you want to proceed? src/assets/wise5/vle/node/node.component.html 44 - Save + 知識整合引出想法 Knowledge Integration elicit ideas @@ -16676,7 +16718,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 83 - Knowledge Integration elicit ideas + 知識整合發現想法 Elicit Ideas @@ -16692,7 +16734,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 88 - Knowledge Integration discover ideas + 知識整合區分想法 Discover Ideas @@ -16708,7 +16750,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 93 - Knowledge Integration distinguish ideas + 知識整合連接想法並反思 Distinguish Ideas @@ -16724,7 +16766,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 98 - Knowledge Integration connect ideas and reflect + 連結想法與反思 Connect Ideas & Reflect @@ -16732,7 +16774,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 99 - Connect Ideas & Reflect + 連接思想 & 反思 Knowledge Integration cycle @@ -16740,7 +16782,7 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 103 - Knowledge Integration cycle + 知識整合循環 KI Cycle @@ -16748,91 +16790,245 @@ Are you sure you want to proceed? src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.ts 104 - KI Cycle + KI 循環 + + + Submitted + + src/assets/wise5/common/save-time-message/save-time-message.component.ts + 30 + + 已提交 + + + Auto Saved + + src/assets/wise5/common/save-time-message/save-time-message.component.ts + 32 + + 已自動儲存 + + + Saved + + src/assets/wise5/common/save-time-message/save-time-message.component.ts + 34 + + 已儲存 + + + Previous Step + + src/assets/wise5/common/stepTools/step-tools.component.html + 5 + + + src/assets/wise5/common/stepTools/step-tools.component.html + 9 + + + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + 9 + + 上一個步驟 + + + Select a Step + + src/assets/wise5/common/stepTools/step-tools.component.html + 20 + + + src/assets/wise5/common/stepTools/step-tools.component.html + 22 + + + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + 20 + + + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + 22 + + 選擇一個步驟 + + + Select a Step + + src/assets/wise5/common/stepTools/step-tools.component.html + 32 + + 選擇一個步驟 + + + Next Step + + src/assets/wise5/common/stepTools/step-tools.component.html + 47 + + + src/assets/wise5/common/stepTools/step-tools.component.html + 51 + + + src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html + 58 + + 下一個步驟 + + + Students chat with an AI bot. + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 4 + + 學生與 AI 聊天。 + + + AI Chat + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 5 + + + src/assets/wise5/components/aiChat/AiChatInfo.ts + 8 + + + src/assets/wise5/components/aiChat/aiChatService.ts + 14 + + AI 聊天 + + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 3,6 + + Use the system prompt to instruct the chat bot how to behave. Students will not see the system prompt. + + + Toggle system prompt instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 13 + + 自動指導回應 + + + System Prompt Instructions + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 20 + + 學生回應 + + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. + + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 21,24 + + Provide context, instructions, and other relevant information to help the chat bot act the way you want it to. Be as specific as possible. - - Submitted + + Example System Prompt - src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 25 - Submitted + 音訊振盪器 - - Auto Saved + + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. - src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 26,32 - Auto Saved + You are a teacher helping a student understand the greenhouse effect by using the example of a car that has been sitting in the sun on a cold day. The student is asked how the temperature inside the car will feel. Do not tell them the correct answer, but guide them to better understand the science by asking questions. Also make sure they explain their reasoning. Limit your response to 100 words or less. - - Saved + + System Prompt - src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 35 - Saved + System Prompt - - Previous Step + + Use the prompt to introduce the chatbot activity. Students will see the prompt. - src/assets/wise5/common/stepTools/step-tools.component.html - 5 + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 44 + Use the prompt to introduce the chatbot activity. Students will see the prompt. + + + Enable Computer Avatar - src/assets/wise5/common/stepTools/step-tools.component.html - 9 + src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html + 55 - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 9 + src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html + 21 - 上一個步驟 + Enable Computer Avatar - - Select a Step + + Automated guidance response - src/assets/wise5/common/stepTools/step-tools.component.html - 20 + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 5 - src/assets/wise5/common/stepTools/step-tools.component.html - 22 + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 17 - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 20 + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 26 + Automated guidance response + + + + + - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 22 + src/assets/wise5/components/aiChat/ai-chat-bot-message/ai-chat-bot-message.component.html + 10 - 選擇一個步驟 + - - Select a Step + + Student response - src/assets/wise5/common/stepTools/step-tools.component.html - 32 + src/assets/wise5/components/aiChat/ai-chat-student-message/ai-chat-student-message.component.html + 5 - Select a Step - - - Next Step - src/assets/wise5/common/stepTools/step-tools.component.html - 47 + src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html + 6 + Student response + + + An error occurred. - src/assets/wise5/common/stepTools/step-tools.component.html - 51 + src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts + 95 + An error occurred. + + + Model - src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 58 + src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html + 2 - 下一個步驟 + 模型 Students watch an animation. @@ -16840,7 +17036,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/AnimationInfo.ts 4 - Students watch an animation. + 學生觀看動畫。 Animation @@ -16856,7 +17052,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animationService.ts 9 - Animation + 動畫 Width (Pixels) @@ -16880,7 +17076,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 29 - Width (Units) + 寬度(單位) Height (Units) @@ -16888,7 +17084,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 39 - Height (Units) + 高度(單位) Data Origin X (Pixels) @@ -16896,7 +17092,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 51 - Data Origin X (Pixels) + 資料原點X(像素) Data Origin Y (Pixels) @@ -16904,7 +17100,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 61 - Data Origin Y (Pixels) + 資料原點Y(像素) Screen @@ -16912,7 +17108,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 77,79 - Screen + 螢幕 Cartesian @@ -16920,7 +17116,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 80,82 - Cartesian + 笛卡兒座標 Objects @@ -16928,7 +17124,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 86 - Objects + 物件 Add Object @@ -16936,7 +17132,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 91 - Add Object + 新增物件 Image @@ -16944,7 +17140,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 116,118 - Image + 圖片 Text @@ -16952,7 +17148,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 119,121 - Text + 文字 Image @@ -16970,7 +17166,7 @@ Are you sure you want to proceed? src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 54 + 59 src/assets/wise5/components/label/label-authoring/label-authoring.component.html @@ -16980,7 +17176,7 @@ Are you sure you want to proceed? src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 61 - Image + 圖片 Choose an Image @@ -17076,7 +17272,7 @@ Are you sure you want to proceed? src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 58 - Choose an Image + 選擇圖片 Text @@ -17096,7 +17292,7 @@ Are you sure you want to proceed? src/assets/wise5/components/label/label-authoring/label-authoring.component.html 137 - Text + 文字 Move Object Up @@ -17104,7 +17300,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 159 - Move Object Up + 向上移動物件 Up @@ -17136,7 +17332,7 @@ Are you sure you want to proceed? src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 163 - Up + 上 Move Object Down @@ -17144,7 +17340,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 173 - Move Object Down + 向下移動物件 Down @@ -17176,7 +17372,7 @@ Are you sure you want to proceed? src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 177 - Down + 下 Delete Object @@ -17184,7 +17380,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 186 - Delete Object + 刪除物件 Image Width (Pixels) @@ -17192,7 +17388,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 197 - Image Width (Pixels) + 圖片寬度 (像素) Image Height (Pixels) @@ -17200,7 +17396,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 207 - Image Height (Pixels) + 圖片高度 (像素) Image Moving Left @@ -17208,7 +17404,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 219 - Image Moving Left + 圖片向左移動 Image Moving Right @@ -17216,7 +17412,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 240 - Image Moving Right + 圖片向右移動 Location X (Pixels) @@ -17224,7 +17420,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 263 - Location X (Pixels) + 位置X(像素) Location Y (Pixels) @@ -17232,7 +17428,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 273 - Location Y (Pixels) + 位置Y(像素) Data X (Units) @@ -17240,7 +17436,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 283 - Data X (Units) + 資料X(單位) Data Y (Units) @@ -17248,7 +17444,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 293 - Data Y (Units) + 資料Y(單位) Data Points @@ -17260,7 +17456,7 @@ Are you sure you want to proceed? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 496 - Data Points + 資料點 Add Data Point @@ -17272,7 +17468,7 @@ Are you sure you want to proceed? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 501 - Add Data Point + 新增資料點 Time @@ -17280,7 +17476,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 332 - Time + 時間 X @@ -17300,7 +17496,7 @@ Are you sure you want to proceed? src/assets/wise5/components/label/label-authoring/label-authoring.component.html 214 - X + X Y @@ -17320,7 +17516,7 @@ Are you sure you want to proceed? src/assets/wise5/components/label/label-authoring/label-authoring.component.html 223 - Y + Y Change to Image (Optional) @@ -17328,7 +17524,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 362 - Change to Image (Optional) + 變更為圖片(可選) Delete Data Point @@ -17340,7 +17536,7 @@ Are you sure you want to proceed? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 593 - Delete Data Point + 刪除資料點 Data Source @@ -17348,7 +17544,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 424 - Data Source + 資料來源 Add Data Source @@ -17356,7 +17552,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 431 - Add Data Source + 新增資料來源 Delete Data Source @@ -17364,7 +17560,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 444 - Delete Data Source + 刪除資料來源 Trial Index @@ -17372,7 +17568,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 493 - Trial Index + 試驗索引 Series Index @@ -17380,7 +17576,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 503 - Series Index + 序列索引 Time Column Index @@ -17388,7 +17584,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 513 - Time Column Index + 時間欄索引 X Column Index @@ -17396,7 +17592,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 523 - X Column Index + X欄索引 Y Column Index @@ -17404,7 +17600,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html 533 - Y Column Index + Y欄索引 You can only have Data Points or a Data Source. If you add a Data Point, the Data Source will be deleted. Are you sure you want to add a Data Point? @@ -17412,7 +17608,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 72 - You can only have Data Points or a Data Source. If you add a Data Point, the Data Source will be deleted. Are you sure you want to add a Data Point? + 您只能有資料點或資料來源。如果新增資料點，資料來源將被刪除。確定要新增資料點嗎? Are you sure you want to delete this data point? @@ -17420,7 +17616,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 89 - Are you sure you want to delete this data point? + 您確定要刪除此資料點嗎? Are you sure you want to delete this object? @@ -17428,7 +17624,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 146 - Are you sure you want to delete this object? + 您確定要刪除此物件嗎? You can only have Data Points or a Data Source. If you add a Data Source, the Data Points will be deleted. Are you sure you want to add a Data Source? @@ -17436,7 +17632,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 160 - You can only have Data Points or a Data Source. If you add a Data Source, the Data Points will be deleted. Are you sure you want to add a Data Source? + 您只能有資料點或資料來源。如果新增資料來源，資料點將被刪除。確定要新增資料來源嗎? Are you sure you want to delete the Data Source? @@ -17444,7 +17640,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.ts 189 - Are you sure you want to delete the Data Source? + 您確定要刪除此資料來源嗎? Number of Times Animation Played @@ -17452,7 +17648,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-show-work/animation-show-work.component.html 2 - Number of Times Animation Played + 動畫播放次數 Play @@ -17460,7 +17656,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-student/animation-student.component.html 10 - Play + 播放 Pause @@ -17476,7 +17672,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-student/animation-student.component.html 34 - Resume + 繼續 Slower @@ -17484,7 +17680,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-student/animation-student.component.html 52 - Slower + 减慢 Faster @@ -17492,7 +17688,7 @@ Are you sure you want to proceed? src/assets/wise5/components/animation/animation-student/animation-student.component.html 61 - Faster + 加快 Add File @@ -17520,7 +17716,7 @@ Are you sure you want to proceed? src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 178 - You do not have any more chances to receive feedback on your answer. + 您已經沒有機會獲得對您答案的回饋了。 You have 1 chance to receive feedback on your answer so this this should be your best work. @@ -17530,9 +17726,9 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/animation/animation-student/animation-student.component.ts 910 - You have 1 chance to receive feedback on your answer so this this should be your best work. + 您還有1次機會獲得對您答案的回饋，所以這應該是您最好的回答。 -Are you ready to receive feedback on this answer? +您準備好接收對此答案的回饋了嗎? You have chances to receive feedback on your answer so this this should be your best work. @@ -17546,9 +17742,9 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 329 - You have chances to receive feedback on your answer so this this should be your best work. + 您還有次機會獲得對您答案的回饋，所以這應該是您最好的回答。 -Are you ready to receive feedback on this answer? +您準備好接收對此答案的回饋了嗎? Students change the frequency and amplitude of a sound wave. They listen to the resulting sounds and view graphs of the waves. @@ -17614,7 +17810,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 40,42 - Triangle + 三角波 Sawtooth @@ -17622,7 +17818,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 50,52 - Sawtooth + 鋸齒波 Frequency @@ -17630,7 +17826,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 60 - Frequency + 頻率 Starting Frequency (Hz) @@ -17638,7 +17834,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 62 - Starting Frequency (Hz) + 初始頻率(Hz) Show Frequency Input @@ -17646,7 +17842,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 76,78 - Show Frequency Input + 顯示頻率輸入 Allow Student to Edit Frequency @@ -17662,7 +17858,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 95 - Amplitude + 振幅 Starting Amplitude (dB) @@ -17670,7 +17866,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 97 - Starting Amplitude (dB) + 初始振幅(dB) Show Amplitude Input @@ -17694,7 +17890,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 135 - Oscillator Width (Pixels) + 振盪器寬度(像素) Oscillator Height (Pixels) @@ -17702,7 +17898,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 145 - Oscillator Height (Pixels) + 振盪器高度(像素) Oscillator Grid Size (Pixels) @@ -17710,7 +17906,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-authoring/audio-oscillator-authoring.component.html 155 - Oscillator Grid Size (Pixels) + 振盪器網格尺寸(像素) Frequencies (Hz) @@ -17718,7 +17914,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 2 - Frequencies (Hz) + 頻率 (赫茲) Frequencies Played @@ -17726,7 +17922,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 4 - Frequencies Played + 播放的頻率 Frequencies Played Sorted @@ -17734,7 +17930,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 7 - Frequencies Played Sorted + 已排序的播放頻率 Number of Frequencies Played @@ -17742,7 +17938,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 10 - Number of Frequencies Played + 播放的頻率數量 Number of Unique Frequencies Played @@ -17750,7 +17946,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 13 - Number of Unique Frequencies Played + 播放的唯一頻率數量 Minimum Frequency Played @@ -17758,7 +17954,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 17 - Minimum Frequency Played + 播放的最小頻率 Maximum Frequency Played @@ -17766,7 +17962,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 20 - Maximum Frequency Played + 播放的最大頻率 Amplitudes (dB) @@ -17774,7 +17970,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 23 - Amplitudes (dB) + 振幅(dB) Amplitudes Played @@ -17782,7 +17978,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 25 - Amplitudes Played + 播放的振幅 Amplitudes Played Sorted @@ -17790,7 +17986,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 28 - Amplitudes Played Sorted + 已排序的播放振幅 Number of Amplitudes Played @@ -17798,7 +17994,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 31 - Number of Amplitudes Played + 播放的振幅數量 Number of Unique Amplitudes Played @@ -17806,7 +18002,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 34 - Number of Unique Amplitudes Played + 播放的唯一振幅數量 Min Amplitude Played @@ -17814,7 +18010,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 38 - Min Amplitude Played + 播放的最小振幅 Max Amplitude Played @@ -17822,7 +18018,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-show-work/audio-oscillator-show-work.component.html 41 - Max Amplitude Played + 播放的最大振幅 Oscillator Type @@ -17830,7 +18026,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.html 4 - Oscillator Type + 振盪器類型 Frequency (Hz) @@ -17846,7 +18042,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.html 26 - Ampitude (dB) + 振幅(dB) Play @@ -17854,7 +18050,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.ts 280 - Play + 播放 Stop @@ -17862,7 +18058,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/audioOscillator/audio-oscillator-student/audio-oscillator-student.component.ts 284 - Stop + 停止 Thanks for submitting your response. @@ -17870,7 +18066,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/FeedbackRuleEvaluator.ts 14 - Thanks for submitting your response. + 感謝您提交回應。 Feedback Rules @@ -17878,7 +18074,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 3 - Feedback Rules + 回饋規則 Feedback # @@ -17886,7 +18082,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 66 - Feedback # + 回饋# Delete feedback @@ -17894,7 +18090,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 79 - Delete feedback + 刪除回饋 Add new feedback @@ -17902,7 +18098,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 90 - Add new feedback + 新增回饋 add_circle @@ -17910,7 +18106,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html 96 - add_circle + add_circle Are you sure you want to delete this feedback? @@ -17918,7 +18114,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.ts 73 - Are you sure you want to delete this feedback? + 您確定要刪除此回饋嗎? Are you sure you want to delete this feedback rule? @@ -17926,7 +18122,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.ts 80 - Are you sure you want to delete this feedback rule? + 您確定要刪除此回饋規則嗎? Note: this term currently only works in the Dialog Guidance component. @@ -17942,7 +18138,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 4 - Feedback Rule Authoring + 回饋規則編寫 Introduction @@ -17950,7 +18146,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 6 - Introduction + 簡介 Rules are evaluated top to bottom. The first rule Expression that matches the student's response is used to provide feedback. @@ -17974,7 +18170,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 16 - Expressions are made up of terms, operators, and parentheses: + 表達式由術語、運算符和括號組成: Terms @@ -17982,7 +18178,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 17 - Terms + 術語 Terms lets you specify what to look for in a student response. @@ -17990,7 +18186,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 18 - Terms lets you specify what to look for in a student response. + 術語可讓您指定要在學生回應中尋找的內容。 Term @@ -17998,7 +18194,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 21 - Term + 術語 Evaluates to true if idea 1, 2, 18, etc was found in the student's response. @@ -18006,7 +18202,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 26 - Evaluates to true if idea 1, 2, 18, etc was found in the student's response. + 如果在學生回應中找到想法1、2、18等，則評估為true。 Evaluates to true if the student received a KI score of X. Ex: hasKIScore(3) evaluates to true if the student received KI score 3. @@ -18118,7 +18314,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 136 - Evaluates to true if the student's response was not scorable. + 如果學生的回答無法評分，則評估為true。 Evaluates to true if no other terms were matched. Add this term as the final rule to specify a default feedback. @@ -18134,7 +18330,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 146 - Operators + 運算子 Operators let you combine one or more terms together to make a rule. @@ -18142,7 +18338,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 147 - Operators let you combine one or more terms together to make a rule. + 運算子允許您將一個或多個術語組合在一起，以制定規則。 Operator @@ -18150,7 +18346,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 150 - Operator + 運算子 Evaluates to true if terms on both sides of this operator evaluate to true. Ex: 1 && 2 evaluates to true if both idea 1 and 2 were found. Ex: 1 && hasKIScore(2) evaluates to true if idea 1 was found and the student received a KI score of 2. @@ -18182,7 +18378,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 179 - Parentheses + 括號 Parentheses let you group expressions and prioritize evaluation. @@ -18190,7 +18386,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 180 - Parentheses let you group expressions and prioritize evaluation. + 括號允許您對表達式進行分組和優先評估。 You can add multiple parentheses in an expression. You can even nest parentheses. @@ -18198,7 +18394,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 181 - You can add multiple parentheses in an expression. You can even nest parentheses. + 您可以在表達式中新增多個括號。您甚至可以嵌套括號。 Example @@ -18206,7 +18402,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 184 - Example + 範例 Evaluates to true if neither idea 4a nor idea 12 were found. @@ -18214,7 +18410,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 189 - Evaluates to true if neither idea 4a nor idea 12 were found. + 如果既沒有找到想法4a也沒有找到想法12，則評估為true。 Evaluates to true if idea 5a and either idea 4a or idea 12 was found. @@ -18222,7 +18418,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/common/feedbackRule/feedback-rule-help/feedback-rule-help.component.html 193 - Evaluates to true if idea 5a and either idea 4a or idea 12 was found. + 如果找到了想法5a以及想法4a或想法12，則評估為true。 Evaluates to true if idea 5a and either idea 4a or idea 12 was found, and the student received a KI score of 3. @@ -18238,7 +18434,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/component/component.component.html 2 - Teaching Tips + 教學提示 Students add items to a canvas and connect the items with links. @@ -18246,7 +18442,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/ConceptMapInfo.ts 4 - Students add items to a canvas and connect the items with links. + 學生在畫布上新增項目，並使用連結將項目連接起來。 Concept Map @@ -18262,7 +18458,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/conceptMapService.ts 22 - Concept Map + 概念圖 Background Image (Optional) @@ -18278,7 +18474,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 304 - Background Image (Optional) + 背景圖 (可選) Stretch background to fit @@ -18286,7 +18482,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 32,34 - Stretch background to fit + 拉伸背景以適應 Allow student to upload background image @@ -18294,7 +18490,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 42,44 - Allow student to upload background image + 允許學生上傳背景圖 Canvas Width (Optional) @@ -18302,7 +18498,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 48 - Canvas Width (Optional) + 畫布寬度(可選) Canvas Height (Optional) @@ -18314,7 +18510,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 49 - Canvas Height (Optional) + 畫布高度(可選) Nodes @@ -18322,7 +18518,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 68 - Nodes + 節點 Add Node @@ -18334,7 +18530,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 76 - Add Node + 新增節點 There are no nodes. Click the "Add Node" button to add a node. @@ -18342,7 +18538,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 83 - There are no nodes. Click the "Add Node" button to add a node. + 沒有節點。點擊"新增節點"按鈕來新增節點。 Node Label @@ -18350,7 +18546,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 98 - Node Label + 節點標籤 Width @@ -18374,7 +18570,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 199,201 - Show Node Labels + 顯示節點標籤 Links Title @@ -18382,7 +18578,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 206 - Links Title + 連結標題 Links @@ -18390,7 +18586,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 214 - Links + 連結 Add Link @@ -18402,7 +18598,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 222 - Add Link + 新增連結 There are no links. Click the "Add Link" button to add a link. @@ -18410,7 +18606,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 229 - There are no links. Click the "Add Link" button to add a link. + 沒有連結。點擊"新增連結"按鈕來新增連結。 Link Label @@ -18418,7 +18614,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html 245 - Link Label + 連結標籤 Color @@ -18454,7 +18650,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 146 - Color + 顏色 Are you sure you want to delete this node? @@ -18465,10 +18661,9 @@ Label: src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts 51 - Are you sure you want to delete this node? - -File Name: -Label: + 您確定要刪除此節點嗎? +檔案名稱: +標籤: Are you sure you want to delete this link? @@ -18478,9 +18673,7 @@ Label: src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.ts 63 - Are you sure you want to delete this link? - -Label: + 您確定要刪除此連結嗎? 標籤: Reset @@ -18488,7 +18681,7 @@ Label: src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.html 12,14 - Reset + 重設 Upload Background Image @@ -18500,7 +18693,7 @@ Label: src/assets/wise5/components/label/label-student/label-student.component.html 59 - Upload Background Image + 上傳背景圖片 Delete Background Image @@ -18512,7 +18705,7 @@ Label: src/assets/wise5/components/label/label-student/label-student.component.html 71 - Delete Background Image + 刪除背景圖片 Delete @@ -18532,7 +18725,7 @@ Label: src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 323 - You have no more chances to receive feedback on your answer. + 您已經沒有機會獲得對您答案的回饋了。 You have 1 chance to receive feedback on your answer so this should be your best work. @@ -18546,9 +18739,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 165 - You have 1 chance to receive feedback on your answer so this should be your best work. - -Are you ready to receive feedback on this answer? + 您還有1次機會獲得對您答案的回饋，所以這應該是您最好的回答。您準備好接收對此答案的回饋了嗎? Feedback @@ -18562,7 +18753,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 Feedback @@ -18572,7 +18763,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/concept-map-student/concept-map-student.component.ts 1412 - Are you sure you want to reset your work? + 您確定要放棄您的修改嗎? Show Auto Score @@ -18580,7 +18771,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 8,10 - Show Auto Score + 顯示自動評分 Show Auto Feedback @@ -18588,7 +18779,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 18,20 - Show Auto Feedback + 顯示自動回饋 Rules @@ -18596,7 +18787,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 23 - Rules + 規則 add @@ -18604,7 +18795,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 25 - add + add Rule Name @@ -18612,7 +18803,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 36 - Rule Name + 規則名稱 Should @@ -18620,7 +18811,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 40 - Should + 應該 should contain @@ -18628,7 +18819,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 42 - should contain + 應該包含 should not contain @@ -18636,7 +18827,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 43 - should not contain + 不應包含 Comparison @@ -18644,7 +18835,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 47 - Comparison + 比較 exactly @@ -18652,7 +18843,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 49 - exactly + 等於 more than @@ -18660,7 +18851,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 50 - more than + 大於 less than @@ -18668,7 +18859,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 51 - less than + 小於 Count @@ -18688,7 +18879,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 93 - Node + 節點 Link Connection @@ -18696,7 +18887,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 75 - Link Connection + 連結關係 with any or no link @@ -18704,7 +18895,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 77 - with any or no link + 有任何連結或無連結 with specific link @@ -18712,7 +18903,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 78 - with specific link + 有特定連結 to @@ -18720,7 +18911,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 91 - to + 到 arrow_upward @@ -18728,7 +18919,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 112 - arrow_upward + 上移 arrow_downward @@ -18736,7 +18927,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 123 - arrow_downward + 下移 delete @@ -18744,7 +18935,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 134 - delete + 刪除 Add Category (Optional) @@ -18752,7 +18943,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 145,147 - Add Category (Optional) + 新增類別(可選) Category Name @@ -18764,7 +18955,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 132 - Category Name + 類別名稱 Delete Catagory @@ -18772,7 +18963,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 165 - Delete Catagory + 刪除類別 Custom Rule Evaluator @@ -18780,7 +18971,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html 174 - Custom Rule Evaluator + 自訂規則評估器 Are you sure you want to delete this rule? @@ -18790,9 +18981,7 @@ Rule Name: src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts 62 - Are you sure you want to delete this rule? - -Rule Name: + 您確定要刪除此規則嗎? 規則名稱: Are you sure you want to delete the category from this rule? @@ -18803,10 +18992,9 @@ Category Name: src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts 84 - Are you sure you want to delete the category from this rule? - -Rule Name: -Category Name: + 您確定要從此規則中刪除該類別嗎? +規則名稱: +類別名稱: Import Work As Background @@ -18826,7 +19014,7 @@ Category Name: src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html 25,27 - Import Work As Background + 將作品匯入為背景 Do you want to copy the nodes and links from the connected component? @@ -18834,7 +19022,7 @@ Category Name: src/assets/wise5/components/conceptMap/edit-concept-map-connected-components/edit-concept-map-connected-components.component.ts 37 - Do you want to copy the nodes and links from the connected component? + 您是否要從連接的組件複製節點和連結? Warning: This will delete all existing nodes and links in this component. @@ -18850,7 +19038,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/DialogGuidanceInfo.ts 4 - Students chat with a computer avatar about a specific topic. + 學生與虛擬化身就特定主題進行聊天。 Dialog Guidance @@ -18866,7 +19054,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts 12 - Dialog Guidance + 對話指導 Item ID @@ -18874,79 +19062,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html 7 - Item ID - - - Enable Computer Avatar - - src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html - 21 - - Enable Computer Avatar - - - Add response... - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 26 - - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 6 - - Add response... - - - Send - - src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html - 39,41 - - Send - - - Student response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 6 - - Student response - - - Automated guidance response - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 17 - - - src/assets/wise5/components/dialogGuidance/dialog-response/dialog-response.component.html - 26 - - Automated guidance response - - - Discuss your answer with a thought buddy! - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 30 - - Discuss your answer with a thought buddy! - - - Hi there! It's nice to meet you. What do you think about... - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 31 - - Hi there! It's nice to meet you. What do you think about... - - - Thought Buddy - - src/assets/wise5/components/dialogGuidance/dialogGuidanceService.ts - 36 - - Thought Buddy + 項目ID Use Global Computer Avatar @@ -18954,7 +19070,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 7 - Use Global Computer Avatar + 使用全域虛擬化身 Computer Avatar Label @@ -18962,7 +19078,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 10 - Computer Avatar Label + 虛擬化身標籤 Thought Buddy @@ -18970,7 +19086,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 15 - Thought Buddy + 思考夥伴 This is what the computer avatar will be referred as @@ -18978,7 +19094,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 18 - This is what the computer avatar will be referred as + 這就是虛擬化身的稱呼 Computer Avatar Prompt @@ -18986,7 +19102,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 21 - Computer Avatar Prompt + 虛擬化身提示 Discuss your answer with a thought buddy! @@ -18994,7 +19110,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 26 - Discuss your answer with a thought buddy! + 與你的思考夥伴討論你的答案! This text will introduce the avatar selection task @@ -19002,7 +19118,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 31 - This text will introduce the avatar selection task + 此文字將介紹化身選擇任務 Computer Avatar Initial Response @@ -19010,7 +19126,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 34 - Computer Avatar Initial Response + 虛擬化身初始回應 Hi there! It's nice to meet you. What do you think about... @@ -19026,7 +19142,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 42 - Computer avatar will initiate dialog with this text + 虛擬化身將以此文字開始對話 Select all avatars @@ -19034,7 +19150,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 51 - Select all avatars + 選擇所有頭像 Select All @@ -19042,7 +19158,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 54,56 - Select All + 全選 Select no avatars @@ -19050,7 +19166,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 61 - Select no avatars + 不選擇任何頭像 Select None @@ -19058,7 +19174,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 64,66 - Select None + 全不選 Avatars available to students @@ -19066,7 +19182,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 71 - Avatars available to students + 學生可用的化身 Toggle @@ -19074,7 +19190,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 79 - Toggle + 切換 Not selected @@ -19082,7 +19198,7 @@ Category Name: src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component.html 99 - Not selected + 未選取 Students post messages for the whole class to see and can reply to other students' posts. @@ -19090,7 +19206,7 @@ Category Name: src/assets/wise5/components/discussion/DiscussionInfo.ts 4 - Students post messages for the whole class to see and can reply to other students' posts. + 學生發布全班可見的訊息，並可以回覆其他學生的貼文。 Discussion @@ -19106,7 +19222,7 @@ Category Name: src/assets/wise5/components/discussion/discussionService.ts 16 - Discussion + 討論 Post attachment @@ -19114,7 +19230,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.html 28 - Post attachment + 發佈附件 Delete this post so students will not see it @@ -19126,7 +19242,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.html 123 - Delete this post so students will not see it + 刪除此貼文，學生將看不到 Delete @@ -19146,7 +19262,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.html 151 - Make this post viewable to students + 使學生可以看到此貼文 Undo Delete @@ -19162,7 +19278,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.html 72,74 - Comments () + 評論() Comments () @@ -19170,7 +19286,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.html 81 - Comments () + 評論() Students will not see this post @@ -19178,7 +19294,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.html 136 - Students will not see this post + 學生將看不到此貼文 Parent Deleted @@ -19186,7 +19302,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.html 139,141 - Parent Deleted + 父貼文已刪除 Undo Delete @@ -19206,7 +19322,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.html 173 - Add Comment + 新增留言 Are you sure you want to delete this post? @@ -19214,7 +19330,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.ts 117 - Are you sure you want to delete this post? + 您確定要刪除此貼文嗎? Are you sure you want to show this post? @@ -19222,7 +19338,7 @@ Category Name: src/assets/wise5/components/discussion/class-response/class-response.component.ts 123 - Are you sure you want to show this post? + 您確定要檢舉此貼文嗎? Students can upload and use images in their posts @@ -19230,7 +19346,7 @@ Category Name: src/assets/wise5/components/discussion/discussion-authoring/discussion-authoring.component.html 11,13 - Students can upload and use images in their posts + 學生可以在貼文中上傳和使用圖片 Students must create a post before viewing classmates' posts @@ -19238,29 +19354,29 @@ Category Name: src/assets/wise5/components/discussion/discussion-authoring/discussion-authoring.component.html 21,23 - Students must create a post before viewing classmates' posts + 學生必須先創建貼文才能查看同學的貼文 Share with class... src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 32 + 37 - Share with class... + 與全班分享... Remove file src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 62 + 67 - Remove file + 移除檔案 Add picture src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 81 + 86 新增圖片 @@ -19268,9 +19384,9 @@ Category Name: Post src/assets/wise5/components/discussion/discussion-student/discussion-student.component.html - 93,95 + 98,100 - Post + 發佈 replied to a discussion you were in! @@ -19278,7 +19394,7 @@ Category Name: src/assets/wise5/components/discussion/discussion-student/discussion-student.component.ts 203 - replied to a discussion you were in! + 回覆了你參與的討論! Students draw on a canvas using a variety of tools. @@ -19286,7 +19402,7 @@ Category Name: src/assets/wise5/components/draw/DrawInfo.ts 4 - Students draw on a canvas using a variety of tools. + 學生使用各種工具在畫布上繪圖。 Draw @@ -19302,7 +19418,7 @@ Category Name: src/assets/wise5/components/draw/drawService.ts 39 - Draw + 繪圖 Allow student to upload background image @@ -19310,7 +19426,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 34,36 - Allow student to upload background image + 允許學生上傳背景圖 Enable All Tools @@ -19318,7 +19434,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 63 - Enable All Tools + 啟用所有工具 Enable All @@ -19326,7 +19442,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 66 - Enable All + 全部啟用 Disable All Tools @@ -19334,7 +19450,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 76 - Disable All Tools + 停用所有工具 Disable All @@ -19342,7 +19458,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 79 - Disable All + 全部停用 Select Tool @@ -19350,7 +19466,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 91,93 - Select Tool + 選擇工具 Line Tool @@ -19358,7 +19474,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 100,102 - Line Tool + 直線工具 Shape Tool @@ -19366,7 +19482,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 109,111 - Shape Tool + 形狀工具 Free Hand Tool @@ -19374,7 +19490,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 118,120 - Free Hand Tool + 自由手繪工具 Text Tool @@ -19382,7 +19498,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 128,130 - Text Tool + 文字工具 Stamp Tool @@ -19390,7 +19506,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 137,139 - Stamp Tool + 印章工具 Clone Tool @@ -19398,7 +19514,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 146,148 - Clone Tool + 重製工具 Stroke Color Tool @@ -19406,7 +19522,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 155,157 - Stroke Color Tool + 描邊顏色工具 Fill Color Tool @@ -19414,7 +19530,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 165,167 - Fill Color Tool + 填色工具 Stroke Width Tool @@ -19422,7 +19538,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 174,176 - Stroke Width Tool + 筆劃寬度工具 Send Back Tool @@ -19430,7 +19546,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 183,185 - Send Back Tool + 發回工具 Send Forward Tool @@ -19438,7 +19554,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 192,194 - Send Forward Tool + 發送工具 Undo Tool @@ -19446,7 +19562,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 202,204 - Undo Tool + 回復工具 Redo Tool @@ -19454,7 +19570,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 211,213 - Redo Tool + 重做工具 Delete Tool @@ -19462,7 +19578,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 220,222 - Delete Tool + 刪除工具 Stamps @@ -19470,7 +19586,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 227 - Stamps + 圖章 Add Stamp @@ -19478,7 +19594,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 233 - Add Stamp + 新增印章 above @@ -19486,7 +19602,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html 290 - above + 上方 Are you sure you want to delete this stamp? @@ -19496,9 +19612,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts 244 - Are you sure you want to delete this stamp? - - + 您確定要刪除此圖章嗎? file_download Import Classmate Work @@ -19534,7 +19648,7 @@ Category Name: src/assets/wise5/components/draw/draw-student/draw-student.component.ts 198 - Are you sure you want to clear your drawing? + 您確定要清除您的繪圖嗎? Do you want to update the connected drawing? @@ -19542,7 +19656,7 @@ Category Name: src/assets/wise5/components/draw/draw-student/draw-student.component.ts 285 - Do you want to update the connected drawing? + 您要更新連接的繪圖嗎? Update On @@ -19550,7 +19664,7 @@ Category Name: src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html 20 - Update On + 更新於 Students interact with a custom applicatio, such as a model or simulation. @@ -19570,7 +19684,7 @@ Category Name: src/assets/wise5/components/embedded/embeddedService.ts 30 - Embedded (Custom) + 嵌入 (自訂) Embedded @@ -19578,7 +19692,7 @@ Category Name: src/assets/wise5/components/embedded/EmbeddedInfo.ts 8 - Embedded + 嵌入 Model Parameters @@ -19586,7 +19700,7 @@ Category Name: src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html 3 - Model Parameters + 模型參數 Model File Name @@ -19594,7 +19708,7 @@ Category Name: src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 3 - Model File Name + 模型檔案名稱 Choose Model File @@ -19602,7 +19716,7 @@ Category Name: src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 11 - Choose Model File + 選擇模型檔案 Width (px) (optional) @@ -19614,7 +19728,7 @@ Category Name: src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 115 - Width (px) (optional) + 寬度 (px) (可選) Height (px) @@ -19626,7 +19740,7 @@ Category Name: src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 124 - Height (px) + 高度 (px) Saves Student Work   help @@ -19646,7 +19760,7 @@ Category Name: src/assets/wise5/components/embedded/embedded-authoring/embedded-authoring.component.html 66 - Reload Model + 重新載入模型 Students view graph data or add points to a graph. @@ -19654,7 +19768,7 @@ Category Name: src/assets/wise5/components/graph/GraphInfo.ts 4 - Students view graph data or add points to a graph. + 學生查看圖表數據或在圖表上新增點。 Graph @@ -19670,7 +19784,7 @@ Category Name: src/assets/wise5/components/graph/graphService.ts 25 - Graph + 圖表 Subtitle @@ -19678,7 +19792,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html 4 - Subtitle + 副標題 Show Mouse X Plot Line @@ -19838,7 +19952,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 73 - X Column + X 欄位 Y Column @@ -19846,7 +19960,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 82 - Y Column + Y 欄位 Show X Plot Line On Latest Point @@ -19854,7 +19968,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 98,100 - Show X Plot Line On Latest Point + 在最新點上顯示X軸繪圖線 Highlight Latest Point @@ -19862,7 +19976,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 106,108 - Highlight Latest Point + 突顯最新點 Series Numbers @@ -19870,7 +19984,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 111 - Series Numbers + 數列數 Add Series Number @@ -19878,7 +19992,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 116 - Add Series Number + 新增數列號 Series Number @@ -19886,7 +20000,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 132 - Series Number + 數列號碼 Delete Series Number @@ -19894,7 +20008,7 @@ Category Name: src/assets/wise5/components/graph/edit-graph-connected-components/edit-graph-connected-components.component.html 144 - Delete Series Number + 刪除數列號 Graph Title @@ -19902,7 +20016,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 7 - Graph Title + 圖表標題 Plot Type @@ -19910,7 +20024,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 15 - Plot Type + 圖表類型 Graph Width @@ -19918,7 +20032,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 26 - Graph Width + 圖表寬度 Graph Height @@ -19926,7 +20040,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 35 - Graph Height + 圖表高度 X Axis @@ -19934,7 +20048,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 45 - X Axis + X 軸 Axis Type @@ -19942,7 +20056,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 55 - Axis Type + 軸類型 Units @@ -19958,7 +20072,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 258 - Units + 單位 Min @@ -19974,7 +20088,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 266 - Min + 最小值 Max @@ -19990,7 +20104,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 275 - Max + 最大值 Locked @@ -20002,7 +20116,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 289,291 - Locked + 已鎖定 Categories @@ -20010,7 +20124,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 112 - Categories + 類別 Add Category @@ -20018,7 +20132,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 117 - Add Category + 新增類別 Delete Category @@ -20026,7 +20140,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 143 - Delete Category + 刪除類別 Enable Multiple Y Axes @@ -20034,7 +20148,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 162,164 - Enable Multiple Y Axes + 啟用多個Y軸 Y Axis @@ -20054,7 +20168,7 @@ Category Name: src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 95 - Y Axis + Y 軸 Locked @@ -20062,7 +20176,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 230,232 - Locked + 已鎖定 Left Side @@ -20070,7 +20184,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 297 - Left Side + 左側 Right Side @@ -20078,7 +20192,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 298 - Right Side + 右側 Round Values To @@ -20086,7 +20200,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 326 - Round Values To + 四捨五入至 Enable Trials @@ -20094,7 +20208,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 343,345 - Enable Trials + 啟用試驗 Can Student Create Trials @@ -20102,7 +20216,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 353,355 - Can Student Create Trials + 學生可以建立試驗 Can Student Delete Trials @@ -20110,7 +20224,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 362,364 - Can Student Delete Trials + 學生可以刪除試驗 Hide Existing Trials On New Trial @@ -20118,7 +20232,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 371,373 - Hide Existing Trials On New Trial + 在新試驗上隱藏現有試驗 Can Student Hide Series By Clicking On Legend @@ -20126,7 +20240,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 380,382 - Can Student Hide Series By Clicking On Legend + 學生可以通過點擊圖例隱藏數列 Enable File Upload @@ -20134,7 +20248,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 389,391 - Enable File Upload + 啟用檔案上傳 Hide Legend @@ -20142,7 +20256,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 398,400 - Hide Legend + 隱藏圖例 Series @@ -20154,7 +20268,7 @@ Category Name: src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 83 - Series + 數列 Add Series @@ -20162,7 +20276,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 409 - Add Series + 新增數列 There are no series. Click the "Add Series" button to add a series. @@ -20171,7 +20285,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 422,424 - There are no series. Click the "Add Series" button to add a series. + 沒有數列。點擊"新增數列"按鈕來新增一個數列。 @@ -20180,7 +20294,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 438 - Symbol + 符號 Line Type @@ -20188,7 +20302,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 463 - Line Type + 線條類型 Can Student Edit @@ -20196,7 +20310,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 479,481 - Can Student Edit + 學生可以編輯 Y Axis : @@ -20204,7 +20318,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 489,491 - Y Axis : + Y軸: Delete Series @@ -20212,7 +20326,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html 608 - Delete Series + 刪除數列 Line Plot @@ -20220,7 +20334,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 24 - Line Plot + 線圖 Column Plot @@ -20228,7 +20342,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 28 - Column Plot + 柱狀圖 Scatter Plot @@ -20236,7 +20350,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 32 - Scatter Plot + 散佈圖 No Rounding @@ -20244,7 +20358,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 39 - No Rounding + 不四捨五入 Integer (example 1) @@ -20252,7 +20366,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 43 - Integer (example 1) + 整數(例如1) Tenth (exapmle 0.1) @@ -20260,7 +20374,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 47 - Tenth (exapmle 0.1) + 十分位(例如0.1) Hundredth (example 0.01) @@ -20268,7 +20382,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 51 - Hundredth (example 0.01) + 百分位(例如0.01) Circle @@ -20276,7 +20390,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 58 - Circle + 圓形 Square @@ -20284,7 +20398,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 62 - Square + 方形 Triangle @@ -20292,7 +20406,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 66 - Triangle + 三角形 Triangle Down @@ -20300,7 +20414,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 70 - Triangle Down + 倒三角形 Diamond @@ -20308,7 +20422,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 74 - Diamond + 菱形 Line @@ -20316,7 +20430,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 81 - Line + 線 Point @@ -20324,7 +20438,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 85 - Point + 點 Solid @@ -20332,7 +20446,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 92 - Solid + 實線 Dash @@ -20340,7 +20454,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 96 - Dash + 虛線 Dot @@ -20348,7 +20462,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 100 - Dot + 點線 Short Dash @@ -20356,7 +20470,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 104 - Short Dash + 短虛線 Short Dot @@ -20364,7 +20478,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 108 - Short Dot + 短點線 Limits @@ -20372,7 +20486,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 115 - Limits + 限制 Categories @@ -20380,7 +20494,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 119 - Categories + 類別 Are you sure you want to delete the series? @@ -20388,7 +20502,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 190 - Are you sure you want to delete the series? + 您確定要刪除數列嗎? Are you sure you want to delete the "" series? @@ -20396,7 +20510,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 192 - Are you sure you want to delete the "" series? + 您確定要刪除 "" 數列嗎? Are you sure you want to delete the category? @@ -20404,7 +20518,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 232 - Are you sure you want to delete the category? + 是否確定要刪除此類別? Are you sure you want to delete the "" category? @@ -20412,7 +20526,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 234 - Are you sure you want to delete the "" category? + 您確定要刪除 "" 類別嗎? Are you sure you want to delete the data point? @@ -20420,7 +20534,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 258 - Are you sure you want to delete the data point? + 您確定要刪除資料點嗎? Category One @@ -20428,7 +20542,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 297 - Category One + 類別一 Category Two @@ -20436,7 +20550,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 297 - Category Two + 類別二 Are you sure you want to remove multiple Y axes? @@ -20444,7 +20558,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 341 - Are you sure you want to remove multiple Y axes? + 您確定要刪除複數Y軸嗎? Are you sure you want to decrease the number of Y Axes? @@ -20452,7 +20566,7 @@ Category Name: src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.ts 434 - Are you sure you want to decrease the number of Y Axes? + 確定要減少Y軸嗎? Select trials to show @@ -20492,7 +20606,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.html 90 - Reset Series + 重設數列 Undo @@ -20500,7 +20614,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.html 96 - Undo + 復原 New Trial @@ -20508,7 +20622,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.html 109 - New Trial + 新試驗 Add to Notebook @@ -20518,9 +20632,9 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 - Add to Notebook + 新增至筆記本 Import Data @@ -20528,7 +20642,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.html 129 - Import Data + 匯入資料 Y Max @@ -20536,7 +20650,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.html 136 - Y Max + Y 軸最大值 Y Min @@ -20544,7 +20658,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.html 147 - Y Min + Y 軸最小值 X Min @@ -20552,7 +20666,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.html 173 - X Min + X 軸最小值 X Max @@ -20560,7 +20674,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.html 184 - X Max + X 軸最大值 Are you sure you want to overwrite the current line data? @@ -20568,7 +20682,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.ts 231 - Are you sure you want to overwrite the current line data? + 您確定要覆寫目前的線條資料嗎? The series you are trying to add a point to is currently hidden. Please show the series by clicking the series name in the legend and try adding the point again. @@ -20576,7 +20690,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.ts 846 - The series you are trying to add a point to is currently hidden. Please show the series by clicking the series name in the legend and try adding the point again. + 您嘗試新增點的數列目前是隱藏的。請透過點擊圖例中的數列名稱來顯示該數列，然後再次嘗試新增點。 You can not edit this series. Please choose a series that can be edited. @@ -20584,7 +20698,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.ts 860 - You can not edit this series. Please choose a series that can be edited. + 您無法編輯此數列。請選擇一個可以編輯的數列。 Are you sure you want to reset the series? @@ -20592,7 +20706,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.ts 1093 - Are you sure you want to reset the series? + 您確定要重設數列嗎? Are you sure you want to reset the "" series? @@ -20600,7 +20714,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.ts 1095 - Are you sure you want to reset the "" series? + 您確定要重設 "" 數列嗎? Trial @@ -20612,7 +20726,7 @@ Category Name: src/assets/wise5/components/graph/graph-student/graph-student.component.ts 2417 - Trial + 試驗 Time (seconds) @@ -20620,7 +20734,7 @@ Category Name: src/assets/wise5/components/graph/graphService.ts 47 - Time (seconds) + 時間(秒) s @@ -20628,7 +20742,7 @@ Category Name: src/assets/wise5/components/graph/graphService.ts 52 - s + 秒 Position (meters) @@ -20636,7 +20750,7 @@ Category Name: src/assets/wise5/components/graph/graphService.ts 59 - Position (meters) + 位置(米) m @@ -20644,7 +20758,7 @@ Category Name: src/assets/wise5/components/graph/graphService.ts 72 - m + 分 Prediction @@ -20652,7 +20766,7 @@ Category Name: src/assets/wise5/components/graph/graphService.ts 78 - Prediction + 預測 Students view rich text (HTML) content. @@ -20660,7 +20774,7 @@ Category Name: src/assets/wise5/components/html/HtmlInfo.ts 4 - Students view rich text (HTML) content. + 學生查看富文本(HTML)內容。 Rich Text (HTML) @@ -20676,7 +20790,7 @@ Category Name: src/assets/wise5/components/html/htmlService.ts 7 - Rich Text (HTML) + 富文本(HTML) Enter html here @@ -20684,7 +20798,7 @@ Category Name: src/assets/wise5/components/html/htmlService.ts 13 - Enter html here + 在此輸入 HTML Students add labels to a canvas. @@ -20692,7 +20806,7 @@ Category Name: src/assets/wise5/components/label/LabelInfo.ts 4 - Students add labels to a canvas. + 學生在畫布上新增標籤。 Label @@ -20708,7 +20822,7 @@ Category Name: src/assets/wise5/components/label/labelService.ts 24 - Label + 標籤 Characters Per Line @@ -20716,7 +20830,7 @@ Category Name: src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html 36 - Characters Per Line + 每行字元數 Space Inbetween Lines @@ -20724,7 +20838,7 @@ Category Name: src/assets/wise5/components/label/edit-label-connected-components/edit-label-connected-components.component.html 45 - Space Inbetween Lines + 線條間距 Font Size @@ -20736,7 +20850,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 58 - Font Size + 字體大小 Background Image @@ -20744,7 +20858,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 7 - Background Image + 背景圖片 Canvas Width (px) @@ -20752,7 +20866,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 29 - Canvas Width (px) + 畫布寬度(像素) Canvas Height (px) @@ -20760,7 +20874,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 38 - Canvas Height (px) + 畫布高度(像素) Point Radius Size (px) @@ -20768,7 +20882,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 49 - Point Radius Size (px) + 點半徑大小(像素) Label Max Character Width @@ -20776,7 +20890,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 67 - Label Max Character Width + 標籤最大字元寬度 Can Student Create Labels @@ -20808,7 +20922,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 110 - Starter Labels + 起始標籤 Add Starter Label @@ -20816,7 +20930,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 115 - Add Starter Label + 新增起始標籤 add @@ -20824,7 +20938,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 118 - add + 新增 There are no starter labels. Click the "Add Label" button to add a starter label. @@ -20840,7 +20954,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 142 - Enter Label Text Here + 在此輸入標籤文字 View Colors @@ -20848,7 +20962,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 159 - View Colors + 查看顏色 Color Palette @@ -20856,7 +20970,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 162 - Color Palette + 調色盤 Can Student Edit Label @@ -20880,7 +20994,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 191 - Point Location + 點位置 Text Location @@ -20888,7 +21002,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 212 - Text Location + 文字位置 Delete Label @@ -20896,7 +21010,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.html 236 - Delete Label + 刪除標籤 Enter text here @@ -20904,7 +21018,7 @@ Category Name: src/assets/wise5/components/label/label-authoring/label-authoring.component.ts 54 - Enter text here + 在此輸入文字 Are you sure you want to delete this label? @@ -20918,9 +21032,7 @@ Category Name: src/assets/wise5/components/label/label-student/label-student.component.ts 739 - Are you sure you want to delete this label? - - + 您確定要刪除此標籤嗎? Add New Label @@ -20928,7 +21040,7 @@ Category Name: src/assets/wise5/components/label/label-student/label-student.component.html 10 - Add New Label + 新增標籤 Label Text @@ -20984,7 +21096,7 @@ Category Name: src/assets/wise5/components/match/matchService.ts 10 - Match + 配對 Delete item @@ -20992,7 +21104,7 @@ Category Name: src/assets/wise5/components/match/delete-choice-button/delete-choice-button.component.html 5 - Delete item + 刪除項目 Are you sure you want to delete this item? @@ -21000,7 +21112,7 @@ Category Name: src/assets/wise5/components/match/delete-choice-button/delete-choice-button.component.ts 22 - Are you sure you want to delete this item? + 您確定要刪除此項目嗎? Student Can Create Choices @@ -21056,7 +21168,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 16 - Choices + 選項 Add Choice @@ -21064,7 +21176,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 45 - Add Choice + 新增選項 There are no choices. Click the "Add Choice" button to add a choice. @@ -21072,7 +21184,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 53,55 - There are no choices. Click the "Add Choice" button to add a choice. + 沒有選項。點擊"新增選項"按鈕來新增一個選項。 Choice Name @@ -21080,7 +21192,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 67 - Choice Name + 選項名稱 Type text or choose an image @@ -21096,7 +21208,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 49 - Type text or choose an image + 輸入文字或選擇圖片 Delete Choice @@ -21104,7 +21216,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 122 - Delete Choice + 刪除選項 Source Bucket Name @@ -21112,7 +21224,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 134 - Source Bucket Name + 來源桶名稱 Target Buckets @@ -21120,7 +21232,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 142 - Target Buckets + 目標桶 Add Target Bucket @@ -21128,7 +21240,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 148 - Add Target Bucket + 新增目標桶 There are no target buckets. Click the "Add Target Bucket" button to add a bucket. @@ -21136,7 +21248,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 156,158 - There are no target buckets. Click the "Add Target Bucket" button to add a bucket. + 沒有目標桶。點擊"新增目標桶"按鈕來新增一個桶。 Target Bucket Name @@ -21144,7 +21256,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 170 - Target Bucket Name + 目標桶名稱 Delete Bucket @@ -21152,7 +21264,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 225 - Delete Bucket + 刪除桶 Choices need to be ordered within buckets @@ -21160,7 +21272,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 243,245 - Choices need to be ordered within buckets + 桶內的選項需要排序 Bucket Name: @@ -21168,7 +21280,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 248 - Bucket Name: + 桶名稱: Choice: @@ -21176,7 +21288,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 250 - Choice: + 選項: Is Correct @@ -21184,7 +21296,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 267,269 - Is Correct + 正確 Position @@ -21192,7 +21304,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 273 - Position + 位置 Incorrect Position Feedback @@ -21200,7 +21312,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.html 282 - Incorrect Position Feedback + 錯誤位置回饋 Are you sure you want to delete this choice? @@ -21212,7 +21324,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.ts 73 - Are you sure you want to delete this choice? + 您確定要刪除此選項嗎? Are you sure you want to delete this bucket? @@ -21220,7 +21332,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-authoring/match-authoring.component.ts 174 - Are you sure you want to delete this bucket? + 您確定要刪除此容器嗎? Correct @@ -21232,7 +21344,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component.html 52 - Correct + 正確 Incorrect @@ -21244,7 +21356,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/multiple-choice-show-work/multiple-choice-show-work.component.html 53 - Incorrect + 不正確 Add item @@ -21252,7 +21364,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-student/add-choice-button/add-choice-button.component.html 6 - Add item + 新增項目 Enter Item Text @@ -21260,7 +21372,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html 2 - Enter Item Text + 輸入項目文字 Item Text required @@ -21268,7 +21380,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html 13 - Item Text required + 需要項目文字 OK @@ -21276,7 +21388,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-student/add-match-choice-dialog/add-match-choice-dialog.html 25,27 - OK + 確定 You have used of . @@ -21294,7 +21406,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-student/match-feedback-section/match-feedback-section.component.html 7,8 - {VAR_PLURAL, plural, =1 {attempt} other {attempts}} + {VAR_PLURAL, plural, =1 {attempt} other {attempts}} Correct @@ -21304,9 +21416,9 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 88,90 + 87,89 - Correct + 正確 Incorrect @@ -21316,9 +21428,9 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 101,103 + 100,102 - Incorrect + 不正確 Correct bucket but wrong position @@ -21326,7 +21438,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/match/match-student/match-student-default/match-student-default.component.ts 487 - Correct bucket but wrong position + 桶正確但位置錯誤 Correct @@ -21342,7 +21454,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/directives/summary-display/summary-display.component.ts 686 - Correct + 正確 Incorrect @@ -21358,7 +21470,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/directives/summary-display/summary-display.component.ts 690 - Incorrect + 不正確 Students select one or more choices. @@ -21366,7 +21478,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts 4 - Students select one or more choices. + 學生選擇一個或多個選項。 Multiple Choice @@ -21378,7 +21490,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/multipleChoiceService.ts 10 - Multiple Choice + 複選題 Single Answer @@ -21386,7 +21498,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts 8 - Single Answer + 單選 Multiple Answer @@ -21394,7 +21506,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/multipleChoice/MultipleChoiceInfo.ts 39 - Multiple Answer + 多選 Show Feedback @@ -21406,7 +21518,7 @@ Warning: This will delete all existing choices and buckets in this component.src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 87,89 - Show Feedback + 顯示回饋 Do you want to copy the choices from the connected component? @@ -21416,9 +21528,8 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/edit-multiple-choice-connected-components/edit-multiple-choice-connected-components.component.ts 29 - Do you want to copy the choices from the connected component? - -Warning: This will delete all existing choices in this component. + 您要從連接的組件複製選項嗎? +警告: 這將刪除此組件中所有現有的選項。 Single Answer @@ -21426,7 +21537,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 12 - Single Answer + 單選 Multiple Answer @@ -21434,7 +21545,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 13 - Multiple Answer + 多選 There are no choices. Click the "Add Choice" button to add a choice. @@ -21443,7 +21554,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 34,36 - There are no choices. Click the "Add Choice" button to add a choice. + 沒有選項。點擊"新增選項"按鈕來新增一個選項。 @@ -21452,7 +21563,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 43 - Choice Text + 選項文字 Is Correct @@ -21460,7 +21571,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 71 - Is Correct + 正確 Is Correct @@ -21468,7 +21579,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 73,75 - Is Correct + 正確 Feeback @@ -21476,7 +21587,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 80 - Feeback + 回饋 Optional @@ -21484,7 +21595,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html 86 - Optional + 選填 You have used of attempt(s) @@ -21498,7 +21609,7 @@ Warning: This will delete all existing choices in this component. You have used of attempt src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 61,63 + 60,62 You have used of attempt @@ -21506,7 +21617,7 @@ Warning: This will delete all existing choices in this component. You have used of attempts src/assets/wise5/components/multipleChoice/multiple-choice-student/multiple-choice-student.component.html - 72,74 + 71,73 You have used of attempts @@ -21516,7 +21627,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/OpenResponseInfo.ts 4 - Students type a response to a question or prompt. + 學生對問題或提示輸入回應。 Open Response @@ -21532,7 +21643,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/openResponseService.ts 14 - Open Response + 開放式回答 Record Response @@ -21540,7 +21651,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 10 - Record Response + 錄製回應 Stop Recording @@ -21548,7 +21659,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 20 - Stop Recording + 停止錄製 Recording Time Left: @@ -21556,7 +21667,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 22,24 - Recording Time Left: + 剩餘錄製時間： Delete Recording @@ -21568,7 +21679,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.html 37 - Delete Recording + 刪除錄音 Are you sure you want to delete your recording? @@ -21576,7 +21687,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.ts 71 - Are you sure you want to delete your recording? + 您確定要刪除錄音嗎? This will replace your existing recording. Is this OK? @@ -21584,7 +21695,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/audio-recorder/audio-recorder.component.ts 78 - This will replace your existing recording. Is this OK? + 這將取代你現有的錄製內容。可以嗎? Starter Sentence (Optional) @@ -21592,7 +21703,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 2 - Starter Sentence (Optional) + 開場句子(可選) Allow students to record audio response @@ -21632,7 +21743,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 53 - Verifying... + 驗證中... Valid @@ -21640,7 +21751,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 54 - Valid + 有效 Invalid @@ -21648,7 +21759,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 55 - Invalid + 無效 Score On @@ -21656,7 +21767,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 59 - Score On + 評分對象 Change @@ -21664,7 +21775,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 66 - Change + 變更 Show Score @@ -21688,7 +21799,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 113 - Scoring Rule + 計分規則 Add Scoring Rule @@ -21696,7 +21807,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 118 - Add Scoring Rule + 新增評分規則 Feedback Text @@ -21704,7 +21815,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 148 - Feedback Text + 回饋文字 Move Scoring Rule Up @@ -21712,7 +21823,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 163 - Move Scoring Rule Up + 上移評分規則 Move Scoring Rule Down @@ -21720,7 +21831,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 174 - Move Scoring Rule Down + 下移評分規則 Delete Scoring Rule @@ -21728,7 +21839,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 184 - Delete Scoring Rule + 刪除評分規則 Enable Multiple Attempt Feedback @@ -21744,7 +21855,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 207 - Multiple Attempt Scoring Rules + 多次嘗試評分規則 Add Multiple Attempt Scoring Rule @@ -21752,7 +21863,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 212 - Add Multiple Attempt Scoring Rule + 新增多次嘗試評分規則 Previous Score @@ -21764,7 +21875,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 343 - Previous Score + 先前分數 Current Score @@ -21776,7 +21887,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 353 - Current Score + 目前分數 Feedback to Student @@ -21788,7 +21899,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 428 - Feedback to Student + 給學生的回饋 Move Multiple Attempt Scoring Rule Up @@ -21796,7 +21907,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 270 - Move Multiple Attempt Scoring Rule Up + 上移多次嘗試評分規則 Move Multiple Attempt Scoring Rule Down @@ -21804,7 +21915,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 286 - Move Multiple Attempt Scoring Rule Down + 下移多次嘗試評分規則 Delet Multiple Attempt Scoring @@ -21812,7 +21923,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 296 - Delet Multiple Attempt Scoring + 刪除多次嘗試評分 Enable Notifications @@ -21828,7 +21939,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 320 - Notifications + 通知 add @@ -21836,7 +21947,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 329 - add + add Move Notification Up @@ -21844,7 +21955,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 371 - Move Notification Up + 上移通知 Move Notification Down @@ -21852,7 +21963,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 387 - Move Notification Down + 下移通知 Delete Notification @@ -21860,7 +21971,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html 397 - Delete Notification + 刪除通知 Enable Ambient Display Dismiss Mode @@ -21880,7 +21991,7 @@ Warning: This will delete all existing choices in this component. src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 13 - Dismiss Code + 解除代碼 Notify Student @@ -22133,8 +22244,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/openResponse/open-response-student/open-response-student.component.ts 327 - There was an issue scoring your work. Please try again. -If this problem continues, let your teacher know and move on to the next activity. Your work will still be saved. + 評分你的作品時發生問題。請再試一次。如果問題持續發生，請告知你的老師並繼續下一個活動。你的作品仍會被儲存。 Speak to add to your response: @@ -22142,7 +22252,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.html 2 - Speak to add to your response: + 說話以新增到你的回應: Recording... @@ -22150,7 +22260,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.html 44 - Recording... + 錄音中... An error occurred while recording: @@ -22158,7 +22268,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/openResponse/speech-to-text/speech-to-text.component.ts 61 - An error occurred while recording: + 錄製時發生錯誤: Students view an external website. @@ -22166,7 +22276,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/OutsideUrlInfo.ts 4 - Students view an external website. + 學生檢視外部網站。 Outside Resource @@ -22182,7 +22292,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outsideURLService.ts 14 - Outside Resource + 外部資源 Show Open Education Resources @@ -22191,7 +22301,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 1,3 - Show Open Education Resources + 顯示開放教育資源 @@ -22200,7 +22310,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 5,8 - Select from our curated library of OERs or enter your own in the 'URL' field below. (Note: Outside resources must start with 'https://' to be displayed.) + 從我們精心策劃的開放教育資源庫中選擇，或在下方的「URL」欄位中輸入你自己的資源。(注意: 外部資源必須以「https://」開頭才能顯示。) @@ -22210,7 +22320,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 18,20 - + Item(s) Found @@ -22218,7 +22328,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 46 - Item(s) Found + 找到個項目 Info @@ -22226,7 +22336,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 80,82 - Info + 資訊 Select @@ -22242,7 +22352,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 103 - URL + 網址 Enter URL Here @@ -22250,7 +22360,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 108 - Enter URL Here + 在此輸入網址 Reload resource @@ -22262,7 +22372,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.html 138 - Reload resource + 重新載入資源 Earth and Space Sciences @@ -22270,7 +22380,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts 25 - Earth and Space Sciences + 地球與太空科學 Life Sciences @@ -22278,7 +22388,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts 29 - Life Sciences + 生命科學 Physical Sciences @@ -22286,7 +22396,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts 33 - Physical Sciences + 物理科學 Engineering, Technology, and Applications of Science @@ -22294,7 +22404,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-authoring/outside-url-authoring.component.ts 37 - Engineering, Technology, and Applications of Science + 工程、科技及科學應用 Credit: @@ -22302,7 +22412,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/outsideURL/outside-url-student/outside-url-student.component.html 6 - Credit: + 學分: Students are grouped with other students to discuss a topic. @@ -22310,7 +22420,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/PeerChatInfo.ts 4 - Students are grouped with other students to discuss a topic. + 將學生分組與其他學生討論某個主題。 Peer Chat @@ -22326,7 +22436,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peerChatService.ts 16 - Peer Chat + 同儕交談 You are not allowed to delete this Grouping Logic because you must have at least one. @@ -22334,7 +22444,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-authoring.component.ts 70 - You are not allowed to delete this Grouping Logic because you must have at least one. + 你不能刪除這個分組邏輯，因為你至少必須保留一個。 Are you sure you want to delete this Grouping Logic? @@ -22342,7 +22452,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-authoring.component.ts 72 - Are you sure you want to delete this Grouping Logic? + 確定要刪除這個分組邏輯嗎? Maximize Similar Ideas @@ -22350,7 +22460,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts 12 - Maximize Similar Ideas + 最大化相似想法 Maximize Different Ideas @@ -22358,7 +22468,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-authoring/peer-chat-logic-options.ts 16 - Maximize Different Ideas + 最大化不同想法 This Peer Chat activity is not yet available. Please check back later or wait for a notification to return. @@ -22374,7 +22484,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.html 5,8 - This Peer Chat activity is not yet available. Please check back later or wait for a notification to return. + 這個同儕交談活動目前還無法使用。請稍後再檢查或等候通知返回。 are typing... @@ -22382,7 +22492,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-member-typing-indicator/peer-chat-member-typing-indicator.component.ts 58 - are typing... + 正在輸入... is typing... @@ -22390,7 +22500,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-member-typing-indicator/peer-chat-member-typing-indicator.component.ts 59 - is typing... + 正在輸入... Chat members: @@ -22398,15 +22508,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-members/peer-chat-members.component.html 7 - Chat members: - - - Send - - src/assets/wise5/components/peerChat/peer-chat-message-input/peer-chat-message-input.component.html - 21,23 - - Send + 聊天室成員： Make this message viewable to students again @@ -22414,7 +22516,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-message/peer-chat-message.component.html 29 - Make this message viewable to students again + 使這則訊息對學生重新可見 Delete this message so students won't see it @@ -22422,7 +22524,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-message/peer-chat-message.component.html 38 - Delete this message so students won't see it + 刪除這則訊息，讓學生看不到 Add to chat @@ -22430,7 +22532,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html 41 - Add to chat + 新增到交談 Used in chat @@ -22438,7 +22540,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-question-bank/peer-chat-question-bank.component.html 50 - Used in chat + 已使用於交談 You have new chat messages @@ -22446,7 +22548,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts 241 - You have new chat messages + 您有新的聊天訊息 Are you sure you want to replace the current text in your response input box with this text? @@ -22454,7 +22556,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts 291 - Are you sure you want to replace the current text in your response input box with this text? + 確定要用這段文字取代你目前在回應輸入框中的文字嗎? Teacher @@ -22470,7 +22572,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showGroupWork/ShowGroupWorkInfo.ts 4 - Students are shown work that everyone in their group submitted for a specific item. + 向學生展示他們所在小組針對特定項目所提交的作品。 Show Group Work @@ -22486,7 +22588,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showGroupWork/showGroupWorkService.ts 7 - Show Group Work + 展示小組作品 Show Work Step @@ -22498,7 +22600,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html 7 - Show Work Step + 展示作業步驟 (None) @@ -22526,7 +22628,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-student/table-student.component.html 95 - (None) + (無) Show Work Component @@ -22538,7 +22640,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showMyWork/show-my-work-authoring/show-my-work-authoring.component.html 21 - Show Work Component + 展示作業組件 Show My Work @@ -22546,7 +22648,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 48,50 - Show My Work + 顯示我的作品 Layout: @@ -22554,7 +22656,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 59 - Layout: + 版面配置： Stacked Vertically @@ -22562,7 +22664,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 72 - Stacked Vertically + 垂直堆疊 Side-by-Side @@ -22570,7 +22672,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html 77 - Side-by-Side + 並排 You have not been paired with a classmate yet. Please check back later. @@ -22578,7 +22680,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showGroupWork/show-group-work-display/show-group-work-display.component.html 2,4 - You have not been paired with a classmate yet. Please check back later. + 你還沒有被分配同學。請稍後再檢查。 (Waiting for response...) @@ -22586,7 +22688,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showGroupWork/show-group-work-display/show-group-work-display.component.html 21,23 - (Waiting for response...) + (等待回應中...) Students are shown work that they submitted for a specific item. @@ -22594,7 +22696,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showMyWork/ShowMyWorkInfo.ts 4 - Students are shown work that they submitted for a specific item. + 向學生展示他們針對特定項目所提交的作品。 Show My Work @@ -22606,7 +22708,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showMyWork/ShowMyWorkInfo.ts 8 - Show My Work + 顯示我的作品 (No response) @@ -22614,7 +22716,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showMyWork/show-my-work-student/show-my-work-student.component.html 4 - (No response) + (無回應) Show Student Work @@ -22622,7 +22724,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/showMyWork/showMyWorkService.ts 7 - Show Student Work + 檢視學生作品 Students are shown an aggregate graph summarizing data from the class. @@ -22630,7 +22732,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/SummaryInfo.ts 4 - Students are shown an aggregate graph summarizing data from the class. + 向學生展示綜合資料圖表，總結班級數據。 Summary @@ -22654,7 +22756,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 5 - Choose the step and component to show the summary data for: + 選擇要顯示摘要數據的步驟和組件: Student Data Type @@ -22662,7 +22764,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 45 - Student Data Type + 學生數據類型 Responses @@ -22670,7 +22772,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 50 - Responses + 回覆 Scores @@ -22678,7 +22780,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 51 - Scores + 分數 Source @@ -22686,7 +22788,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 55 - Source + 來源 Only Self @@ -22694,7 +22796,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 61 - Only Self + 僅限自己 Only Students In Period @@ -22702,7 +22804,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 62 - Only Students In Period + 僅本班級學生 Students In All Periods @@ -22710,7 +22812,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 63 - Students In All Periods + 所有班級的學生 Chart Type @@ -22718,7 +22820,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 67 - Chart Type + 圖表類型 Bar @@ -22726,7 +22828,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 69 - Bar + 長條圖 Pie @@ -22734,7 +22836,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 70 - Pie + 圓餅圖 Required to View Summary @@ -22742,7 +22844,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 74 - Required to View Summary + 需要查看摘要 Complete Component @@ -22750,7 +22852,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 79 - Complete Component + 完成組件 Submit Work @@ -22758,7 +22860,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 80 - Submit Work + 提交作品 None @@ -22766,7 +22868,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 81 - None + 無 Highlight Correct Answer @@ -22774,7 +22876,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 92,94 - Highlight Correct Answer + 突顯正確答案 Show Prompt From Source Component @@ -22782,7 +22884,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 102,104 - Show Prompt From Source Component + 顯示來源組件的提示 Custom Label Colors (Optional) @@ -22790,7 +22892,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 108 - Custom Label Colors (Optional) + 自訂標籤顏色(可選) Add Custom Label Color @@ -22798,7 +22900,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 113 - Add Custom Label Color + 新增自訂標籤顏色 There are no custom label colors. Click the "Add Custom Label Color" button to give a label a specific color. @@ -22807,7 +22909,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 122,125 - There are no custom label colors. Click the "Add Custom Label Color" button to give a label a specific color. + 目前沒有自訂標籤顏色。點選"新增自訂標籤顏色"按鈕為標籤指定特定顏色。 @@ -22816,7 +22918,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html 138 - Label + 標籤 Are you sure you want to delete this custom label color? @@ -22824,7 +22926,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.ts 174 - Are you sure you want to delete this custom label color? + 您確定要刪除此自訂標籤顏色嗎？ You must submit work on "" to view the summary. @@ -22832,7 +22934,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-student/summary-student.component.ts 137 - You must submit work on "" to view the summary. + 你必須在"""提交作品才能查看摘要。 You must complete "" to view the summary. @@ -22840,7 +22942,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-student/summary-student.component.ts 139 - You must complete "" to view the summary. + 你必須完成"""才能查看摘要。 You must submit work on "" to view the class summary. @@ -22848,7 +22950,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-student/summary-student.component.ts 145 - You must submit work on "" to view the class summary. + 你必須在"""提交作品才能查看班級摘要。 You must complete "" to view the class summary. @@ -22856,7 +22958,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/summary/summary-student/summary-student.component.ts 147 - You must complete "" to view the class summary. + 你必須完成"""才能查看班級摘要。 Students view and/or edit table data. @@ -22864,7 +22966,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/TableInfo.ts 4 - Students view and/or edit table data. + 學生檢視和/或編輯表格數據。 Table @@ -22896,7 +22998,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 14 - Allowed Graph Types: + 允許的圖表類型: Scatter Plot @@ -22904,7 +23006,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 20,22 - Scatter Plot + 散佈圖 Line Graph @@ -22912,7 +23014,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 28,30 - Line Graph + 線形圖 Bar Graph @@ -22920,7 +23022,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 36,38 - Bar Graph + 長條圖 Show Scatter Plot Regression Line @@ -22928,7 +23030,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 46,48 - Show Scatter Plot Regression Line + 顯示散佈圖回歸線 Number of Series @@ -22936,7 +23038,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 52 - Number of Series + 數列數量 Number of Y Axes @@ -22944,7 +23046,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 64 - Number of Y Axes + Y軸數量 Choose the Y Axis for each Series @@ -22992,7 +23094,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-student/table-student.component.html 67 - X Data + X數據 (Allow student to select) @@ -23020,7 +23122,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 191 - Table Column + 表格欄 Y Data @@ -23044,7 +23146,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 185 - (Default) + (預設) When the student hovers their mouse over a data point on a scatter plot or line graph, the tooltip will display the value from this column along with the x and y values. This can be left blank and the tooltip will still show the x and y values like normal. @@ -23060,7 +23162,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html 214 - Import Table + 匯入表格 Only .csv (comma separated values) files are allowed @@ -23152,7 +23254,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-authoring/table-authoring.component.html 30 - Invalid Value + 無效值 Rows @@ -23168,7 +23270,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-authoring/table-authoring.component.html 35 - Global Cell Size + 全域儲存格大小 Insert Column Before @@ -23248,7 +23350,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-authoring/table-authoring.component.html 183 - Column Cell Size + 欄儲存格大小 You can freeze the first column and any next to it to the beginning of the table. Other columns you freeze will be pinned to the end. @@ -23272,7 +23374,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-authoring/table-authoring.component.html 217,219 - Make All Cells Editable + 使所有儲存格可編輯 Make All Cells Uneditable @@ -23280,7 +23382,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-authoring/table-authoring.component.html 226,228 - Make All Cells Uneditable + 使所有儲存格不可編輯 Are you sure you want to decrease the number of rows? @@ -23288,7 +23390,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-authoring/table-authoring.component.ts 104 - Are you sure you want to decrease the number of rows? + 確定要減少列數嗎? Are you sure you want to decrease the number of columns? @@ -23296,7 +23398,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-authoring/table-authoring.component.ts 142 - Are you sure you want to decrease the number of columns? + 您確定要減少欄位數嗎？ Are you sure you want to delete this row? @@ -23324,7 +23426,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-student/table-student.component.html 53 - Graph Type + 圖表類型 Y Data @@ -23332,7 +23434,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-show-work/table-show-work.component.html 42 - Y Data + Y數據 X Axis Label @@ -23372,7 +23474,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-show-work/table-show-work.component.ts 23 - (None) + (無) image Import Data @@ -23380,7 +23482,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-student/table-student.component.html 32,34 - image Import Data + image 匯入數據 Choose the table data you want to graph: @@ -23388,7 +23490,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-student/table-student.component.html 64 - Choose the table data you want to graph: + 選擇你要繪製圖表的表格數據: Y Data @@ -23396,7 +23498,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-student/table-student.component.html 89 - Y Data + Y數據 Enter Text Here @@ -23420,7 +23522,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/components/table/table-student/table-student.component.html 151 - Y Axis Label + Y軸 標籤 Save @@ -23444,7 +23546,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/componentAnnotations/component-annotations.component.html 22 - Score: + 分數: No @@ -23452,7 +23554,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/dialog-with-confirm/dialog-with-confirm.component.html 12 - No + 否 Yes @@ -23460,7 +23562,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/dialog-with-confirm/dialog-with-confirm.component.html 13,15 - Yes + 是 Open In New Window @@ -23476,7 +23578,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html 9 - Importing Work... + 正在匯入作品... Error: Failed to import work. @@ -23484,7 +23586,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/generate-image-dialog/generate-image-dialog.component.html 19 - Error: Failed to import work. + 錯誤: 匯入作品失敗。 Previous step @@ -23508,7 +23610,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/summary-display/summary-display.component.ts 154 - The student will see a graph of their individual data here. + 學生將在此處看到他們個人數據的圖表。 Your Response @@ -23516,7 +23618,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/summary-display/summary-display.component.ts 710 - Your Response + 您的回應 Your Score @@ -23532,7 +23634,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/summary-display/summary-display.component.ts 719 - Period Responses + 班級回應 Period Scores @@ -23540,7 +23642,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/summary-display/summary-display.component.ts 724 - Period Scores + 班級分數 Class Responses @@ -23548,7 +23650,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/summary-display/summary-display.component.ts 733 - Class Responses + 班級回應 Class Scores @@ -23556,7 +23658,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/summary-display/summary-display.component.ts 738 - Class Scores + 班級分數 % Responded (/) @@ -23600,13 +23702,13 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/directives/wise-tinymce-editor/wise-authoring-tinymce-editor.component.ts 56 - Insert WISE Link + 插入WISE連結 File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 149 + 141 檔案 @@ -23614,115 +23716,139 @@ If this problem continues, let your teacher know and move on to the next activit Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 163 + 155 - Insert from Notebook + 從筆記本插入 Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 164 + 156 - Insert note + + 插入註記 + Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 190 + 182 - Image from notebook + 筆記本中的圖片 Ermina src/assets/wise5/services/computerAvatarService.ts - 10 + 11 A name for a computer avatar - Ermina + Ermina Alyx src/assets/wise5/services/computerAvatarService.ts - 11 + 12 A name for a computer avatar - Alyx + Alyx Kai src/assets/wise5/services/computerAvatarService.ts - 12 + 13 A name for a computer avatar - Kai + 凱 Morgan src/assets/wise5/services/computerAvatarService.ts - 13 + 14 A name for a computer avatar - Morgan + 摩根 Parker src/assets/wise5/services/computerAvatarService.ts - 14 + 15 A name for a computer avatar - Parker + Parker Milan src/assets/wise5/services/computerAvatarService.ts - 15 + 16 A name for a computer avatar - Milan + 米蘭 Emery src/assets/wise5/services/computerAvatarService.ts - 16 + 17 A name for a computer avatar - Emery + Emery Yuna src/assets/wise5/services/computerAvatarService.ts - 17 + 18 A name for a computer avatar - Yuna + Yuna Ada src/assets/wise5/services/computerAvatarService.ts - 18 + 19 A name for a computer avatar - Ada + 艾達 Nico src/assets/wise5/services/computerAvatarService.ts - 19 + 20 A name for a computer avatar - Nico + Nico + + + Discuss your answer with a thought buddy! + + src/assets/wise5/services/computerAvatarService.ts + 44 + + 與你的思考夥伴討論你的答案! + + + Hi there! It's nice to meet you. What do you think about... + + src/assets/wise5/services/computerAvatarService.ts + 45 + + Hi there! It's nice to meet you. What do you think about... + + + Thought Buddy + + src/assets/wise5/services/computerAvatarService.ts + 50 + + 思考夥伴 Student @@ -23758,7 +23884,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 151 - note + 註記 notes @@ -23774,7 +23900,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 152 - notes + 註記 Manage Notes @@ -23782,7 +23908,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/notebookService.ts 33 - Manage Notes + 管理筆記 report @@ -23794,7 +23920,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 119 - report + 報告 reports @@ -23806,7 +23932,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 120 - reports + 報告 Report @@ -23818,7 +23944,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 121 - Report + 報告 You have new replies to your discussion post! @@ -23826,7 +23952,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/notificationService.ts 132 - You have new replies to your discussion post! + 你的討論文章有新的回覆! You have new feedback from your teacher! @@ -23834,7 +23960,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/notificationService.ts 134 - You have new feedback from your teacher! + 你的老師給了新的回饋! You have new feedback! @@ -23842,7 +23968,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/notificationService.ts 149 - You have new feedback! + 你有新的回饋! Your teacher has paused all the screens in the class. @@ -23850,7 +23976,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/pauseScreenService.ts 39 - Your teacher has paused all the screens in the class. + 你的老師已暫停全班的螢幕。 Screen Paused @@ -23858,7 +23984,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/pauseScreenService.ts 40 - Screen Paused + 螢幕已暫停 Complete <b></b> @@ -23866,7 +23992,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1188 - Complete <b></b> + 完成 <b></b> Visit <b></b> @@ -23874,7 +24000,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1194 - Visit <b></b> + 前往 <b></b> Correctly answer <b></b> @@ -23882,7 +24008,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1200 - Correctly answer <b></b> + 正確回答 <b></b> Obtain a score of <b></b> on <b></b> @@ -23890,7 +24016,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1215 - Obtain a score of <b></b> on <b></b> + 在 <b></b> 獲得 <b></b> 的分數 You must choose "" on "" @@ -23898,7 +24024,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1223 - You must choose "" on "" + 你必須在""選擇"" Submit <b></b> time on <b></b> @@ -23906,7 +24032,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1235 - Submit <b></b> time on <b></b> + 在<b></b>提交<b></b>次 Submit <b></b> times on <b></b> @@ -23914,7 +24040,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1237 - Submit <b></b> times on <b></b> + 在<b></b>提交<b></b>次 Take the branch path from <b></b> to <b></b> @@ -23922,7 +24048,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1244 - Take the branch path from <b></b> to <b></b> + 從<b></b>到<b></b>的分支路徑 Write <b></b> words on <b></b> @@ -23930,7 +24056,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1250 - Write <b></b> words on <b></b> + 在<b></b>寫<b></b>個字 "" is visible @@ -23938,7 +24064,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1256 - "" is visible + "" 是可見的 "" is visitable @@ -23946,7 +24072,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1262 - "" is visitable + "" 是可訪問的 Add <b></b> note on <b></b> @@ -23954,7 +24080,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1269 - Add <b></b> note on <b></b> + 在<b></b>新增<b></b>個筆記 Add <b></b> notes on <b></b> @@ -23962,7 +24088,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1271 - Add <b></b> notes on <b></b> + 在<b></b>新增<b></b>個筆記 You must fill in <b></b> row in the <b>Table</b> on <b></b> @@ -23970,7 +24096,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1278 - You must fill in <b></b> row in the <b>Table</b> on <b></b> + 您必須在<b></b>的<b>表格</b>中填寫<b></b>列 You must fill in <b></b> rows in the <b>Table</b> on <b></b> @@ -23978,7 +24104,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1280 - You must fill in <b></b> rows in the <b>Table</b> on <b></b> + 您必須在<b></b>的<b>表格</b>中填寫<b></b>列 Wait for your teacher to unlock the item @@ -23986,7 +24112,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/projectService.ts 1283 - Wait for your teacher to unlock the item + 等待您的老師解鎖該項目 There was an error uploading. @@ -24010,7 +24136,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/studentDataService.ts 74 - Preview Student + 預覽學生 StudentDataService.saveComponentEvent: component, category, event args must not be null @@ -24018,7 +24144,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/studentDataService.ts 241 - StudentDataService.saveComponentEvent: component, category, event args must not be null + StudentDataService.saveComponentEvent: component, category, event 參數不能為空 StudentDataService.saveComponentEvent: nodeId, componentId, componentType must not be null @@ -24026,7 +24152,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/studentDataService.ts 251 - StudentDataService.saveComponentEvent: nodeId, componentId, componentType must not be null + StudentDataService.saveComponentEvent: nodeId, componentId, componentType 不能為空 StudentDataService.saveVLEEvent: category and event args must not be null @@ -24034,7 +24160,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/studentDataService.ts 260 - StudentDataService.saveVLEEvent: category and event args must not be null + StudentDataService.saveVLEEvent: category, event 參數不能為空 Sorry, you cannot view this item yet. @@ -24042,7 +24168,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/studentNodeService.ts 40 - Sorry, you cannot view this item yet. + 對不起，您還不能查看此項目。 Item Locked @@ -24050,7 +24176,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/studentNodeService.ts 44 - Item Locked + 項目已鎖定 <p>To visit <b></b> you need to:</p><ul> @@ -24066,7 +24192,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 57 - First Lesson + 第一課 First Step @@ -24074,7 +24200,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 75 - First Step + 第一步 Notes @@ -24086,7 +24212,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 153 - Notes + 註記 Final Report @@ -24094,7 +24220,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 128 - Final Report + 最終報告 Final summary report of what you learned in this unit @@ -24102,7 +24228,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 129 - Final summary report of what you learned in this unit + 您在本單元中學到的最終總結報告 Use this space to write your final report using evidence from your notebook. @@ -24110,7 +24236,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 130 - Use this space to write your final report using evidence from your notebook. + 使用此空間編寫您的最終報告，並使用筆記本中的證據。 <h3>This is a heading</h3><p>This is a paragraph.</p> @@ -24118,7 +24244,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 131 - <h3>This is a heading</h3><p>This is a paragraph.</p> + <h3>這是標題</h3><p>這是段落。</p> Teacher Notebook @@ -24126,7 +24252,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 139 - Teacher Notebook + 教師筆記本 teacher notes @@ -24138,7 +24264,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 162 - teacher notes + 教師註記 Teacher Notes @@ -24150,7 +24276,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 170 - Teacher Notes + 教師註記 Notes for the teacher as they're running the WISE unit @@ -24158,7 +24284,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 171 - Notes for the teacher as they're running the WISE unit + 教師在運行WISE單元時的筆記 Use this space to take notes for this unit @@ -24166,7 +24292,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 172 - Use this space to take notes for this unit + 使用此空間為此單元做筆記 <p>Use this space to take notes for this unit</p> @@ -24174,7 +24300,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts 173 - <p>Use this space to take notes for this unit</p> + <p>使用此空間為此單元做筆記</p> All steps after this one will not be visitable until @@ -24230,7 +24356,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 30 - Chinese (Simplified) + 簡體中文 English @@ -24238,7 +24364,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 31 - English + 英文 French @@ -24246,7 +24372,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 32 - French + 法文 German @@ -24254,7 +24380,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 33 - German + 德文 Italian @@ -24262,7 +24388,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 34 - Italian + 義大利文 Japanese @@ -24270,7 +24396,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 35 - Japanese + 日文 Korean @@ -24278,7 +24404,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 36 - Korean + 韓文 Portuguese (Brazilian) @@ -24286,7 +24412,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 37 - Portuguese (Brazilian) + 葡萄牙文 (巴西) Spanish @@ -24294,7 +24420,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/transcribeService.ts 38 - Spanish + 西班牙文 Project Plan @@ -24310,7 +24436,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 70 - Project Plan + 計畫方案 required @@ -24328,18 +24454,6 @@ If this problem continues, let your teacher know and move on to the next activit 移除檔案 - - Drop image or file here or click to upload! - - src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html - 48 - - - src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html - 24 - - 使用拖曳或點擊來上傳檔案 - Share with Class @@ -24443,7 +24557,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 7 - Previous Item + 前一項 Next Item @@ -24451,7 +24565,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html 56 - Next Item + 下一項 Your : @@ -24475,7 +24589,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/computer-avatar-selector/computer-avatar-selector.component.html 13 - Selected avatar + 選擇頭像 Continue @@ -24491,7 +24605,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 2 - Action Required + 所需操作 Teacher, enter code to dismiss this alert: @@ -24507,7 +24621,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 19 - Dismiss code + 關閉代碼 Cancel @@ -24523,7 +24637,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html 38,40 - Dismiss + 關閉 Invalid dismiss code. Please try again. @@ -24531,7 +24645,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.ts 25 - Invalid dismiss code. Please try again. + 無效的關閉代碼。請再試一次。 Expand or collapse lesson content @@ -24539,7 +24653,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/nav-item/nav-item.component.html 11 - Expand or collapse lesson content + 展開或折疊課程內容 % completed @@ -24547,7 +24661,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/nav-item/nav-item.component.html 46 - % completed + 已完成 % / items @@ -24555,7 +24669,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/nav-item/nav-item.component.html 49,51 - / items + /個項目 Lesson is locked @@ -24563,7 +24677,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/nav-item/nav-item.component.html 60 - Lesson is locked + 課程已鎖定 Go to @@ -24571,7 +24685,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/nav-item/nav-item.component.html 75 - Go to + 前往 Item is locked @@ -24579,7 +24693,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/nav-item/nav-item.component.html 88 - Item is locked + 項目已鎖定 Dismiss all alerts @@ -24587,7 +24701,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 15 - Dismiss all alerts + 關閉所有警示 Hi there! You currently have no alerts. @@ -24595,7 +24709,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 24 - Hi there! You currently have no alerts. + 嗨! 您目前沒有任何警報。 View alert @@ -24603,7 +24717,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html 35 - View alert + 查看警報 Are you sure you want to dismiss all your alerts? @@ -24611,7 +24725,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.ts 89 - Are you sure you want to dismiss all your alerts? + 您確定要關閉所有警示嗎？ This unit ended on . You can no longer save new work. @@ -24619,7 +24733,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/run-ended-and-locked-message/run-ended-and-locked-message.component.ts 15 - This unit ended on . You can no longer save new work. + 該單元已於結束。您不能再儲存新的作業。 Unit Completion @@ -24627,7 +24741,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 15 - Unit Completion + 單元完成 / items @@ -24635,7 +24749,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/student-account-menu/student-account-menu.component.html 16,21 - / items + / 個項目 / points @@ -24684,7 +24798,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/vle/studentAsset/student-assets/student-assets.component.html 26,28 - The student assets will appear here once you set up a classroom run. + 設置教室運行後，學生資產將出現在此處。 diff --git a/src/messages.xlf b/src/messages.xlf index 51561ea2e01..8189fc3d779 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -279,7 +279,7 @@ src/app/modules/library/library-project-details/library-project-details.component.html - 131 + 132 src/app/modules/library/official-library/official-library-details.html @@ -289,17 +289,21 @@ src/app/modules/library/personal-library/personal-library-details.html 15 + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + 57 + src/app/teacher/share-run-code-dialog/share-run-code-dialog.component.html 61 src/assets/wise5/authoringTool/components/component-info-dialog/component-info-dialog.component.html - 30 + 29 src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html - 20 + 19 src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-dialog/select-peer-grouping-dialog.component.html @@ -421,7 +425,7 @@ src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html - 76 + 75 src/app/teacher/create-run-dialog/create-run-dialog.component.html @@ -431,6 +435,10 @@ src/app/teacher/edit-run-warning-dialog/edit-run-warning-dialog.component.html 20 + + src/app/teacher/edit-tag/edit-tag.component.html + 30 + src/app/teacher/list-classroom-courses-dialog/list-classroom-courses-dialog.component.html 52 @@ -693,6 +701,10 @@ src/app/authoring-tool/edit-connected-component-delete-button/edit-connected-component-delete-button.component.html 5 + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + 39 + src/assets/wise5/authoringTool/project-asset-authoring/project-asset-authoring.component.html 85 @@ -1013,6 +1025,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html 23 + + src/app/teacher/edit-tag/edit-tag.component.html + 7 + Are you sure you want to delete this tag? @@ -1497,7 +1513,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Submit src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html - 65 + 68 src/app/contact/contact-form/contact-form.component.html @@ -1535,25 +1551,37 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.html 20 + + src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html + 40 + + + src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html + 77 + + + src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html + 59 + src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html - 42 + 50 src/assets/wise5/authoringTool/structure/jigsaw/jigsaw.component.html - 26 + 34 src/assets/wise5/authoringTool/structure/ki-cycle-using-oer/ki-cycle-using-oer.component.html - 17 + 25 src/assets/wise5/authoringTool/structure/peer-review-and-revision/peer-review-and-revision.component.html - 15 + 23 src/assets/wise5/authoringTool/structure/self-directed-investigation/self-directed-investigation.component.html - 16 + 24 src/assets/wise5/components/draw/edit-draw-connected-components/edit-draw-connected-components.component.html @@ -1569,18 +1597,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/vle/node/node.component.html - 56 - - - - Submit - - src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html - 69,71 - - - src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html - 57,59 + 55 @@ -1704,11 +1721,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/classroom-monitor/step-info/step-info.component.html - 19 + 17 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroupInfo/workgroup-info.component.html - 14 + 13 src/assets/wise5/directives/componentAnnotations/component-annotations.component.html @@ -3022,7 +3039,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/teacher/teacher-run-list/teacher-run-list.component.html - 14 + 11 src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html @@ -4849,42 +4866,42 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. The WISE Advantage src/app/home/home.component.html - 58,60 + 57,59 Curriculum Offerings src/app/home/home.component.html - 99,101 + 98,100 Ready to try WISE in the Classroom? src/app/home/home.component.html - 112 + 111 Sign up for free! src/app/home/home.component.html - 113 + 112 Connect src/app/home/home.component.html - 129 + 128 WISE on Facebook src/app/home/home.component.html - 135 + 134 src/app/modules/footer/footer.component.html @@ -4895,7 +4912,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.WISE on Twitter src/app/home/home.component.html - 144 + 143 src/app/modules/footer/footer.component.html @@ -4906,7 +4923,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.WISE on Github src/app/home/home.component.html - 153 + 152 src/app/modules/footer/footer.component.html @@ -4917,7 +4934,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Community src/app/home/home.component.html - 173 + 172 src/app/modules/footer/footer.component.html @@ -4936,14 +4953,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Join us! Discuss all things WISE. src/app/home/home.component.html - 175 + 174 Help + FAQs src/app/home/home.component.html - 187 + 186 src/app/modules/footer/footer.component.html @@ -4954,14 +4971,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.View tutorials and common questions. src/app/home/home.component.html - 189 + 188 Contact Us src/app/home/home.component.html - 199 + 198 src/app/modules/footer/footer.component.html @@ -4972,7 +4989,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Want to get in touch? Send us a message. src/app/home/home.component.html - 201 + 200 @@ -5369,7 +5386,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Main menu src/app/modules/header/header.component.html - 25 + 27 @@ -5507,21 +5524,21 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Discipline src/app/modules/library/library-filters/library-filters.component.html - 50 + 45 DCI Arrangement src/app/modules/library/library-filters/library-filters.component.html - 68 + 62 Performance Expectation src/app/modules/library/library-filters/library-filters.component.html - 86 + 79 @@ -5592,49 +5609,49 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.This unit is licensed under CC BY-SA. src/app/modules/library/library-project-details/library-project-details.component.html - 87,88 + 88,89 This unit is licensed under CC BY-SA by . src/app/modules/library/library-project-details/library-project-details.component.html - 91,93 + 92,94 This unit is a copy of (used under CC BY-SA). src/app/modules/library/library-project-details/library-project-details.component.html - 98,100 + 99,101 This unit is a copy of by (used under CC BY-SA). src/app/modules/library/library-project-details/library-project-details.component.html - 103,106 + 104,107 More src/app/modules/library/library-project-details/library-project-details.component.html - 117 + 118 View License src/app/modules/library/library-project-details/library-project-details.component.html - 119 + 120 Use with Class src/app/modules/library/library-project-details/library-project-details.component.html - 139 + 140 src/app/teacher/create-run-dialog/create-run-dialog.component.html @@ -5645,7 +5662,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Preview src/app/modules/library/library-project-details/library-project-details.component.html - 143 + 144 src/app/teacher/run-menu/run-menu.component.html @@ -5696,6 +5713,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/modules/library/library-project-menu/library-project-menu.component.html 14 + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + 29 + src/assets/wise5/authoringTool/peer-grouping/select-peer-grouping-option/select-peer-grouping-option.component.html 9 @@ -5786,7 +5807,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Unit Details src/app/modules/library/library-project/library-project.component.ts - 53 + 90 @@ -5890,54 +5911,54 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.3 + + View + + src/app/modules/library/personal-library/personal-library.component.html + 7 + + Active src/app/modules/library/personal-library/personal-library.component.html - 8 + 9 src/app/teacher/teacher-run-list/teacher-run-list.component.html - 23 + 21 Archived src/app/modules/library/personal-library/personal-library.component.html - 9 + 10 src/app/teacher/teacher-run-list/teacher-run-list.component.html - 24 + 22 selected src/app/modules/library/personal-library/personal-library.component.html - 23,25 + 24,26 No owned or shared units found. src/app/modules/library/personal-library/personal-library.component.html - 56,58 + 60,62 - - units + + Select all units src/app/modules/library/personal-library/personal-library.component.ts - 28 - - - - items - - src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.ts - 13 + 30 @@ -6012,7 +6033,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/modules/shared/search-bar/search-bar.component.html - 11 + 16 src/app/teacher/share-run-dialog/share-run-dialog.component.html @@ -6273,7 +6294,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Select an option src/app/modules/shared/select-menu/select-menu.component.ts - 29 + 27 @@ -6339,7 +6360,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/teacher/teacher-run-list/teacher-run-list.component.html - 104 + 115 @@ -6434,7 +6455,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 205 + 189 @@ -6467,7 +6488,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/vle/node/node.component.html - 47,49 + 46,48 @@ -7289,11 +7310,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Sign up with Microsoft src/app/register/register-student/register-student.component.html - 40 + 39 src/app/register/register-teacher/register-teacher.component.html - 34 + 33 @@ -7505,82 +7526,82 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Successfully unit. src/app/services/archive-project.service.ts - 42 + 43 Undo src/app/services/archive-project.service.ts - 42 + 43 src/app/services/archive-project.service.ts - 123 + 124 Action undone. src/app/services/archive-project.service.ts - 56 + 57 src/app/services/archive-project.service.ts - 139 + 140 Error undoing action. src/app/services/archive-project.service.ts - 59 + 60 src/app/services/archive-project.service.ts - 142 + 143 Error archiving unit. src/app/services/archive-project.service.ts - 66 + 67 Error restoring unit. src/app/services/archive-project.service.ts - 66 + 67 Successfully archived unit(s). src/app/services/archive-project.service.ts - 121 + 122 Successfully restored unit(s). src/app/services/archive-project.service.ts - 122 + 123 Error archiving unit(s). src/app/services/archive-project.service.ts - 149 + 150 Error restoring unit(s). src/app/services/archive-project.service.ts - 149 + 150 @@ -7870,7 +7891,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/app/teacher/teacher-run-list/teacher-run-list.component.html - 31 + 38 @@ -7930,7 +7951,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Launch Unit src/app/student/team-sign-in-dialog/team-sign-in-dialog.component.html - 77,79 + 76,78 @@ -8111,6 +8132,46 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.121,123 + + Apply tags + + src/app/teacher/apply-tags-button/apply-tags-button.component.html + 4 + + + src/app/teacher/apply-tags-button/apply-tags-button.component.html + 11 + + + + Manage Tags + + src/app/teacher/apply-tags-button/apply-tags-button.component.html + 26 + + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + 1 + + + src/app/teacher/select-tags/select-tags.component.html + 29 + + + + Successfully applied tag + + src/app/teacher/apply-tags-button/apply-tags-button.component.ts + 78 + + + + Successfully removed tag + + src/app/teacher/apply-tags-button/apply-tags-button.component.ts + 88 + + 1. Choose Periods @@ -8333,6 +8394,102 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.25 + + Required + + src/app/teacher/edit-tag/edit-tag.component.html + 10 + + + src/app/teacher/edit-tag/edit-tag.component.html + 21 + + + src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.html + 3 + + + + Archived tag not allowed + + src/app/teacher/edit-tag/edit-tag.component.html + 12 + + + + Tag already exists + + src/app/teacher/edit-tag/edit-tag.component.html + 14 + + + + Color + + src/app/teacher/edit-tag/edit-tag.component.html + 18 + + + src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html + 250 + + + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + 109 + + + src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html + 154 + + + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + 195 + + + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + 253 + + + src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html + 427 + + + src/assets/wise5/components/label/label-authoring/label-authoring.component.html + 138 + + + src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html + 146 + + + + Create + + src/app/teacher/edit-tag/edit-tag.component.ts + 42 + + + + Save + + src/app/teacher/edit-tag/edit-tag.component.ts + 59 + + + + Tag created + + src/app/teacher/edit-tag/edit-tag.component.ts + 129 + + + + Tag updated + + src/app/teacher/edit-tag/edit-tag.component.ts + 143 + + Share to Google Classroom @@ -8446,6 +8603,41 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.123 + + + New Tag + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.html + 8,10 + + + + Tag deleted + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts + 86 + + + + There is unit with this tag. + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts + 97 + + + + There are units with this tag. + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts + 98 + + + + Are you sure you want to delete this tag? + + src/app/teacher/manage-tags-dialog/manage-tags-dialog.component.ts + 99 + + Teams @@ -8809,6 +9001,13 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.28 + + Filter by tag + + src/app/teacher/select-tags/select-tags.component.html + 6 + + Share with Students @@ -8969,6 +9168,13 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.172 + + Remove tag + + src/app/teacher/tag/tag.component.html + 9 + + Teacher home navigation @@ -9088,70 +9294,77 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Class Periods: src/app/teacher/teacher-run-list-item/teacher-run-list-item.component.ts - 82 + 116 Archived classroom units: src/app/teacher/teacher-run-list/teacher-run-list.component.html - 34 + 41 Active classroom units: src/app/teacher/teacher-run-list/teacher-run-list.component.html - 35 + 42 completed src/app/teacher/teacher-run-list/teacher-run-list.component.html - 40 + 47 running src/app/teacher/teacher-run-list/teacher-run-list.component.html - 43 + 50 scheduled src/app/teacher/teacher-run-list/teacher-run-list.component.html - 46 + 53 Clear filters src/app/teacher/teacher-run-list/teacher-run-list.component.html - 57 + 64 Hey there! Looks like you don't have any active classroom units. src/app/teacher/teacher-run-list/teacher-run-list.component.html - 65 + 72 Browse the "Unit Library" to find titles to use with your students. src/app/teacher/teacher-run-list/teacher-run-list.component.html - 66 + 73 Looks like you don't have any archived classroom units. src/app/teacher/teacher-run-list/teacher-run-list.component.html - 69 + 76 + + + + Unit tags + + src/app/teacher/unit-tags/unit-tags.component.html + 1 @@ -9376,21 +9589,6 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.64,66 - - Submit - - src/assets/wise5/authoringTool/addLesson/add-lesson-configure/add-lesson-configure.component.html - 38,40 - - - src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html - 76,78 - - - src/assets/wise5/vle/node/node.component.html - 59,61 - - Step Title @@ -9979,7 +10177,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Next component type src/assets/wise5/authoringTool/components/component-type-selector/component-type-selector.component.html - 25 + 22 @@ -9993,12 +10191,15 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.10 - - Preview Component + + Preview component src/assets/wise5/authoringTool/components/preview-component-button/preview-component-button.component.html 4 + + + Preview Component src/assets/wise5/authoringTool/components/preview-component-dialog/preview-component-dialog.component.html 1 @@ -10019,14 +10220,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Are you sure you want to save the starter state? src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 24 + 28 Are you sure you want to delete the starter state? This will also close this preview window. src/assets/wise5/authoringTool/components/save-starter-state/save-starter-state.component.ts - 37 + 41 @@ -10196,30 +10397,30 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Removal Conditional src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html - 16 + 18 src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html - 16 + 18 Add Removal Criteria src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html - 39 + 37 src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html - 39 + 37 src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html - 44 + 42 src/assets/wise5/authoringTool/constraint/constraint-authoring/constraint-authoring.component.html - 44 + 42 @@ -10272,99 +10473,101 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Please Choose a Step src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 39 + 40 - - () + + () src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 43 + 45,47 Please Choose a Component src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 60 + 63 - + . (Prompt: ) src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 67 + 73,74 Please Select a From Step src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 85 + 91 Please Select a To Step src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 107 + 112 Please Select a Choice src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 178 + 175 src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 223 + 213 src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 246 + 231 src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.html - 269 + 249 Component src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 19 + 42 Step src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 26 + 49 Please Choose a Removal Criteria src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 29 + 52 Is Completed src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 30 + 53 Score src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 31 + 54 src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.ts @@ -10383,35 +10586,35 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Score(s) src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 34 + 57 Branch Path Taken src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 36 + 59 From Step src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 37 + 60 To Step src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 38 + 61 Choice Chosen src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 40 + 63 src/assets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.ts @@ -10422,7 +10625,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Choices src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 43 + 66 src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts @@ -10441,112 +10644,112 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Is Correct src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 45 + 68 Used X Submits src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 46 + 69 Required Submit Count src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 49 + 72 Is Visible src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 51 + 74 Is Visitable src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 52 + 75 Is Visited src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 53 + 76 Wrote X Number of Words src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 54 + 77 Required Number of Words src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 57 + 80 Add X Number of Notes On This Step src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 61 + 84 Required Number of Notes src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 64 + 87 Fill X Number of Rows src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 67 + 90 Required Number of Filled Rows (Not Including Header Row) src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 72 + 95 Table Has Header Row src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 74 + 97 Require All Cells In a Row To Be Filled src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 77 + 100 Teacher Removes Constraint src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 81 + 104 Are you sure you want to delete this removal criteria? src/assets/wise5/authoringTool/constraint/edit-constraint-removal-criteria/edit-constraint-removal-criteria.component.ts - 114 + 137 @@ -11658,13 +11861,6 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.203 - - Required - - src/assets/wise5/authoringTool/node/advanced/required-error-label/required-error-label.component.html - 3 - - Choose the new location by clicking one of the buttons below @@ -12581,21 +12777,21 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Copying Unit... src/assets/wise5/authoringTool/project-list/project-list.component.ts - 43 + 42 There was an error copying this unit. Please contact WISE staff. src/assets/wise5/authoringTool/project-list/project-list.component.ts - 50 + 49 (Run ID: ) src/assets/wise5/authoringTool/project-list/project-list.component.ts - 65 + 64 @@ -12604,14 +12800,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/project-list/project-list.component.ts - 67 + 66 Loading Unit... src/assets/wise5/authoringTool/project-list/project-list.component.ts - 92 + 89 @@ -14070,7 +14266,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Item Info src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/node-info/node-info.component.html - 31 + 30 @@ -15184,7 +15380,7 @@ Are you sure you want to proceed? src/assets/wise5/vle/node/node.component.html - 44 + 43 @@ -15261,32 +15457,28 @@ Are you sure you want to proceed? Submitted src/assets/wise5/common/save-time-message/save-time-message.component.ts - 28 + 30 Auto Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 30 + 32 Saved src/assets/wise5/common/save-time-message/save-time-message.component.ts - 32 + 34 Previous Step src/assets/wise5/common/stepTools/step-tools.component.html - 5 - - - src/assets/wise5/common/stepTools/step-tools.component.html - 9 + 7 src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html @@ -15297,41 +15489,33 @@ Are you sure you want to proceed? Select a Step src/assets/wise5/common/stepTools/step-tools.component.html - 20 - - - src/assets/wise5/common/stepTools/step-tools.component.html - 22 + 18 src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 20 + 21 src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 22 + 23 Select a Step src/assets/wise5/common/stepTools/step-tools.component.html - 32 + 28 Next Step src/assets/wise5/common/stepTools/step-tools.component.html - 47 - - - src/assets/wise5/common/stepTools/step-tools.component.html - 51 + 45 src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 58 + 60 @@ -16616,7 +16800,7 @@ Are you ready to receive feedback on this answer? Teaching Tips src/assets/wise5/components/component/component.component.html - 2 + 3 @@ -16784,41 +16968,6 @@ Are you ready to receive feedback on this answer? 244 - - Color - - src/assets/wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html - 250 - - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html - 109 - - - src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html - 154 - - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 195 - - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 253 - - - src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html - 427 - - - src/assets/wise5/components/label/label-authoring/label-authoring.component.html - 138 - - - src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html - 146 - - Are you sure you want to delete this node? @@ -16910,7 +17059,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/componentAnnotations/component-annotations.component.ts - 202 + 186 @@ -18587,7 +18736,7 @@ Category Name: src/assets/wise5/directives/add-to-notebook-button/add-to-notebook-button.component.html - 8 + 2 @@ -21277,28 +21426,28 @@ If this problem continues, let your teacher know and move on to the next activit File src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 174 + 165 Insert from Notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 188 + 179 Insert note + src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 189 + 180 Image from notebook src/assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.component.ts - 215 + 206 @@ -21874,11 +22023,11 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 68 + 70 src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 70 + 72 @@ -21963,7 +22112,7 @@ If this problem continues, let your teacher know and move on to the next activit Rubric src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts - 33 + 36 @@ -21991,7 +22140,7 @@ If this problem continues, let your teacher know and move on to the next activit Next Item src/assets/wise5/themes/default/themeComponents/stepTools/step-tools.component.html - 56 + 58 @@ -22106,6 +22255,24 @@ If this problem continues, let your teacher know and move on to the next activit 88 + + Choose an icon + + src/assets/wise5/vle/node-icon/node-icon.component.html + 20 + + + src/assets/wise5/vle/node-icon/node-icon.component.html + 20 + + + + Submit + + src/assets/wise5/vle/node/node.component.html + 58,60 + + Dismiss all alerts diff --git a/src/style/abstracts/_mixins.scss b/src/style/abstracts/_mixins.scss index 388c1bbf6d0..8346c0d37bf 100644 --- a/src/style/abstracts/_mixins.scss +++ b/src/style/abstracts/_mixins.scss @@ -63,6 +63,10 @@ } } + .mat-mdc-standard-chip .mdc-evolution-chip__text-label { + font-size: mat.font-size($wise-typography, 'button'); + } + .mat-divider-horizontal { margin: 16px 0; } @@ -286,6 +290,67 @@ border-color: $value; } } + + // ng-select + .ng-select { + .ng-select-container { + padding: 0 12px; + background-color: rgba(0, 0, 0, 0.04); + border-radius: $card-border-radius; + + .ng-value-container { + padding: .2875em 0; + + .ng-value { + margin: 0.21875em 0.4375em 0.21875em 0; + } + + .ng-input>input { + height: 100%; + } + } + + &.ng-appearance-outline { + min-height: 56px; + + .ng-placeholder { + background-color: transparent; + } + + &:after { + border-radius: $card-border-radius; + border: 0 none; + } + + &:hover:after { + border-bottom: 1px solid; + } + + &.ng-has-value { + .ng-placeholder { + margin-top: 0.4375em; + } + } + } + } + + &.ng-select-focused { + .ng-select-container { + background-color: rgba(0, 0, 0, 0.08); + + &.ng-appearance-outline { + &:after { + border-bottom: 2px solid map.get($colors, 'primary'); + } + + .ng-placeholder { + color: map.get($colors, 'primary'); + margin-top: 0.4375em; + } + } + } + } + } } // Set Angular Material icon size diff --git a/src/style/components/_dialog.scss b/src/style/components/_dialog.scss index ffa66c00af1..ab2dddc6731 100644 --- a/src/style/components/_dialog.scss +++ b/src/style/components/_dialog.scss @@ -35,7 +35,7 @@ mat-dialog-container.mat-mdc-dialog-container { } } - .dialog-content-scroll { + .mat-mdc-dialog-title+.mat-mdc-dialog-content.dialog-content-scroll { padding-top: 16px; padding-bottom: 16px; } diff --git a/src/style/styles.scss b/src/style/styles.scss index 62cae66dc2f..ae143c27d32 100644 --- a/src/style/styles.scss +++ b/src/style/styles.scss @@ -65,6 +65,8 @@ @import 'themes/monitor'; @import "~@ng-select/ng-select/themes/material.theme.css"; +@import "~@ng-select/ng-select/themes/material.theme.css"; + // TODO: remove/merge after upgrading apps to Angular @import 'themes/apps'; .app-styles { From 9b94617e4e65c3e133ea6dd91a12160bda8509cd Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 8 Jul 2024 12:24:59 -0700 Subject: [PATCH 63/90] feat(Multilingual Unit): Copy single component generates new translation ids for new component (#1852) --- .../services/copyTranslationsService.spec.ts | 50 +++++++++++++++ src/app/teacher/teacher-authoring.module.ts | 2 + .../copy-component-button.component.html | 2 +- .../copy-component-button.component.spec.ts | 11 +++- .../copy-component-button.component.ts | 7 ++- .../node-authoring.component.spec.ts | 4 +- .../wise5/services/copyTranslationsService.ts | 61 +++++++++++++++++++ .../services/deleteTranslationsService.ts | 35 +---------- .../editProjectTranslationsService.ts | 35 +++++++++++ src/messages.xlf | 4 +- 10 files changed, 171 insertions(+), 40 deletions(-) create mode 100644 src/app/services/copyTranslationsService.spec.ts create mode 100644 src/assets/wise5/services/copyTranslationsService.ts create mode 100644 src/assets/wise5/services/editProjectTranslationsService.ts diff --git a/src/app/services/copyTranslationsService.spec.ts b/src/app/services/copyTranslationsService.spec.ts new file mode 100644 index 00000000000..e5da9833d1b --- /dev/null +++ b/src/app/services/copyTranslationsService.spec.ts @@ -0,0 +1,50 @@ +import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { TeacherProjectService } from '../../assets/wise5/services/teacherProjectService'; +import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module'; +import { ProjectLocale } from '../domain/projectLocale'; +import { ComponentContent } from '../../assets/wise5/common/ComponentContent'; +import { ConfigService } from '../../assets/wise5/services/configService'; +import { CopyTranslationsService } from '../../assets/wise5/services/copyTranslationsService'; +import { Node } from '../../assets/wise5/common/Node'; + +let configService: ConfigService; +let http: HttpTestingController; +let projectService: TeacherProjectService; +let service: CopyTranslationsService; +describe('CopyTranslationsService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule], + providers: [CopyTranslationsService, TeacherProjectService], + teardown: { destroyAfterEach: false } + }); + configService = TestBed.inject(ConfigService); + http = TestBed.inject(HttpTestingController); + projectService = TestBed.inject(TeacherProjectService); + service = TestBed.inject(CopyTranslationsService); + }); + tryCopyComponents(); +}); + +function tryCopyComponents() { + describe('tryCopyComponents()', () => { + it('fetches all supported translations', () => { + spyOn(projectService, 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en_us', supported: ['es', 'ja'] }) + ); + spyOn(configService, 'getProjectId').and.returnValue('123'); + spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json'); + service.tryCopyTranslations({} as Node, [ + { + id: 'abc', + type: 'OpenResponse', + prompt: 'hello', + 'prompt.i18n': { id: 'xyz' } + } as ComponentContent + ]); + http.expectOne(`/123/translations.es.json`).flush({ xyz: {} }); + http.expectOne(`/123/translations.ja.json`).flush({ xyz: {} }); + }); + }); +} diff --git a/src/app/teacher/teacher-authoring.module.ts b/src/app/teacher/teacher-authoring.module.ts index 16d7121f9b7..7d081fd5705 100644 --- a/src/app/teacher/teacher-authoring.module.ts +++ b/src/app/teacher/teacher-authoring.module.ts @@ -34,6 +34,7 @@ import { RouterModule } from '@angular/router'; import { ComponentInfoService } from '../../assets/wise5/services/componentInfoService'; import { TeacherProjectTranslationService } from '../../assets/wise5/services/teacherProjectTranslationService'; import { DeleteTranslationsService } from '../../assets/wise5/services/deleteTranslationsService'; +import { CopyTranslationsService } from '../../assets/wise5/services/copyTranslationsService'; @NgModule({ imports: [StudentTeacherCommonModule, AuthoringToolModule, RouterModule, AuthoringRoutingModule], @@ -42,6 +43,7 @@ import { DeleteTranslationsService } from '../../assets/wise5/services/deleteTra ComponentInfoService, CopyNodesService, CopyProjectService, + CopyTranslationsService, DataExportService, { provide: DataService, useExisting: TeacherDataService }, TeacherProjectTranslationService, diff --git a/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.html b/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.html index 22281025754..ec4e1524c51 100644 --- a/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.html +++ b/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.html @@ -2,7 +2,7 @@ mat-icon-button color="primary" (click)="copy($event)" - matTooltip="Copy Component" + matTooltip="Copy component" matTooltipPosition="above" i18n-matTooltip > diff --git a/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.spec.ts b/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.spec.ts index 9eac9b4285a..5b5c5998f5c 100644 --- a/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.spec.ts @@ -2,6 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CopyComponentButtonComponent } from './copy-component-button.component'; import { TeacherProjectService } from '../../../services/teacherProjectService'; import { MatIconModule } from '@angular/material/icon'; +import { CopyTranslationsService } from '../../../services/copyTranslationsService'; +import { ConfigService } from '../../../services/configService'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; class MockTeacherProjectService {} describe('CopyComponentButtonComponent', () => { @@ -11,8 +14,12 @@ describe('CopyComponentButtonComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [CopyComponentButtonComponent], - imports: [MatIconModule], - providers: [{ provide: TeacherProjectService, useClass: MockTeacherProjectService }] + imports: [HttpClientTestingModule, MatIconModule], + providers: [ + ConfigService, + CopyTranslationsService, + { provide: TeacherProjectService, useClass: MockTeacherProjectService } + ] }); fixture = TestBed.createComponent(CopyComponentButtonComponent); component = fixture.componentInstance; diff --git a/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.ts b/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.ts index 4c0b81e180e..3d4405f4576 100644 --- a/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.ts +++ b/src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.ts @@ -1,5 +1,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { TeacherProjectService } from '../../../services/teacherProjectService'; +import { CopyTranslationsService } from '../../../services/copyTranslationsService'; import { Node } from '../../../common/Node'; @Component({ @@ -11,12 +12,16 @@ export class CopyComponentButtonComponent { @Output() newComponentEvent = new EventEmitter(); @Input() node: Node; - constructor(private projectService: TeacherProjectService) {} + constructor( + private copyTranslationsService: CopyTranslationsService, + private projectService: TeacherProjectService + ) {} protected copy(event: Event): void { event.stopPropagation(); const newComponents = this.node.copyComponents([this.componentId], this.componentId); this.projectService.saveProject(); + this.copyTranslationsService.tryCopyTranslations(this.node, newComponents); this.newComponentEvent.emit(newComponents); } } diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts index 7ab09f86465..5230e37903d 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentAuthoringModule } from '../../../../../app/teacher/component-a import { ProjectAssetService } from '../../../../../app/services/projectAssetService'; import { DebugElement } from '@angular/core'; import { DragDropModule } from '@angular/cdk/drag-drop'; -import { RouterTestingModule } from '@angular/router/testing'; import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; import { of } from 'rxjs'; import { TeacherNodeService } from '../../../services/teacherNodeService'; @@ -29,6 +28,7 @@ import { TeacherProjectTranslationService } from '../../../services/teacherProje import { ComponentTypeServiceModule } from '../../../services/componentTypeService.module'; import { DeleteTranslationsService } from '../../../services/deleteTranslationsService'; import { PreviewComponentButtonComponent } from '../../components/preview-component-button/preview-component-button.component'; +import { CopyTranslationsService } from '../../../services/copyTranslationsService'; let component: NodeAuthoringComponent; let component1: any; @@ -58,12 +58,12 @@ describe('NodeAuthoringComponent', () => { MatIconModule, MatInputModule, PreviewComponentButtonComponent, - RouterTestingModule, StudentTeacherCommonServicesModule, TeacherNodeIconComponent ], providers: [ ClassroomStatusService, + CopyTranslationsService, DeleteTranslationsService, TeacherProjectTranslationService, ProjectAssetService, diff --git a/src/assets/wise5/services/copyTranslationsService.ts b/src/assets/wise5/services/copyTranslationsService.ts new file mode 100644 index 00000000000..201f5aa482a --- /dev/null +++ b/src/assets/wise5/services/copyTranslationsService.ts @@ -0,0 +1,61 @@ +import { Injectable } from '@angular/core'; +import { EditTranslationsService } from './editProjectTranslationsService'; +import { Node } from '../common/Node'; +import { Observable, forkJoin } from 'rxjs'; +import { generateRandomKey } from '../common/string/string'; +import { ComponentContent } from '../common/ComponentContent'; + +interface I18NReplaceKey { + new: string; + original: string; +} + +@Injectable() +export class CopyTranslationsService extends EditTranslationsService { + tryCopyTranslations(node: Node, components: ComponentContent[]): void { + if (this.projectService.getLocale().hasTranslations()) { + this.copyTranslations( + node, + components.map((c) => c.id) + ); + } + } + + private async copyTranslations(node: Node, componentIds: string[]): Promise { + const allTranslations = await this.fetchAllTranslations(); + const i18nKeys = node.components + .filter((component) => componentIds.includes(component.id)) + .flatMap((component) => this.replaceI18NKeys(component)); + const saveTranslationRequests: Observable[] = []; + allTranslations.forEach((translations, language) => { + i18nKeys.forEach((i18nKey) => (translations[i18nKey.new] = translations[i18nKey.original])); + saveTranslationRequests.push( + this.http.post( + `/api/author/project/translate/${this.configService.getProjectId()}/${language.locale}`, + translations + ) + ); + }); + forkJoin(saveTranslationRequests).subscribe(); + this.projectService.saveProject(); + } + + protected replaceI18NKeys(componentElement: object): I18NReplaceKey[] { + let i18nKeys = Object.keys(componentElement) + .filter((key) => key.endsWith('.i18n')) + .map((key) => { + const originalI18NKey = componentElement[key].id; + const newI18NKey = generateRandomKey(30); + componentElement[key].id = newI18NKey; + return { original: originalI18NKey, new: newI18NKey }; + }); + Object.values(componentElement).forEach((value) => { + if (Array.isArray(value)) { + i18nKeys = i18nKeys.concat(...value.map((val) => this.replaceI18NKeys(val))); + } else if (typeof value === 'object' && value != null) { + i18nKeys = i18nKeys.concat(this.replaceI18NKeys(value)); + } + }); + return i18nKeys; + } +} diff --git a/src/assets/wise5/services/deleteTranslationsService.ts b/src/assets/wise5/services/deleteTranslationsService.ts index a0dfa6bac45..dad81d9c2a5 100644 --- a/src/assets/wise5/services/deleteTranslationsService.ts +++ b/src/assets/wise5/services/deleteTranslationsService.ts @@ -1,23 +1,10 @@ -import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Observable, forkJoin, lastValueFrom } from 'rxjs'; -import { Translations } from '../../../app/domain/translations'; +import { Observable, forkJoin } from 'rxjs'; import { ComponentContent } from '../common/ComponentContent'; -import { ConfigService } from './configService'; -import { Language } from '../../../app/domain/language'; -import { ProjectTranslationService } from './projectTranslationService'; -import { TeacherProjectService } from './teacherProjectService'; +import { EditTranslationsService } from './editProjectTranslationsService'; @Injectable() -export class DeleteTranslationsService extends ProjectTranslationService { - constructor( - protected configService: ConfigService, - protected http: HttpClient, - protected projectService: TeacherProjectService - ) { - super(configService, http, projectService); - } - +export class DeleteTranslationsService extends EditTranslationsService { tryDeleteComponents(components: ComponentContent[]): void { if (this.projectService.getLocale().hasTranslations()) { this.deleteComponents(components); @@ -40,22 +27,6 @@ export class DeleteTranslationsService extends ProjectTranslationService { forkJoin(saveTranslationRequests).subscribe(); } - private async fetchAllTranslations(): Promise> { - const allTranslations = new Map(); - await Promise.all( - this.projectService - .getLocale() - .getSupportedLanguages() - .map(async (language) => { - allTranslations.set( - language, - await lastValueFrom(this.fetchTranslations(language.locale)) - ); - }) - ); - return allTranslations; - } - private getI18NKeys(componentElement: object): string[] { let i18nKeys = Object.keys(componentElement) .filter((key) => key.endsWith('.i18n')) diff --git a/src/assets/wise5/services/editProjectTranslationsService.ts b/src/assets/wise5/services/editProjectTranslationsService.ts new file mode 100644 index 00000000000..c367b761f09 --- /dev/null +++ b/src/assets/wise5/services/editProjectTranslationsService.ts @@ -0,0 +1,35 @@ +import { HttpClient } from '@angular/common/http'; +import { ConfigService } from './configService'; +import { ProjectTranslationService } from './projectTranslationService'; +import { TeacherProjectService } from './teacherProjectService'; +import { lastValueFrom } from 'rxjs'; +import { Translations } from '../../../app/domain/translations'; +import { Language } from '../../../app/domain/language'; +import { Injectable } from '@angular/core'; + +@Injectable() +export class EditTranslationsService extends ProjectTranslationService { + constructor( + protected configService: ConfigService, + protected http: HttpClient, + protected projectService: TeacherProjectService + ) { + super(configService, http, projectService); + } + + protected async fetchAllTranslations(): Promise> { + const allTranslations = new Map(); + await Promise.all( + this.projectService + .getLocale() + .getSupportedLanguages() + .map(async (language) => { + allTranslations.set( + language, + await lastValueFrom(this.fetchTranslations(language.locale)) + ); + }) + ); + return allTranslations; + } +} diff --git a/src/messages.xlf b/src/messages.xlf index 8189fc3d779..319098cb90a 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -11886,8 +11886,8 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.38 - - Copy Component + + Copy component src/assets/wise5/authoringTool/node/copy-component-button/copy-component-button.component.html 5 From 79294b299c9672c96122fc341976ba8c64b4d9ce Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Mon, 8 Jul 2024 18:30:40 -0400 Subject: [PATCH 64/90] feat(Translation): Convert step title input to translatable (#1851) --- .../translatable-input.component.html | 2 +- .../edit-node-title.component.html | 17 ++--- .../edit-node-title.component.scss | 11 ---- .../edit-node-title.component.spec.ts | 32 +++++++-- .../edit-node-title.component.ts | 12 ++-- .../node-authoring.component.html | 2 +- .../node-authoring.component.scss | 4 ++ .../node-authoring.component.spec.ts | 4 +- src/assets/wise5/services/projectService.ts | 6 +- src/messages.xlf | 66 +++++++++---------- 10 files changed, 80 insertions(+), 76 deletions(-) delete mode 100644 src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.scss diff --git a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html index a630eebe53c..f538d81ab1d 100644 --- a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html +++ b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html @@ -1,5 +1,5 @@ @if (!showTranslationInput()) { - + {{ label }} - Step Title {{ nodePosition }}: - Lesson Title {{ nodePosition }}: - - + diff --git a/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.scss b/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.scss deleted file mode 100644 index 2e2a61b6393..00000000000 --- a/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.scss +++ /dev/null @@ -1,11 +0,0 @@ -@import - 'style/abstracts/variables', - 'style/abstracts/functions'; - -.step-title { - width: 320px; - - @media (min-width: breakpoint('md.min')) { - width: 480px; - } -} diff --git a/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.spec.ts b/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.spec.ts index 8f90bf130c9..65ac37a79d6 100644 --- a/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.spec.ts +++ b/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.spec.ts @@ -7,23 +7,41 @@ import { FormsModule } from '@angular/forms'; import { MatInputModule } from '@angular/material/input'; import { provideAnimations } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; +import { TranslatableInputComponent } from '../../components/translatable-input/translatable-input.component'; +import { TeacherProjectTranslationService } from '../../../services/teacherProjectTranslationService'; +import { ConfigService } from '../../../services/configService'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { ProjectLocale } from '../../../../../app/domain/projectLocale'; +import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module'; -class MockTeacherProjectService { - getNodeById() {} - getNodePositionById() {} -} let component: EditNodeTitleComponent; let fixture: ComponentFixture; +let teacherProjectService: TeacherProjectService; + describe('EditNodeTitleComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [EditNodeTitleComponent], - imports: [FormsModule, MatFormFieldModule, MatInputModule], + imports: [ + FormsModule, + HttpClientTestingModule, + MatFormFieldModule, + MatInputModule, + StudentTeacherCommonServicesModule, + TranslatableInputComponent + ], providers: [ - { provide: TeacherProjectService, useClass: MockTeacherProjectService }, - provideAnimations() + ConfigService, + provideAnimations(), + TeacherProjectService, + TeacherProjectTranslationService ] }); + teacherProjectService = TestBed.inject(TeacherProjectService); + spyOn(teacherProjectService, 'getLocale').and.returnValue( + new ProjectLocale({ default: 'en_us', supported: ['es', 'ja'] }) + ); + spyOn(teacherProjectService, 'isDefaultLocale').and.returnValue(true); fixture = TestBed.createComponent(EditNodeTitleComponent); component = fixture.componentInstance; const node = new Node(); diff --git a/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.ts b/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.ts index 1b9e563d40e..396ff212441 100644 --- a/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.ts +++ b/src/assets/wise5/authoringTool/node/edit-node-title/edit-node-title.component.ts @@ -4,21 +4,21 @@ import { TeacherProjectService } from '../../../services/teacherProjectService'; @Component({ selector: 'edit-node-title', - templateUrl: './edit-node-title.component.html', - styleUrls: ['./edit-node-title.component.scss'] + templateUrl: './edit-node-title.component.html' }) export class EditNodeTitleComponent { - protected isGroupNode: boolean; + protected label: string; @Input() node: Node; protected nodeJson: any; - protected nodePosition: string; constructor(private projectService: TeacherProjectService) {} ngOnChanges(): void { - this.isGroupNode = this.node.isGroup(); this.nodeJson = this.projectService.getNodeById(this.node.id); - this.nodePosition = this.projectService.getNodePositionById(this.node.id); + this.label = + (this.node.isGroup() ? $localize`Lesson Title` : $localize`Step Title`) + + ' ' + + this.projectService.getNodePositionById(this.node.id); } protected save(): void { diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html index 4f017c36dc1..a2c185228d8 100644 --- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html +++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html @@ -1,7 +1,7 @@
- +