Added new features / Bug fixed

・CSVをインポートするAPIを追加。・モバイル環境のユーザビリティの向上。・APIによるレコード作成時に添付ファイルのサイズチェックが行われない問題を解消。・ファイルアップロード時に拡張機能のサイトIDの指定が機能しない問題を解消。・ファイルアップロード時にサーバスクリプトのサイト設定の読み込み時が動作しない問題を解消。
Implem · Sep 22, 2023 · cd671cf · cd671cf
1 parent 5dd3282
commit cd671cf
Show file tree

Hide file tree

Showing 34 changed files with 3,472 additions and 265 deletions.
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
     <Description>This program does the automatic code creation and merging of existing code based on the definition. Also it will make the configuration change of sql server database.</Description>
-    <AssemblyVersion>1.3.46.1</AssemblyVersion>
-    <FileVersion>1.3.46.1</FileVersion>
-    <Version>1.3.46.1</Version>
+    <AssemblyVersion>1.3.47.0</AssemblyVersion>
+    <FileVersion>1.3.47.0</FileVersion>
+    <Version>1.3.47.0</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

diff --git a/Implem.DefinitionAccessor/Def.cs b/Implem.DefinitionAccessor/Def.cs
@@ -478,6 +478,7 @@ public static void SetCodeDefinition()
                     case "Model_ImageLibCases": Code.Model_ImageLibCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_ImageLibCases, definitionRow, CodeXls); break;
                     case "Model_ImageLibJsonCases": Code.Model_ImageLibJsonCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_ImageLibJsonCases, definitionRow, CodeXls); break;
                     case "Model_ImageLibNextCases": Code.Model_ImageLibNextCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_ImageLibNextCases, definitionRow, CodeXls); break;
+                    case "Model_ImportByApi": Code.Model_ImportByApi = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_ImportByApi, definitionRow, CodeXls); break;
                     case "Model_ImportCases": Code.Model_ImportCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_ImportCases, definitionRow, CodeXls); break;
                     case "Model_IndexCases": Code.Model_IndexCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_IndexCases, definitionRow, CodeXls); break;
                     case "Model_IndexJsonCases": Code.Model_IndexJsonCases = definitionRow[1].ToString().NoSpace(definitionRow["NoSpace"].ToBool()); SetCodeTable(CodeTable.Model_IndexJsonCases, definitionRow, CodeXls); break;
@@ -6924,6 +6925,7 @@ public class CodeColumn2nd
         public string Model_ImageLibCases;
         public string Model_ImageLibJsonCases;
         public string Model_ImageLibNextCases;
+        public string Model_ImportByApi;
         public string Model_ImportCases;
         public string Model_IndexCases;
         public string Model_IndexJsonCases;
@@ -7721,6 +7723,7 @@ public class CodeTable
         public CodeDefinition Model_ImageLibCases = new CodeDefinition();
         public CodeDefinition Model_ImageLibJsonCases = new CodeDefinition();
         public CodeDefinition Model_ImageLibNextCases = new CodeDefinition();
+        public CodeDefinition Model_ImportByApi = new CodeDefinition();
         public CodeDefinition Model_ImportCases = new CodeDefinition();
         public CodeDefinition Model_IndexCases = new CodeDefinition();
         public CodeDefinition Model_IndexJsonCases = new CodeDefinition();

diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.46.1</AssemblyVersion>
-    <FileVersion>1.3.46.1</FileVersion>
-    <Version>1.3.46.1</Version>
+    <AssemblyVersion>1.3.47.0</AssemblyVersion>
+    <FileVersion>1.3.47.0</FileVersion>
+    <Version>1.3.47.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.46.1</AssemblyVersion>
-    <FileVersion>1.3.46.1</FileVersion>
-    <Version>1.3.46.1</Version>
+    <AssemblyVersion>1.3.47.0</AssemblyVersion>
+    <FileVersion>1.3.47.0</FileVersion>
+    <Version>1.3.47.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.46.1</AssemblyVersion>
-    <FileVersion>1.3.46.1</FileVersion>
-    <Version>1.3.46.1</Version>
+    <AssemblyVersion>1.3.47.0</AssemblyVersion>
+    <FileVersion>1.3.47.0</FileVersion>
+    <Version>1.3.47.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.46.1</AssemblyVersion>
-    <FileVersion>1.3.46.1</FileVersion>
-    <Version>1.3.46.1</Version>
+    <AssemblyVersion>1.3.47.0</AssemblyVersion>
+    <FileVersion>1.3.47.0</FileVersion>
+    <Version>1.3.47.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.46.1</AssemblyVersion>
-    <FileVersion>1.3.46.1</FileVersion>
-    <Version>1.3.46.1</Version>
+    <AssemblyVersion>1.3.47.0</AssemblyVersion>
+    <FileVersion>1.3.47.0</FileVersion>
+    <Version>1.3.47.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Body.txt
@@ -93,6 +93,7 @@ namespace Implem.Pleasanter.Models
 <!--Model_Get-->
 <!--Model_GetByApi-->
 <!--Model_ExportByApi-->
+<!--Model_ImportByApi-->
 <!--Model_ToValue-->
 <!--Model_ToValueApiDisplayValue-->
 <!--Model_ToDisplay-->

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_ImportByApi.json b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_ImportByApi.json
@@ -0,0 +1,5 @@
+{
+    "Id": "Model_ImportByApi",
+    "Indent": "2",
+    "Include": "Items"
+}
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_ImportByApi_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_ImportByApi_Body.txt
@@ -0,0 +1,39 @@
+public ContentResultInheritance ImportByApi(Context context)
+{
+    SetSite(
+        context: context,
+        initSiteSettings: true,
+        setSiteIntegration: true,
+        setAllChoices: true);
+    if (!Site.WithinApiLimits(context: context))
+    {
+        return ApiResults.Get(ApiResponses.OverLimitApi(
+            context: context,
+            siteId: Site.SiteId,
+            limitPerSite: context.ContractSettings.ApiLimit()));
+    }
+    switch (Site.ReferenceType)
+    {
+        case "Issues":
+            if (SiteId == ReferenceId)
+            {
+                return IssueUtilities.ImportByApi(
+                    context: context,
+                    ss: Site.SiteSettings,
+                    siteModel: Site);
+            }
+            break;
+        case "Results":
+            if (SiteId == ReferenceId)
+            {
+                return ResultUtilities.ImportByApi(
+                    context: context,
+                    ss: Site.SiteSettings,
+                    siteModel: Site);
+            }
+            break;
+        default:
+            return ApiResults.Get(ApiResponses.BadRequest(context: context));
+    }
+    return ApiResults.Get(ApiResponses.BadRequest(context: context));
+}