Merge branch 'develop' into develop-cosmosdb-v3

TEAMModelOS.Function/CosmosDBTriggers/TriggerArt.cs

@@ -1,5 +1,4 @@
 using Azure.Messaging.ServiceBus;
-using HTEXLib.COMM.Helpers;
 using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;

TEAMModelOS.Function/CosmosDBTriggers/TriggerCorrect.cs

@@ -7,7 +7,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using HTEXLib.COMM.Helpers;
+ 
 using TEAMModelOS.Function;
 
 

TEAMModelOS.Function/CosmosDBTriggers/TriggerExam.cs

@@ -5,7 +5,6 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Service;
-using HTEXLib.COMM.Helpers;
 using ClouDASLibx;
 using System.Text.Json;
 using System.Collections.Generic;
@@ -19,18 +18,13 @@ using System.Text;
 using System.Text.Json.Nodes;
 using Newtonsoft.Json.Linq;
 using TEAMModelOS.SDK.Models.Cosmos.Student;
-using HTEXLib.Helpers.ShapeHelpers;
 using TEAMModelOS.Models.Dto;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.Vml;
 using System.Net.Http;
 using Newtonsoft.Json;
 using System.Net;
 using System.Security.Policy;
 using Microsoft.Extensions.Configuration;
-using DocumentFormat.OpenXml.EMMA;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.Models;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -201,7 +195,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                         foreach (ExamSubject subject in info.subjects)
                                         {
                                             string classCode = string.Empty;
-                                            string cname = string.Empty;
+                                            string? cname = string.Empty;
                                             if (string.IsNullOrEmpty(info.school) || !info.scope.Equals("school", StringComparison.OrdinalIgnoreCase))
                                             {
                                                 classCode = "ExamClassResult-" + info.creatorId;
@@ -1089,8 +1083,8 @@ namespace TEAMModelOS.CosmosDBTriggers
                 //确定高分组 最低分数
                 //var srowallorder = scores.EnumerateIndexed().OrderByDescending(g => g.Item2); //各生總分排序   
                 //var srowallorder =  scores.OrderByDescending(g => g);
-                double[] point = StringHelper.ListTodouble(er.paper.point);
-                double[,] result = StringHelper.ListToDouble(er.studentScores);
+                double[] point = TEAMModelOS.SDK.Helper.Common.StringHelper.StringHelper.ListTodouble(er.paper.point);
+                double[,] result = TEAMModelOS.SDK.Helper.Common.StringHelper. StringHelper.ListToDouble(er.studentScores);
                 var cdm = new ClouDASMatrix(result, point);
 
                 scores.Sort((s1, s2) => { return s2.CompareTo(s1); });

TEAMModelOS.Function/CosmosDBTriggers/TriggerExamImport.cs

@@ -12,7 +12,6 @@ using System.Net.Http;
 using TEAMModelOS.SDK.Models.Cosmos.School;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using HTEXLib.COMM.Helpers;
 using TEAMModelOS.Function;
 namespace TEAMModelOS.CosmosDBTriggers
 {

TEAMModelOS.Function/CosmosDBTriggers/TriggerExamLite.cs

@@ -1,6 +1,5 @@
 using Microsoft.Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
-using HTEXLib.COMM.Helpers;
 using Microsoft.Azure.Documents;
 using Microsoft.Extensions.Configuration;
 using System;

TEAMModelOS.Function/CosmosDBTriggers/TriggerHomework.cs

@@ -1,6 +1,5 @@
 using Microsoft.Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
-using HTEXLib.COMM.Helpers;
 using Microsoft.Azure.Documents;
 using Microsoft.Extensions.Configuration;
 using System;

TEAMModelOS.Function/CosmosDBTriggers/TriggerQuotaImport.cs

@@ -12,8 +12,6 @@ using Microsoft.Azure.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.School;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Extension;
-using HTEXLib.COMM.Helpers;
-using OpenXmlPowerTools;
 using Microsoft.OData.Edm;
 using TEAMModelOS.Function;
 namespace TEAMModelOS.CosmosDBTriggers

TEAMModelOS.Function/CosmosDBTriggers/TriggerStudy.cs

@@ -1,11 +1,6 @@
 using Microsoft.Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
-using DocumentFormat.OpenXml.Bibliography;
-using DocumentFormat.OpenXml.Office2013.Excel;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml.VariantTypes;
-using DocumentFormat.OpenXml.Vml;
-using HTEXLib.COMM.Helpers;
+ 
 using Microsoft.Azure.Documents;
 using Microsoft.Extensions.Configuration;
 using System;

TEAMModelOS.Function/CosmosDBTriggers/TriggerSurvey.cs

@@ -18,7 +18,6 @@ using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
 using TEAMModelOS.SDK.Models.Service;
-using HTEXLib.COMM.Helpers;
 using Microsoft.Extensions.Configuration;
 using System.Linq;
 using TEAMModelOS.SDK.Models.Service.BI;

TEAMModelOS.Function/CosmosDBTriggers/TriggerVote.cs

@@ -15,10 +15,9 @@ using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
 using TEAMModelOS.SDK.Models.Service;
-using HTEXLib.COMM.Helpers;
+ 
 using Microsoft.Extensions.Configuration;
-using DocumentFormat.OpenXml.Office2013.Excel;
-using DocumentFormat.OpenXml.Vml;
+ 
 using TEAMModelOS.SDK.Models.Service.BI;
 using TEAMModelOS.Function;
 namespace TEAMModelOS.CosmosDBTriggers

TEAMModelOS.Function/IESHttpTrigger.cs

@@ -11,7 +11,6 @@ using Microsoft.Extensions.Options;
 using System.Net;
 using System.Text.Json;
 using System.Reflection;
-using HTEXLib.COMM.Helpers;
 using StackExchange.Redis;
 using static TEAMModelOS.SDK.Services.BlobService;
 using TEAMModelOS.SDK.Models;

TEAMModelOS.Function/IESServiceBusTrigger.cs

@@ -20,7 +20,6 @@ using TEAMModelOS.SDK.Models.Cosmos.Common;
 using StackExchange.Redis;
 using static TEAMModelOS.SDK.StatisticsService;
 using Azure;
-using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK.Models.Dtos;
 using TEAMModelOS.SDK.Models.Service.BI;
 using TEAMModelOS.SDK.Models.Service;

TEAMModelOS/ClientApp/src/view/evaluation/bank/index.vue

@@ -374,7 +374,8 @@
 			},
 			/* 判断是否为国际站 */
 			inGlobalSite() {
-				return localStorage.getItem("location") === "Global";
+				// return localStorage.getItem("location") === "Global";
+				return this.$store.state.config.srvAdr === 'Global'
 			},
 			hasXkwAuth() {
 				// if (localStorage.school_profile) {
@@ -386,7 +387,7 @@
 				return true;
 			},
 			isTestSite() {
-				return this.$store.state.config.srvAdrType === "test" || ((this.$store.state.config.srvAdrType === "product" || this.$store.state.config.srvAdrType === "rc") && (this.$store.state.userInfo.schoolCode === "habook" || this.$store.state.userInfo.schoolCode === "hbcn") && this.$store.state.config.srvAdr === 'China')
+				return (this.$store.state.config.srvAdrType === "test" && this.$store.state.config.srvAdr === 'China') || ((this.$store.state.config.srvAdrType === "product" || this.$store.state.config.srvAdrType === "rc") && (this.$store.state.userInfo.schoolCode === "habook" || this.$store.state.userInfo.schoolCode === "hbcn") && this.$store.state.config.srvAdr === 'China')
 			}
 		},
 		beforeRouteLeave(to, from, next) {

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseEditAnsScore.vue

@@ -3,7 +3,7 @@
         <div>
             <div>
                 <div class="exersices-content">
-                    <IconText :text="$t('evaluation.connector') + $t('evaluation.newExercise.stem')" :color="'#2d8cf0'" :icon="'ios-create'" style="margin-bottom:15px;"></IconText>
+                    <IconText :text="$t(`evaluation.${exersicesType}`) + $t('evaluation.newExercise.stem')" :color="'#2d8cf0'" :icon="'ios-create'" style="margin-bottom:15px;"></IconText>
                     <p v-html="editInfo.question"></p>
                 </div>
                 <div class="exersices-option" ref="optionRefs">

TEAMModelOS/Controllers/Both/KnowledgeController.cs

@@ -304,7 +304,7 @@ namespace TEAMModelOS.Controllers.Both
 #endif 
         public async Task<IActionResult> UpsertKnowledge(JsonElement json) 
         {
-            KnowledgeTreeDto knowledge = json.GetProperty("knowledge").ToObject<KnowledgeTreeDto>();
+            KnowledgeTreeDto knowledge = json.GetProperty("knowledgeTree").ToObject<KnowledgeTreeDto>();
             
             ValidResult validResult = knowledge.Valid();
             if (!validResult.isVaild)