修改成績統計類別 / 新增回傳成績統計資料API用的類別

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

@@ -60,9 +60,9 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         {
             pk = "ScoreCalc";
             itemRates = new List<double>();
-            itemScores = new List<double>();
-            itemScoresOrg = new List<double>();
-            stuScores = new List<double>();
+            //itemScores = new List<double>();
+            //itemScoresOrg = new List<double>();
+            //stuScores = new List<double>();
             stuActScores = new List<List<double>>();
             stuActScoresOrg = new List<List<double>>();
         }
@@ -71,41 +71,50 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// </summary>
         public string scorecalcId { get; set; }
         /// <summary>
+        /// 活動名稱
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
         /// 類型 exam:評量 | homework:作業 | lessonrecord:課堂紀錄
         /// </summary>
         public string type { get; set; }
         /// <summary>
+        /// 總加權數
+        /// </summary>
+        public double rate { get; set; }
+        /// <summary>
+        /// 個學生最後成績的加減分
+        /// </summary>
+        public List<double> editScores { get; set; }
+        /// <summary>
         /// 各活動權重
         /// </summary>
         public List<double> itemRates { get; set; }
         /// <summary>
         /// 各活動權重類型 count:加權 | percentage:百分比
         /// </summary>
-        public string itemRateType { get; set; }
+        //public string itemRateType { get; set; }
         /// <summary>
         /// 各活動分數最終結果 - 一門課全部學生的平均 - 編輯後
         /// </summary>
-        public List<double> itemScores { get; set; }
+        //public List<double> itemScores { get; set; }
         /// <summary>
         /// 各活動分數最初系統計算結果 - 一門課全部學生的平均 - 原始
         /// </summary>
-        public List<double> itemScoresOrg { get; set; }
+        //public List<double> itemScoresOrg { get; set; }
         /// <summary>
         /// 最終成績 - 一個項目總平均 - 編輯後
         /// </summary>
-        public double score { get; set; }
+        //public double score { get; set; }
         /// <summary>
         /// 最終成績系統計算結果 - 一個項目總平均 - 原始
         /// </summary>
-        public double scoreOrg { get; set; }
-        /// <summary>
-        /// 總加權數
-        /// </summary>
-        public double rate { get; set; }
+        //public double scoreOrg { get; set; }
+
         /// <summary>
         /// 各學生所有活動結算成績 - 此項目所有學生的計算後分數
         /// </summary>
-        public List<double> stuScores { get; set; }
+        //public List<double> stuScores { get; set; }
         /// <summary>
         /// 各活動所屬學生成績
         /// </summary>
@@ -132,7 +141,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     /// <summary>
     /// 成績計算總覽分項-課堂紀錄
     /// </summary>
-    public class ScoreCalcLsRecord : CosmosEntity
+    public class ScoreCalcLsRecord : ScoreCalcActivityBase
     {
         public ScoreCalcLsRecord()
         {
@@ -149,13 +158,24 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
             stuItactScores = new List<double>();
         }
         /// <summary>
-        /// 被選取的課堂紀錄列表
+        /// 出席加權數
         /// </summary>
-        public List<ScoreCalcActivityItems> items { get; set; }
+        public double attendRate { get; set; }
         /// <summary>
-        /// 各活動權重
+        /// 記分板加權數
         /// </summary>
-        public List<double> itemRates { get; set; }
+        public double pointRate { get; set; }
+        /// <summary>
+        /// 互動加權數
+        /// </summary>
+        public double itactRate { get; set; }
+        /// <summary>
+        /// 總加權數
+        /// </summary>
+        /// <summary>
+        /// 被選取的課堂紀錄列表
+        /// </summary>
+        public List<ScoreCalcActivityItems> items { get; set; }
 
         #region ==========出席==========
         /// <summary>
@@ -214,18 +234,6 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         public List<double> stuItactScores { get; set; }
         #endregion
 
-        /// <summary>
-        /// 出席加權數
-        /// </summary>
-        public double attendRate { get; set; }
-        /// <summary>
-        /// 記分板加權數
-        /// </summary>
-        public double pointRate { get; set; }
-        /// <summary>
-        /// 互動加權數
-        /// </summary>
-        public double itactRate { get; set; }
     }
 
     public class ScoreCalcMember
@@ -257,12 +265,12 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// <summary>
         /// 發布對象 學校(school)/個人(private)
         /// </summary>
