Create a filter based on Year and Quarter

Hi All, 

I am trying to create a single filter for year and quarter using date dimension table. 

My financial year starts from October so Qtr1 is Oct to Dec.  

I changed the date Default properties - Fiscal start Year - October.  

I created a calculated field - Quarter Date - DATEPART('quarter', [Date1])

Then I created one more calculated field - Quarter Filter - 

Case  [Quarter Date]

 WHEN 1 THEN 'Qtr2'

when 2 then 'Qtr3'

When 3 then 'Qtr4'

when 4 then 'Qtr1' 

End

However when I am using this as a filter , I am getting values for Year 2019 and 2020. For example if I select Qtr2 then I am getting Jan to March values for Year s 2020 and for 2019. 

I would like to create a single filter for year and quarter - so the filter should be a dropdown having the following values - 

Q2’FY19, Q3’FY19, Q4’FY19, Q1’FY20, Q2’FY20, Q3’FY20, Q4’FY20.  

Attaching the workbook.  Any guidance would be helpful.

Thank you!

Regards,

Rishi Saka