Merge branch 'develop5.0' into develop5.0-tmd

TEAMModelOS/ClientApp/src/locale/lang/en-US/courseManage.js

@@ -75,8 +75,8 @@ export default {
         studentTableC6: 'Group Name',
         studentTableC7: 'Account/Student ID',
         studentTableC8: 'Type',
-        studentTableC9: 'IRS號碼',
-        studentTableC10: '行政班',
+        studentTableC9: 'IRS Number',
+        studentTableC10: 'Admin Class',
         addClassroomProp1: 'Select Default classroom',
         addClassroomProp2: 'New personal classroom',
         chooseClassroom: 'Please select system classroom',

TEAMModelOS/ClientApp/src/locale/lang/en-US/cusMgt.js

@@ -149,7 +149,7 @@ export default {
     action:'Operate',
     atLeast:'Keep at least one group',
     checkName:'Please enter the group name and then create the group',
-    groupNameRepeat:'組名重複',
+    groupNameRepeat:'The group name is duplicated',
     noStuTips:'No students are available for grouping',
     groupCount:'Minimum number of groups is 1',
     groupTypeTips:'Please set the grouping method',
@@ -201,7 +201,7 @@ export default {
     createList:'Create Self-customized List',
     name:'Name: ',
     nameHolder:'Please enter list name...',
-    nameRepeat:'教學班名稱重複',
+    nameRepeat:'The customized class name is duplicated',
     pdHolder:'Please set the school system',
     timeSetTitle:'Schedule Settings',
     job:'Title',
@@ -231,20 +231,20 @@ export default {
     //MgtStuList.vue
     nameList:'Name list',
     remvStu:'Remove Student',
-    editStu:'設置IRS',
+    editStu:'Set IRS number',
     goBack:'Click to go back',
     delListTitle:'Delete Self-customized List',
-    notSet:'未設置',
-    irsTips1:'1、按照名單順序快速設置IRS號碼；',
-    irsTips2:'2、如果學生已經設置IRS號碼將被重置。 ',
-    irsRepeat:'IRS號碼重複',
-    remvContent1:'是否確認從名單移除',
-    remvContent2:'位學生',
-    okText:'是',
-    cancelText:'否',
-    remvTips:'請選擇需要移除的學生',
-    findListInfoErr:'查詢教學班信息失敗',
-    findListErr:'查詢教學班列表失敗',
+    notSet:'Not set',
+    irsTips1:'1. Quickly set the IRS number in the order of the list;',
+    irsTips2:'2. If the student already has a set IRS number, it will be reset.',
+    irsRepeat:'IRS number is duplicated',
+    remvContent1:'Are you sure you want to remove',
+    remvContent2:'student(s) from the list',
+    okText:'Yes',
+    cancelText:'No',
+    remvTips:'Please select the students to be removed',
+    findListInfoErr:'Failed to search customized class information',
+    findListErr:'Failed to search customized class list information',
 
     //TeaTable.vue
     am:'Morning',

TEAMModelOS/ClientApp/src/locale/lang/en-US/evaluation.js

@@ -4,7 +4,7 @@ export default {
 	importItems:'Import Question',
 	composePaper:'Form Exam File',
 	syncItems:'Synchronize questions to the question bank',
-	syncPoints:'Synchronize key concept points to the school library when saving',
+	syncPoints:'Synchronize key concept points to the school library',
 	paperTag:'Exam File Tag',
 	paperTagPlace:'Manual input to create new tabs',
 	useTip:'Please keep at least one use of the test question',
@@ -316,7 +316,7 @@ export default {
 	addTip5:'No question was found!',
 	checkList:{
 		title:'Exam File Two-way Analysis Table',
-		tip:'Note： a(b) a: Allocated Point(s), b: Number',
+		tip:'Note: a(b) a: Number, b: Allocated Point(s)',
 		sum:'Total',
 		none:'None'
 	}

TEAMModelOS/ClientApp/src/locale/lang/en-US/learnActivity.js

@@ -103,7 +103,7 @@ export default {
         togglePdTip2: 'subject. Switching the school system now will clear the selected subjects. Do you confirm the switch?',
         toggleOkText: 'Switch',
         delPdTitle: 'Delete Subject',
-        delPdContent: 'Are you sure to delete?',
+        delPdContent: 'Are you sure to delete ',
         delOk: 'Delete successfully',
         pdTips: 'Please select the school system！',
         defaultPaper: '(Please pick or import exam files)',
@@ -276,7 +276,7 @@ export default {
         assigned: 'Assigned',
         unassigned: 'Not Assigned',
         teaProgress: 'Teaching Marking Progress',
-        exProgress: '異常捲進度',
+        exProgress: '異常卷進度',
         schedule: 'Adjust',
         subject: 'Subject',
         stuNum: 'Examinee Number',
@@ -315,11 +315,11 @@ export default {
         rmvTitle:'Remove Teacher',
         rmvContent:'Are you sure to remove ',
         baseErr:'請完成閱卷基礎設置',
-        teacherErr:'閱捲和相關老師設置',
+        teacherErr:'閱卷和相關老師設置',
         saveOk:'Save successfully!',
         saveErr:'Failed to save！',
-        deleteOk:'刪除成功',
-        deleteErr:'刪除失敗',
+        deleteOk:'Delete successfully',
+        deleteErr:'Failed to delete',
         byStuTips:'Mark the entire exam file',
         byQuTips:'Mark the assigned questions',
         quBlock:'題目劃塊',

TEAMModelOS/ClientApp/src/locale/lang/en-US/schoolBaseInfo.js

@@ -33,7 +33,7 @@ export default {
   semesterDuration: 'Semester Length：',
   dayUnit: ' days',
   saveInfo: 'Save Changes',
-  deleteTask:'刪除任務',
+  deleteTask:'Delete Task',
   noSemester: 'No semester set',
   editLabel: 'Edit',
   monthHolder: '',

TEAMModelOS/ClientApp/src/locale/lang/en-US/task.js

@@ -68,7 +68,7 @@ export default {
     arbQu:'仲裁題目:',
     arb:'仲裁',
     hasarb:'已仲裁',
-    goingTips:'閱捲進行中，請等閱卷結束後再查看仲裁卷。 ',
+    goingTips:'閱卷進行中，請等閱卷結束後再查看仲裁卷。 ',
     markScore1:'閱卷分數1: ',
     markScore2:'閱卷分數2: ',
     score:'分',

TEAMModelOS/ClientApp/src/locale/lang/en-US/teachermgmt.js

@@ -182,9 +182,9 @@ export default {
     rmvErr:'Failed to remove',
     groupInfoErr:'Failed to search for the group',
     delGroup:'Delete Pedagogical Research Team',
-    leader:'組長：',
-    notSet:'未設置',
-    setLeader:'設置為組長',
-    setOk:'設置成功',
-    setErr:'設置失敗'
+    leader:'Team Leader：',
+    notSet:'Not set',
+    setLeader:'Set as team leader',
+    setOk:'Set up successfully',
+    setErr:'Failed to set up'
 }

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/courseManage.js

@@ -76,7 +76,7 @@ export default {
         studentTableC7: '帳號/學號',
         studentTableC8: '類型',
         studentTableC9: 'IRS號碼',
-        studentTableC10: '行政班',
+        studentTableC10: '編制班',
         addClassroomProp1: '選擇預設教室',
         addClassroomProp2: '新建個人教室',
         chooseClassroom: '請選擇系統的教室',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/cusMgt.js

@@ -201,7 +201,7 @@ export default {
     createList: '新建選課班',
     name: '名稱：',
     nameHolder: '請輸入名單名稱…',
-    nameRepeat:'教學班名稱重複',
+    nameRepeat:'選課班名稱重複',
     pdHolder:'請設置學段',
     timeSetTitle: '時段設定',
     job: '職位',
@@ -243,8 +243,8 @@ export default {
     okText:'是',
     cancelText:'否',
     remvTips:'請選擇需要移除的學生',
-    findListInfoErr:'查詢教學班信息失敗',
-    findListErr:'查詢教學班列表失敗',
+    findListInfoErr:'查詢選課班信息失敗',
+    findListErr:'查詢選課班列表失敗',
 
     //TeaTable.vue
     am: '上午',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js

@@ -276,7 +276,7 @@ export default {
         assigned: '已分配',
         unassigned: '未分配',
         teaProgress: '教師閱卷進度',
-        exProgress: '異常捲進度',
+        exProgress: '異常卷進度',
         schedule: '調度',
         subject: '學科',
         stuNum: '考試人數',
@@ -315,7 +315,7 @@ export default {
         rmvTitle: '移除老師',
         rmvContent: '是否確認移除',
         baseErr: '請完成閱卷基礎設置',
-        teacherErr: '閱捲和相關老師設置',
+        teacherErr: '閱卷和相關老師設置',
         saveOk: '保存成功！ ',
         saveErr: '保存失敗！ ',
         deleteOk:'刪除成功',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/task.js

@@ -68,7 +68,7 @@ export default {
     arbQu:'仲裁題目:',
     arb:'仲裁',
     hasarb:'已仲裁',
-    goingTips:'閱捲進行中，請等閱卷結束後再查看仲裁卷。 ',
+    goingTips:'閱卷進行中，請等閱卷結束後再查看仲裁卷。 ',
     markScore1:'閱卷分數1: ',
     markScore2:'閱卷分數2: ',
     score:'分',

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -1147,14 +1147,14 @@ namespace TEAMModelOS.Controllers.Client
                 string strExam = JsonSerializer.Serialize(exam);
                 if (strExam.Contains("\"publish\":\"0\""))
                 {
-                    strExam.Replace("\"publish\":\"0\"", "\"publish\":0");
+                    strExam = strExam.Replace("\"publish\":\"0\"", "\"publish\":0");
                 }
-                ExamInfo ExamInfoFromReq = Newtonsoft.Json.JsonConvert.DeserializeObject<ExamInfo>(strExam);
+                ExamInfo ExamInfoFromReq = JsonSerializer.Deserialize<ExamInfo>(strExam);
                 string examId = ExamInfoFromReq.id;
                 string excode = ExamInfoFromReq.code;
                 //ExamInfo dbExamInfo = exam.ToObject<ExamInfo>();
-                ExamInfo dbExamInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ExamInfo>(strExam);
-                
+                ExamInfo dbExamInfo = JsonSerializer.Deserialize<ExamInfo>(strExam);
+
                 var queryex = $"SELECT * FROM c WHERE c.id = '{examId}'";
                 await foreach (var itemex in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: queryex, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{excode}") }))
                 {
@@ -1166,9 +1166,9 @@ namespace TEAMModelOS.Controllers.Client
                             string strExamDb = JsonSerializer.Serialize(obj);
                             if (strExamDb.Contains("\"publish\":\"0\""))
                             {
-                                strExamDb.Replace("\"publish\":\"0\"", "\"publish\":0");
+                                strExamDb = strExamDb.Replace("\"publish\":\"0\"", "\"publish\":0");
                             }
-                            dbExamInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ExamInfo>(strExamDb);
+                            dbExamInfo = JsonSerializer.Deserialize<ExamInfo>(strExamDb);
                             //dbExamInfo = obj.ToObject<ExamInfo>();
                         }
                     }

TEAMModelOS/Controllers/Research/AbilityStatisticsController.cs

@@ -38,7 +38,7 @@ namespace TEAMModelOS.Controllers
             _option = option?.Value;
         }
         /// <summary>
-        /// 更新教师最终学习分数。
+        /// 更新教师最终学习分数。
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -75,7 +75,7 @@ namespace TEAMModelOS.Controllers
                 }
                 else
                 {
-                    int pages = (teacherTrains.Count + pagesize) / pagesize; //256是批量操作最大值，pages = (total + max -1) / max;
+                    int pages = (teacherTrains.Count + pagesize) / pagesize; //256鏄�壒閲忔搷浣滄渶澶у€硷紝pages = (total + max -1) / max;
                     for (int i = 0; i < pages; i++)
                     {
                         var listssb = teacherTrains.Skip((i) * pagesize).Take(pagesize).ToList();
@@ -91,7 +91,7 @@ namespace TEAMModelOS.Controllers
 
 
         /// <summary>
-        /// 提交学习总结、。
+        /// 提交学习总结、。
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -118,11 +118,11 @@ namespace TEAMModelOS.Controllers
                 return Ok(new { status=200});
             }
             catch (CosmosException ex ){
-                return Ok(new { error = 1, msg = "你没有学习记录" });
+                return Ok(new { error = 1, msg = "你没有学习记录" });
             }
         }
         /// <summary>
-        /// 对某个订阅的能力点进行操作
+        /// 对某个订阅的能力点进行操作
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -197,7 +197,7 @@ namespace TEAMModelOS.Controllers
                         count += 1;
                     }
                     schoolInfos.Add(new SchoolInfos { schoolId=school.id,schoolName =school.name, picture = school.picture, teacherCount = count, appraiseCount = appraise });
-                    //增加评审人员总人数，学习总人数。
+                    //增加评审人员总人数，学习总人数。
                     trains.Add(StatisticsService.StatisticsSchool(school.id, setting, area, client, _dingDing, null));
                 }
                 int pagesize = 100;
@@ -217,7 +217,7 @@ namespace TEAMModelOS.Controllers
                 }
                 else
                 {
-                    int pages = (trains.Count + pagesize) / pagesize; //256是批量操作最大值，pages = (total + max -1) / max;
+                    int pages = (trains.Count + pagesize) / pagesize; //256鏄�壒閲忔搷浣滄渶澶у€硷紝pages = (total + max -1) / max;
                     for (int i = 0; i < pages; i++)
                     {
                         var listssb = trains.Skip((i) * pagesize).Take(pagesize).ToList();
@@ -242,7 +242,7 @@ namespace TEAMModelOS.Controllers
             }
             catch (Exception ex)
             {
-                await _dingDing.SendBotMsg($"OS，{_option.Location}，UpsertSubmitScore/UpsertSubmitScore()\n{ex.Message}\n{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
+                await _dingDing.SendBotMsg($"OS，{_option.Location}，UpsertSubmitScore/UpsertSubmitScore()\n{ex.Message}\n{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
                 return BadRequest(new { ex.Message, ex.StackTrace });
 
             }
@@ -257,7 +257,7 @@ namespace TEAMModelOS.Controllers
         }
 
         /// <summary>
-        /// 对某个订阅的能力点进行操作
+        /// 对某个订阅的能力点进行操作
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -295,7 +295,7 @@ namespace TEAMModelOS.Controllers
             {
                 try
                 {
-                    //优先找校级
+                    //优先找校级
                     setting = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<AreaSetting>(school, new PartitionKey("AreaSetting"));
                 }
                 catch (CosmosException)
@@ -333,7 +333,7 @@ namespace TEAMModelOS.Controllers
                     }
                     count += 1;
                 }
-                //增加评审人员总人数，学习总人数。
+                //增加评审人员总人数，学习总人数。
                 (List<TeacherTrain> teacherTrains, List<RGroupList> yxtrain)   = await StatisticsService.StatisticsSchool(school, setting, area, client, _dingDing,update) ;
                 //try
                 //{
@@ -356,7 +356,7 @@ namespace TEAMModelOS.Controllers
 
 
         /// <summary>
-        /// 对某个订阅的能力点进行操作
+        /// 对某个订阅的能力点进行操作
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -395,7 +395,7 @@ namespace TEAMModelOS.Controllers
             {
                 try
                 {
-                    //优先找校级
+                    //优先找校级
                     setting = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<AreaSetting>(school, new PartitionKey("AreaSetting"));
                 }
                 catch (CosmosException)