|
@@ -276,7 +276,7 @@ namespace TEAMModelOS.Controllers
|
|
{
|
|
{
|
|
members.Add(item);
|
|
members.Add(item);
|
|
}
|
|
}
|
|
- #endregion
|
|
|
|
|
|
+ #endregion
|
|
|
|
|
|
#region ====取得非課堂紀錄的項目資料===
|
|
#region ====取得非課堂紀錄的項目資料===
|
|
string sql_Items = $"SELECT c.id, c.name, c.type, c.attendRate, c.pointRate, c.itactRate, c.rate, c.items, c.itemRates, c.itemRateType, c.score, c.scoreOrg, c.stuActScores, c.stuActScoresOrg, c.editScores, c.sort, c.custom FROM c where c.scorecalcId = '{id}' and c.type <> 'lessonrecord' ";
|
|
string sql_Items = $"SELECT c.id, c.name, c.type, c.attendRate, c.pointRate, c.itactRate, c.rate, c.items, c.itemRates, c.itemRateType, c.score, c.scoreOrg, c.stuActScores, c.stuActScoresOrg, c.editScores, c.sort, c.custom FROM c where c.scorecalcId = '{id}' and c.type <> 'lessonrecord' ";
|
|
@@ -416,11 +416,27 @@ namespace TEAMModelOS.Controllers
|
|
scoreCalcAct.Add(scoreCalcActivityActDto);
|
|
scoreCalcAct.Add(scoreCalcActivityActDto);
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|
|
|
|
+
|
|
|
|
+ #region ====取得學生資料===
|
|
|
|
+ string sql_editScores = $"select c.editScores from c where c.id = '{id}'";
|
|
|
|
+
|
|
|
|
+ List<EditScores> editScores = new List<EditScores>();
|
|
|
|
+
|
|
|
|
+ await foreach (var item in client.GetItemQueryIterator<EditScores>(queryText: sql_editScores))
|
|
|
|
+ {
|
|
|
|
+ editScores.Add(item);
|
|
|
|
+ }
|
|
|
|
+ if (editScores.Count == 0)
|
|
|
|
+ {
|
|
|
|
+ editScores.Add(new EditScores());
|
|
|
|
+ }
|
|
|
|
+ #endregion
|
|
var result = new
|
|
var result = new
|
|
{
|
|
{
|
|
members = members,
|
|
members = members,
|
|
scoreCalcAct = scoreCalcAct,
|
|
scoreCalcAct = scoreCalcAct,
|
|
- scoreCalcFunc = scoreCalcFunc
|
|
|
|
|
|
+ scoreCalcFunc = scoreCalcFunc,
|
|
|
|
+ editScores = editScores[0].editScores
|
|
};
|
|
};
|
|
|
|
|
|
return Ok(result);
|
|
return Ok(result);
|
|
@@ -1248,7 +1264,7 @@ namespace TEAMModelOS.Controllers
|
|
}
|
|
}
|
|
//更新
|
|
//更新
|
|
scoreCalcActivity = await clientTeacher.ReplaceItemAsync(scoreCalcActivity, $"{scoreCalcActivity.id}", new PartitionKey(scoreCalcActivity.code));
|
|
scoreCalcActivity = await clientTeacher.ReplaceItemAsync(scoreCalcActivity, $"{scoreCalcActivity.id}", new PartitionKey(scoreCalcActivity.code));
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
return Ok(result);
|
|
return Ok(result);
|
|
}
|
|
}
|
|
@@ -1925,9 +1941,9 @@ namespace TEAMModelOS.Controllers
|
|
for (int j = 0; j < lessonBases[i].student.Count; j++)
|
|
for (int j = 0; j < lessonBases[i].student.Count; j++)
|
|
{
|
|
{
|
|
for (int k = 0; k < members.Count; k++)
|
|
for (int k = 0; k < members.Count; k++)
|
|
- {
|
|
|
|
|
|
+ {
|
|
//如果有比對中學生id再把分數設定過來
|
|
//如果有比對中學生id再把分數設定過來
|
|
- if (lessonBases[i].student[j].id== members[k].id)
|
|
|
|
|
|
+ if (lessonBases[i].student[j].id == members[k].id)
|
|
{
|
|
{
|
|
lessonBaseCalc.report.clientSummaryList[k] = lessonBases[i].report.clientSummaryList[j];
|
|
lessonBaseCalc.report.clientSummaryList[k] = lessonBases[i].report.clientSummaryList[j];
|
|
}
|
|
}
|
|
@@ -2003,7 +2019,7 @@ namespace TEAMModelOS.Controllers
|
|
ExamItem examItemCalc = new ExamItem();
|
|
ExamItem examItemCalc = new ExamItem();
|
|
examItemCalc.examId = examItem[i].examId;
|
|
examItemCalc.examId = examItem[i].examId;
|
|
examItemCalc.sum = new List<double>();
|
|
examItemCalc.sum = new List<double>();
|
|
-
|
|
|
|
|
|
+
|
|
// 設定分數的預設值
|
|
// 設定分數的預設值
|
|
for (int f = 0; f < members.Count; f++)
|
|
for (int f = 0; f < members.Count; f++)
|
|
{
|
|
{
|
|
@@ -2241,7 +2257,7 @@ namespace TEAMModelOS.Controllers
|
|
ScoreCalcActivity scoreCalcActivity = await clientTeacher.ReadItemAsync<ScoreCalcActivity>(updateActItemSortRq.scoreCalcActId.ToString(), new PartitionKey($"ScoreCalcAct-{teammodelId}"));
|
|
ScoreCalcActivity scoreCalcActivity = await clientTeacher.ReadItemAsync<ScoreCalcActivity>(updateActItemSortRq.scoreCalcActId.ToString(), new PartitionKey($"ScoreCalcAct-{teammodelId}"));
|
|
scoreCalcActivity.items = setSort(scoreCalcActivity.items, updateActItemSortRq.sortItems);
|
|
scoreCalcActivity.items = setSort(scoreCalcActivity.items, updateActItemSortRq.sortItems);
|
|
scoreCalcActivity = await clientTeacher.ReplaceItemAsync(scoreCalcActivity, $"{scoreCalcActivity.id}", new PartitionKey(scoreCalcActivity.code));
|
|
scoreCalcActivity = await clientTeacher.ReplaceItemAsync(scoreCalcActivity, $"{scoreCalcActivity.id}", new PartitionKey(scoreCalcActivity.code));
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
var result = new
|
|
var result = new
|
|
{
|
|
{
|
|
@@ -2264,20 +2280,20 @@ namespace TEAMModelOS.Controllers
|
|
/// <param name="sortItems"></param>
|
|
/// <param name="sortItems"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
private List<ScoreCalcActivityItems> setSort(List<ScoreCalcActivityItems> dbitems, List<sortItem> sortItems)
|
|
private List<ScoreCalcActivityItems> setSort(List<ScoreCalcActivityItems> dbitems, List<sortItem> sortItems)
|
|
- {
|
|
|
|
- for (int i = 0; i < dbitems.Count; i++)
|
|
|
|
|
|
+ {
|
|
|
|
+ for (int i = 0; i < dbitems.Count; i++)
|
|
{
|
|
{
|
|
for (int j = 0; j < sortItems.Count; j++)
|
|
for (int j = 0; j < sortItems.Count; j++)
|
|
{
|
|
{
|
|
- if (dbitems[i].id == sortItems[j].id)
|
|
|
|
|
|
+ if (dbitems[i].id == sortItems[j].id)
|
|
{
|
|
{
|
|
dbitems[i].sort = sortItems[j].sort;
|
|
dbitems[i].sort = sortItems[j].sort;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }
|
|
var newdbitems = from e in dbitems
|
|
var newdbitems = from e in dbitems
|
|
- orderby e.sort
|
|
|
|
- select e;
|
|
|
|
|
|
+ orderby e.sort
|
|
|
|
+ select e;
|
|
List<ScoreCalcActivityItems> scoreCalcActivityItems = new List<ScoreCalcActivityItems>();
|
|
List<ScoreCalcActivityItems> scoreCalcActivityItems = new List<ScoreCalcActivityItems>();
|
|
foreach (var dbitem in newdbitems)
|
|
foreach (var dbitem in newdbitems)
|
|
{
|
|
{
|