IOT統計項目 追加T課堂

TEAMModelBI/Controllers/BITmid/TmidController.cs

@@ -494,7 +494,7 @@ namespace TEAMModelBI.Controllers.BITmid
         public async Task<TmidAnalysisCal> getTMIDIotData(CosmosClient cosmosClientIes5, string tmid, string toolType, string dateUnit, int year, int month, int day, long from, long to)
         {
             TmidAnalysisCal result = new TmidAnalysisCal();
-            List<string> calPropList = new List<string>() { "lessonRecord", "useIES", "useIES5Resource", "useWebIrs", "useDeviceIrs", "useHaboard", "useHita", "lessonLengMin", "lessonLeng0", "stuShow", "stuLessonLengMin", "tGreen", "lTypeCoop", "lTypeIact", "lTypeMis", "lTypeTst", "lTypeDif", "lTypeNone", "lessonCnt928", "lessonCntId", "lessonCntDevice", "lessonCntIdDevice", "mission", "missionFin", "item", "interact", "sendSok" }; //要計算的ProdAnalysis欄位列表
+            List<string> calPropList = new List<string>() { "lessonRecord", "useIES", "useIES5Resource", "useWebIrs", "useDeviceIrs", "useHaboard", "useHita", "lessonLengMin", "lessonLeng0", "stuShow", "stuLessonLengMin", "tGreen", "tLesson", "lTypeCoop", "lTypeIact", "lTypeMis", "lTypeTst", "lTypeDif", "lTypeNone", "lessonCnt928", "lessonCntId", "lessonCntDevice", "lessonCntIdDevice", "mission", "missionFin", "item", "interact", "sendSok" }; //要計算的ProdAnalysis欄位列表
             string strQuery = $"SELECT * FROM c WHERE c.tmid = '{tmid}' AND c.toolType = '{toolType}'";
             var qryOption = new QueryRequestOptions() { PartitionKey = new PartitionKey("TmidAnalysis") };
             if (!string.IsNullOrWhiteSpace(dateUnit)) strQuery += $" AND c.dateUnit = '{dateUnit}'";

TEAMModelOS.SDK/Models/Cosmos/Common/IotTeachingData.cs

@@ -137,6 +137,10 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
         /// 課堂中有使用Excel測驗模式 0:false 1:true
         /// </summary>
         public string useExcelTest { get; set; }
+        /// <summary>
+        /// T課堂 0:false 1:true
+        /// </summary>
+        public string tlesson { get; set; }
     }
 
     /// <summary>
@@ -165,6 +169,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
         public int stuShow { get; set; } //學生出席人次
         public long stuLessonLengMin { get; set; } //學生參與總時數 ※課堂時間x學生出席人次
         public int tGreen { get; set; } //T綠燈數(T>=70)
+        public int tLesson { get; set; } //T課堂(課堂時間>=10 && T指數>0)
         public int lTypeCoop { get; set; } //學習型態: 合作
         public int lTypeIact { get; set; } //學習型態: 互動
         public int lTypeMis { get; set; } //學習型態: 任務