Merge branch 'develop_local' into TPE/develop

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

@@ -8073,8 +8073,11 @@ const LANG_EN_US = {
         stage:'Stage',
         description:'Description',
         Eventlayout: 'Event type',
-        examType: 'Is regular exam',
-        examCanBeChecked:'Exam are repeatable',
+        joinType: "Registration type",
+        joinTypePre: "Pre-registration",
+        joinTypeRegular: "Official registration",
+        examType: "Is regular exam",
+        examCanBeChecked: "Exam can be retaken",
         operation:'Operation',        
         confirm:'Save',
         cancel:'Cancel',

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

@@ -8075,8 +8075,11 @@ const LANG_ZH_CN = {
         stage:'阶段',
         description:'说明',
         Eventlayout: '活动类型',
-        examType: '是否为基本评量类型',
-        examCanBeChecked:'评量可重复',
+        joinType: '报名类型',
+        joinTypePre: '预报名',
+        joinTypeRegular: '正式报名',
+        examType: '是否为热身赛',
+        examCanBeChecked: '评量可重複作答',
         operation:'操作',        
         confirm:'保存',
         cancel:'取消',

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

@@ -8073,8 +8073,11 @@ const LANG_ZH_TW = {
         stage:'階段',
         description:'說明',
         Eventlayout: '活動類型',
-        examType: '是否為基本評量類型',
-        examCanBeChecked:'評量可重複',
+        joinType: '報名類型',
+        joinTypePre: '預報名',
+        joinTypeRegular: '正式報名',
+        examType: '是否為熱身賽',
+        examCanBeChecked:'評量可重複作答',
         operation:'操作',        
         confirm:'保存',
         cancel:'取消',

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

@@ -117,9 +117,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'">                                  
-                                  {{$t("htcommunity.Warning02")}}
-                                  </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">
@@ -151,12 +151,20 @@
                                 <!--<el-checkbox v-model="scope.row.type" :disabled="scheduleDisabled(scope, '')"></el-checkbox>-->
                             </template>
                         </el-table-column>
+                        <el-table-column prop="joinType" :label="this.$t('htcommunity.joinType')" min-width="80px">
+                            <template slot-scope="scope">
+                                <el-select v-model="scope.row.joinType" :placeholder="$t('htcommunity.pleaseChoose')" :disabled="scheduleDisabled(scope, 'joinType')">
+                                    <el-option v-for="item in eventJoinTypes" :key="item.code" :label="item.name" :value="item.code">
+                                    </el-option>
+                                </el-select>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="examType" :label="this.$t('htcommunity.examType')" min-width="50px">
                             <template slot-scope="scope">
                                 <el-checkbox v-model="scope.row.examType" :disabled="scheduleDisabled(scope, 'examType')"></el-checkbox>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="evaluation" :label="this.$t('htcommunity.examCanBeChecked')" min-width="60px">
+                        <el-table-column prop="evaluation" :label="this.$t('htcommunity.examCanBeChecked')" min-width="50px">
                             <template slot-scope="scope">
                                 <el-checkbox v-model="scope.row.evaluation" :disabled="scheduleDisabled(scope, 'evaluation')"></el-checkbox>
                             </template>
@@ -219,7 +227,11 @@ export default {
             { code: 'join', name: this.$t("htcommunity.signup") },
             { code: 'exam', name: this.$t("htcommunity.exam") },
             { code: 'other', name: this.$t("htcommunity.other") }
-        ],      
+        ],
+        eventJoinTypes: [
+            { code: 'pre', name: this.$t("htcommunity.joinTypePre") },
+            { code: 'regular', name: this.$t("htcommunity.joinTypeRegular") }
+        ],
       showAddModal: false,
       selectedActivity: {},
       newActivity: {
@@ -233,7 +245,7 @@ export default {
         ],
         requireOrderCompletion: false,
         planContent: [
-          {id:'', step: 1, schedule: [], name: this.$t("htcommunity.jointTime"), location: '', description: '', blobs: '', type: true, examType: false, evaluation: false }
+            { id: '', step: 1, schedule: [], name: this.$t("htcommunity.jointTime"), location: '', description: '', blobs: '', type: true, joinType: '', examType: false, evaluation: false }
         ],
         loginType: [],
        
@@ -279,6 +291,14 @@ export default {
             return false;
           }
         }
+        else if (column === 'joinType') {
+          if (scope.row.type != 'join') {
+            scope.row.joinType = '';
+            return true;
+          } else {
+            return false;
+          }
+        }
       }
     },
     // 取得列表資料
@@ -436,6 +456,7 @@ export default {
           schedule: [this.$jsFn.secondTimeFormat(item.startTime), this.$jsFn.secondTimeFormat(item.endTime)],
           name: item.name,
           type: item.type,
+          joinType: item.joinType,
           examType: item.examType === "regular" ? true : false,
           evaluation: item.examOverwrite,
           progress: item.progress,
@@ -667,6 +688,7 @@ export default {
                         let upItem = {
                           id: item.id,
                           type: pType,
+                          joinType: item.joinType,
                           examType: pExamType,
                           examOverwrite: item.evaluation, //評量可否重複作答 true:可                           
                           name: item.name, //行程階段