CrazyIter_Bin 1 年之前
父节点
当前提交
a41ed19485

+ 3 - 3
TEAMModelBI/TEAMModelBI.csproj

@@ -65,9 +65,9 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2309.20</Version>
-		<AssemblyVersion>5.2309.20.1</AssemblyVersion>
-		<FileVersion>5.2309.20.1</FileVersion>
+		<Version>5.2309.27</Version>
+		<AssemblyVersion>5.2309.27.1</AssemblyVersion>
+		<FileVersion>5.2309.27.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

+ 3 - 3
TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

@@ -5,9 +5,9 @@
 		<OutputType>Exe</OutputType>
 		<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
 		<SignAssembly>true</SignAssembly>
-		<Version>5.2309.20</Version>
-		<AssemblyVersion>5.2309.20.1</AssemblyVersion>
-		<FileVersion>5.2309.20.1</FileVersion>
+		<Version>5.2309.27</Version>
+		<AssemblyVersion>5.2309.27.1</AssemblyVersion>
+		<FileVersion>5.2309.27.1</FileVersion>
 		<PackageId>TEAMModelOS.FunctionV4</PackageId>
 		<Authors>teammodel</Authors>
 		<Company>醍摩豆(成都)信息技术有限公司</Company>

+ 14 - 6
TEAMModelOS.SDK/Models/Cosmos/Common/StudentScoreRecord.cs

@@ -13,13 +13,21 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
 
     /// <summary>
     /// 
+//    Quiz : IRS問題(不論任何題型)
+//Quiz_Buzz: 搶權
+//Collate_End/Collate_Start: 任務(不論任何內容, 如果結束課堂時還開著, 會出現 Collate_Start)
+//Meteor_End: 星光評分/投票
+//MutuallyScore_End: 互評
+//SelfPace_End: 課中測驗
+
+
     /// 互动:
-//    答题:按反馈器。
-//isBuzz 抢权
-//互动 => TimeLine.json => PickupOption=>   挑人
-//差异化:推送给学生。???
-//绿灯数: 拉取所有的分数,然后 计算中位数,
-//教师喜欢的功能 :Event 事件,同页过滤。
+    //    答题:按反馈器。
+    //isBuzz 抢权
+    //互动 => TimeLine.json => PickupOption=>   挑人
+    //差异化:推送给学生。???
+    //绿灯数: 拉取所有的分数,然后 计算中位数,
+    //教师喜欢的功能 :Event 事件,同页过滤。
     /// 学生计分记录
     /// </summary>
     public class StudentSemesterRecord : CosmosEntity

+ 3 - 5
TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -2,14 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.1223</Version>
-    <AssemblyVersion>3.0.1223.0</AssemblyVersion>
-    <FileVersion>3.0.1223.0</FileVersion>
+    <Version>5.2309.27</Version>
+    <AssemblyVersion>5.2309.27.1</AssemblyVersion>
+    <FileVersion>5.2309.27.1</FileVersion>
     <PackageReleaseNotes>发版</PackageReleaseNotes>
   </PropertyGroup>
 
-
-
   <ItemGroup>
     <PackageReference Include="CHTCHSConv" Version="1.0.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.2.0" />

+ 68 - 0
TEAMModelOS.TEST/Program.cs

@@ -16,6 +16,74 @@ namespace TEAMModelOS.TEST
             groupNames =groupNames.OrderBy(x => x).ToList();
             var jsonAuth = System.IO.File.ReadAllText("C:\\Users\\CrazyIter\\Downloads\\492266088181141504\\ActivityInfo.json", Encoding.UTF8);
             var jsonData = jsonAuth.ToObject<LessonRecordActivityInfo>();
+
         }
     }
+
+    public class LessonBase {
+        public string? id { get; set; }
+        public string? duration { get; set; }
+
+        public string? schoolId { get; set; }
+        public string? schoolName { get; set; }
+
+        public string? scope { get; set; }
+        public string? subjectId { get; set; }
+        public string? subjectName { get; set; }
+        public string? courseId { get; set; }
+        public string? courseName { get; set; }
+        public string? classId { get; set; }
+        public string? className { get; set; }
+        public string? gradeId { get; set; }
+        public string? gradeName { get; set; }
+        public string? teacherId { get; set; }
+        public string? teacherName { get; set; }
+        public long time { get; set; }
+        public int memberCount { get; set; }
+    }
+
+    public class LessonStudent { 
+        public string? studentID { get; set; }
+        public string? groupName { get; set; }
+        public string? groupId { get; set; }
+        /// <summary>
+        /// 1开始,groupIndex=0  表示未分组
+        /// </summary>
+        public int groupIndex { get; set; }
+
+        public int seatID { get; set; }
+        public int studentIndex { get; set; }
+        public string? studentName { get; set; }
+        /// <summary>
+        /// 学生类型 1 醍摩豆id, 2校内账号  ==对应字段 ies_Type   //ID類型 1 tmdid,2 student  本地或動態班級的話會是0
+        /// </summary>
+        public int type  { get; set; }
+        /// <summary>
+        /// 名单id
+        /// </summary>
+        public string? classId { get; set; }
+        /// <summary>
+        ///Uncall,//未點名
+        ///Attended,//已出席
+        ///Absent,//缺席
+        ///DayOff,//請假
+        ///Absent_Sick,//病假
+        ///Absent_Personal,//事假
+        ///Absent_Official,//公假
+        /// </summary>
+        public string? AttendState { get; set; }
+        /// <summary>
+        /// 个人积分
+        /// </summary>
+        public double score { get; set; }
+        /// <summary>
+        /// 小组积分
+        /// </summary>
+        public double groupScore { get; set; }
+        /// <summary>
+        /// 互动积分
+        /// </summary>
+        public double interactScore { get; set; }
+    }
+
 }

+ 4 - 4
TEAMModelOS/TEAMModelOS.csproj

@@ -74,11 +74,11 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2309.20</Version>
-    <AssemblyVersion>5.2309.20.1</AssemblyVersion>
-    <FileVersion>5.2309.20.1</FileVersion>
+    <Version>5.2309.27</Version>
+    <AssemblyVersion>5.2309.27.1</AssemblyVersion>
+    <FileVersion>5.2309.27.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
-    <PackageReleaseNotes>IES版本说明版本切换标记5.2309.20.1</PackageReleaseNotes>
+    <PackageReleaseNotes>IES版本说明版本切换标记5.2309.27.1</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>
     <Authors>teammodel</Authors>
     <Company>醍摩豆(成都)信息技术有限公司</Company>

+ 1 - 1
TEAMModelOS/appsettings.Development.json

@@ -18,7 +18,7 @@
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction-test.chinacloudsites.cn/api/",
     //"HttpTrigger": "http://localhost:7071/api/"
-    "Version": "5.2309.20.1"
+    "Version": "5.2309.27.1"
   },
   "Azure": {
     // 测试站数据库

+ 1 - 1
TEAMModelOS/appsettings.json

@@ -18,7 +18,7 @@
     "Exp": 86400,
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction.chinacloudsites.cn/api/",
-    "Version": "5.2309.20.1"
+    "Version": "5.2309.27.1"
   },
   "Azure": {
     "Storage": {