修改成績統計公式類別資料 / 活動子項目類別資料 / 活動系統資料

TEAMModelOS.SDK/Models/Cosmos/School/ScoreCalc.cs

@@ -1,4 +1,5 @@
-using System;
+using DocumentFormat.OpenXml.Spreadsheet;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -353,10 +354,10 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     {
         public ScoreCalcFunc()
         {
-            pk = "ScoreCalc";
+            pk = "ScoreCalcActFormula";
             keyvals = new List<ScoreCalcFuncTemplateKeyval>();
-        }
-        public string id { get; set; }
+        }        
+
         public string name { get; set; }
         public string scorecalcActId { get; set; }
         /// <summary>
@@ -380,7 +381,6 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// </summary>
         public string content { get; set; }
     }
-
     public class ScoreCalcFuncTemplateKeyval
     {
         public string key { get; set; }
@@ -388,14 +388,97 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         //public string type { get; set; }
         //public string describe { get; set; }
     }
+    /// <summary>
+    /// 課堂紀錄取Id列表
+    /// </summary>
+    public class LessonId
+    {
+        /// <summary>
+        /// 課堂id
+        /// </summary>
+        public string id { get; set; }
+    }
+    /// <summary>
+    /// 評量活動取系統資料
+    /// </summary>
+    public class ExamItem
+    {
+        /// <summary>
+        /// 評量id
+        /// </summary>
+        public string examId { get; set; }
+        /// <summary>
+        /// 評量名稱
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 評量學生Id列表
+        /// </summary>
+        public List<string> studentIds { get; set; }
+        /// <summary>
+        /// 評量分數列表
+        /// </summary>
+        public List<double> sum { get; set; }        
+    }
+    /// <summary>
+    /// 取作業活動Id
+    /// </summary>
+    public class HomeworkItemId
+    {
+        /// <summary>
+        /// 作業id
+        /// </summary>
+        public string id { get; set; }
+        /// <summary>
+        /// 作業名稱
+        /// </summary>
+        public string name { get; set; }       
+    }
+    /// <summary>
+    /// 取作業活動Id
+    /// </summary>
+    public class HomeworkItem
+    {
+        /// <summary>
+        /// 作業id
+        /// </summary>
+        public string id { get; set; }
+        /// <summary>
+        /// 作業名稱
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 作業代碼 包含學生座號
+        /// </summary>
+        public string code { get; set; }
+        /// <summary>
+        /// 分數
+        /// </summary>
+        public double score { get; set; }
+        /// <summary>
+        /// pk
+        /// </summary>
+        public string pk { get; set; }
+        /// <summary>
+        /// school id
+        /// </summary>
+        public string school { get; set; }
+    }
+    
+
 
     #region API回傳資料用
 
+    #region （二）查詢成績統計首頁表資料用
     /// <summary>
     /// 查詢總表-活動資料的Base
     /// </summary>
     public class ScoreCalcActDtoBase
     {
+        public ScoreCalcActDtoBase()
+        {
+            editScores = new List<double>();
+        }
         /// <summary>
         /// 活動id
         /// </summary>
@@ -532,6 +615,10 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     /// </summary>
     public class SubActActivity: SubActBase
     {
+        public SubActActivity()
+        {
+            scores = new List<double>();
+        }
         public List<double> scores { get; set; }        
     }
     /// <summary>
@@ -539,6 +626,12 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     /// </summary>
     public class SubActLsRecord: SubActBase
     {
+        public SubActLsRecord()
+        {
+            stuActAttendScores = new List<double>();
+            stuActPointScores = new List<double>();
+            stuActItactScores = new List<double>();
+        }
         /// <summary>
         /// 出席分數
         /// </summary>
@@ -567,4 +660,6 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         public string name { get; set; }
     }
     #endregion
+
+    #endregion
 }