A local-first personal finance app
Explain condition types on Rules and Filtering pages (#390)
wdpk9d59672a600b
diff --git a/docs/budgeting/rules/index.md b/docs/budgeting/rules/index.mdindex 4705393846..047dfddb80 100644--- a/docs/budgeting/rules/index.md+++ b/docs/budgeting/rules/index.md@@ -22,6 +22,13 @@ Rules are **automatically ranked** from least to most specific. If the conditionWhile ranking works for the most part, you might want to say "this rule _always_ should run last no matter what". Actual allows this with **stages**. Rules are actually run in 3 stages: `pre`, normal, and `post`. By tagging a rule as `pre` or `post`, you force it to always run before or after rules in the other stages. Within a stage, rules are still automatically ranked.+### Condition Types++- `is`/`is not` matches exactly+- `contains`/`does not contain` matches a substring+- `matches` is regex+- `one of`/`not one of` is a multi-select+### FieldsConditions can use the following fields:diff --git a/docs/reports-filters/filters.md b/docs/reports-filters/filters.mdindex 6e8571fdf0..fce6c89db2 100644--- a/docs/reports-filters/filters.md+++ b/docs/reports-filters/filters.md@@ -27,14 +27,14 @@ Now select **Filter**. You will see from this drop-down that there are a numberThe great thing is that you are not limited to just one Filter. You can select multiple filters. In effect stacking one upon another. An example will help illustrate this.-There are further options to choose within each area, in order to narrow the Filter still further. Here are three just to illustrate the choices – Dates, Categories and Notes:+There are further options within each area to narrow the filter further. Here are a couple to illustrate the choices – Dates and Categories:++`Matches` is *[regular expressions](https://regextutorial.org/)*, the other condition types are further explained at [Rules Page](../budgeting/rules/#condition-types).--**Note**: There are further options available by clicking the down arrow under **Date** and **Amount**. The **Date** options are *Year* and *Month*. The **Amount** options are to choose between *Inflow* and *Outflow*.### Examplediff --git a/static/img/filtering/conditions-1.png b/static/img/filtering/conditions-1.pngindex 77251c1362..b4fb7d5c53 100644Binary files a/static/img/filtering/conditions-1.png and b/static/img/filtering/conditions-1.png differdiff --git a/static/img/filtering/conditions-2.png b/static/img/filtering/conditions-2.pngindex a404c551e8..9e2eef0423 100644Binary files a/static/img/filtering/conditions-2.png and b/static/img/filtering/conditions-2.png differdiff --git a/static/img/filtering/conditions-3.png b/static/img/filtering/conditions-3.pngdeleted file mode 100644index 5f527e850d..0000000000Binary files a/static/img/filtering/conditions-3.png and /dev/null differ