diff --git a/tests/_output/bootstrap/pivotgrid/pivotgrid-cell-states.png b/tests/_output/bootstrap/pivotgrid/pivotgrid-cell-states.png new file mode 100644 index 0000000000..efa1c89568 Binary files /dev/null and b/tests/_output/bootstrap/pivotgrid/pivotgrid-cell-states.png differ diff --git a/tests/_output/bootstrap/pivotgrid/pivotgrid-column-menus.png b/tests/_output/bootstrap/pivotgrid/pivotgrid-column-menus.png index 0a23e34b8f..7b1bef251e 100644 Binary files a/tests/_output/bootstrap/pivotgrid/pivotgrid-column-menus.png and b/tests/_output/bootstrap/pivotgrid/pivotgrid-column-menus.png differ diff --git a/tests/_output/bootstrap/pivotgrid/pivotgrid-settings-left-right.png b/tests/_output/bootstrap/pivotgrid/pivotgrid-settings-left-right.png new file mode 100644 index 0000000000..e971c2916e Binary files /dev/null and b/tests/_output/bootstrap/pivotgrid/pivotgrid-settings-left-right.png differ diff --git a/tests/_output/bootstrap/pivotgrid/pivotgrid.png b/tests/_output/bootstrap/pivotgrid/pivotgrid.png index 7dec098bee..782a2b9258 100644 Binary files a/tests/_output/bootstrap/pivotgrid/pivotgrid.png and b/tests/_output/bootstrap/pivotgrid/pivotgrid.png differ diff --git a/tests/_output/classic/pivotgrid/pivotgrid-cell-states.png b/tests/_output/classic/pivotgrid/pivotgrid-cell-states.png new file mode 100644 index 0000000000..4c159e3e1e Binary files /dev/null and b/tests/_output/classic/pivotgrid/pivotgrid-cell-states.png differ diff --git a/tests/_output/classic/pivotgrid/pivotgrid-column-menus.png b/tests/_output/classic/pivotgrid/pivotgrid-column-menus.png index b4f9d665b4..da395dafa2 100644 Binary files a/tests/_output/classic/pivotgrid/pivotgrid-column-menus.png and b/tests/_output/classic/pivotgrid/pivotgrid-column-menus.png differ diff --git a/tests/_output/classic/pivotgrid/pivotgrid-settings-left-right.png b/tests/_output/classic/pivotgrid/pivotgrid-settings-left-right.png new file mode 100644 index 0000000000..06a8d3a087 Binary files /dev/null and b/tests/_output/classic/pivotgrid/pivotgrid-settings-left-right.png differ diff --git a/tests/_output/classic/pivotgrid/pivotgrid.png b/tests/_output/classic/pivotgrid/pivotgrid.png index 3fac7de366..aaea4a0ead 100644 Binary files a/tests/_output/classic/pivotgrid/pivotgrid.png and b/tests/_output/classic/pivotgrid/pivotgrid.png differ diff --git a/tests/_output/default/pivotgrid/pivotgrid-cell-states.png b/tests/_output/default/pivotgrid/pivotgrid-cell-states.png new file mode 100644 index 0000000000..ce429348f4 Binary files /dev/null and b/tests/_output/default/pivotgrid/pivotgrid-cell-states.png differ diff --git a/tests/_output/default/pivotgrid/pivotgrid-column-menus.png b/tests/_output/default/pivotgrid/pivotgrid-column-menus.png index 1e3fbf81b1..817fc8e01b 100644 Binary files a/tests/_output/default/pivotgrid/pivotgrid-column-menus.png and b/tests/_output/default/pivotgrid/pivotgrid-column-menus.png differ diff --git a/tests/_output/default/pivotgrid/pivotgrid-settings-left-right.png b/tests/_output/default/pivotgrid/pivotgrid-settings-left-right.png new file mode 100644 index 0000000000..5c1c230880 Binary files /dev/null and b/tests/_output/default/pivotgrid/pivotgrid-settings-left-right.png differ diff --git a/tests/_output/default/pivotgrid/pivotgrid.png b/tests/_output/default/pivotgrid/pivotgrid.png index e95c866b43..eaf57537e5 100644 Binary files a/tests/_output/default/pivotgrid/pivotgrid.png and b/tests/_output/default/pivotgrid/pivotgrid.png differ diff --git a/tests/_output/fluent/pivotgrid/pivotgrid-cell-states.png b/tests/_output/fluent/pivotgrid/pivotgrid-cell-states.png new file mode 100644 index 0000000000..eea78f9311 Binary files /dev/null and b/tests/_output/fluent/pivotgrid/pivotgrid-cell-states.png differ diff --git a/tests/_output/fluent/pivotgrid/pivotgrid-column-menus.png b/tests/_output/fluent/pivotgrid/pivotgrid-column-menus.png index 8594051530..949052f1f3 100644 Binary files a/tests/_output/fluent/pivotgrid/pivotgrid-column-menus.png and b/tests/_output/fluent/pivotgrid/pivotgrid-column-menus.png differ diff --git a/tests/_output/fluent/pivotgrid/pivotgrid-settings-left-right.png b/tests/_output/fluent/pivotgrid/pivotgrid-settings-left-right.png new file mode 100644 index 0000000000..941bf17926 Binary files /dev/null and b/tests/_output/fluent/pivotgrid/pivotgrid-settings-left-right.png differ diff --git a/tests/_output/fluent/pivotgrid/pivotgrid.png b/tests/_output/fluent/pivotgrid/pivotgrid.png index 00af85d7f1..d8b3ed0017 100644 Binary files a/tests/_output/fluent/pivotgrid/pivotgrid.png and b/tests/_output/fluent/pivotgrid/pivotgrid.png differ diff --git a/tests/_output/material/pivotgrid/pivotgrid-cell-states.png b/tests/_output/material/pivotgrid/pivotgrid-cell-states.png new file mode 100644 index 0000000000..0c2798c30a Binary files /dev/null and b/tests/_output/material/pivotgrid/pivotgrid-cell-states.png differ diff --git a/tests/_output/material/pivotgrid/pivotgrid-column-menus.png b/tests/_output/material/pivotgrid/pivotgrid-column-menus.png index bbd5837c1e..154698fc2b 100644 Binary files a/tests/_output/material/pivotgrid/pivotgrid-column-menus.png and b/tests/_output/material/pivotgrid/pivotgrid-column-menus.png differ diff --git a/tests/_output/material/pivotgrid/pivotgrid-settings-left-right.png b/tests/_output/material/pivotgrid/pivotgrid-settings-left-right.png new file mode 100644 index 0000000000..ed47e11299 Binary files /dev/null and b/tests/_output/material/pivotgrid/pivotgrid-settings-left-right.png differ diff --git a/tests/_output/material/pivotgrid/pivotgrid.png b/tests/_output/material/pivotgrid/pivotgrid.png index 429f6e4416..79873313d4 100644 Binary files a/tests/_output/material/pivotgrid/pivotgrid.png and b/tests/_output/material/pivotgrid/pivotgrid.png differ diff --git a/tests/_output/nouvelle/pivotgrid/pivotgrid-cell-states.png b/tests/_output/nouvelle/pivotgrid/pivotgrid-cell-states.png new file mode 100644 index 0000000000..b6c4c10a35 Binary files /dev/null and b/tests/_output/nouvelle/pivotgrid/pivotgrid-cell-states.png differ diff --git a/tests/_output/nouvelle/pivotgrid/pivotgrid-column-menus.png b/tests/_output/nouvelle/pivotgrid/pivotgrid-column-menus.png index bfe9a58df2..8ab78ad109 100644 Binary files a/tests/_output/nouvelle/pivotgrid/pivotgrid-column-menus.png and b/tests/_output/nouvelle/pivotgrid/pivotgrid-column-menus.png differ diff --git a/tests/_output/nouvelle/pivotgrid/pivotgrid-settings-left-right.png b/tests/_output/nouvelle/pivotgrid/pivotgrid-settings-left-right.png new file mode 100644 index 0000000000..183372e874 Binary files /dev/null and b/tests/_output/nouvelle/pivotgrid/pivotgrid-settings-left-right.png differ diff --git a/tests/_output/nouvelle/pivotgrid/pivotgrid.png b/tests/_output/nouvelle/pivotgrid/pivotgrid.png index 8e26e13bbf..b6c4c10a35 100644 Binary files a/tests/_output/nouvelle/pivotgrid/pivotgrid.png and b/tests/_output/nouvelle/pivotgrid/pivotgrid.png differ diff --git a/tests/pivotgrid/pivotgrid-cell-states.html b/tests/pivotgrid/pivotgrid-cell-states.html new file mode 100644 index 0000000000..b56329fe2c --- /dev/null +++ b/tests/pivotgrid/pivotgrid-cell-states.html @@ -0,0 +1,243 @@ + + + + Document + + + + + + +
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + Categories + + Categories +
+ Seafood + + Beverages +
+ + + + Products + + + + + Products + + Products +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + Regions + + South America + + + + + Countries +
+ North America + + + + + Countries +
+ Europe + + + + + Countries +
+ Asia + + + + + Countries +
+ Africa + + + + + Countries +
+ Regions + + Countries +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 1847.00 + + 1488.00 + + 3335.00 +
+ 1998.00 + + 1406.00 + + 3404.00 +
+ 2065.00 + + 1242.00 + + 3307.00 +
+ 1830.00 + + 1579.00 + + 3409.00 +
+ 2005.00 + + 1441.00 + + 3446.00 +
+ 9745.00 + + 7156.00 + + 16901.00 +
+
+
+
+
+
+ + diff --git a/tests/pivotgrid/pivotgrid-column-menus.html b/tests/pivotgrid/pivotgrid-column-menus.html index 5c5ce57c13..bc17739ab9 100644 --- a/tests/pivotgrid/pivotgrid-column-menus.html +++ b/tests/pivotgrid/pivotgrid-column-menus.html @@ -14,12 +14,9 @@ } -
- Start View - Include Fields (list) - Include Fields (tree) - Filter Fields View +
+ Start View
@@ -82,6 +79,157 @@
+ Columns Field Menu View +
+
+
+
+
+
+ + + Sort ascending +
+
+ + + Sort descending +
+
+
+
+
+ + + Include fields + + + + + +
+
+
+
+
+ + + Move to Columns +
+
+ + + Move to Rows +
+
+ + + Move previous +
+
+ + + Move next +
+
+
+
+
+
+
+
+ Rows Field Menu View +
+
+
+
+
+
+ + + Sort ascending +
+
+ + + Sort descending +
+
+
+
+
+ + + Include fields + + + + + +
+
+
+
+
+ + + Move to Columns +
+
+ + + Move to Rows +
+
+ + + Move previous +
+
+ + + Move next +
+
+
+
+
+
+
+
+ Include Fields (list)
@@ -218,6 +366,7 @@
+ Include Fields (tree)
@@ -489,6 +638,7 @@
+ Filter Fields View
diff --git a/tests/pivotgrid/pivotgrid-settings-left-right.html b/tests/pivotgrid/pivotgrid-settings-left-right.html new file mode 100644 index 0000000000..18cc156971 --- /dev/null +++ b/tests/pivotgrid/pivotgrid-settings-left-right.html @@ -0,0 +1,896 @@ + + + + Document + + + + + + +
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + Categories + + Categories +
+ Seafood + + Beverages +
+ + + + Products + + + + + Products + + Products +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + Regions + + South America + + + + + Countries +
+ North America + + + + + Countries +
+ Europe + + + + + Countries +
+ Asia + + + + + Countries +
+ Africa + + + + + Countries +
+ Regions + + Countries +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 1847.00 + + 1488.00 + + 3335.00 +
+ 1998.00 + + 1406.00 + + 3404.00 +
+ 2065.00 + + 1242.00 + + 3307.00 +
+ 1830.00 + + 1579.00 + + 3409.00 +
+ 2005.00 + + 1441.00 + + 3446.00 +
+ 9745.00 + + 7156.00 + + 16901.00 +
+
+
+
+
+
+
Settings
+
+
+
+
+ +
+
+
+
+
    +
  • + + + + + + Category + + +
    • +
  • + + + + + + Product + + +
    • +
  • + + + + + + Region + + +
    • +
  • + + + + + + Country + + +
    • +
  • + + + + + + + + Measures + + +
    • +
