Added dynamic chart data calculation according to activity