Finished the convert data in format national
Merge branch 'master' of https://github.com/isaaceliape/foxtrot-dashboard