Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Load from the file subtotals for PivotFields #601

Merged
merged 6 commits into from Dec 2, 2017
Merged

Load from the file subtotals for PivotFields #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44bd929
Load from the file subtotals for PivotFields
b0bi79 Nov 24, 2017
583307b
Load from the file subtotals for PivotFields part2
b0bi79 Nov 24, 2017
52dab6d
Fix
b0bi79 Nov 24, 2017
0e8d6f0
Added test
b0bi79 Nov 30, 2017
913edca
Merge branch 'develop' of https://github.com/ClosedXML/ClosedXML into…
b0bi79 Dec 2, 2017
e689660
Resolve conflict
b0bi79 Dec 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 44 additions & 0 deletions ClosedXML/Excel/XLWorkbook_Load.cs
View file
Open in desktop
Expand Up @@ -582,6 +582,28 @@ private void LoadSpreadsheetDocument(SpreadsheetDocument dSpreadsheet)

if (pivotField != null)
{
if (pf.AverageSubTotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Average);
if (pf.CountASubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Count);
if (pf.CountSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.CountNumbers);
if (pf.MaxSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Maximum);
if (pf.MinSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Minimum);
if (pf.ApplyStandardDeviationPInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.PopulationStandardDeviation);
if (pf.ApplyVariancePInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.PopulationVariance);
if (pf.ApplyProductInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Product);
if (pf.ApplyStandardDeviationInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.StandardDeviation);
if (pf.SumSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Sum);
if (pf.ApplyVarianceInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Variance);
var items = pf.Items.OfType<Item>().Where(i => i.Index != null && i.Index.HasValue);
if (!items.Any(i => i.HideDetails == null || BooleanValue.ToBoolean(i.HideDetails)))
pivotField.SetCollapsed();
Expand Down Expand Up @@ -620,6 +642,28 @@ private void LoadSpreadsheetDocument(SpreadsheetDocument dSpreadsheet)

if (pivotField != null)
{
if (pf.AverageSubTotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Average);
if (pf.CountASubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Count);
if (pf.CountSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.CountNumbers);
if (pf.MaxSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Maximum);
if (pf.MinSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Minimum);
if (pf.ApplyStandardDeviationPInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.PopulationStandardDeviation);
if (pf.ApplyVariancePInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.PopulationVariance);
if (pf.ApplyProductInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Product);
if (pf.ApplyStandardDeviationInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.StandardDeviation);
if (pf.SumSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Sum);
if (pf.ApplyVarianceInSubtotal != null)
pivotField.AddSubtotal(XLSubtotalFunction.Variance);
var items = pf.Items.OfType<Item>().Where(i => i.Index != null && i.Index.HasValue);
if (!items.Any(i => i.HideDetails == null || BooleanValue.ToBoolean(i.HideDetails)))
pivotField.SetCollapsed();
Expand Down
17 changes: 17 additions & 0 deletions ClosedXML_Tests/Excel/Loading/LoadingTests.cs
View file
Open in desktop
Expand Up @@ -136,6 +136,23 @@ public void CanLoadOrderedPivotTable()
}
}

[Test]
public void CanLoadPivotTableSubtotals()
{
using (var stream = TestHelper.GetStreamFromResource(TestHelper.GetResourcePath(@"Misc\LoadPivotTables.xlsx")))
using (var wb = new XLWorkbook(stream))
{
var ws = wb.Worksheet("PivotTableSubtotals");
var pt = ws.PivotTable("PivotTableSubtotals");

var subtotals = pt.RowLabels.Get("Group").Subtotals.ToArray();
Assert.AreEqual(3, subtotals.Length);
Assert.AreEqual(XLSubtotalFunction.Average, subtotals[0]);
Assert.AreEqual(XLSubtotalFunction.Count, subtotals[1]);
Assert.AreEqual(XLSubtotalFunction.Sum, subtotals[2]);
}
}

/// <summary>
/// For non-English locales, the default style ("Normal" in English) can be
/// another piece of text (e.g. ??????? in Russian).
Expand Down
Binary file modified ClosedXML_Tests/Resource/Misc/LoadPivotTables.xlsx
View file
Open in desktop
Binary file not shown.