|
@@ -415,7 +415,13 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
if (exams.Count == 0) return;
|
|
|
foreach (var ss in art.subjects)
|
|
|
{
|
|
|
- knoledge.Add(await getKnowledge(art.periodType, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].code, client, ss.id, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].periodId));
|
|
|
+ if (string.IsNullOrEmpty(exams[0].papers[0].periodId)) {
|
|
|
+
|
|
|
+ knoledge.Add(await getKnowledge("university", "hbcn", client, ss.id, "be32942d-97a9-52ba-45d6-2e5b722583f5"));
|
|
|
+ } else {
|
|
|
+ knoledge.Add(await getKnowledge(art.periodType, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].code, client, ss.id, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].periodId));
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
List<(string name, double score, double aver, string subject)> blockScore = new();
|
|
@@ -521,7 +527,16 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
aver = z.ToList().Sum(j => j.aver)
|
|
|
})
|
|
|
});
|
|
|
- var subjectKnow = knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ //List<(string subId,List<(string name, List<string> kno)>)> subjectKnow = knoledge.Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ //var subjectKnow;
|
|
|
+ var subjectKnow = string.IsNullOrEmpty(exams[0].papers[0].periodId) ? knoledge.Select(x => new { x.subId, x.knos }).ToList() : knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ /*if (string.IsNullOrEmpty(exams[0].papers[0].periodId))
|
|
|
+ {
|
|
|
+ var subjectKnow = knoledge.Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ var subjectKnow = knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ }*/
|
|
|
List<(string subjectId, List<(string name, double score, double persent, double aver, List<string> dim)> bks)> bs = new();
|
|
|
List<(string subjectId, List<(string stuId, List<(string name, double score, double point, List<string> dim)> values)> stuBks)> sbs = new();
|
|
|
List<(string name, double score, double av, string sId)> stuBlockScore = new();
|