|
@@ -627,12 +627,20 @@ namespace TEAMModelOS.Controllers
|
|
|
dynamic studentInClassAndGrade = new ExpandoObject();
|
|
|
if (!string.IsNullOrWhiteSpace($"{_studentId}"))
|
|
|
{
|
|
|
+ List<ExamDimensionScore> examScores= new List<ExamDimensionScore>();
|
|
|
+ exam3Scores.ForEach(z => {
|
|
|
+ var stu = z.xdatas.Find(z => z.code.Equals($"{_semesterId}"));
|
|
|
+ if (stu!=null) {
|
|
|
+ examScores.Add(new ExamDimensionScore { examName=z.name, classScore=z.classScore,gradeScore=z.gradeScore,stuScore=stu.value });
|
|
|
+ }
|
|
|
+ });
|
|
|
var student = students.Find(z => z.id.Equals($"{_studentId}"));
|
|
|
var studentDimension = dimensions.Find(z => z.studentId.Equals($"{_studentId}"));
|
|
|
if (studentDimension==null)
|
|
|
{
|
|
|
studentDimension=new StudentDimensionScore
|
|
|
{
|
|
|
+ examScores=examScores,
|
|
|
art=60,
|
|
|
classId=student.classId,
|
|
|
className=student.classId,
|
|
@@ -655,6 +663,7 @@ namespace TEAMModelOS.Controllers
|
|
|
virtue=60,
|
|
|
};
|
|
|
}
|
|
|
+ studentDimension.examScores= examScores;
|
|
|
var classDimension = classDimensions.Find(z => z.classId.Equals(student.classId));
|
|
|
studentInClassAndGrade= new { studentDimension, inClass = classDimension, inGrade = new { grade_gscore_avg, grade_pscore_avg, grade_tscore_avg } };
|
|
|
studentOverallEducation = overallEducations.FindAll(x => x.studentId.Equals($"{_studentId}")).FirstOrDefault();
|
|
@@ -748,11 +757,11 @@ namespace TEAMModelOS.Controllers
|
|
|
|
|
|
}
|
|
|
public class ExamDimensionScore
|
|
|
- {
|
|
|
- public string type { get; set; }
|
|
|
- public string name { get; set; }
|
|
|
- public string id { get; set; }
|
|
|
- public double score { get; set; }
|
|
|
+ {
|
|
|
+ public string examName { get; set; }
|
|
|
+ public double stuScore { get; set; }
|
|
|
+ public double classScore { get;set; }
|
|
|
+ public double gradeScore { get; set; }
|
|
|
}
|
|
|
public class ClassDimensionScore
|
|
|
{
|
|
@@ -774,7 +783,7 @@ namespace TEAMModelOS.Controllers
|
|
|
}
|
|
|
public class StudentDimensionScore
|
|
|
{
|
|
|
- List<ExamDimensionScore> examScores = new List<ExamDimensionScore>();
|
|
|
+ public List<ExamDimensionScore> examScores { get; set; } = new List<ExamDimensionScore>();
|
|
|
public string className { get; set; }
|
|
|
public string classId { get; set; }
|
|
|
public string studentId { get; set; }
|