Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -306,6 +306,7 @@ namespace TEAMModelOS.Controllers.Client
                             {
                                 // 互動
                                 case "PopQuesLoad":
+                                case "QuesLoad":
                                     for (int j = 0; j < iRSItems.Count; j++)
                                     {
                                         if (timeLineEvents.events[i].Pgid == iRSItems[j].pageID) // 比對 Pgid 找到 IRS.json 該活動的詳細資料
@@ -350,12 +351,12 @@ namespace TEAMModelOS.Controllers.Client
                                                     if (lessonBase.student[m].seatID.ToString() == iRSItems[j].buzzClients[k])
                                                     {
                                                         if (lessonBase.student[k].type == 2)
-                                                        {
+                                                        {// 校內帳號
                                                             await getSchoolCode(school, lessonId, lessonBase.student[k].id, learnRecordItem);
                                                         }
                                                         else
-                                                        {// 非校內帳號用直接用學號
-                                                            learnRecordItem.actor = lessonBase.student[k].id;
+                                                        {// 非校內帳號
+                                                            learnRecordItem.actor = setActor(school, lessonBase.student[k].id);                                                                                   
                                                         }
                                                     }
                                                 }
@@ -399,12 +400,12 @@ namespace TEAMModelOS.Controllers.Client
                                                     if (lessonBase.student[m].seatID == taskItems[j].clientWorks[k].seatID)
                                                     {
                                                         if (lessonBase.student[k].type == 2)
-                                                        {
+                                                        {// 校內帳號
                                                             await getSchoolCode(school, lessonId, lessonBase.student[k].id, learnRecordItem);
                                                         }
                                                         else
-                                                        {// 非校內帳號用直接用學號
-                                                            learnRecordItem.actor = lessonBase.student[k].id;
+                                                        {// 非校內帳號
+                                                            learnRecordItem.actor = setActor(school, lessonBase.student[k].id);
                                                         }
                                                     }
                                                 }
@@ -440,10 +441,9 @@ namespace TEAMModelOS.Controllers.Client
                                                 await getSchoolCode(school, lessonId, lessonBase.student[k].id, learnRecordItem);
                                             }
                                             else
-                                            {// 非校內帳號用直接用學號
-                                                learnRecordItem.actor = lessonBase.student[k].id;
+                                            {// 非校內帳號
+                                                learnRecordItem.actor = setActor(school, lessonBase.student[k].id);
                                             }
-
                                         }
 
                                         string[] arrymd = lessonBase.summary.date.Split('.');
@@ -476,12 +476,10 @@ namespace TEAMModelOS.Controllers.Client
                                                 await getSchoolCode(school, lessonId, lessonBase.student[k].id, learnRecordItem);
                                             }
                                             else
-                                            {// 非校內帳號用直接用學號
-                                                learnRecordItem.actor = lessonBase.student[k].id;
+                                            {// 非校內帳號
+                                                learnRecordItem.actor = setActor(school, lessonBase.student[k].id);
                                             }
-
                                         }
-
                                         string[] arrymd = lessonBase.summary.date.Split('.');
                                         string[] arrhms = lessonBase.summary.startTime.Split(':');
                                         DateTime dt = new DateTime(int.Parse(arrymd[0]), int.Parse(arrymd[1]), int.Parse(arrymd[2]), int.Parse(arrhms[0]), int.Parse(arrhms[1]), int.Parse(arrhms[2]));
@@ -554,6 +552,19 @@ namespace TEAMModelOS.Controllers.Client
 
             }
         }
+
+        private string setActor(string school, string id)
+        {
+            if (!string.IsNullOrWhiteSpace(school))
+            {
+                return $"Local-{school.Trim()},{id}";
+            }
+            else
+            {
+                return id;
+            }
+        }
+
         /// <summary>
         /// 設定學習記錄互動的內容
         /// </summary>
@@ -575,8 +586,8 @@ namespace TEAMModelOS.Controllers.Client
                     await getSchoolCode(school, lessonId, lessonBase.student[k].id, learnRecordItem);
                 }
                 else
-                {// 非校內帳號用直接用學號
-                    learnRecordItem.actor = lessonBase.student[k].id;
+                {// 非校內帳號
+                    learnRecordItem.actor = setActor(school, lessonBase.student[k].id);
                 }
                 string[] arrymd = lessonBase.summary.date.Split('.');
                 string[] arrhms = lessonBase.summary.startTime.Split(':');