refactor(AAE periods): changed periods calculation method

Mike Hoang requested to merge mike/AAE-periods into master

rel to #1298

needs !1651 (merged) to be merged

Edited by Mike Hoang

Merge request reports