Skip to content

Commit

Permalink
Added new features / Bug fixed
Browse files Browse the repository at this point in the history
・全般タブの名称変更機能を追加。
・二段階認証機能を追加。
・メール送信APIを追加。
・サムネイル作成機能を追加。
・数値項目の端数処理機能を追加。
・Extensionテーブルに格納したスクリプト及びスタイルの出力条件が正しく機能しない問題を解消。
  • Loading branch information
HAYATO committed Jul 9, 2020
1 parent 33283d1 commit 3c8e109
Show file tree
Hide file tree
Showing 70 changed files with 2,289 additions and 242 deletions.
6 changes: 6 additions & 0 deletions Implem.DefinitionAccessor/Def.cs
Expand Up @@ -1575,6 +1575,8 @@ public static void SetColumnDefinition()
case "Users_MailAddresses": Column.Users_MailAddresses = definitionRow[1].ToString(); SetColumnTable(ColumnTable.Users_MailAddresses, definitionRow, ColumnXls); break;
case "Users_DemoMailAddress": Column.Users_DemoMailAddress = definitionRow[1].ToString(); SetColumnTable(ColumnTable.Users_DemoMailAddress, definitionRow, ColumnXls); break;
case "Users_SessionGuid": Column.Users_SessionGuid = definitionRow[1].ToString(); SetColumnTable(ColumnTable.Users_SessionGuid, definitionRow, ColumnXls); break;
case "Users_SecondaryAuthenticationCode": Column.Users_SecondaryAuthenticationCode = definitionRow[1].ToString(); SetColumnTable(ColumnTable.Users_SecondaryAuthenticationCode, definitionRow, ColumnXls); break;
case "Users_SecondaryAuthenticationCodeExpirationTime": Column.Users_SecondaryAuthenticationCodeExpirationTime = definitionRow[1].ToString(); SetColumnTable(ColumnTable.Users_SecondaryAuthenticationCodeExpirationTime, definitionRow, ColumnXls); break;
case "Users_LdapSearchRoot": Column.Users_LdapSearchRoot = definitionRow[1].ToString(); SetColumnTable(ColumnTable.Users_LdapSearchRoot, definitionRow, ColumnXls); break;
case "Users_SynchronizedTime": Column.Users_SynchronizedTime = definitionRow[1].ToString(); SetColumnTable(ColumnTable.Users_SynchronizedTime, definitionRow, ColumnXls); break;
case "LoginKeys_LoginId": Column.LoginKeys_LoginId = definitionRow[1].ToString(); SetColumnTable(ColumnTable.LoginKeys_LoginId, definitionRow, ColumnXls); break;
Expand Down Expand Up @@ -9037,6 +9039,8 @@ public class ColumnColumn2nd
public string Users_MailAddresses;
public string Users_DemoMailAddress;
public string Users_SessionGuid;
public string Users_SecondaryAuthenticationCode;
public string Users_SecondaryAuthenticationCodeExpirationTime;
public string Users_LdapSearchRoot;
public string Users_SynchronizedTime;
public string LoginKeys_LoginId;
Expand Down Expand Up @@ -9531,6 +9535,8 @@ public class ColumnTable
public ColumnDefinition Users_MailAddresses = new ColumnDefinition();
public ColumnDefinition Users_DemoMailAddress = new ColumnDefinition();
public ColumnDefinition Users_SessionGuid = new ColumnDefinition();
public ColumnDefinition Users_SecondaryAuthenticationCode = new ColumnDefinition();
public ColumnDefinition Users_SecondaryAuthenticationCodeExpirationTime = new ColumnDefinition();
public ColumnDefinition Users_LdapSearchRoot = new ColumnDefinition();
public ColumnDefinition Users_SynchronizedTime = new ColumnDefinition();
public ColumnDefinition LoginKeys_LoginId = new ColumnDefinition();
Expand Down
40 changes: 40 additions & 0 deletions Implem.DefinitionAccessor/Initializer.cs
Expand Up @@ -81,6 +81,7 @@ public static void SetParameters()
Parameters.ExtendedSqls = ExtendedSqls();
Parameters.ExtendedStyles = ExtendedStyles();
Parameters.ExtendedScripts = ExtendedScripts();
Parameters.ExtendedHtmls = ExtendedHtmls();
Parameters.ExtendedTags = ExtendedTags();
Parameters.General = Read<ParameterAccessor.Parts.General>();
Parameters.History = Read<ParameterAccessor.Parts.History>();
Expand Down Expand Up @@ -298,6 +299,45 @@ private static T Read<T>()
return list;
}

private static Dictionary<string, List<DisplayElement>> ExtendedHtmls(
string path = null,
Dictionary<string, List<DisplayElement>> list = null)
{
list = list ?? new Dictionary<string, List<DisplayElement>>();
path = path ?? Path.Combine(
Environments.CurrentDirectoryPath,
"App_Data",
"Parameters",
"ExtendedHtmls");
foreach (var file in new DirectoryInfo(path).GetFiles("*.html"))
{
var extendedHtml = Files.Read(file.FullName);
if (!extendedHtml.IsNullOrEmpty())
{
var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(file.Name);
var displayElement = new DisplayElement
{
Language = fileNameWithoutExtension?.Split('_').Skip(1).LastOrDefault(),
Body = extendedHtml
};
var elementId = displayElement.Language.IsNullOrEmpty()
? fileNameWithoutExtension
: fileNameWithoutExtension?.Substring(
0,
fileNameWithoutExtension.Length - displayElement.Language.Length - 1);
list
.AddIfNotConainsKey(elementId, new List<DisplayElement>())
.Get(elementId)
.Add(displayElement);
}
}
foreach (var dir in new DirectoryInfo(path).GetDirectories())
{
list = ExtendedHtmls(dir.FullName, list);
}
return list;
}

private static Dictionary<string, string> ExtendedTags()
{
var hash = new Dictionary<string, string>();
Expand Down
1 change: 1 addition & 0 deletions Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
Expand Up @@ -55,6 +55,7 @@
<Compile Include="Parts\Locations.cs" />
<Compile Include="Parts\SamlAttributes.cs" />
<Compile Include="Parts\Saml.cs" />
<Compile Include="Parts\SecondaryAuthentication.cs" />
<Compile Include="Parts\SitePackage.cs" />
<Compile Include="Parts\Registration.cs" />
<Compile Include="Parts\Validation.cs" />
Expand Down
4 changes: 3 additions & 1 deletion Implem.ParameterAccessor/Parameters.cs
@@ -1,4 +1,5 @@
using Implem.ParameterAccessor.Parts;
using Implem.DisplayAccessor;
using Implem.ParameterAccessor.Parts;
using System;
using System.Collections.Generic;
namespace Implem.DefinitionAccessor
Expand All @@ -18,6 +19,7 @@ public static class Parameters
public static List<ExtendedSql> ExtendedSqls;
public static List<ExtendedStyle> ExtendedStyles;
public static List<ExtendedScript> ExtendedScripts;
public static Dictionary<string, List<DisplayElement>> ExtendedHtmls;
public static Dictionary<string, string> ExtendedTags;
public static General General;
public static History History;
Expand Down
5 changes: 5 additions & 0 deletions Implem.ParameterAccessor/Parts/BinaryStorage.cs
Expand Up @@ -15,6 +15,11 @@ public class BinaryStorage
public decimal MaxSize;
public decimal TotalMinSize;
public decimal TotalMaxSize;
public decimal Image;
public decimal? ImageLimitSize;
public decimal? ThumbnailLimitSize;
public decimal ThumbnailMinSize;
public decimal ThumbnailMaxSize;

public bool IsLocal()
{
Expand Down
1 change: 1 addition & 0 deletions Implem.ParameterAccessor/Parts/ExtendedSql.cs
Expand Up @@ -26,6 +26,7 @@ public class ExtendedSql
public bool OnImporting;
public bool OnImported;
public bool OnSelectingWhere;
public bool OnUseSecondaryAuthentication;
public string CommandText;
}
}
11 changes: 11 additions & 0 deletions Implem.ParameterAccessor/Parts/SecondaryAuthentication.cs
@@ -0,0 +1,11 @@
namespace Implem.ParameterAccessor.Parts
{
public class SecondaryAuthentication
{
public bool Enabled;
public string NotificationType;
public string AuthenticationCodeCharacterType;
        public int? AuthenticationCodeLength;
public int? AuthenticationCodeExpirationPeriod;
}
}
1 change: 1 addition & 0 deletions Implem.ParameterAccessor/Parts/Security.cs
Expand Up @@ -10,5 +10,6 @@ public class Security
public int PasswordExpirationPeriod;
public bool JoeAccountCheck;
public List<PasswordPolicy> PasswordPolicies;
public SecondaryAuthentication SecondaryAuthentication;
}
}
49 changes: 5 additions & 44 deletions Implem.Pleasanter.sln
Expand Up @@ -27,6 +27,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implem.SupportTools.SysLogV
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implem.SupportTools.LdapSyncTester", "Implem.SupportTools\LdapSyncTester\Implem.SupportTools.LdapSyncTester.csproj", "{F7543D1C-61EF-4C68-94B3-AAD950CE2EC7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0F3C5C42-85A1-4DB4-BA9A-47A3EDC9ADC4}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CD_ROM|Any CPU = CD_ROM|Any CPU
Expand Down Expand Up @@ -160,48 +165,4 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6E97E664-D49F-4BFC-930F-F941C4996E2C}
EndGlobalSection
GlobalSection(TeamFoundationVersionControl) = preSolution
SccNumberOfProjects = 12
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccTeamFoundationServer = https://implem.visualstudio.com/
SccLocalPath0 = .
SccProjectUniqueName1 = Implem.CodeDefiner\\Implem.CodeDefiner.csproj
SccProjectName1 = Implem.CodeDefiner
SccLocalPath1 = Implem.CodeDefiner
SccProjectUniqueName2 = Implem.DefinitionAccessor\\Implem.DefinitionAccessor.csproj
SccProjectName2 = Implem.DefinitionAccessor
SccLocalPath2 = Implem.DefinitionAccessor
SccProjectUniqueName3 = Implem.DisplayAccessor\\Implem.DisplayAccessor.csproj
SccProjectName3 = Implem.DisplayAccessor
SccLocalPath3 = Implem.DisplayAccessor
SccProjectUniqueName4 = Implem.Libraries\\Implem.Libraries.csproj
SccProjectName4 = Implem.Libraries
SccLocalPath4 = Implem.Libraries
SccProjectUniqueName5 = Implem.ParameterAccessor\\Implem.ParameterAccessor.csproj
SccProjectName5 = Implem.ParameterAccessor
SccLocalPath5 = Implem.ParameterAccessor
SccProjectUniqueName6 = Implem.Pleasanter\\Implem.Pleasanter.csproj
SccProjectName6 = Implem.Pleasanter
SccLocalPath6 = Implem.Pleasanter
SccProjectUniqueName7 = Implem.SupportTools\\Common\\Implem.SupportTools.Common.csproj
SccProjectTopLevelParentUniqueName7 = Implem.Pleasanter.sln
SccProjectName7 = Implem.SupportTools/Common
SccLocalPath7 = Implem.SupportTools\\Common
SccProjectUniqueName8 = Implem.SupportTools\\Launcher\\Implem.SupportTools.csproj
SccProjectTopLevelParentUniqueName8 = Implem.Pleasanter.sln
SccProjectName8 = Implem.SupportTools/Launcher
SccLocalPath8 = Implem.SupportTools\\Launcher
SccProjectUniqueName9 = Implem.SupportTools\\MailTester\\Implem.SupportTools.MailTester.csproj
SccProjectTopLevelParentUniqueName9 = Implem.Pleasanter.sln
SccProjectName9 = Implem.SupportTools/MailTester
SccLocalPath9 = Implem.SupportTools\\MailTester
SccProjectUniqueName10 = Implem.SupportTools\\SysLogViewer\\Implem.SupportTools.SysLogViewer.csproj
SccProjectTopLevelParentUniqueName10 = Implem.Pleasanter.sln
SccProjectName10 = Implem.SupportTools/SysLogViewer
SccLocalPath10 = Implem.SupportTools\\SysLogViewer
SccProjectUniqueName11 = Implem.SupportTools\\LdapSyncTester\\Implem.SupportTools.LdapSyncTester.csproj
SccProjectTopLevelParentUniqueName11 = Implem.Pleasanter.sln
SccProjectName11 = Implem.SupportTools/LdapSyncTester
SccLocalPath11 = Implem.SupportTools\\LdapSyncTester
EndGlobalSection
EndGlobal
Binary file modified Implem.Pleasanter/App_Data/Definitions/definition_Code.xlsm
Binary file not shown.
Binary file modified Implem.Pleasanter/App_Data/Definitions/definition_Column.xlsm
Binary file not shown.
29 changes: 29 additions & 0 deletions Implem.Pleasanter/App_Data/Displays/AllowExpand.json
@@ -0,0 +1,29 @@
{
"Id": "AllowExpand",
"Type": 110,
"Languages": [
{
"Body": "Allow expand"
},
{
"Language": "zh",
"Body": "允许折叠部分"
},
{
"Language": "ja",
"Body": "セクションの折りたたみを許可"
},
{
"Language": "de",
"Body": "Klappabschnitt zulassen"
},
{
"Language": "ko",
"Body": "접는 섹션 허용"
},
{
"Language": "es",
"Body": "Permitir sección plegable"
}
]
}
29 changes: 29 additions & 0 deletions Implem.Pleasanter/App_Data/Displays/AuthenticationCode.json
@@ -0,0 +1,29 @@
{
"Id": "AuthenticationCode",
"Type": 110,
"Languages": [
{
"Body": "Authentication code"
},
{
"Language": "zh",
"Body": "验证码"
},
{
"Language": "ja",
"Body": "確認コード"
},
{
"Language": "de",
"Body": "Authentication Code"
},
{
"Language": "ko",
"Body": "인증 코드"
},
{
"Language": "es",
"Body": "Código de autenticación"
}
]
}
29 changes: 29 additions & 0 deletions Implem.Pleasanter/App_Data/Displays/AwayFromZero.json
@@ -0,0 +1,29 @@
{
"Id": "AwayFromZero",
"Type": 110,
"Languages": [
{
"Body": "Round"
},
{
"Language": "zh",
"Body": "四舍五入"
},
{
"Language": "ja",
"Body": "四捨五入"
},
{
"Language": "de",
"Body": "Runden"
},
{
"Language": "ko",
"Body": "반올림"
},
{
"Language": "es",
"Body": "redondeo"
}
]
}
29 changes: 29 additions & 0 deletions Implem.Pleasanter/App_Data/Displays/Ceiling.json
@@ -0,0 +1,29 @@
{
"Id": "Ceiling",
"Type": 110,
"Languages": [
{
"Body": "Ceiling"
},
{
"Language": "zh",
"Body": "舍入"
},
{
"Language": "ja",
"Body": "切り上げ"
},
{
"Language": "de",
"Body": "Aufgerundet"
},
{
"Language": "ko",
"Body": "올림"
},
{
"Language": "es",
"Body": "Redondeado"
}
]
}
29 changes: 29 additions & 0 deletions Implem.Pleasanter/App_Data/Displays/Close.json
@@ -0,0 +1,29 @@
{
"Id": "Close",
"Type": 110,
"Languages": [
{
"Body": "Close"
},
{
"Language": "zh",
"Body": ""
},
{
"Language": "ja",
"Body": "閉じる"
},
{
"Language": "de",
"Body": "schließen"
},
{
"Language": "ko",
"Body": "닫기"
},
{
"Language": "es",
"Body": "cerca"
}
]
}
29 changes: 29 additions & 0 deletions Implem.Pleasanter/App_Data/Displays/Confirm.json
@@ -0,0 +1,29 @@
{
"Id": "Confirm",
"Type": 110,
"Languages": [
{
"Body": "Confirm"
},
{
"Language": "zh",
"Body": "确认"
},
{
"Language": "ja",
"Body": "確認"
},
{
"Language": "de",
"Body": "Bestätigen"
},
{
"Language": "ko",
"Body": "확인"
},
{
"Language": "es",
"Body": "Confirmar"
}
]
}

0 comments on commit 3c8e109

Please sign in to comment.