merge request id	16
Titel	Feature/upgrade catalog cards
Beschreibung	Added markings for "is on watchlist", "is in basket" and "is already owned". The ones about the basket and the watchlist are colored orange and the indicator for owned trainings is colored green (for now - I personally like the orange more... maybe exchanging the colors against each other is an idea) Also to mention: Beforehand we still had `$canStartTraining = auth()->check() && auth()->user()->trainings()->setEagerLoads([])->where('training_id', $training->id)->exists()`. Now the views make use of `$training->isOwned`, and this property determines it's status via `auth()->check() && auth()->user()->trainings->contains($this);`
Status	merged
Created at	2018-09-05T10:05:43.310Z
Updated at	2018-09-05T14:28:16.545Z
Source branch	feature/upgrade-catalog-cards
Target branch	develop
Author	Sascha Immig
Assignee	Marcel Pociot

Discussion notes

changed the description	Sascha Immig	2018-09-05T13:42:59.189Z
merged	Sascha Immig	2018-09-05T14:28:16.578Z

Merge Commits

Title	Id	Author	Created at	Message
added indicator via file instead of data-uri due to IE	0073f1b3a3f7fe4a5fb56167e2345b8531a66b02	TUV\immigs	2018-08-30T15:41:20.000Z	added indicator via file instead of data-uri due to IE
refined hover effect	0647c8c92f0624c0f07cff916a0e600bfcd3b958	TUV\immigs	2018-08-30T14:01:19.000Z	refined hover effect
updated markings	0ebffdf43edf3b1538bb6dd49d5165c29fef140f	TUV\immigs	2018-09-03T06:42:09.000Z	updated markings
WIP: indicator for certifictaion	13aedaae5c38712c9c84d3f69a1b1d8a9b3d9348	TUV\immigs	2018-08-29T07:01:41.000Z	WIP: indicator for certifictaion
added image transition on hover	22f4afe8fd4619287e2fb797c9b97f29cd5b8d9a	TUV\immigs	2018-08-28T12:29:53.000Z	added image transition on hover
markings for "is in basket" added	242d0ee8821efffb7ad21d9e0dbb7f83033e5232	TUV\immigs	2018-09-05T09:52:29.000Z	markings for "is in basket" added
WIP: added purchase_status to show markings for "on watchlist", "in basket" and "bought"	46336b43db5ab52689232209dd76835a1ae6ad43	TUV\immigs	2018-09-03T12:53:37.000Z	WIP: added purchase_status to show markings for "on watchlist", "in basket" and "bought"
smaller font for vat	4683f12307807668afc01b460025cf1f47ef5ccf	TUV\immigs	2018-08-28T12:29:32.000Z	smaller font for vat
corrected if clause	64bd50bef6b2b49c918f7aceedd91571f077c6a9	TUV\immigs	2018-09-03T10:43:16.000Z	corrected if clause
Revert "added toggle indicator"	7cb4994ea1d01570bf59e77b916352fba03a33df	TUV\immigs	2018-09-04T11:50:54.000Z	Revert "added toggle indicator" This reverts commit abdf310e9ecf77becec5b98a3b2107cf3b2f8d94.
added generated files	97407c361d35d7b52d29bcabe75d8d40d4b29a8b	TUV\immigs	2018-09-03T13:48:41.000Z	added generated files
corrected transition	a988b79950cf248965804ba6c41269733b1dd6ad	TUV\immigs	2018-08-30T15:41:55.000Z	corrected transition
added red	abb8b5156243dc9862cb04ea6af0058fea62fb2a	TUV\immigs	2018-08-29T10:31:02.000Z	added red
added toggle indicator	abdf310e9ecf77becec5b98a3b2107cf3b2f8d94	TUV\immigs	2018-09-04T11:49:12.000Z	added toggle indicator
added "isOwned" property to training and connected "isOnWatchlist". Made use of…	aea41e5fab986f5ea2319999a76f291817da7424	TUV\immigs	2018-09-04T15:07:48.000Z	added "isOwned" property to training and connected "isOnWatchlist". Made use of the new propeties in taining details, too
changed size	c60105e3ffb7c42605246e0784d3b6229ba7c1ee	TUV\immigs	2018-08-31T06:59:08.000Z	changed size
corrected calculation for IE	ceb9c28bc46f5f76a271b34f5605b52e7a84a8a8	TUV\immigs	2018-08-30T15:39:41.000Z	corrected calculation for IE
refactoring	db698a9ff38dc18a9cd4380ff85f7a3a426c166b	TUV\immigs	2018-09-03T13:31:20.000Z	refactoring
corrected catalog card	e7f6e8b1b146997bea2a1a6e0e1f7d6bf59b85fc	TUV\immigs	2018-09-04T11:40:06.000Z	corrected catalog card