## Added new features / Bug fixed

・「エディタ」の選択肢一覧をフィルタする機能を追加。・一覧編集画面で添付ファイルの追加・削除を行える機能を追加。・分析チャート機能を追加。・チェック項目の集計機能を追加。・画像をLightBoxで表示する機能を追加。・ダッシュボードパーツに一覧を追加。・ダッシュボードのレイアウトをビューに保存する機能を追加。・サーバスクリプト新規作成時、初期状態でONになっていた「計算式の前」のチェックをOFFに変更。・入れ子のダイアログをクリックした際に前面のダイアログのみ閉じるように修正。・Ajaxによる更新でラジオボタンの分類項目への変更が反映されない問題を解消。・テーブルのExport API実行時、SysLogsのAPI項目がtrueにならない問題を解消。・状況による制御の設定画面で、複数選択した項目が１度に変更できない問題を解消。・リマインダのテストを実行すると、共通のサーバースクリプトが他のサーバースクリプトのコードに追加される問題を解消。・LDAP連携でLdapExcludeAccountDisabledの設定が機能しない問題を解消。・NULL許容の数値項目の値が0の場合にCSVインポートでNULLに上書きできない問題を解消。・カレンダーからレコードの新規作成時、自動ポストバックの項目を変更すると日付が初期値に変更される問題を解消。
Implem · Feb 13, 2024 · 30b2eb9 · 30b2eb9
1 parent 135b46d
commit 30b2eb9
Show file tree

Hide file tree

Showing 234 changed files with 6,956 additions and 817 deletions.
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -3,16 +3,16 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
+    <Copyright>Copyright © Implem Inc 2014 - 2024</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.4.0.1</AssemblyVersion>
-    <FileVersion>1.4.0.1</FileVersion>
-    <Version>1.4.0.1</Version>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1.0</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Implem.DefinitionAccessor/Def.cs b/Implem.DefinitionAccessor/Def.cs
diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.4.0.1</AssemblyVersion>
-    <FileVersion>1.4.0.1</FileVersion>
-    <Version>1.4.0.1</Version>
+    <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.4.0.1</AssemblyVersion>
-    <FileVersion>1.4.0.1</FileVersion>
-    <Version>1.4.0.1</Version>
+    <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.4.0.1</AssemblyVersion>
-    <FileVersion>1.4.0.1</FileVersion>
-    <Version>1.4.0.1</Version>
+    <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Libraries/DataSources/SqlServer/SqlDebugs.cs b/Implem.Libraries/DataSources/SqlServer/SqlDebugs.cs
@@ -1,5 +1,6 @@
 using Implem.IRds;
 using Implem.Libraries.Utilities;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -12,7 +13,20 @@ public static class SqlDebugs
         private static object WriteLockObject = new object();
 
         [Conditional("DEBUG")]
-        public static void WriteSqlLog(string rdsName, ISqlCommand sqlCommand, string logsPath)
+        public static void WriteSqlLog(string provider, string rdsName, ISqlCommand sqlCommand, string logsPath)
+        {
+            switch (provider)
+            {
+                case "SQLServer":
+                    WriteSqlServerLog(rdsName, sqlCommand, logsPath);
+                        break;
+                case "PostgreSQL":
+                    WritePostgreSqlLog(sqlCommand, logsPath);
+                    break;
+            }
+        }
+
+        public static void WriteSqlServerLog(string rdsName, ISqlCommand sqlCommand, string logsPath)
         {
             var commandTextForDebugging = new StringBuilder();
             commandTextForDebugging.Append("use [", rdsName, "];\r\n");
@@ -24,6 +38,50 @@ public static void WriteSqlLog(string rdsName, ISqlCommand sqlCommand, string lo
                     .Write(Path.Combine(logsPath, "CommandTextForDebugging.sql"));
             }
         }
