Update Filtering topics (#126)

dashboard-for-desktop/articles/dashboard-designer/data-analysis/expression-constants-operators-and-functions.md

@@ -318,6 +318,7 @@ Iif(Name = 'Bob', 1, Name = 'Dan', 2, Name = 'Sam', 3, 0)
 | CharIndex(String1, String2) | Returns the starting position of String1 within String2, beginning from the zero character position to the end of a string. | CharIndex('e', 'devexpress') | 
 | CharIndex(String1, String2, StartLocation) | Returns the starting position of String1 within String2, beginning from the StartLocation character position to the end of a string. | CharIndex('e', 'devexpress', 2) | 
 | Concat(String1, ... , StringN) | Returns a string value containing the concatenation of the current string with any additional strings. | Concat('A', ')', [ProductName]) | 
+| Contains(String1, SubString1) | Returns True if SubString1 occurs within String1; otherwise, False is returned.| Contains([ProductName], 'dairy') | 
 | EndsWith(String1, SubString1) | Returns True if the end of String1 matches SubString1; otherwise, False is returned. | EndsWith([Description], 'The end.') | 
 | Insert(String1, StartPosition, String2) | Inserts String2 into String1 at the position specified by StartPositon | Insert([Name], 0, 'ABC-') | 
 | Len(Value) | Returns an integer containing either the number of characters in a string or the nominal number of bytes required to store a variable. | Len([Description]) | 

dashboard-for-desktop/articles/dashboard-designer/data-shaping/filtering.md

@@ -3,40 +3,68 @@ title: Filtering
 author: Natalia Kazakova
 legacyId: 16532
 ---
+
 # Filtering
-The **Dashboard** allows you to filter a [query](../working-with-data/filter-queries.md) of the [SQL Data Source](../providing-data/connecting-to-sql-databases.md) or apply filtering to a specific data-aware dashboard item.
+The Dashboard Designer allows you to filter data in the dashboard items or apply filters to a specific measure. [Dimensions](../binding-dashboard-items-to-data/binding-dashboard-items-to-data.md) and [hidden dimensions](../binding-dashboard-items-to-data/hidden-data-items.md) are used to build filter criteria.
+
+## Dashboard Item Filter
 
-This topic describes how to enable and reset filtering.
+Filters that apply to a [dashboard item](../designing-dashboard-items.md) affect only this item. To add filters, select the target dashboard item and do one of the following:
 
-## Apply Filtering
-To configure filtering, select the target dashboard item and do one of the following.
-* If you are using a Ribbon menu, click the **Edit Filter** button in the **Data** tab.
+* Click the **Edit Filter** button in the Ribbon menu's **Data** tab. 
 
-	![DataShaping_Filtering_EditFilterButton](../../../images/img19368.png)
+	![DataShaping_Filtering_EditFilterButton](../../../images/datashaping_filtering_editfilterbutton19368.png)
 * Right-click a dashboard item and select **Edit Filter** from its context menu.
 
-	![DataShaping_Filtering_EditFilterMenuItem](../../../images/img19369.png)
+	![DataShaping_Filtering_EditFilterMenuItem](../../../images/datashaping_filtering_editfiltermenuitem19369.png)
 
-This will invoke the **Filter Editor** dialog. Use this dialog to build filter criteria with a convenient tree-like interface.
+This invokes the [Filter Editor](../../../../interface-elements-for-desktop/articles/filter-editor/filter-data-via-the-filter-editor.md) dialog that allows you to build complex filter criteria:
 
-![DataShaping_Filtering_FilterEditor](../../../images/img19370.png)
+![DataShaping_Filtering_FilterEditor](../../../images/datashaping_filtering_filtereditor19370.png)
 
-You can use [hidden dimensions](../binding-dashboard-items-to-data/hidden-data-items.md) within the Filter Editor dialog, allowing you to filter data based on their values.
+> [!Tip]
+> **Documentation**: [Filter Editor](../../../../interface-elements-for-desktop/articles/filter-editor/filter-data-via-the-filter-editor.md) 
 
-## Clear Filtering
-To clear filtering in the Designer, select the target dashboard item and do one of the following.
-* If you are using a Ribbon menu, click the **Clear** button in the **Data** tab.
-
-	![DataShaping_Filtering_ClearFilterButton](../../../images/img19371.png)
-* Right-click a dashboard item and select **Clear** from its context menu.
+To clear the applied filter, select **Clear** from the dashboard item's context menu or click the **Clear** button in the **Data** Ribbon tab.
+
+## Measure Filter
+
+You can apply filters to individual [measures](../binding-dashboard-items-to-data/binding-dashboard-items-to-data.md). If you create multiple measures that only differ in applied filters, you can compare values calculated over different date-time periods or against different categories.
+
+Select a dashboard item and right-click a measure to be filtered. Select **Edit Filter** from its context menu.
+
+![win-filter-to-measure-menu](../../../images/win-filter-to-measure-menu.png)
+
+This invokes the **Filter Editor** dialog where you can specify filter criteria:
+
+![win-filter-editor-for-measure](../../../images/win-filter-editor-for-measure.png)
+
+The filtered measure has the _Filter_ icon:
+
+![win-filtered-measure-icon](../../../images/win-filtered-measure-icon.png)
+
+To clear the applied filter, select **Clear** from the measure's context menu.
+
+> [!Note]
+> The measure filter is technically an expression that uses the `filter(summaryExpression, filterCriteria)` function, where `summaryExpression` is the measure to be filtered and `filterCriteria` is the filter. See the following topic for more information about functions you can use in dashboard expressions: [Expression Constants, Operators, and Functions](../data-analysis/expression-constants-operators-and-functions.md).
+
+The image below shows a Chart with three measures:  
+
+- _2019 - Opened_ is filtered by year 2019.
+- _2020 - Opened_ is filtered by year 2020.
+- _Opened_ is the original measure without filters.
+
+![win-filter-to-measure-year](../../../images/win-filter-to-measure-year.png)
+## Pass Parameter Values
+You can use the Filter Editor to filter a dashboard item according to the current parameter value. See the following topic for details: [Pass Parameter Values](../data-analysis/using-dashboard-parameters/passing-parameter-values.md).
 
 ## OLAP Filtering Specifics
-You cannot apply filtering by building complex filter criteria in [OLAP](../binding-dashboard-items-to-data/binding-dashboard-items-to-data-in-olap-mode.md) mode. Instead, you can filter dimension attributes and hierarchies by manually selecting the values you wish (or do not wish) to include in the dashboard.
+You cannot filter data by building complex filter criteria in [OLAP](../binding-dashboard-items-to-data/binding-dashboard-items-to-data-in-olap-mode.md) mode. Instead, select the values you wish to include in or exclude from the dashboard to filter dimension attributes and hierarchies.
 
 For dimension attributes, the Filter Editor contains a list of all values. You can select the values that you wish to display.
 
 ![ProvidingData_OLAP_Filter_Standard](../../../images/img19755.png)
 
 For hierarchies, a tree is displayed instead, allowing you to filter individual values at any hierarchy level.
 
-![ProvidingData_OLAP_Filter_Hierarchical](../../../images/img19754.png)
+![ProvidingData_OLAP_Filter_Hierarchical](../../../images/img19754.png) 

dashboard-for-web/articles/web-dashboard-designer-mode/data-analysis/expression-constants-operators-and-functions.md

@@ -318,6 +318,7 @@ Iif(Name = 'Bob', 1, Name = 'Dan', 2, Name = 'Sam', 3, 0)
 | CharIndex(String1, String2) | Returns the starting position of String1 within String2, beginning from the zero character position to the end of a string. | CharIndex('e', 'devexpress') | 
 | CharIndex(String1, String2, StartLocation) | Returns the starting position of String1 within String2, beginning from the StartLocation character position to the end of a string. | CharIndex('e', 'devexpress', 2) | 
 | Concat(String1, ... , StringN) | Returns a string value containing the concatenation of the current string with any additional strings. | Concat('A', ')', [ProductName]) | 
+| Contains(String1, SubString1) | Returns True if SubString1 occurs within String1; otherwise, False is returned.| Contains([ProductName], 'dairy') | 
 | EndsWith(String1, SubString1) | Returns True if the end of String1 matches SubString1; otherwise, False is returned. | EndsWith([Description], 'The end.') | 
 | Insert(String1, StartPosition, String2) | Inserts String2 into String1 at the position specified by StartPositon | Insert([Name], 0, 'ABC-') | 
 | Len(Value) | Returns an integer containing either the number of characters in a string or the nominal number of bytes required to store a variable. | Len([Description]) | 

dashboard-for-web/articles/web-dashboard-designer-mode/data-shaping/filtering.md

@@ -3,30 +3,51 @@ title: Filtering
 author: Natalia Kazakova
 legacyId: 117706
 ---
+
 # Filtering
-The Web Dashboard allows you to apply filtering for individual dashboard items, filter a [query](../providing-data/working-with-sql-data-sources.md) of the SQL Data Source or the entire Data Source.
+Web Dashboard allows you to filter data in the [dashboard items](../designing-dashboard-items.md) or apply filters to a specific measure. [Dimensions](../binding-dashboard-items-to-data/binding-dashboard-items-to-data-in-the-web-dashboard.md) and [hidden dimensions](../binding-dashboard-items-to-data/hidden-data-items.md) are used to build filter criteria.
+
+## Dashboard Item Filter
+
+Filters that are applied to a dashboard item affect only this item. Open a dashboard item's [Filters](../ui-elements/dashboard-item-menu.md) menu, go to the **Item Filter** section and click **Edit** to add a filter:
+
+![wdd-invoke-filter-editor](../../../images/wdd-invoke-filter-editor124630.png)
+
+This invokes the [Filter Editor](../../../../interface-elements-for-web/articles/report-designer/report-designer-tools/filter-editor.md) dialog where you can specify filter criteria:
 
-This topic describes how to filter data in the dashboard items.
+![Filtering_FilterEditor_Empty](../../../images/filtering_filtereditor_empty132417.png)
 
-## Apply Filtering
-To configure filtering in the Web Dashboard, select the target dashboard item and invoke the dashboard item's [Bindings](../ui-elements/dashboard-item-menu.md) menu. Then, go to the **Data / Filtering** section and use the **Click to set Filter Criteria** button to invoke the Filter Editor dialog.
+> [!Tip]
+> **Documentation**: [Filter Editor](../../../../interface-elements-for-web/articles/report-designer/report-designer-tools/filter-editor.md) 
 
-![wdd-invoke-filter-editor](../../../images/img124630.png)
+## Measure Filter
 
-Use this dialog to build filter criteria with a convenient tree-like interface.
+You can apply filters to individual [measures](../binding-dashboard-items-to-data/binding-dashboard-items-to-data-in-the-web-dashboard.md). If you create multiple measures that only differ in applied filters, you can compare values calculated over different date-time periods or against different categories.
 
-![wdd-filter-editor](../../../images/img124632.png)
+Open a dashboard item's [Binding](../ui-elements/dashboard-item-menu.md) menu and select a measure to filter. In the invoked [data item menu](../ui-elements/data-item-menu.md), open the **Filter** section and click **Edit**. This invokes the [Filter Editor](../../../../interface-elements-for-web/articles/report-designer/report-designer-tools/filter-editor.md) dialog where you can specify filter criteria. 
 
-> [!NOTE]
-> Note that you can use [hidden dimensions](../binding-dashboard-items-to-data/hidden-data-items.md) within the Filter Editor dialog, allowing you to filter data based on the values.
+![web-filter-to-measure-menu](../../../images/web-filter-to-measure-menu.png)
 
-## Pass Parameter Values
-You can use the Filter Editor to filter a data source according to the current parameter value. To learn more, see the [Using Dashboard Parameters](../data-analysis/dashboard-parameters.md) topic.
+> [!Tip]
+> **Documentation**: [Filter Editor](../../../../interface-elements-for-web/articles/report-designer/report-designer-tools/filter-editor.md)
 
+You can clear the applied filter in the [data item menu](../ui-elements/data-item-menu.md)'s **Filter** section.
+
+> [!Note]
+> The measure filter is technically an expression that uses the `filter(summaryExpression, filterCriteria)` function, where `summaryExpression` is the measure to be filtered and `filterCriteria` is the filter. See the following topic for more information about functions you can use in dashboard expressions: [Expression Constants, Operators, and Functions](../data-analysis/expression-constants-operators-and-functions.md).
+
+The image below shows a Chart with three measures: 
+
+- _2019 - Opened_ is filtered by year 2019.
+- _2020 - Opened_ is filtered by year 2020.
+- _Opened_ is the original measure without filters.
+
+![web-filter-to-measure-year](../../../images/web-filter-to-measure-year.png)
 ## OLAP Filtering Specifics
-In OLAP mode, you cannot apply filtering by building complex filter criteria. Instead, you can filter dimension attributes and hierarchies by manually selecting the values you wish to include or exclude from the dashboard.
+In OLAP mode, you cannot filter data by building complex filter criteria. Instead, select the values you wish to include in or exclude from the dashboard to filter dimension attributes and hierarchies.
 
-| Dimension Attribute | Dimension Hierachy |
+| Dimension Attribute | Dimension Hierarchy |
 |---|---|
 | For dimension attributes, the Filter Editor contains a list of all values. | For hierarchies, a tree is displayed instead, allowing you to filter individual values at any hierarchy level. |
-| ![wdd-olap-filtering-attribute](../../../images/img124640.png) | ![wdd-olap-filtering-hierarchy](../../../images/img124639.png) |
+| ![wdd-olap-filtering-attribute](../../../images/img124640.png) | ![wdd-olap-filtering-hierarchy](../../../images/img124639.png) |
+