145 Commits

Author SHA1 Message Date
a0480036bf Show annotations on overview of favorites 2020-06-10 15:05:41 +02:00
ba2e90386f Add keyword field to favorites 2020-06-09 19:30:16 +02:00
af88064af9 Add keyword field in database 2020-06-09 18:14:14 +02:00
de165f3d47 Update dependencies to latest versions 2020-06-05 16:49:16 +02:00
Marco Zeisler
8cd87ce642 Merge branch 'personal_annotations' into 'master'
Personal annotations

See merge request kranklyboy/tiss2go!1
2020-06-04 23:09:44 +00:00
Pfingstfrosch
86d3e2f4e3 push 2020-06-05 00:43:10 +02:00
Pfingstfrosch
9cc357fb17 add print button to all detail views 2020-06-05 00:41:18 +02:00
Pfingstfrosch
ca38d7260d fixed bugfix where another user could not store the same object again
fixed the primary keys => all the classes have now composite primary key which contais an id + user_id, necessary gem: 'composite_primary_keys'
fixed the user_id relation => every class now "belongs_to" user

pls kill me know
2020-06-05 00:35:04 +02:00
Pfingstfrosch
1e87036094 personal annotations for all classes implemented 2020-06-04 23:15:54 +02:00
Pfingstfrosch
9881e7962d add render_personal_annotations to all favorite classes 2020-06-04 22:17:38 +02:00
Pfingstfrosch
74cc3dce22 make annotation storing and retrieving more generic 2020-06-04 22:14:21 +02:00
Pfingstfrosch
88783ffede on detail view show stored annotation if available 2020-06-04 21:54:17 +02:00
Pfingstfrosch
d59030ffc0 render personal_annotation partial with the help of render_personal_annotations helper 2020-06-04 21:53:54 +02:00
Pfingstfrosch
72db9148c4 push 2020-06-04 21:53:38 +02:00
Pfingstfrosch
37cc1ae72d add stubs, routes for add_annotation action 2020-06-04 21:53:32 +02:00
Pfingstfrosch
8196517175 add helper for personal_annotation partial form 2020-06-04 21:52:51 +02:00
Pfingstfrosch
b7119cdbd3 add partial render for rendering the personal_annotation form 2020-06-04 21:52:22 +02:00
Pfingstfrosch
81a7e16bae add field for storing personal_annotation string 2020-06-04 21:51:52 +02:00
Pfingstfrosch
c82ba79776 Add input field for personal annotations 2020-06-04 20:14:45 +02:00
Pfingstfrosch
cf0422731c fix input styling 2020-06-04 20:14:09 +02:00
Pfingstfrosch
31f437c37a Fix styling issue with missing td cell 2020-06-04 19:25:51 +02:00
Pfingstfrosch
6ef204797c push 2020-06-04 19:25:36 +02:00
Pfingstfrosch
10950525f2 Remove nokogiri as it is part of rails 2020-06-04 19:25:27 +02:00
Pfingstfrosch
d52e844fa5 Reformat the delete buttons 2020-06-04 19:25:06 +02:00
Pfingstfrosch
b188b238b8 Reformat inputs 2020-06-04 19:24:56 +02:00
Pfingstfrosch
3e3ed87b18 Introduce and use print.css 2020-06-04 19:24:45 +02:00
Pfingstfrosch
c6073806de lel 2020-05-31 17:25:48 +02:00
Pfingstfrosch
8cbf96742f final styling of fav table buttons 2020-05-31 17:08:40 +02:00
Pfingstfrosch
1a94f5919d final styling of table sorting 2020-05-31 17:02:34 +02:00
Pfingstfrosch
ad85619ccc added sorting arrow for favorites view 2020-05-31 16:45:22 +02:00
Pfingstfrosch
cfcbf5acdb Ad requirement 4
I have no idea how this requirement shall be implemented at the end, but at first step, the tiss_crawler.rb lib checks if the search_term is an empty string and returns an error msg if found

otherwise it returns the result, but appended to 'content' key
2020-05-31 15:48:17 +02:00
Pfingstfrosch
72b9f7d7a0 Don't allow empty search due to the course requirement 4 2020-05-31 15:17:56 +02:00
Pfingstfrosch
80bf9dbc5b render search crawlers header as partial 2020-05-31 15:06:25 +02:00
Pfingstfrosch
fcc07a75b4 offer a back to search button 2020-05-31 14:25:41 +02:00
Pfingstfrosch
0a849a92e3 restyle fav subnav 2020-05-31 14:17:59 +02:00
Pfingstfrosch
2d8a2f8b7e decrease size of titles, looks better on mobiles
change text, add information on which specific search you are
2020-05-31 13:59:11 +02:00
Pfingstfrosch
28a722e5e1 decrease size of titles, looks better on mobiles 2020-05-31 13:54:01 +02:00
Pfingstfrosch
15e2b25a50 better font for whole body 2020-05-31 13:52:01 +02:00
Pfingstfrosch
32ec7c49ff make favorite view more mobile friendly
append buttons under each row of data instead besides
append a line which separates the tables beneath every odd line to group data and buttons
2020-05-31 13:50:07 +02:00
Pfingstfrosch
ea47df1043 remove doubled migration file 2020-05-31 13:42:14 +02:00
Pfingstfrosch
204597b39d fix rubycop issue:
- don't introduce global variable
 - don't prefix getter with get_
 - single quotes instead of doubles for hash usage
2020-05-31 13:41:50 +02:00
Pfingstfrosch
831c78a3ff Merge remote-tracking branch 'remotes/origin/projects_search' into fixes
# Conflicts:
#	app/views/favorites/projects.html.erb
#	db/schema.rb
2020-05-31 13:16:56 +02:00
Pfingstfrosch
bfd58dc7c1 create favorite projects table 2020-05-29 16:30:24 +02:00
Pfingstfrosch
724a13347c Display 'Not implemented yet.' 2020-05-29 16:12:44 +02:00
Pfingstfrosch
84cf537412 Catch render errors and display 'Couldn't find anything' instead of stacktrace 2020-05-29 16:12:23 +02:00
Pfingstfrosch
f96ed67cf0 move buttons underneath the displayed lines to make the view more mobile compatible 2020-05-29 15:56:19 +02:00
Pfingstfrosch
a3f7066cc1 Merge branches 'projects_search' and 'user_based_+_sortable_favs'
# Conflicts:
#	app/assets/stylesheets/favorites.scss
2020-05-29 15:48:58 +02:00
Pfingstfrosch
b47a37daea Merge branch 'master' of https://gitlab.com/kranklyboy/tiss2go 2020-05-29 15:48:29 +02:00
Pfingstfrosch
47d47a51b7 styling of favorites 2020-05-29 15:48:11 +02:00
Pfingstfrosch
1f70049dc4 added arrows for sorting 2020-05-29 15:47:20 +02:00