CrazyIter_Bin 3 years ago
parent
commit
9979d1d9fe

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/en-US/cusMgt.js

@@ -174,8 +174,8 @@ export default {
     setOk:'Set up successfully',
     setOk:'Set up successfully',
     setErr:'Failed to set up',
     setErr:'Failed to set up',
     uploadErr:'Failed to upload profile picture',
     uploadErr:'Failed to upload profile picture',
-    deleteGroup:'刪除分組',
-    delGroupContent:'確認刪除',
+    deleteGroup:'Delete Group',
+    delGroupContent:'Are you sure to delete',
     setAvatarLabel:'Set Profile Picture',
     setAvatarLabel:'Set Profile Picture',
     classStuErr:'Failure to obtain class list',
     classStuErr:'Failure to obtain class list',
     unGroup:'未分組學生',
     unGroup:'未分組學生',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/en-US/schoolBaseInfo.js

@@ -249,6 +249,6 @@ export default {
   updErr:'Failed to modify',
   updErr:'Failed to modify',
   warmTips: 'Reminder',
   warmTips: 'Reminder',
   noStuContent:'The school has not imported any student account, do you want to go to Student Management to import student accounts?',
   noStuContent:'The school has not imported any student account, do you want to go to Student Management to import student accounts?',
-  setIrsWarning:'請設置IRS編號',
-  setNoWarning:'請設置座號'
+  setIrsWarning:'Please set IRS number',
+  setNoWarning:'Please set seat number'
 }
 }

+ 1 - 1
TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -1324,7 +1324,7 @@ namespace TEAMModelOS.Controllers.Client
                         string targetScope = dbExamInfo.scope; //評測對象 school:校本班級  private:私人課程
                         string targetScope = dbExamInfo.scope; //評測對象 school:校本班級  private:私人課程
                         var blobPrivateContainer = _azureStorage.GetBlobContainerClient(id);
                         var blobPrivateContainer = _azureStorage.GetBlobContainerClient(id);
                         string sourceBlobPath = recordPaperInfoDic["blob"];
                         string sourceBlobPath = recordPaperInfoDic["blob"];
-                        string destBlobPath = $"exam/{dbExamInfo.id}/paper/{recordPaperInfoDic["id"]}/"; //拷貝對象路徑 path:exam/{評測ID}/paper/{試卷ID}/
+                        string destBlobPath = $"exam/{dbExamInfo.id}/paper/{recordPaperInfoDic["subjectId"]}/"; //拷貝對象路徑 path:exam/{評測ID}/paper/{subjectID}/  ※2022-1-6 式樣變更[原]/paper/{試卷ID}/ [新]/paper/{subjectID}/
                         if (targetScope.Equals("school")) //校本
                         if (targetScope.Equals("school")) //校本
                         {
                         {
                             string schoolId = dbExamInfo.school;
                             string schoolId = dbExamInfo.school;

+ 1 - 1
TEAMModelOS/Controllers/School/SchoolController.cs

@@ -560,7 +560,7 @@ namespace TEAMModelOS.Controllers
                     }
                     }
                 }
                 }
 
 
-                return Ok(new { prodinfo, serial = serialResult, service = serviceOrder, hard, spaceinfo });
+                return Ok(new { serial = serialResult, service = serviceOrder, hard, spaceinfo });
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {