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

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.2407.24</Version>
-		<AssemblyVersion>5.2407.24.1</AssemblyVersion>
-		<FileVersion>5.2407.24.1</FileVersion>
+		<Version>5.2407.31</Version>
+		<AssemblyVersion>5.2407.31.1</AssemblyVersion>
+		<FileVersion>5.2407.31.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelOS.Function/TEAMModelOS.Function.csproj

@@ -5,9 +5,9 @@
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<Version>5.2407.24</Version>
-	<AssemblyVersion>5.2407.24.1</AssemblyVersion>
-	<FileVersion>5.2407.24.1</FileVersion>
+	<Version>5.2407.31</Version>
+	<AssemblyVersion>5.2407.31.1</AssemblyVersion>
+	<FileVersion>5.2407.31.1</FileVersion>
 	<PackageId>TEAMModelOS.FunctionV4</PackageId>
 	<Authors>teammodel</Authors>
 	<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS.SDK/Models/Cosmos/Teacher/JointEvent.cs

@@ -37,12 +37,19 @@ namespace TEAMModelOS.SDK.Models
             public string type { get; set; } //"exam":評量 "join":報名 "other":其他
             public string examType { get; set; } //評量類型 "regular":一般競賽 "custom":挑戰賽
             public bool examOverwrite { get; set; } //評量可否重複作答 true:可 false:不可
-            public string blob { get; set; } //說明文件存放Blob路徑
+            public List<JointEventScheduleBlob> blobs { get; set; } = null; //說明文件存放Blob
+            public string location { get; set; } //地點
+            public string description { get; set; } //說明
             public long startTime { get; set; }
             public long endTime { get; set; }
             public string progress { get; set; } //進行狀況 "pending" "going" "finish"
             public int orderby { get; set; } //排序
         }
+        public class JointEventScheduleBlob
+        {
+            public string name { get; set; } //檔案名稱
+            public string blob { get; set; } //檔案Blob路徑
+        }
     }
 
     /// <summary>

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>5.2407.24</Version>
-		<AssemblyVersion>5.2407.24.1</AssemblyVersion>
-		<FileVersion>5.2407.24.1</FileVersion>
+		<Version>5.2407.31</Version>
+		<AssemblyVersion>5.2407.31.1</AssemblyVersion>
+		<FileVersion>5.2407.31.1</FileVersion>
 		<PackageReleaseNotes>发版</PackageReleaseNotes>
 	</PropertyGroup>
 

TEAMModelOS/Controllers/Teacher/JointEventController.cs

@@ -321,6 +321,9 @@ namespace TEAMModelOS.Controllers.Common
                     jointEventSchedule.endTime = schedule.endTime;
                     jointEventSchedule.progress = (schedule.startTime <= now && now <= schedule.endTime) ? "going" : (now < schedule.startTime) ? "pending" : "finish";
                     jointEventSchedule.orderby = schedule.orderby;
+                    if (!string.IsNullOrWhiteSpace(schedule.location)) jointEventSchedule.location = schedule.location;
+                    if (!string.IsNullOrWhiteSpace(schedule.description)) jointEventSchedule.description = schedule.description;
+                    if(schedule.blobs != null) jointEventSchedule.blobs = schedule.blobs;
                     if (mode.Equals("add"))
                     {
                         jointEvent.schedule.Add(jointEventSchedule);

TEAMModelOS/TEAMModelOS.csproj

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

TEAMModelOS/appsettings.Development.json

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

TEAMModelOS/appsettings.json

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