completed dashboard viewmodel
Merge branch 'master' of https://github.com/ffiadmin/truefit-project