recombine timeseries.jsp into one reusable module