Commit graph

39 commits

Author SHA1 Message Date
aignatov-bio
e1ce81280e
Merge pull request #4430 from aignatov-bio/ai-sci-7171-duplicate-protocols-in-activities
Fix duplicate protocols in activities search [SCI-7171]
2022-09-15 14:07:23 +02:00
Anton
d68bb6ddf4 Fix dupicate protocols in activities search [SCI-7171] 2022-09-13 12:38:26 +02:00
Oleksii Kriuchykhin
03ec4cb319 Setup user assignments relations for team, inventory and protocol [SCI-6818] 2022-05-17 14:32:14 +02:00
aignatov-bio
c85f5187f3
Fix duplicarte results in activities filters [SCI-5948] (#3579) 2021-10-05 13:45:09 +02:00
aignatov-bio
3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
aignatov-bio
75930b99c3 Fix global activities filters 2020-07-20 15:01:00 +02:00
Urban Rotnik
3db48c44f7 Add ordered scope 2020-01-30 13:47:14 +01:00
Urban Rotnik
1bb54d20cf Teams ordering fixed 2020-01-30 13:46:04 +01:00
Anton Ignatov
17e457c686 Finished global activities refactoring 2019-11-18 13:59:54 +01:00
Anton Ignatov
fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
Anton Ignatov
7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
aignatov-bio
94b220172d
Fix empty result name issue (#1812) 2019-05-31 09:48:58 +02:00
Oleksii Kriuchykhin
40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
Urban Rotnik
7eeba0e57e
Merge pull request #1670 from urbanrotnik/ur-sci-3343-dynamic-filtering-default-fix
Dynamic filtering default fix [SCI-3343]
2019-04-15 11:40:16 +02:00
Urban Rotnik
83f2a5c961 Dynamic filtering default fix 2019-04-15 11:20:43 +02:00
Alex Kriuchykhin
a61d637e6d
Merge pull request #1669 from okriuchykhin/ok_SCI_3340
Fix crash when no activities present [SCI-3340]
2019-04-15 11:13:25 +02:00
Oleksii Kriuchykhin
a43e42fdb3 Fix crash when no activities present [SCI-3340] 2019-04-15 10:51:59 +02:00
aignatov-bio
063f02dc56
Add ability to select filters with keyboard [SCI-3200] (#1649)
* Add ability to select fitlers with keyboard
2019-04-15 10:30:08 +02:00
Oleksii Kriuchykhin
231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00
Alex Kriuchykhin
7f20b7fa20
Merge pull request #1661 from okriuchykhin/ok_SCI_3292
Improve global activities pagination and fetching [SCI-3292]
2019-04-11 16:23:37 +02:00
Oleksii Kriuchykhin
d378e33038 Improve global activities pagination and fetching [SCI-3292] 2019-04-10 15:45:17 +02:00
aignatov-bio
e2e299b424
Add dynamic generating filters for global activities [SCI-3228] (#1644)
* Add dynamic generating filters

* Add url methods
2019-04-09 09:08:27 +02:00
aignatov-bio
e93b0c3109
Adding preload filters for global activities [SCI-3254] (#1619)
* Adding preload filter for global activities

* Adding link to task activities
2019-04-02 11:14:36 +02:00
Alex Kriuchykhin
913bdd91be
Merge pull request #1610 from okriuchykhin/ok_SCI_3251
Make subject search more precise in global activities [SCI-3251]
2019-03-29 09:28:13 +01:00
aignatov-bio
b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] (#1605)
* Adding children selector to global activities subjects

* Fix naming, add seperate check for project id
2019-03-29 09:26:27 +01:00
Oleksii Kriuchykhin
58af23e9b5 Make subject search more precise in global activities [SCI-3251] 2019-03-28 17:03:05 +01:00
aignatov-bio
8416d1ab1c
Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects 2019-03-28 09:13:34 +01:00
Jure Grabnar
07609d34c8 User/teams are now alphabetically listed 2019-03-27 15:34:01 +01:00
Anton Ignatov
3676aeb83c Adding localization to subjects group name in filters 2019-03-27 15:30:04 +01:00
Oleksii Kriuchykhin
2ff43a3320 Change filtering logic when no filters are selected [SCI-3223] 2019-03-26 16:04:03 +01:00
Oleksii Kriuchykhin
e3a3ec4491 Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225] 2019-03-25 17:38:13 +01:00
Mojca Lorber
4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Anton Ignatov
29b67be127 Fix team selection in global activities and add link from navbar 2019-03-20 10:33:22 +01:00
Anton Ignatov
f606210652 Rubocop fix 2019-03-19 13:52:03 +01:00
Anton Ignatov
87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +01:00
Oleksii Kriuchykhin
0c71493fdb Add viewing permissions for global activities [SCI-2997] 2019-03-18 15:38:19 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521)
* Adding side pane filtering and top pane
2019-03-06 10:34:04 +01:00
Oleksii Kriuchykhin
61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Miha Mencin
76c3db0b11 added layout, added css, added select2 lib, WIP 2019-02-25 16:50:38 +01:00