Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 33
TitelFeature/more catalog filters
BeschreibungDie Filter die in MYC-256 hinzugekommen sind müssen funktional gemacht werden. Bitte alle Funktionen anklemmen, sobald der obige Design- und Frontend-Task abgeschlossen ist. - Nutzung der Repository-Klassen bitte überprüfen
Statusmerged
Created at 2018-10-17T15:31:58.601Z
Updated at 2018-10-30T13:49:39.556Z
Source branchfeature/more-catalog-filters
Target branchdevelop
AuthorGregor Gabriel
AssigneeMarcel Pociot

Discussion notes

added 2 commits
  • 1e8d3439 - 1 commit from branch develop
  • 3beb960e - Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version		 Gregor Gabriel 2018-10-18T06:54:06.278Z
Lokal tritt folgendes Phänomen auf: filtere ich nach einem Kriterium und danach - bevor die Filterung des ersten Kriteriums abgeschlossen ist - nach einem 2. Krriterium, finden die Filterungen nacheinander statt, d.h. kacheln kommen und gehen. M.E. sollte eine Filterung abebrochen werden und durch die neue ersetzt werden, wenn neue Einstellugnen während des Filterungsprozesses vorgenommen werden. Sascha Immig 2018-10-19T12:23:30.273Z
Die empty states (die derzeit das vorhandensein einer Query prüfen) werden nicht ausgelöst, wenn durch die weiteren Filter eine leere Ergebnismenge zurückgeliefert wird. Sascha Immig 2018-10-19T12:26:05.737Z
added 2 commits
  • 0a993905 - Move filters to query
  • 5e86ad31 - Show empty states only when filters were modified
Compare with previous version		 Marcel Pociot 2018-10-30T12:33:16.675Z
added 1 commit
  • 808b143b - Dont try to load user progress when user is logged out
Compare with previous version		 Marcel Pociot 2018-10-30T12:37:03.585Z
added 1 commit
  • 8ffe8038 - Load empty training progress
Compare with previous version		 Marcel Pociot 2018-10-30T12:46:31.247Z
added 1 commit
  • 976ed030 - hide button 'more filters' on trainings list
Compare with previous version		 Sascha Immig 2018-10-30T12:53:15.277Z
merged Sascha Immig 2018-10-30T13:49:39.607Z

Merge Commits

Title Id Author Created at Message
WIP - made phpcsd not warning about code duplicate 0522280d200d74818a859d91fa1f4d03a67f0e50 TUV\gabrielg 2018-10-17T09:28:33.000Z WIP - made phpcsd not warning about code duplicate
Filter box now is fully connected to backend 05f512f159eb4341511ea3621752eea22b0ecad0 TUV\gabrielg 2018-10-17T15:25:39.000Z Filter box now is fully connected to backend - one can think about adding Filters to DB-Query instead of doing subsequent filtering
Move filters to query 0a993905d0b8e426783ae7c0b1016c5acc0b2ab7 Marcel Pociot 2018-10-30T11:35:37.000Z Move filters to query
no message 1772734f6776c6bae6714516e76b0453243dfe9b TUV\immigs 2018-10-11T12:28:19.000Z no message
a11y corrections 2832281bc1a5ddddde6f41104824fbbebc506af5 TUV\immigs 2018-10-11T14:29:03.000Z a11y corrections
Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into… 3beb960efd157fb9403599692c5e4a7cd6648e4d TUV\gabrielg 2018-10-18T06:54:23.000Z Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into feature/more-catalog-filters
corrected the collapse tip 3c8f1a522dc694e2d93e6f3a3564ba242f6f091e TUV\immigs 2018-10-11T14:28:12.000Z corrected the collapse tip
WIP - now fiilter box is connected to vue and vue sends all filter requests to server 41a7ec913f1412db2766ede45590d18d9572aacc TUV\gabrielg 2018-10-17T13:24:17.000Z WIP - now fiilter box is connected to vue and vue sends all filter requests to server - server side filter handling is missing
Show empty states only when filters were modified 5e86ad31a9276c0068e3f305db4af17ae6134415 Marcel Pociot 2018-10-30T12:30:22.000Z Show empty states only when filters were modified
Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into… 663f941ba04b78cd0b40a0ddd101b860f528dec2 TUV\gabrielg 2018-10-17T13:27:43.000Z Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into feature/more-catalog-filters # Conflicts: # public/css/app.css.map # public/js/admin/app.js.map # public/js/app.js.map
WIP - alle filter box data is generated dynamically now 7505a0c99403578a1c44b9f74f94706949bf930b TUV\gabrielg 2018-10-17T08:43:46.000Z WIP - alle filter box data is generated dynamically now - duplicate code error contained - detected by phpcpd - still no filtering is done, when using any filter box filter
Dont try to load user progress when user is logged out 808b143bb1a94667d613243129c02f417ca53fc3 Marcel Pociot 2018-10-30T12:36:42.000Z Dont try to load user progress when user is logged out
Load empty training progress 8ffe803859948564b893a6f4044df0ce76efa235 Marcel Pociot 2018-10-30T12:46:15.000Z Load empty training progress
hide button 'more filters' on trainings list 976ed030df5897e6005fb1a635a83dcc8a64c325 TUV\immigs 2018-10-30T12:53:03.000Z hide button 'more filters' on trainings list
corrected drp-down-toggle's appearance 97faa0570b8e22869919a46f23240abc8ba683c9 TUV\immigs 2018-10-11T10:35:33.000Z corrected drp-down-toggle's appearance
polished filters ca9e9caa7ef2d10d0bbc0b1752a23fdcfec4f557 TUV\immigs 2018-10-11T12:09:29.000Z polished filters
Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into… d0467f4ac006aab26f8f3dc01726853e8815032a TUV\gabrielg 2018-10-17T08:48:43.000Z Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into feature/more-catalog-filters # Conflicts: # public/css/app.css # public/css/app.css.map # public/js/admin/app.js.map # public/js/app.js.map # resources/assets/sass/app.scss
added lang file, corrected margin dc5ccade70a8a0eb8b29485dd0fc2e1278fdc85d TUV\immigs 2018-10-11T14:33:00.000Z added lang file, corrected margin
Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into… de27bca68ac93d83cfa36becc6f1e7dd0aaebb06 TUV\gabrielg 2018-10-17T15:30:08.000Z Merge branch 'develop' of http://gitlab.learningsystem.de/lms/seventeen into feature/more-catalog-filters # Conflicts: # public/css/app.css # public/css/app.css.map # public/js/app.js # public/js/app.js.map # resources/assets/sass/_rating-overview.scss
altered custom-select style f5a47faec5decb2cb1c3e9cf0e2c128fac3f8c27 TUV\immigs 2018-10-11T12:08:03.000Z altered custom-select style