|
@@ -246,13 +246,15 @@ namespace TEAMModelOS.Controllers.Client
|
|
|
periods.Add(periodExtobj);
|
|
|
if (periodinfo.TryGetProperty("grades", out JsonElement gradesJobj))
|
|
|
{
|
|
|
- foreach (var gradeinfo in gradesJobj.EnumerateArray())
|
|
|
+ int gradeIndex = 0;
|
|
|
+ foreach (var gradeName in gradesJobj.EnumerateArray()) //2021-06-09 [式樣]grades改為array(string)
|
|
|
{
|
|
|
dynamic gradeExtobj = new ExpandoObject();
|
|
|
- gradeExtobj.id = gradeinfo.GetProperty("id");
|
|
|
- gradeExtobj.name = gradeinfo.GetProperty("name");
|
|
|
+ gradeExtobj.id = gradeIndex.ToString();
|
|
|
+ gradeExtobj.name = gradeName;
|
|
|
gradeExtobj.periodId = periodinfo.GetProperty("id");
|
|
|
grades.Add(gradeExtobj);
|
|
|
+ gradeIndex++;
|
|
|
}
|
|
|
}
|
|
|
if (periodinfo.TryGetProperty("subjects", out JsonElement subjectsJobj))
|