Browse Source

字串變更、成績結算模型修正

jeff 2 years ago
parent
commit
007e71a9fd

+ 33 - 18
TEAMModelOS.SDK/Models/Cosmos/School/ScoreCalc.cs

@@ -138,14 +138,17 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         {
             items = new List<ScoreCalcActivityItems>();
             stuAttendFunction = new List<string>();
-            stuAttendVals = new List<List<string>>();
-            stuAttendScores = new List<List<double>>();
+            stuActAttendOrgVals = new List<List<string>>();
+            stuActAttendScores = new List<List<double>>();
+            stuAttendScores = new List<double>();
             stuPointFunction = new List<string>();
-            stuPointVals = new List<List<int>>();
-            stuPointScores = new List<List<double>>();
+            stuActPointOrgVals = new List<List<int>>();
+            stuActPointScores = new List<List<double>>();
+            stuPointScores = new List<double>();
             stuItactFunction = new List<string>();
-            stuItactVals = new List<List<int>>();
-            stuItactScores = new List<List<double>>();
+            stuActItactOrgVals = new List<List<int>>();
+            stuActItactScores = new List<List<double>>();
+            stuItactScores = new List<double>();
         }
         /// <summary>
         /// 被選取的課堂紀錄列表
@@ -156,37 +159,49 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// </summary>
         public List<string> stuAttendFunction { get; set; }
         /// <summary>
-        /// 各學生課堂紀錄出席 系統原值
+        /// 各學生課堂紀錄出席 系統原值
         /// </summary>
-        public List<List<string>> stuAttendVals { get; set; }
+        public List<List<string>> stuActAttendOrgVals { get; set; }
         /// <summary>
-        /// 各學生課堂紀錄出席 分數
+        /// 各學生課堂紀錄出席 分數
         /// </summary>
-        public List<List<double>> stuAttendScores { get; set; }
+        public List<List<double>> stuActAttendScores { get; set; }
+        /// <summary>
+        /// 各學生所有課堂紀錄出席 分數
+        /// </summary>
+        public List<double> stuAttendScores { get; set; }
         /// <summary>
         /// 課堂紀錄記分板 採用的公式ID
         /// </summary>
         public List<string> stuPointFunction { get; set; }
         /// <summary>
-        /// 各學生課堂紀錄記分板 系統原值
+        /// 各學生各課堂紀錄記分板 系統原值
+        /// </summary>
+        public List<List<int>> stuActPointOrgVals { get; set; }
+        /// <summary>
+        /// 各學生各課堂紀錄記分板 分數
         /// </summary>
-        public List<List<int>> stuPointVals { get; set; }
+        public List<List<double>> stuActPointScores { get; set; }
         /// <summary>
-        /// 各學生課堂紀錄記分板 分數
+        /// 各學生所有課堂紀錄記分板 分數
         /// </summary>
-        public List<List<double>> stuPointScores { get; set; }
+        public List<double> stuPointScores { get; set; }
         /// <summary>
         /// 課堂紀錄互動 採用的公式ID
         /// </summary>
         public List<string> stuItactFunction { get; set; }
         /// <summary>
-        /// 各學生課堂紀錄互動 系統原值
+        /// 各學生各課堂紀錄互動 系統原值
+        /// </summary>
+        public List<List<int>> stuActItactOrgVals { get; set; }
+        /// <summary>
+        /// 各學生各課堂紀錄互動 分數
         /// </summary>
-        public List<List<int>> stuItactVals { get; set; }
+        public List<List<double>> stuActItactScores { get; set; }
         /// <summary>
-        /// 各學生課堂紀錄互動 分數
+        /// 各學生所有課堂紀錄互動 分數
         /// </summary>
-        public List<List<double>> stuItactScores { get; set; }
+        public List<double> stuItactScores { get; set; }
         /// <summary>
         /// 出席加權數
         /// </summary>

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

@@ -2535,7 +2535,7 @@ const LANG_EN_US = {
             tab1: 'Assessment Data',
             tab2: 'Assessment Files',
             tab3: 'Answering Details',
-            tab4: 'clouDAS diagnostic analysis',
+            tab4: 'clouDAS Diagnostic Analysis',
             autoTips1: 'This function is only used to show the scenario and quickly simulate student response data. Student responses are randomly generated for reference only!',
             autoTips2: 'This function is only used to show the scenario and quickly simulate teacher grading data. Teacher grading are randomly generated for reference only!',
             autoScore: 'One Click Grading',
@@ -2744,7 +2744,7 @@ const LANG_EN_US = {
             gradeLabel: 'Grade:',
             classLabel: 'Class:',
             stuLabel: 'Student:',
-            autoCheck: 'Automatically detect whether scoring is completed',
+            autoCheck: 'Auto-detect if grading is completed',
             scoreView: 'Score Overview',
             scoring: 'Exam File Grading',
             classNoStu: 'No students in the class yet',
@@ -4372,7 +4372,7 @@ const LANG_EN_US = {
                 tips3: "Use your registered TEAM Model account to log in",
                 tips4: "Use the account/password assigned by the school to login",
             },
-            scale1: 'Today’s login limit has reached the school’s scale limit. This function is temporarily unavailable. Please contact the school administrator for confirmation.',
+            scale1: "The number of students logging in today has reached the school's limit, so the function is temporarily unavailable. Please contact the school administrator for confirmation.",
             scale2: 'Note: If there is a district scale test, it can still be answered normally.',
         },
         public: {