+
+        public static void WritePostgreSqlLog(ISqlCommand sqlCommand, string logsPath)
+        {
+            var commandTextForDebugging = FormattedCommandText(sqlCommand);
+            var parameters = sqlCommand.SqlParameters()
+                .Select(o => new
+                {
+                    Name = "@" + GetParameterName(o),
+                    Value = GetParameterValue(o)
+                })
+                .OrderByDescending(o => o.Name.Length);
+            foreach (var param in parameters)
+            {
+                commandTextForDebugging = commandTextForDebugging
+                    .Replace(param.Name, param.Value);
+            }
+            var comment = $$"""
+                /*
+                {{DeclareParametersText(sqlCommand)}}
+                */
+
+                """;
+            lock (WriteLockObject)
+            {
+                (comment + commandTextForDebugging)
+                    .Write(Path.Combine(logsPath, "CommandTextForDebugging.sql"));
+            }
+        }
+
+        private static string GetParameterValue(ISqlParameter parameter)
+        {
+            return parameter.DbType switch
+            {
+                System.Data.DbType.String
+                    or System.Data.DbType.AnsiString
+                    or System.Data.DbType.AnsiStringFixedLength
+                    or System.Data.DbType.StringFixedLength
+                    or System.Data.DbType.Date
+                    or System.Data.DbType.DateTime
+                    or System.Data.DbType.DateTime2
+                    or System.Data.DbType.DateTimeOffset => $"'{parameter.Value.ToStr()}'",
+                _ => parameter.Value.ToStr()
+            };
+        }
 
         private static string FormattedCommandText(ISqlCommand sqlCommand)
         {

diff --git a/Implem.Libraries/DataSources/SqlServer/SqlIo.cs b/Implem.Libraries/DataSources/SqlServer/SqlIo.cs
@@ -33,7 +33,7 @@ private void SetCommand(ISqlObjectFactory factory)
             SetSqlCommand(factory: factory);
             if (SqlContainer.WriteSqlToDebugLog)
             {
-                SqlDebugs.WriteSqlLog(SqlContainer.RdsName, SqlCommand, Sqls.LogsPath);
+                SqlDebugs.WriteSqlLog(Parameters.Rds.Dbms, SqlContainer.RdsName, SqlCommand, Sqls.LogsPath);
             }
         }
 

diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.4.0.1</AssemblyVersion>
-    <FileVersion>1.4.0.1</FileVersion>
-    <Version>1.4.0.1</Version>
+    <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
+    <PackageReference Include="CsvHelper" Version="30.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.4.0.1</AssemblyVersion>
-    <FileVersion>1.4.0.1</FileVersion>
-    <Version>1.4.0.1</Version>
+    <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.ParameterAccessor/Parts/General.cs b/Implem.ParameterAccessor/Parts/General.cs
@@ -72,6 +72,8 @@ public class General
         public int GanttPeriodMax;
         public int BurnDownLimit;
         public int TimeSeriesLimit;
+        public int AnalyPartPeriodValueMin;
+        public int AnalyPartPeriodValueMax;
         public int KambanLimit;
         public int KambanXLimit;
         public int KambanYLimit;
@@ -99,5 +101,6 @@ public class General
         public bool HideCurrentTimeIcon;
         public bool HideCurrentUserIcon;
         public bool HideCurrentDeptIcon;
+        public bool EnableLightBox;
     }
 }
