|
@@ -16,8 +16,9 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
{
|
|
|
pk = "ScoreCalc";
|
|
|
members = new List<ScoreCalcMember>();
|
|
|
- scores = new List<double>();
|
|
|
- scoresOrg = new List<double>();
|
|
|
+ //scores = new List<double>();
|
|
|
+ //scoresOrg = new List<double>();
|
|
|
+ editScores = new List<double>();
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 名稱
|
|
@@ -42,11 +43,15 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// <summary>
|
|
|
/// 各成員成績總覽
|
|
|
/// </summary>
|
|
|
- public List<double> scores { get; set; }
|
|
|
+ //public List<double> scores { get; set; }
|
|
|
/// <summary>
|
|
|
/// 各成員成績總覽最初系統計算結果
|
|
|
/// </summary>
|
|
|
- public List<double> scoresOrg { get; set; }
|
|
|
+ //public List<double> scoresOrg { get; set; }
|
|
|
+ /// <summary>
|
|
|
+ /// 各學生最後成績的加減分
|
|
|
+ /// </summary>
|
|
|
+ public List<double> editScores { get; set; }
|
|
|
/// <summary>
|
|
|
/// 總覽分項權重類型 count:加權 | percentage:百分比
|
|
|
/// </summary>
|
|
@@ -59,13 +64,11 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
{
|
|
|
public ScoreCalcActivityBase()
|
|
|
{
|
|
|
- pk = "ScoreCalc";
|
|
|
+ pk = "ScoreCalcAct";
|
|
|
itemRates = 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>>();
|
|
|
+ //stuScores = new List<double>();
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 成績計算ID
|
|
@@ -116,14 +119,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// 各學生所有活動結算成績 - 此項目所有學生的計算後分數
|
|
|
/// </summary>
|
|
|
//public List<double> stuScores { get; set; }
|
|
|
- /// <summary>
|
|
|
- /// 各活動所屬學生成績
|
|
|
- /// </summary>
|
|
|
- public List<List<double>> stuActScores { get; set; }
|
|
|
- /// <summary>
|
|
|
- /// 各活動所屬學生成績最初系統計算結果
|
|
|
- /// </summary>
|
|
|
- public List<List<double>> stuActScoresOrg { get; set; }
|
|
|
+
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 成績計算總覽分項-評量、作業
|
|
@@ -133,11 +129,21 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
public ScoreCalcActivity()
|
|
|
{
|
|
|
items = new List<ScoreCalcActivityItems>();
|
|
|
+ stuActScores = new List<List<double>>();
|
|
|
+ stuActScoresOrg = new List<List<double>>();
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 被選取的活動列表
|
|
|
/// </summary>
|
|
|
public List<ScoreCalcActivityItems> items { get; set; }
|
|
|
+ /// <summary>
|
|
|
+ /// 各活動所屬學生成績
|
|
|
+ /// </summary>
|
|
|
+ public List<List<double>> stuActScores { get; set; }
|
|
|
+ /// <summary>
|
|
|
+ /// 各活動所屬學生成績最初系統計算結果
|
|
|
+ /// </summary>
|
|
|
+ public List<List<double>> stuActScoresOrg { get; set; }
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 成績計算總覽分項-課堂紀錄
|
|
@@ -150,13 +156,13 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
|
|
|
stuActAttendOrgVals = new List<List<double>>();
|
|
|
stuActAttendScores = new List<List<double>>();
|
|
|
- stuAttendScores = new List<double>();
|
|
|
- stuActPointOrgVals = new List<List<int>>();
|
|
|
+ //stuAttendScores = new List<double>();
|
|
|
+ stuActPointOrgVals = new List<List<double>>();
|
|
|
stuActPointScores = new List<List<double>>();
|
|
|
- stuPointScores = new List<double>();
|
|
|
- stuActItactOrgVals = new List<List<int>>();
|
|
|
+ //stuPointScores = new List<double>();
|
|
|
+ stuActItactOrgVals = new List<List<double>>();
|
|
|
stuActItactScores = new List<List<double>>();
|
|
|
- stuItactScores = new List<double>();
|
|
|
+ //stuItactScores = new List<double>();
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 出席加權數
|
|
@@ -194,7 +200,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// <summary>
|
|
|
/// 各學生所有課堂紀錄出席 分數
|
|
|
/// </summary>
|
|
|
- public List<double> stuAttendScores { get; set; }
|
|
|
+ //public List<double> stuAttendScores { get; set; }
|
|
|
#endregion
|
|
|
|
|
|
#region ==========記分板==========
|
|
@@ -205,7 +211,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// <summary>
|
|
|
/// 各學生各課堂紀錄記分板 系統原值
|
|
|
/// </summary>
|
|
|
- public List<List<int>> stuActPointOrgVals { get; set; }
|
|
|
+ public List<List<double>> stuActPointOrgVals { get; set; }
|
|
|
/// <summary>
|
|
|
/// 各學生各課堂紀錄記分板 分數
|
|
|
/// </summary>
|
|
@@ -213,7 +219,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// <summary>
|
|
|
/// 各學生所有課堂紀錄記分板 分數
|
|
|
/// </summary>
|
|
|
- public List<double> stuPointScores { get; set; }
|
|
|
+ //public List<double> stuPointScores { get; set; }
|
|
|
#endregion
|
|
|
|
|
|
#region ==========互動==========
|
|
@@ -224,7 +230,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// <summary>
|
|
|
/// 各學生各課堂紀錄互動 系統原值
|
|
|
/// </summary>
|
|
|
- public List<List<int>> stuActItactOrgVals { get; set; }
|
|
|
+ public List<List<double>> stuActItactOrgVals { get; set; }
|
|
|
/// <summary>
|
|
|
/// 各學生各課堂紀錄互動 分數
|
|
|
/// </summary>
|
|
@@ -232,7 +238,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// <summary>
|
|
|
/// 各學生所有課堂紀錄互動 分數
|
|
|
/// </summary>
|
|
|
- public List<double> stuItactScores { get; set; }
|
|
|
+ //public List<double> stuItactScores { get; set; }
|
|
|
#endregion
|
|
|
|
|
|
}
|
|
@@ -296,57 +302,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// 是否使用(是否被勾選) true:使用
|
|
|
/// </summary>
|
|
|
public bool use { get; set; }
|
|
|
- }
|
|
|
- /// <summary>
|
|
|
- /// 課堂紀錄
|
|
|
- /// </summary>
|
|
|
- public class ScoreCalcLsRecordItems
|
|
|
- {
|
|
|
- /// <summary>
|
|
|
- /// 課堂紀錄ID
|
|
|
- /// </summary>
|
|
|
- public string id { get; set; }
|
|
|
- /// <summary>
|
|
|
- /// 課堂紀錄分區鍵
|
|
|
- /// </summary>
|
|
|
- public string code { get; set; }
|
|
|
- /// <summary>
|
|
|
- /// 課堂紀錄名稱
|
|
|
- /// </summary>
|
|
|
- public string name { get; set; }
|
|
|
- /// <summary>
|
|
|
- /// 學校ID
|
|
|
- /// </summary>
|
|
|
- public string school { get; set; }
|
|
|
- /// <summary>
|
|
|
- /// 上課時長(分)
|
|
|
- /// </summary>
|
|
|
- public double duration { get; set; } = 0;
|
|
|
- /// <summary>
|
|
|
- /// 總計分
|
|
|
- /// </summary>
|
|
|
- public double totalPoint { get; set; } = 0;
|
|
|
- /// <summary>
|
|
|
- /// 學生總數(出席人數)
|
|
|
- /// </summary>
|
|
|
- public int mCount { get; set; } = 0;
|
|
|
- /// <summary>
|
|
|
- /// 作品總數
|
|
|
- /// </summary>
|
|
|
- public int collateCount { get; set; } = 0;
|
|
|
- /// <summary>
|
|
|
- /// 學生互動總數
|
|
|
- /// </summary>
|
|
|
- public int clientInteractionCount { get; set; } = 0;
|
|
|
- /// <summary>
|
|
|
- /// 測驗得分率
|
|
|
- /// </summary>
|
|
|
- public double examPointRate { get; set; } = 0;
|
|
|
- /// <summary>
|
|
|
- /// 是否使用(是否被勾選) true:使用
|
|
|
- /// </summary>
|
|
|
- public bool use { get; set; }
|
|
|
- }
|
|
|
+ }
|
|
|
/// <summary>
|
|
|
/// 老師成績計算公式 code:"ScoreCalcFunc-{TMID}"
|
|
|
/// </summary>
|
|
@@ -387,17 +343,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
public string val { get; set; }
|
|
|
//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>
|
|
@@ -419,21 +365,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
|
|
|
/// 評量分數列表
|
|
|
/// </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>
|