Improved TrainingJournal sql view