-        public string scope { get; set; }
+        //public string scope { get; set; }
         /// <summary>
         /// (評量專有)擁有者 學校(school)/個人(teacher)
         /// </summary>
-        public string owner { get; set; }
-        
+        //public string owner { get; set; }
+
         /// <summary>
         /// 活動名稱
         /// </summary>
@@ -270,15 +278,15 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// <summary>
         /// 活動進度 pending 待发布 | going 已发布 | finish 已结束
         /// </summary>
-        public string progress { get; set; }
+        //public string progress { get; set; }
         /// <summary>
         /// 活動評分狀態(評量專用) 0未评分，1已评分
         /// </summary>
-        public int sStatus { get; set; } = 0;
+        //public int sStatus { get; set; } = 0;
         /// <summary>
         /// 評測類型(評量專用) 0:線上評量 | 1:課中評量 | 2.卷卡合一
         /// </summary>
-        public string source { get; set; }
+        //public string source { get; set; }
         /// <summary>
         /// 創建時間 (milliseconds 13位數)
         /// </summary>
@@ -380,4 +388,126 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         public string type { get; set; }
         public string describe { get; set; }
     }
+
+    #region API回傳資料用
+
+    /// <summary>
+    /// 查詢總表-活動資料的Base
+    /// </summary>
+    public class ScoreCalcActDtoBase
+    {
+        /// <summary>
+        /// 活動id
+        /// </summary>
+        public string id { get; set; }
+        /// <summary>
+        /// 活動名稱
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 類型 exam:評量 | homework:作業 | lessonrecord:課堂紀錄
+        /// </summary>
+        public string type { get; set; }
+        /// <summary>
+        /// 活動加權數
+        /// </summary>
+        public double rate { get; set; }
+        /// <summary>
+        /// 個學生最後成績的加減分
+        /// </summary>
+        public List<double> editScores { get; set; }
+    }
+
+    /// <summary>
+    /// 查詢總表-活動資料的詳細列表資料
+    /// </summary>
+    public class ScoreCalcActivityActDto : ScoreCalcActDtoBase
+    {
+        public List<SubActActivity> items { get; set; }
+    }
+    /// <summary>
+    /// 查詢總表-活動資料課堂紀錄的詳細列表資料
+    /// </summary>
+    public class ScoreCalcLsRecordActDto : ScoreCalcActDtoBase
+    {
+        public double attendRate { get; set; }
+        public double pointRate { get; set; }
+        public double itactRate { get; set; }
+        public string stuAttendFunctionId { get; set; }
+        public string stuPointFunctionId { get; set; }
+        public string stuItactFunctionId { get; set; }
+        public List<AttendStatesCalc> attendStates { get; set; }
+        public List<SubActLsRecord> items { get; set; }
+    }
+    /// <summary>
+    /// 統計出席狀態
+    /// </summary>
+    public class AttendStatesCalc
+    {
+        /// <summary>
+        /// 病假次數
+        /// </summary>
+        public int sickLeave { get; set; }
+        /// <summary>
+        /// 缺席次數
+        /// </summary>
+        public int absent { get; set; }
+        /// <summary>
+        /// 事假次數
+        /// </summary>
+        public int personalLeave { get; set; }
+        /// <summary>
+        /// 公假次數
+        /// </summary>
+        public int publicLeave { get; set; }
+    }
+    /// <summary>
+    /// 子項目欄位的Base
+    /// </summary>
+    public class SubActBase
+    {
+        /// <summary>
+        /// 子項目id
+        /// </summary>
+        public string id { get; set; }
+        /// <summary>
+        /// 子項目名稱
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 子項目加權數
+        /// </summary>
+        public double rate { get; set; }
+        /// <summary>
+        /// 是否為勾選的項目
+        /// </summary>
+        public bool use { get; set; }
+        
+    }
+    /// <summary>
+    /// 活動子項目欄位
+    /// </summary>
+    public class SubActActivity: SubActBase
+    {
+        public List<double> scores { get; set; }        
+    }
+    /// <summary>
+    /// 課堂紀錄子項目欄位
+    /// </summary>
+    public class SubActLsRecord: SubActBase
+    {
+        /// <summary>
+        /// 出席分數
+        /// </summary>
+        public List<double> stuActAttendScores { get; set; }
+        /// <summary>
+        /// 記分板分數
+        /// </summary>
+        public List<double> stuActPointScores { get; set; }
+        /// <summary>
+        /// 互動分數
+        /// </summary>
+        public List<double> stuActItactScores { get; set; }        
+    }
+    #endregion
 }