diff --git a/Implem.Pleasanter.sln b/Implem.Pleasanter.sln
@@ -44,8 +44,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Implem.TestAutomation", "Im
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CICD", "CICD", "{EDD4BA11-3C06-4DE2-82CA-D0B945EE21E6}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\stale.yml = .github\workflows\stale.yml
-		.github\workflows\build-docker-images.yaml = .github\workflows\build-docker-images.yml
+		.github\workflows\CI.yaml = .github\workflows\CI.yaml
+		.github\workflows\xUnit.yaml = .github\workflows\xUnit.yaml
 	EndProjectSection
 EndProject
 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{10984740-E12C-427F-A980-0100734AE1B9}"

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/HtmlGrid_Td_Or_Editor_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/HtmlGrid_Td_Or_Editor_Body.txt
@@ -12,9 +12,12 @@
         baseModel: #modelName#Model))
 {
     hb.Td(
-        css: column.TextAlign == SiteSettings.TextAlignTypes.Right
-            ? " right-align"
-            : string.Empty,
+        css: column.TextAlign switch
+            {
+                SiteSettings.TextAlignTypes.Right => " right-align",
+                SiteSettings.TextAlignTypes.Center => " center-align",
+                _ => string.Empty
+            },
         action: () => hb.Field(
             context: context,
             column: column,

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_AnalyCases.json b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_AnalyCases.json
@@ -0,0 +1,8 @@
+{
+    "Id": "Model_AnalyCases",
+    "RepeatType": "Table",
+    "Indent": "4",
+    "Separator": "\\r\\n",
+    "ItemOnly": "1",
+    "Include": "Issues,Results"
+}
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_AnalyCases_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_AnalyCases_Body.txt
@@ -0,0 +1,4 @@
+case "#TableName#":
+    return #ModelName#Utilities.Analy(
+        context: context,
+        ss: Site.SiteSettings);
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_AnalyJsonCases.json b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_AnalyJsonCases.json
@@ -0,0 +1,8 @@
+{
+    "Id": "Model_AnalyJsonCases",
+    "RepeatType": "Table",
+    "Indent": "4",
+    "Separator": "\\r\\n",
+    "ItemOnly": "1",
+    "Include": "Issues,Results"
+}
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_AnalyJsonCases_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_AnalyJsonCases_Body.txt
@@ -0,0 +1,4 @@
+case "#TableName#":
+    return #ModelName#Utilities.AnalyJson(
+        context: context,
+        ss: Site.SiteSettings);
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Body.txt
@@ -252,6 +252,36 @@ namespace Implem.Pleasanter.Models
         {
             return Updated()
 
+<!--Model_Updated-->;
+
+        }
+
+        private bool UpdatedWithColumn(Context context, SiteSettings ss)
+        {
+            return ClassHash.Any(o => Class_Updated(
+                    columnName: o.Key,
+                    column: ss.GetColumn(context: context, o.Key)))
+                || NumHash.Any(o => Num_Updated(
+                    columnName: o.Key,
+                    column: ss.GetColumn(context: context, o.Key)))
+                || DateHash.Any(o => Date_Updated(
+                    columnName: o.Key,
+                    column: ss.GetColumn(context: context, o.Key)))
+                || DescriptionHash.Any(o => Description_Updated(
+                    columnName: o.Key,
+                    column: ss.GetColumn(context: context, o.Key)))
+                || CheckHash.Any(o => Check_Updated(
+                    columnName: o.Key,
+                    column: ss.GetColumn(context: context, o.Key)))
+                || AttachmentsHash.Any(o => Attachments_Updated(
+                    columnName: o.Key,
+                    column: ss.GetColumn(context: context, o.Key)));
+        }
+
+        public bool Updated(Context context, SiteSettings ss)
+        {
+            return UpdatedWithColumn(context: context, ss: ss)
+
 <!--Model_Updated-->;
 
         }

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_DashboardGridRowsCases.json b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_DashboardGridRowsCases.json
@@ -0,0 +1,8 @@
+{
+    "Id": "Model_DashboardGridRowsCases",
+    "RepeatType": "Table",
+    "Indent": "4",
+    "Separator": "\\r\\n",
+    "ItemOnly": "1",
+    "Include": "Dashboards"
+}
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_DashboardGridRowsCases_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_DashboardGridRowsCases_Body.txt
@@ -0,0 +1,5 @@
+case "#TableName#":
+    return #ModelName#Utilities.DashboardIndexGridRows(
+        context: context,
+        ss: Site.SiteSettings,
+        offset: context.Forms.Int("GridOffset"));
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_OpenAnalyPartDialogCases.json b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_OpenAnalyPartDialogCases.json
@@ -0,0 +1,8 @@
+{
+    "Id": "Model_OpenAnalyPartDialogCases",
+    "RepeatType": "Table",
+    "Indent": "4",
+    "Separator": "\\r\\n",
+    "ItemOnly": "1",
+    "Include": "Issues,Results"
+}
diff --git a/...m.Pleasanter/App_Data/Definitions/Definition_Code/Model_OpenAnalyPartDialogCases_Body.txt b/...m.Pleasanter/App_Data/Definitions/Definition_Code/Model_OpenAnalyPartDialogCases_Body.txt
@@ -0,0 +1,4 @@
+case "#TableName#":
+    return #ModelName#Utilities.OpenAnalyPartDialog(
+        context: context,
+        ss: Site.SiteSettings);
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_PostInit.json b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_PostInit.json
@@ -0,0 +1,6 @@
+{
+    "Id": "Model_PostInit",
+    "Indent": "3",
+    "ItemOnly": "1",
+    "Include": "Issues,Results,Wikis"
+}
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_PostInit_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_PostInit_Body.txt
@@ -0,0 +1,10 @@
+var postInitForm = formData
+    .Where(o => o.Key.StartsWith("PostInit_"))
+    .ToDictionary(o => o.Key.Replace("PostInit_", ""), o => o.Value);
+if (postInitForm.Count > 0)
+{
+    SetByFormData(
+        context: context,
+        ss: ss,
+        formData: postInitForm);
+}
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByForm_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByForm_Body.txt
@@ -8,6 +8,8 @@
 
 <!--Model_SetByForm_Sites-->
 
+<!--Model_PostInit-->
+
     SetByFormData(
         context: context,
         ss: ss,

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SwitchItems2_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SwitchItems2_Body.txt
@@ -7,6 +7,7 @@
     switch (Site.ReferenceType)
     {
 
+<!--Model_DashboardGridRowsCases-->
 <!--Model_GridRowsCases-->
 
         default: