Skip to content

Commit

Permalink
## Bug fixed
Browse files Browse the repository at this point in the history 
・カレンダー表示で「開始-完了」以外の項目を選択するとカレンダーが正しく表示されない問題を解消。
・ナビゲーションメニューのポップアップが一覧のヘッダの下に隠れてしまう問題を解消。
  • Loading branch information
@pierre3
pierre3 committed Jul 12, 2024
1 parent 8101487 commit 6f1d6af
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 35 deletions.
6 changes: 3 additions & 3 deletions Implem.CodeDefiner/Implem.CodeDefiner.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<TargetFramework>net8.0</TargetFramework>
<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.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.Factory/Implem.Factory.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.Libraries/Implem.Libraries.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
7 changes: 4 additions & 3 deletions Implem.Pleasanter/Implem.Pleasanter.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<Description>Business application platform</Description>
<AssemblyName>Implem.Pleasanter</AssemblyName>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
Expand Down Expand Up @@ -59,6 +59,7 @@
<PackageReference Include="Microsoft.Web.Infrastructure" Version="2.0.0">
<NoWarn>NU1701</NoWarn>
</PackageReference>
<PackageReference Include="MimeKit" Version="4.7.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
<PackageReference Include="Quartz.AspNetCore" Version="3.9.0" />
Expand Down
2 changes: 2 additions & 0 deletions Implem.Pleasanter/wwwroot/content/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ pre {
padding: 0px 6px;
border: none;
position: relative;
z-index: 2;
clear: both;
}

Expand Down Expand Up @@ -493,6 +494,7 @@ pre {
margin: 10px 0px 0px 0px;
padding: 0px 10px 120px 10px;
position: relative;
z-index: 1;
clear: both;
}

Expand Down
2 changes: 1 addition & 1 deletion Implem.Pleasanter/wwwroot/content/styles.min.css
View file

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion Implem.Pleasanter/wwwroot/scripts/calendar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,11 @@ function addItem(group, hash, element, current, calendarSuffix, sub, rank, yearl
hash[id]++;
}
function removeTimeZoneSuffix(datetime_str) {
return datetime_str.replace("Z", "");
if (datetime_str === undefined) {
return datetime_str;
} else {
return datetime_str.replace("Z", "");
}
}

function margeTime(date, dateTime) {
Expand Down
2 changes: 2 additions & 0 deletions Implem.Pleasanter/wwwroot/styles/site.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ pre {
padding: 0px 6px;
border: none;
position: relative;
z-index: 2;
clear: both;
}

Expand Down Expand Up @@ -493,6 +494,7 @@ pre {
margin: 10px 0px 0px 0px;
padding: 0px 10px 120px 10px;
position: relative;
z-index: 1;
clear: both;
}

Expand Down
6 changes: 3 additions & 3 deletions Implem.TestAutomation/implem.TestAutomation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Rds/Implem.IRds/Implem.IRds.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Rds/Implem.PostgreSql/Implem.PostgreSql.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Rds/Implem.SqlServer/Implem.SqlServer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
<AssemblyVersion>1.4.6.1</AssemblyVersion>
<FileVersion>1.4.6.1</FileVersion>
<Version>1.4.6.1</Version>
<AssemblyVersion>1.4.6.2</AssemblyVersion>
<FileVersion>1.4.6.2</FileVersion>
<Version>1.4.6.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down

0 comments on commit 6f1d6af

Please sign in to comment.