+
+
+
+
+ +
+
+
+ + Category + + + + + + + + + + + + + +
+
+ + Product + + + + + + + + + + + + + +
+
+
+ +
+
+
+ + Region + + + + + + + + + + + + + +
+
+ + Country + + + + + + + + + + + + + +
+
+
+ +
+
+
+ + Total + + + + + + + + + + + + + +
+
+
+
+
+ + +
+
+
+
+ Change settings + + + +
+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + Categories + + Categories +
+ Seafood + + Beverages +
+ + + + Products + + + + + Products + + Products +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + Regions + + South America + + + + + Countries +
+ North America + + + + + Countries +
+ Europe + + + + + Countries +
+ Asia + + + + + Countries +
+ Africa + + + + + Countries +
+ Regions + + Countries +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 1847.00 + + 1488.00 + + 3335.00 +
+ 1998.00 + + 1406.00 + + 3404.00 +
+ 2065.00 + + 1242.00 + + 3307.00 +
+ 1830.00 + + 1579.00 + + 3409.00 +
+ 2005.00 + + 1441.00 + + 3446.00 +
+ 9745.00 + + 7156.00 + + 16901.00 +
+
+
+
+
+
+
Settings
+
+
+
+
+ +
+
+
+
+
    +
  • + + + + + + Category + + +
    • +
  • + + + + + + Product + + +
    • +
  • + + + + + + Region + + +
    • +
  • + + + + + + Country + + +
    • +
  • + + + + + + + + Measures + + +
    • +
+
+
+
+
+ +
+
+
+ + Category + + + + + + + + + + + + + +
+
+ + Product + + + + + + + + + + + + + +
+
+
+ +
+
+
+ + Region + + + + + + + + + + + + + +
+
+ + Country + + + + + + + + + + + + + +
+
+
+ +
+
+
+ + Total + + + + + + + + + + + + + +
+
+
+
+
+ + +
+
+
+
+ Change settings + + + +
+
+
+
+ + diff --git a/tests/pivotgrid/pivotgrid-settings-panel-horizontal.html b/tests/pivotgrid/pivotgrid-settings-panel-horizontal.html index 2515666c94..800dc9af41 100644 --- a/tests/pivotgrid/pivotgrid-settings-panel-horizontal.html +++ b/tests/pivotgrid/pivotgrid-settings-panel-horizontal.html @@ -30,7 +30,7 @@
Settings
-
+
@@ -299,7 +299,7 @@
Settings
- +
@@ -914,7 +914,7 @@
-
+
diff --git a/tests/pivotgrid/pivotgrid-settings-panel-vertical.html b/tests/pivotgrid/pivotgrid-settings-panel-vertical.html index 4677d80e37..9c34db3900 100644 --- a/tests/pivotgrid/pivotgrid-settings-panel-vertical.html +++ b/tests/pivotgrid/pivotgrid-settings-panel-vertical.html @@ -28,7 +28,7 @@
Settings
-
+
@@ -291,7 +291,7 @@
Settings
- +
@@ -934,7 +934,7 @@
-
+
diff --git a/tests/pivotgrid/pivotgrid-settings-top.html b/tests/pivotgrid/pivotgrid-settings-top.html index 9e51dfe5b2..883f945fb8 100644 --- a/tests/pivotgrid/pivotgrid-settings-top.html +++ b/tests/pivotgrid/pivotgrid-settings-top.html @@ -30,20 +30,20 @@ - + All Periods - + All Periods - + @@ -51,7 +51,7 @@ CY 2010 - + @@ -59,7 +59,7 @@ CY 2011 - + @@ -67,7 +67,7 @@ CY 2012 - + @@ -77,7 +77,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -108,7 +108,7 @@ All Products - + @@ -119,7 +119,7 @@ All Products - + @@ -127,7 +127,7 @@ All Products - + @@ -135,15 +135,15 @@ All Products - + All Products - - + + @@ -152,7 +152,7 @@ - + Accessories @@ -176,8 +176,8 @@ - - + + @@ -575,13 +575,13 @@
-
-
+
+
Settings
-
+
diff --git a/tests/pivotgrid/pivotgrid.html b/tests/pivotgrid/pivotgrid.html index a01759f271..c14640823b 100644 --- a/tests/pivotgrid/pivotgrid.html +++ b/tests/pivotgrid/pivotgrid.html @@ -37,7 +37,7 @@ All Periods - + All Periods @@ -142,7 +142,7 @@ All Products - + Accessories @@ -176,7 +176,7 @@ - + $10567.67 - + $344.69 @@ -316,7 +316,7 @@ - + $96.89 @@ -347,7 +347,7 @@ $816.16 - + $1070.34 @@ -412,7 +412,7 @@ - + $344.69 @@ -575,659 +575,6 @@
-
-
-
-
Settings
-
-
- -
- - - - - - - - -
-
-
- - - - Select all -
- - 5 fields selected -
-
-
-
-
    -
  • - - - - - - - - - - - Account - - -
    • -
  • - - - - - - - - - - - Customer - - -
    • -
  • - - - - - - - - - - - Date - - -
      -
    • - - - - - - - - - - - Date.Calendar - - -
      • -
    • - - - - - - - - - - - Date.Calendar Quarter of Year - - -
        -
      • - - - - - - - - - - - (All) - - -
        • -
      • - - - - - - - - - - - Calendar Quarter of Year - - -
        • -
      -
      • -
    -
    • -
  • - - - - - - - - - - - Delivery date - - -
    • -
  • - - - - - - - - - - - Department - - -
    • -
  • - - - - - - - - - - - Country - - -
    • -
  • - - - - - - - - - - - Region - - -
    • -
-
-
-
-
- -
-
-
- - Date.Calendar - - - - - - - - - - - - - -
-
- - Product.Category - - - - - - - - - - - - - -
-
-
- -
-
-
- - Geography.City - - - - - - - - - - - - - -
-
-
- -
-
-
- - Sales Channel.Sales Channel - - - - - - - - - - - - - -
-
-
- - - -
-
-
-
-
Calculated Field 1
- - -
- -
-
-
- - - -
-
- - - - - - Custom - - - - - - - - - - Default - - - -
-
-
-
- - - - - - - - -
- -
-
-
- - - - - - - - - -
-
- - - - - - Custom - - - - - - - - - - Default - - - -
-
-
-
-
Date.Calendar
- -
- -
-
-
- - - - - - SUM - - - - - - - - - - Default - - - -
-
-
-
-
Date.Calendar
- -
- -
-
-
- - - - - - SUM - - - - - - - - - - Default - - - -
-
-
-
-
Date.Calendar
- -
- -
-
-
- - - - - - SUM - - - - - - - - - - Default - - - -
-
-
- -
-
- - -
-
-
-
- Change settings - - - -