Weekly Pivot - only showing current week and not past weeks?

[k.sin]

Hi,

Does anyone know how to go about tweaking the current efs code to show:

1. show only the current week for R3, R2, R1, PP, S1, S2, S3. No historical data.
2. Add R3 and S3 to the current efs formula - unfortunately the weekly pivots go through R2 and S2.

Thank you!