Преглед изворни кода

1.字串更新 2.學校空間無購買空間時Reset程序暫修正為維持原空間數不變更,待式樣確定後再修正

jeff пре 3 година
родитељ
комит
ee22e05c00

+ 2 - 1
TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -703,7 +703,8 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                     if(chgSchSizeCnt.Equals(0) && !school.size.Equals(schoolDefaultSize))
                     {
                         school.size = schoolDefaultSize;
-                        updSchool = true;
+                        //updSchool = true; //關於學校空間初始式樣未定,目前暫定:若需要Reset空間,則先維持原空間數不更動
+                        updSchool = false;
                     }
                 }
                 //變更學校基本資料

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/answerSheet.js

@@ -3,7 +3,7 @@ export default {
 	sheetTip2:'1. The height of subjective question answer area can be quickly adjusted by clicking and dragging on the lower border.',
 	sheetTip3:'2. The answer card supports up to 7 pages. If your content exceeds the maximum of 7 pages, please adjust accordingly, otherwise the answer card cannot be generated properly.',
 	sheetTip4:'The answer card supports up to 7 pages, please readjust the content of the card!',
-	sheetTip5: '當前試卷答題卡文件數據丟失,請重新生成!',
+	sheetTip5: 'The data of the current exam file answer card file is lost, please regenerate it!',
 	printA4: 'Print in A4',
 	printA3:'Print in A3',
 	singleColumn:'Single Column',

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

@@ -91,8 +91,8 @@ export default {
 	updateTime: 'Update Time',
 	remove: 'Remove',
 	choose: 'Select',
-	isTrue: 'Correct',
-	isFalse: 'Incorrect',
+	isTrue: 'True',
+	isFalse: 'False',
 	deleteItem: 'Delete',
 	editItem: 'Edit',
 	confirm: 'Confirm',

+ 10 - 10
TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js

@@ -178,7 +178,7 @@ export default {
     defaultRecentClass: 'Introduction to Microprocessor Basics and Applications',
     defaultClassTime: 'Wednesday 13:30-16:30 (Sections 7-9)',
     defaultClassPlace: 'F504 classroom in the fifth teaching building',
-    todaydeadlineList: 'Today deadline event reminder',
+    todaydeadlineList: 'Ends Today',
     endsToday: "Today",
     endsTodayTime: 'ends today at 23:59',
     addCourse: "Enter the course invitation code to join it",
@@ -426,9 +426,9 @@ export default {
     },
     exam: {
         info: {
-            total1: "",
-            total2: "總計",
-            num: "",
+            total1: "Total ",
+            total2: "Total Score",
+            num: " questions",
         },
         score111: "",
         examLink: 'Exam File Link',
@@ -460,7 +460,7 @@ export default {
             questions: 'questions',
             submitted: 'Submit Answer',
             submitted1: "End The Practice",
-            againPractice: "再次練習",
+            againPractice: "Practice Again",
             finish: 'Completed',
             showAns: 'Show the answer',
             hideAns: 'Hide the answer',
@@ -548,7 +548,7 @@ export default {
         score: 'Score',
         difficulty: 'Average difficulty of questions',
         average: 'Class Average Score',
-        waiting: "等待統計分數",
+        waiting: "Waiting for the score count",
         rightNum: 'My number of correctly answered questions',
         smartComment: 'Smart Comment',
         keypoint: 'Recommended key concepts for review:',
@@ -673,10 +673,10 @@ export default {
         classmates: 'Classmates list',
         classmates1: 'TEAM Model List',
         classRecord: "Lesson Records",
-        examRecord: "評測清單",
-        hwRecord: "作业清單",
-        voteRecord: "投票活動",
-        surRecord: "問卷活動",
+        examRecord: "Assesment List",
+        hwRecord: "Homework List",
+        voteRecord: "Poll Activity",
+        surRecord: "Survey Activity",
         classID: 'Course Code',
         classTime: 'Class Time',
         classroom: 'Classroom',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/auth.js

@@ -8,7 +8,7 @@ export default {
     prodRecord: '產品購買記錄',
     customer: '諮詢客服',
     totalSpace: '總空間',
-    exam: '評',
+    exam: '評',
     vote: '投票',
     survey: '問卷',
     teachSpace: '分配給教師',

+ 6 - 6
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/jyzx.js

@@ -84,11 +84,11 @@ export default{
         queAnswer: "作答問卷",
         feedback: "問卷迴響",
         answered: "已作答",
-        exam: "評",
-        examName: "評名稱",
-        examDes: "評描述",
-        examAnswer: "作答評",
-        answerExam: "評作答",
+        exam: "評",
+        examName: "評名稱",
+        examDes: "評描述",
+        examAnswer: "作答評",
+        answerExam: "評作答",
         right: "答對",
         error: "答錯",
         topic: "題",
@@ -99,7 +99,7 @@ export default{
         error3: "此時不在該活動的作答時間内,無法作答",
         error4: "您不在該活動的名單中,無法作答",
         message1: "問卷未填寫完,請繼續填寫",
-        message2: "評未作答完,請繼續作答",
+        message2: "評未作答完,請繼續作答",
         placeholder1: "輸入您的回答内容...",
         message3: "刪除成功",
         delTitle: "研修活動已被刪除,是否刪除此條記錄?",

+ 14 - 14
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js

@@ -19,8 +19,8 @@ export default {
         finish: '已結束',
         endTime: '結束時間:',
         stop: '立即結束',
-        evType: '評類型:',
-        evMode: '評模式:',
+        evType: '評類型:',
+        evMode: '評模式:',
         stuCount: '施測人數:',
         nodata: '暫無評量',
         tab1: '評量數據',
@@ -49,20 +49,20 @@ export default {
         ftType: '類型:',
         ftMode: '模式:',
         search: '搜尋',
-        taskTips: '您可以發布閱卷任務,將評作答數據分配給老師進行線上閱卷評分。',
+        taskTips: '您可以發布閱卷任務,將評作答數據分配給老師進行線上閱卷評分。',
         editEndTime: '修改結束時間',
-        endTimeHolder: '請設置評結束時間',
+        endTimeHolder: '請設置評結束時間',
         updOk: '修改成功',
         updErr: '修改失敗',
-        edName: '修改評名稱',
-        edNameHolder: '請輸入評名稱',
+        edName: '修改評名稱',
+        edNameHolder: '請輸入評名稱',
         scoreStatus: '待評分',
-        scoreStatus1:'已評分',
-        hasDel: '此評已被刪除',
+        scoreStatus1: '已評分',
+        hasDel: '此評已被刪除',
         actionErr: '操作失敗',
         classInfoErr: '査詢班級資訊失敗',
-        evListErr: '査詢評清單失敗',
-        exInfoErr: '査詢評詳情失敗'
+        evListErr: '査詢評清單失敗',
+        exInfoErr: '査詢評詳情失敗'
     },
 
     //建立評量學校/個人
@@ -251,10 +251,10 @@ export default {
         crtRateTitle: '正確率統計',
         crtLabel: '正確',
         wrongLabel: '錯誤',
-        wrongQuTips: '評結束後才能查看錯題統計',
+        wrongQuTips: '評結束後才能查看錯題統計',
         exportData: '導出數據',
         exporting: '正在導出',
-        exportTips: '評進行中,有些學生尚未作答,確認導出數據嗎? ',
+        exportTips: '評進行中,有些學生尚未作答,確認導出數據嗎? ',
         noQuMark: '已完成所有題目評分,暫無未閱題目',
         noUpd:'暫未修改分數',
         totalScore:'總成績'
@@ -284,7 +284,7 @@ export default {
         failedNum: '不及格',
         complyCount: '及格人數統計',
         simpleErr: '查詢統計數據失敗',
-        dataErr:'評統計數據出錯啦'
+        dataErr:'評統計數據出錯啦'
     },
 
     mark: {
@@ -408,7 +408,7 @@ export default {
         markCount: '閱卷次數:',
         examSubject: '考試科目:',
         delTask: '刪除閱卷任務',
-        delTaskTips: '刪除閱卷任務後,當前評的所有閱卷老師的閱卷任務以及閱卷數據都將被刪除,確認刪除閱卷任務嗎? ',
+        delTaskTips: '刪除閱卷任務後,當前評的所有閱卷老師的閱卷任務以及閱卷數據都將被刪除,確認刪除閱卷任務嗎? ',
         distribution: '題目配分:',
         loadAll: '已加載所有數據',
 

+ 5 - 5
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js

@@ -37,7 +37,7 @@ export default {
         note: "通知",
         all: "全部",
         preview: "課前預習",
-        exam: "評",
+        exam: "評",
         homework: "作業",
         vote: "投票",
         survey: "問卷",
@@ -178,7 +178,7 @@ export default {
     defaultRecentClass: '微處理機基礎與應用概論',
     defaultClassTime: '星期三 13:30 - 16:30 (第7-9節)',
     defaultClassPlace: '第五教學樓 F504 教室',
-    todaydeadlineList: '今日截止活動提醒 ',
+    todaydeadlineList: '今日截止活動提醒',
     endsToday: "今日",
     endsTodayTime: '今日23:59截止',
     addCourse: "輸入課程邀請碼,加入課程",
@@ -609,7 +609,7 @@ export default {
         answer: '作答',
         inputAnswers: '請輸入作答結果',
         emput: '空',
-        delTitle: "評已被刪除,是否刪除此條記錄?",
+        delTitle: "評已被刪除,是否刪除此條記錄?",
         delOk: "刪除",
         delCancel: "取消",
         examError: "試卷存在問題,無法正常打開",
@@ -673,8 +673,8 @@ export default {
         classmates: '同學名單',
         classmates1: '醍摩豆名單',
         classRecord: "課堂記錄",
-        examRecord: "評清單",
-        hwRecord: "作清單",
+        examRecord: "評清單",
+        hwRecord: "作清單",
         voteRecord: "投票活動",
         surRecord: "問卷活動",
         classID: '課程代號',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/tip.js

@@ -16,6 +16,6 @@ export default {
 	cusInfo:'依據學校定義的學科,建立所屬歸類的課程 Ex:”語文”學科下的 “閱讀理解”',
 	cusTea:'加入負責該類課程授課的所有授課教師',
 	sCusClass:'加入教師於該課程所負責的學生班級',
-	examMode:'進行評量的方式有三種:\n1.線上自主評量,具備授權的學生可直接登入醍摩豆雲平台學生帳號,直接於平台上選擇評量活動進行測驗。\n2.智慧教室評量,教師於課堂上使用HiTeach智慧教學系統的測驗模式直接進行評。\n3.	卷卡合一評量,透過紙本考試的方式進行測驗,作答紙本透過閱卷方式導入平台運用。',
+	examMode:'進行評量的方式有三種:\n1.線上自主評量,具備授權的學生可直接登入醍摩豆雲平台學生帳號,直接於平台上選擇評量活動進行測驗。\n2.智慧教室評量,教師於課堂上使用HiTeach智慧教學系統的測驗模式直接進行評。\n3.	卷卡合一評量,透過紙本考試的方式進行測驗,作答紙本透過閱卷方式導入平台運用。',
 	targetTips:'溫馨提示:\n1.班級類型:編制班和選課班只能選其一; \n2.課程數量:只能選擇一個課程; \n3.班級數量:同一個課程的班級可以多選。 '
 }

+ 4 - 4
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/totalAnalysis.js

@@ -32,10 +32,10 @@ export default {
 	condition1: '關注學制',
 	condition2: '關注年級',
 	condition3: '學年期',
-	condition4: '評類型',
-	condition5: '評範圍',
-	condition6: '評模式',
-	condition7: '評學科',
+	condition4: '評類型',
+	condition5: '評範圍',
+	condition6: '評模式',
+	condition7: '評學科',
 	condition8: '發佈年份',
 	// totalIndex.vue
 	ti_title1: '基本資料統計',

+ 14 - 14
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/train.js

@@ -27,7 +27,7 @@ export default {
         signLabel: '現場簽到',
         hwLabel: '佈置作業',
         quLabel: '問卷反饋',
-        examLabel: '評反饋',
+        examLabel: '評反饋',
         hwName: '作業名稱',
         hwNameHolder: '請輸入作業名稱',
         hwDesc: '作業描述',
@@ -41,12 +41,12 @@ export default {
         quItems: '問卷題目',
         quItemsHolder: '請添加問卷題目',
         addItem: '添加題目',
-        examName: '評名稱',
-        examNameHolder: '請輸入評名稱',
-        examDesc: '評描述',
-        examDescHolder: '請輸入評描述',
-        examItem: '評題目',
-        examItemHolder: '請添加評題目',
+        examName: '評名稱',
+        examNameHolder: '請輸入評名稱',
+        examDesc: '評描述',
+        examDescHolder: '請輸入評描述',
+        examItem: '評題目',
+        examItemHolder: '請添加評題目',
         publishOk: '發布成功',
         publishErr: '發布失敗',
         publishBtn: '確認發布',
@@ -55,7 +55,7 @@ export default {
         addItemTitle: '添加題目',
         hwSet: '作業設置',
         surveySet: '問卷設置',
-        examSet: '評設置',
+        examSet: '評設置',
         uploadErr: '請上傳正確格式的封面圖片! ',
         typeErr: '請選擇活動類型',
         targetErr: '請選擇活動對象',
@@ -63,8 +63,8 @@ export default {
         surveyErr: '問卷保存失敗',
         hwOk: '作業保存成功',
         hwErr: '作業保存失敗',
-        examOk: '評保存成功',
-        examErr: '評保存失敗',
+        examOk: '評保存成功',
+        examErr: '評保存失敗',
         fullInfo: '請完善資訊! ',
         quType1: '單選題',
         quType2: '多選題',
@@ -115,7 +115,7 @@ export default {
         quLabel: '問卷反饋',
         viewDetail: '查看詳情',
         noAnswer: '暫未作答',
-        examLabel: '評反饋',
+        examLabel: '評反饋',
         signQrCode: '簽到碼',
         isStart: '是否開始簽到:',
         autoFresh: '定時刷新(10s):',
@@ -127,7 +127,7 @@ export default {
         unsubmit: '未提交',
         sunmitRate: '提交率',
         quCount: '問卷統計',
-        examCount: '評統計',
+        examCount: '評統計',
         hasAnswer: '已作答',
         unAnswer: '未作答',
         peopleUnit: '人',
@@ -156,11 +156,11 @@ export default {
         delErr: '刪除失敗',
         saveOk: '保存成功',
         saveErr: '保存失敗',
-        examErrInfo: '評資訊獲取失敗',
+        examErrInfo: '評資訊獲取失敗',
         hwErrInfo: '作業資訊獲取失敗',
         hwUpdTime: '作業提交時間',
         quAsTime: '完成問卷時間',
-        examAsTime: '完成評時間',
+        examAsTime: '完成評時間',
         referAnswer: '參考答案',
         signNow: '立即簽到',
         signOk: '簽到成功',