Help converting JQL to calculated measures

Hi all,

I am trying to convert the following simple JQL filters for use within a timeline EazyBi report.

  1. Type = Task OR (Type = Bug AND Labels in (NoTriage))
  2. Type = Bug AND (Labels not in (NoTriage) OR Labels IS EMPTY)

I am using in/not in as the list of labels may change over time, but unlikely.

The EazyBi report, as mentioned above, is a timeline view where the above measures would be used to refine the scope

Rows = Time
Measures include: Story Point history, predicted completion dates, etc, example below
Multiple Page filters too

I have tried using a combination of Filter, Aggregate and Exclude but just cannot seem to get this to work.

Any advice?? Many thanks