AT-53261129-Coverted reporting to use AngularJS