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

TEAMModelBI/ClientApp/src/view/issueCoupons/crteadCoupon.vue

@@ -10,12 +10,14 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item v-if="!detailSettingFlag" label="活動票券" prop="eventType">
-                <el-radio-group v-model="eventType" @change="setEventType">
+                <el-radio-group v-model="eventType" @change="setEventType" style="max-width: 1000px;">
                     <el-radio label="hiteach50-3"  border>Hiteach 50 第三階段</el-radio>
                     <el-radio label="hiteach333-1"  border>HiTeach 333 第一階段</el-radio>
                     <el-radio label="hiteach333-3"  border>HiTeach 333 第三階段</el-radio>
                     <el-radio label="hiteachBookSPLicense"  border>HiTeach專書贈送授權</el-radio>
                     <el-radio label="fbGroupOpening"  border>HiTeach社團開幕活動</el-radio>
+                    <el-radio label="giftWebIRS501M"  border>贈送WEBIRS50一個月</el-radio>
+                    <el-radio label="giftSmart1Y"  border>贈送智慧評分一年</el-radio>
                 </el-radio-group>
             </el-form-item>
             <el-form-item v-if="detailSettingFlag" label="票券類型" prop="couponType" >
@@ -94,8 +96,8 @@
                             </div>
                         </template>
                         <div style="text-align: left;">
-                            票券標題:<el-input v-model="info.n" :readonly="!detailSettingFlag"/>
-                            連結:<el-input v-model="info.u" :readonly="!detailSettingFlag"/>
+                            票券標題:<el-input v-model="info.n"/>
+                            連結:<el-input v-model="info.u"/>
                         </div>
                         <template #footer>
                             <div style="display: flex;justify-content: center;">
@@ -321,6 +323,28 @@ const setEventType = (type)=>{
             crtCouponForm.info[2].n = 'Facebook Group Opening'
             crtCouponForm.info[2].u = 'https://www.habook.com/en/'
         break
+        case 'giftWebIRS501M':
+            crtCouponForm.couponType =  'Event'
+            crtCouponForm.eventName = 'giftWebIRS501M'
+            crtCouponForm.rule[0].b = '901004'
+            crtCouponForm.info[0].l = 'zh-tw' 
+            crtCouponForm.info[0].u = 'https://www.habook.com/zh-tw'
+            crtCouponForm.info[1].l = 'zh-cn'
+            crtCouponForm.info[1].u = 'https://www.habook.com.cn/'
+            crtCouponForm.info[2].l = 'en-us'
+            crtCouponForm.info[2].u = 'https://www.habook.com/en/'
+        break
+        case 'giftSmart1Y':
+            crtCouponForm.couponType =  'Event'
+            crtCouponForm.eventName = 'giftSmart1Y'
+            crtCouponForm.rule[0].b = '901005'
+            crtCouponForm.info[0].l = 'zh-tw' 
+            crtCouponForm.info[0].u = 'https://www.habook.com/zh-tw'
+            crtCouponForm.info[1].l = 'zh-cn'
+            crtCouponForm.info[1].u = 'https://www.habook.com.cn/'
+            crtCouponForm.info[2].l = 'en-us'
+            crtCouponForm.info[2].u = 'https://www.habook.com/en/'
+        break        
     }
 }
 

TEAMModelOS.FunctionV4/CosmosDB/TriggerExam.cs

@@ -37,6 +37,7 @@ using TEAMModelOS.Models;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using HtmlAgilityPack;
 using Azure.Storage.Blobs;
+using System.ComponentModel;
 
 namespace TEAMModelOS.FunctionV4
 {
@@ -807,12 +808,12 @@ namespace TEAMModelOS.FunctionV4
             {// 如果是是非題 正確答案要用true false的方式設定
                 if (questionData.exercise.answer[0] == "A")
                 {
-                    learnRecordItem.Correct = true;
+                    learnRecordItem.Correct = new string[] { "true" };
                 }
                 else
                 {
-                    learnRecordItem.Correct = false;
-                }
+                    learnRecordItem.Correct = new string[] { "false" };
+                }               
             }
             else
             {// 防呆 去html標籤

TEAMModelOS.SDK/Models/Cosmos/Common/LearnRecord.cs

@@ -31,9 +31,9 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
         public string Desc { get; set; }
         // 知識點陣列, 裡面放字串, 相當於關鍵詞
         public List<string> Points { get; set; }
-        // 知識點陣列, 裡面放字串, 相當於關鍵詞
+        //正確答案, 複選可以放多個
         public object Correct { get; set; }
-        // 知識點陣列, 裡面放字串, 相當於關鍵詞
+        //選項內容, 純文字, 沒有就放空的
         public List<ChoicesItem> Choices { get; set; }
         // 考試卷題數, 若無放 null
         public int? ExamQuesQty { get; set; }

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

@@ -8078,7 +8078,7 @@ const LANG_ZH_CN = {
             text10: '手动分配作品',
             text11: '成绩等级设置',
             text12: '调整参数作品分数',
-            text13: '调整参数确认开始评审后，不可删除已邀请的专家，不可调整评审规则，同时专家可以对作品进行评审，是否确认开始评审？作品分数',
+            text13: '调整参数确认开始评审后，不可删除已邀请的专家，不可调整评审规则，同时专家可以对作品进行评审，是否确认开始评审？',
             text14: '删除专家',
             text15: '确认公示成绩后，参赛者将可以查看成绩排名和个人成绩',
             text16: '是否同时修改模板内容',