Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -8021,6 +8021,18 @@ const LANG_EN_US = {
         course: 'Course',
         courseGroup: 'Class',
         schoolName: 'School',
+        Warning01: 'For designated review, please enter the TEAM Model user number and check to confirm it is the correct TEAM Model ID',
+        check: 'check',
+        Warning02: 'The ongoing schedule cannot be edited',
+        jointTime: 'Registration time',
+        pleaseEnterEventName: 'Please enter the event name',
+        pleaseEnterSchedule: 'Please enter the schedule',
+        accountNotExist: 'Account does not exist',
+        pleaseEnterAccount: 'Please enter account number',
+        confirm: 'OK',
+        Warning03: 'Are you sure you want to delete the group?',
+        notice: 'hint',
+        Warning04: 'Are you sure you want to delete the schedule?',
     },
     activity: {
         scoreWord: {

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -8022,6 +8022,18 @@ const LANG_ZH_CN = {
         course: '课程',
         courseGroup: '课程名单',
         schoolName: '学校',
+        Warning01: '指定评审，请输入醍摩豆用户编号，检查确认为正确醍摩豆ID',
+        check: '检查',
+        Warning02: '进行中时程不可编辑',
+        jointTime: '报名时间',
+        pleaseEnterEventName: '请输入活动名称',
+        pleaseEnterSchedule: '请输入时程',
+        accountNotExist: '帐号不存在',
+        pleaseEnterAccount: '请输入帐号',
+        confirm: '确定',
+        Warning03: '确定要删除组别?',
+        notice: '提示',
+        Warning04: '确定要删除时程?',
     },
     activity: {
         scoreWord: {

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -8022,6 +8022,18 @@ const LANG_ZH_TW = {
         course: '課程',
         courseGroup: '課程名單',
         schoolName: '學校',
+        Warning01: '指定評審，請輸入醍摩豆用戶編號，檢查確認為正確醍摩豆ID',
+        check: '檢查',
+        Warning02: '進行中時程不可編輯',
+        jointTime: '報名時間',
+        pleaseEnterEventName: '請輸入活動名稱',
+        pleaseEnterSchedule: '請輸入時程',
+        accountNotExist: '帳號不存在',
+        pleaseEnterAccount: '請輸入帳號',
+        confirm: '確定',
+        Warning03: '確定要刪除組別?',
+        notice: '提示',
+        Warning04: '確定要刪除時程?',
     },
     activity: {
         scoreWord: {

TEAMModelOS/ClientApp/src/view/htcommunity/htMgtExam.vue

@@ -13,10 +13,10 @@
 			</el-tabs>
 		</div> -->
 		<div style="margin: 10px">
-			<el-select v-model="filter.schedule" placeholder="請選擇時程" style="margin-right: 30px;" @change="findEvaluation">
+			<el-select v-model="filter.schedule"  style="margin-right: 30px;" @change="findEvaluation">
 				<el-option v-for="item in propSchedules" :key="item.id" :label="item.name" :value="item.id" />
 			</el-select>
-			<el-select v-model="filter.group" placeholder="請選擇組別" @change="findEvaluation">
+			<el-select v-model="filter.group"  @change="findEvaluation">
 				<el-option v-for="item in propGroups" :key="item.id" :label="item.name" :value="item.id" />
 			</el-select>
 		</div>

TEAMModelOS/ClientApp/src/view/htcommunity/htMgtHome.vue

@@ -22,18 +22,7 @@
                     <!-- <el-button type="text" @click="return false">{{$t("htcommunity.view")}}</el-button> -->
                 </template>
             </el-table-column>
-        </el-table>
-
-        <!-- 詳細內容彈出視窗 -->
-        <el-dialog :title="this.$t('htcommunity.details')" :visible.sync="showDetailsModal" width="50%">
-            <p>{{this.$t("htcommunity.activityName")}}: {{ selectedActivity.name }}</p>
-            <p>{{this.$t("htcommunity.schedule")}}: {{ selectedActivity.time }}</p>
-            <p>{{this.$t("htcommunity.administrator")}}: {{ selectedActivity.admin }}</p>
-            <p>原始資料: {{ selectedActivity.originalData }}</p>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="showDetailsModal = false">{{this.$t("htcommunity.cancel")}}</el-button>
-            </span>
-        </el-dialog>
+        </el-table>       
 
         <!-- 新增活動彈出視窗 -->
         <el-dialog :title="this.$t('htcommunity.addEvent')" :visible.sync="showAddModal" width="90%"
@@ -64,7 +53,9 @@
                         <el-form-item :label="this.$t('htcommunity.group')">
                             <!-- <el-tooltip content="指定評審，請檢查確認為正確醍摩豆ID" placement="bottom" effect="light"> -->
                             <el-tooltip placement="bottom" effect="light">
-                                <div slot="content" style="color: red;font-size: 1.2em;">指定評審，請輸入醍摩豆用戶編號，檢查確認為正確醍摩豆ID</div>
+                                <div slot="content" style="color: red;font-size: 1.2em;">
+                                  {{$t("htcommunity.Warning01")}}
+                                  </div>
                                 <i class="el-icon-warning-outline" style="font-size: 2em;"></i>
                             </el-tooltip>
                             <!-- <span>指定評審請輸入<span class="point">手機號碼</span>、<span class="point">醍摩豆用戶編號</span>或<span class="point">電子信箱</span>等資訊進行搜尋</span> -->
@@ -79,7 +70,7 @@
                                     <template slot-scope="scope">
                                         <el-input v-model="scope.row.groupJudge" style="width: 200px;margin-right: 10px"></el-input>
                                         <el-button type="primary" icon="el-icon-search" size="mini" @click="checkTmdid(scope)"
-                                                   style="margin-top: 5px;">檢查</el-button>
+                                                   style="margin-top: 5px;">{{$t("htcommunity.check")}}</el-button>
                                         <span v-if="scope.row.valid">✔️</span>
 
                                     </template>
@@ -112,7 +103,9 @@
                                 <el-date-picker v-model="scope.row.schedule" type="datetimerange" start-placeholder="Start"
                                                 end-placeholder="End" style="width: 100%;" :disabled="scheduleDisabled(scope, '')">
                                 </el-date-picker>
-                                <span style="color:red;font-size: small;" v-show="scope.row.progress==='going'">進行中時程不可編輯</span>
+                                <span style="color:red;font-size: small;" v-show="scope.row.progress==='going'">                                  
+                                  {{$t("htcommunity.Warning02")}}
+                                  </span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="name" :label="this.$t('htcommunity.stage')" min-width="100px">
@@ -210,8 +203,7 @@ export default {
             { code: 'join', name: this.$t("htcommunity.signup") },
             { code: 'exam', name: this.$t("htcommunity.exam") },
             { code: 'other', name: this.$t("htcommunity.other") }
-        ],
-      showDetailsModal: false,
+        ],      
       showAddModal: false,
       selectedActivity: {},
       newActivity: {
@@ -225,18 +217,18 @@ export default {
         ],
         requireOrderCompletion: false,
         planContent: [
-          {id:'', step: 1, schedule: [], name: '報名時間', location: '', description: '', blobs: '', type: true, examType: false, evaluation: false }
+          {id:'', step: 1, schedule: [], name: this.$t("htcommunity.jointTime"), location: '', description: '', blobs: '', type: true, examType: false, evaluation: false }
         ],
        
       },
       // 表單驗證
       rules: {
         name: [
-          { required: true, message: '請輸入活動名稱' }
+          { required: true, message: this.$t("htcommunity.pleaseEnterEventName") }
         ],
         time: [
           {
-            required: true, message: '請輸入時程'
+            required: true, message: this.$t("htcommunity.pleaseEnterSchedule")
           }
         ],
       },
@@ -341,7 +333,7 @@ export default {
             else {
               this.$message({
                 showClose: true,
-                message: '帳號不存在',
+                message: this.$t('htcommunity.accountNotExist'),
                 type: 'error'
               });
               scope.row.valid = false;
@@ -355,7 +347,7 @@ export default {
       } else {
         this.$message({
           showClose: true,
-          message: '請輸入帳號',
+          message: this.$t('htcommunity.pleaseEnterAccount'),
           type: 'error'
         });
         scope.row.valid = false;
@@ -694,7 +686,7 @@ export default {
         ],
         requireOrderCompletion: false,
         planContent: [
-          {id:'', step: 1, schedule: [], name: '報名時間', location: '', description: '', blobs: '',  type: true, examType: false, evaluation: false }
+          {id:'', step: 1, schedule: [], name: this.$t('htcommunity.jointTime'), location: '', description: '', blobs: '',  type: true, examType: false, evaluation: false }
         ]
       };      
     },
@@ -704,9 +696,9 @@ export default {
     },
     //移除分組
     removeGroup(scope) {
-      this.$confirm('確定要刪除組別?', '提示', {
-        confirmButtonText: '確定',
-        cancelButtonText: '取消',
+      this.$confirm(this.$t('htcommunity.Warning03'), this.$t('htcommunity.notice'), {
+        confirmButtonText: this.$t('htcommunity.confirm'),
+        cancelButtonText: this.$t('htcommunity.cancel'),
         type: 'warning'
       }).then(() => {
         try {
@@ -741,9 +733,9 @@ export default {
     },
     //移除時程
     removePlanContent(scope) {      
-      this.$confirm('確定要刪除時程?', '提示', {
-        confirmButtonText: '確定',
-        cancelButtonText: '取消',
+     this.$confirm(this.$t('htcommunity.Warning04'), this.$t('htcommunity.notice'), {
+        confirmButtonText: this.$t('htcommunity.confirm'),
+        cancelButtonText: this.$t('htcommunity.cancel'),
         type: 'warning'
       }).then(() => {
         try {

TEAMModelOS/ClientApp/src/view/syllabus/Syllabus.vue

@@ -1506,12 +1506,14 @@ export default {
           // 获取关联的试题数据
           itemNodeArr.forEach(async item => {
             promiseArr.push(new Promise(async (r, j) => {
+              let blob = this.$evTools.getBlobHost() + '/' + item.cntr + item.link + sas
               let indexJsonFile = await this.$tools.getFile(this.$evTools.getBlobHost() + '/' + item.cntr + item.link + sas)
               let jsonData = JSON.parse(indexJsonFile)
               jsonData.exercise.question = jsonData.item[0].question
               jsonData.exercise.option = jsonData.item[0].option
               jsonData.exercise.id = jsonData.id
               jsonData.exercise.pid = jsonData.pid
+              jsonData.exercise.blob = blob
               jsonData.exercise = await this.$evTools.doAddHost(jsonData.exercise, null, null, true)
               r(jsonData.exercise)
             }))