Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Changed feature by issue.([Issue #76](https://github.com/overdrive1708/MagonoteToolkit/issues/76))
- Changed feature by issue.([Issue #77](https://github.com/overdrive1708/MagonoteToolkit/issues/77))
- Changed feature by issue.([Issue #78](https://github.com/overdrive1708/MagonoteToolkit/issues/78))
- Changed feature by issue.([Issue #82](https://github.com/overdrive1708/MagonoteToolkit/issues/82))

### Fixed

Expand Down
13 changes: 13 additions & 0 deletions src/MagonoteToolkit/Models/ExcelFileInspector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ public class InspectionResult
/// </summary>
public string FileName { get; set; } = string.Empty;

/// <summary>
/// シート
/// </summary>
public string Sheet { get; set; } = string.Empty;

/// <summary>
/// セル
/// </summary>
Expand Down Expand Up @@ -86,6 +91,7 @@ public static List<InspectionResult> InspectionFile(string filename, List<ExcelF
result = new()
{
FileName = filename,
Sheet = worksheet.Name,
Cell = address.ToString(),
ResultMessage = string.Format(Resources.Strings.MessageResultInspectionNGEqual, method.Value)
};
Expand All @@ -99,6 +105,7 @@ public static List<InspectionResult> InspectionFile(string filename, List<ExcelF
result = new()
{
FileName = filename,
Sheet = worksheet.Name,
Cell = address.ToString(),
ResultMessage = string.Format(Resources.Strings.MessageResultInspectionNGNotEqual, method.Value)
};
Expand All @@ -112,6 +119,7 @@ public static List<InspectionResult> InspectionFile(string filename, List<ExcelF
result = new()
{
FileName = filename,
Sheet = worksheet.Name,
Cell = address.ToString(),
ResultMessage = Resources.Strings.MessageResultInspectionNGEmpty
};
Expand All @@ -125,6 +133,7 @@ public static List<InspectionResult> InspectionFile(string filename, List<ExcelF
result = new()
{
FileName = filename,
Sheet = worksheet.Name,
Cell = address.ToString(),
ResultMessage = Resources.Strings.MessageResultInspectionNGNotEmpty
};
Expand All @@ -138,6 +147,7 @@ public static List<InspectionResult> InspectionFile(string filename, List<ExcelF
result = new()
{
FileName = filename,
Sheet = worksheet.Name,
Cell = address.ToString(),
ResultMessage = string.Format(Resources.Strings.MessageResultInspectionNGContains, method.Value)
};
Expand All @@ -151,6 +161,7 @@ public static List<InspectionResult> InspectionFile(string filename, List<ExcelF
result = new()
{
FileName = filename,
Sheet = worksheet.Name,
Cell = address.ToString(),
ResultMessage = string.Format(Resources.Strings.MessageResultInspectionNGRegex, method.Value)
};
Expand All @@ -170,6 +181,7 @@ public static List<InspectionResult> InspectionFile(string filename, List<ExcelF
result = new()
{
FileName = filename,
Sheet = "―",
Cell = "―",
ResultMessage = Resources.Strings.MessageResultFileOpenError
};
Expand All @@ -182,6 +194,7 @@ public static List<InspectionResult> InspectionFile(string filename, List<ExcelF
result = new()
{
FileName = filename,
Sheet = "―",
Cell = "―",
ResultMessage = Resources.Strings.MessageResultInspectionOK
};
Expand Down
1 change: 1 addition & 0 deletions src/MagonoteToolkit/Views/ExcelFileInspectionPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
ItemsSource="{Binding InspectionResultList}">
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding FileName}" Header="{x:Static resources:Strings.File}" />
<DataGridTextColumn Binding="{Binding Sheet}" Header="{x:Static resources:Strings.Sheet}" />
<DataGridTextColumn Binding="{Binding Cell}" Header="{x:Static resources:Strings.Cell}" />
<DataGridTextColumn Binding="{Binding ResultMessage}" Header="{x:Static resources:Strings.Result}" />
</DataGrid.Columns>
Expand Down
Loading