Commit graph

197 commits

Author SHA1 Message Date
okriuchykhin
8d4b2d7373 Merge pull request #399 from okriuchykhin/ok_SCI_811_v2
Fix changed sample type and sample group in sample edit [SCI-811]
2017-01-11 11:37:38 +01:00
mlorb
b898c792c4 Merge pull request #395 from mlorb/ml_sci_847
Adjust columns width in table header after selecting sample type/group [SCI-847]
2017-01-11 10:43:12 +01:00
Oleksii Kriuchykhin
a3d9e25feb Fix changed sample type and sample group in sample edit [SCI-811] 2017-01-10 16:51:51 +01:00
zmagod
89e8946a47 expand smart annotation 2017-01-10 14:14:21 +01:00
Luka Murn
0cf5afa499 Merge pull request #376 from Ducz0r/lm-sci-813-fix
Fix search on hidden columns in samples table [SCI-813]
2017-01-10 11:27:56 +01:00
Luka Murn
05be1e862f Update filter after toggling visibility (if neccesary) 2017-01-10 11:26:12 +01:00
okriuchykhin
f8237e025a Merge pull request #394 from okriuchykhin/ok_SCI_853
Fix non removable error messages in samples [SCI-853]
2017-01-10 11:00:01 +01:00
Mojca Lorber
a0a7f35d44 adjust columns width in table header after selecting sample type/group 2017-01-09 15:00:07 +01:00
Oleksii Kriuchykhin
773b00933a Improve multiple messages handling in samples [SCI-853] 2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin
0fd7688427 Fix hiding of error messages in the samples datatable [SCI-853] 2017-01-09 13:34:23 +01:00
okriuchykhin
3f930ccfce Merge pull request #392 from okriuchykhin/ok_SCI_858
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 12:49:38 +01:00
mz3944
54ef2be94b Merge pull request #383 from mz3944/mz-sci-845
Fixed samples table all rows un/checking. [SCI-845]
2017-01-09 11:58:44 +01:00
Oleksii Kriuchykhin
bc8db28746 Fixes wrong samples info modals being shown in samples datatable [SCI-858] 2017-01-09 09:38:42 +01:00
Matej Zrimšek
72df48500d Fixed samples table all rows un/checking. [SCI-845] 2017-01-06 18:19:20 +01:00
Mojca Lorber
6f7c08fa63 fix samples info popup error 2017-01-06 17:31:17 +01:00
Luka Murn
09ef3b3ad5 Merge pull request #378 from Ducz0r/lm-sci-802-fix
Add tooltips to samples column dropdown [SCI-802]
2017-01-04 11:30:04 +01:00
Luka Murn
2c5b27ce81 Change "Update" to "Save"
Closes SCI-802.
2017-01-04 11:29:34 +01:00
Luka Murn
37cd6417c8 Merge pull request #374 from Ducz0r/lm-sci-808-814-fix
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
2017-01-04 09:50:26 +01:00
Oleksii Kriuchykhin
4065be9e4e Fix marking of selected option [SCI-819] 2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
e22ff6f8bb Fix an issue with sample editing and type/group dropdowns [SCI-819] 2016-12-30 15:50:43 +01:00
okriuchykhin
2474eac37d Merge pull request #367 from okriuchykhin/ok_SCI_818
Fix sample info popup [SCI-818]
2016-12-30 15:43:28 +01:00
okriuchykhin
e826791429 Merge pull request #365 from okriuchykhin/ok_SCI_807
Fix buttons disappear when deleting columns in samples [SCI-807]
2016-12-30 15:43:13 +01:00
okriuchykhin
73478d7b5e Merge pull request #372 from okriuchykhin/ok_SCI_816
Fix flash message display in samples table [SCI-816]
2016-12-30 15:30:14 +01:00
Oleksii Kriuchykhin
e156dbc987 Implement flash message hiding through module pattern [SCI-816] 2016-12-28 14:52:03 +01:00
Luka Murn
2304742d87 Add tooltips to samples column dropdown
Closes SCI-802.
2016-12-27 08:45:23 +01:00
Luka Murn
fbc2be890c Fix search on hidden columns in samples table
Closes SCI-813.
2016-12-23 19:56:54 +01:00
Luka Murn
87d8fece46 Fix bug on edit/cancel sample group page
Closes SCI-814.
2016-12-23 12:50:49 +01:00
mlorb
876ce37a96 Merge pull request #366 from mlorb/ml-sci-284
Samples - freeze header row and edit button... [SCI-284]
2016-12-23 12:29:41 +01:00
Oleksii Kriuchykhin
ee5e0ad455 Fix flash message display in samples table [SCI-816] 2016-12-21 17:26:33 +01:00
Oleksii Kriuchykhin
034976a709 Fix sample info popup [SCI-818] 2016-12-20 17:21:17 +01:00
Mojca Lorber
ba0214d1ff staying on same page after saving a sample; fix button disappearance when adding new column 2016-12-20 15:19:31 +01:00
Mojca Lorber
165ec6144c adjust columns width in table header when editing or adding new sample; and fix horizontal scrolling 2016-12-20 13:41:19 +01:00
Oleksii Kriuchykhin
42f71f4da8 Fix buttons disappear when deleting columns in samples datatable [SCI-807] 2016-12-20 09:49:21 +01:00
Mojca Lorber
d1e2354f4e add scrolling functionality and remove bug with adding new column 2016-12-19 16:59:09 +01:00
zmagod
6f7f6a8b7f removes dropdown sorting [fixes SCI-811] 2016-12-19 16:41:14 +01:00
zmagod
efe41817f2 removes sample group/type link in new sample form [fixes SCI-809] 2016-12-19 10:49:21 +01:00
Zmago Devetak
c9d38a5454 Merge pull request #359 from ZmagoD/zd_SCI_804
disables sorting and columns dropdown when editing or adding new samp…
2016-12-16 12:56:11 +01:00
Zmago Devetak
601594fdb9 Merge pull request #355 from ZmagoD/zd_fix_mozilla_compatibility_issue
fixes compatibility issue on mozilla firefox
2016-12-16 11:57:18 +01:00
Zmago Devetak
ad9b25ba44 Merge pull request #356 from ZmagoD/zd_SCI_803
fixes bug with long column names in edit mode [fixes SCI-803]
2016-12-16 11:02:42 +01:00
Zmago Devetak
3d500800cd Merge pull request #358 from ZmagoD/zd_SCI_805_801
removes error message from new type/group form [fixes SCI-805]
2016-12-16 10:54:23 +01:00
zmagod
25671c744a disables sorting and columns dropdown when editing or adding new sampe [fixes SCI-804] 2016-12-16 09:50:45 +01:00
zmagod
fffa0d91da removes error message from new type/group form [fixes SCI-805] 2016-12-15 16:17:34 +01:00
zmagod
7c88f3e0aa fixed empty name error 2016-12-15 15:50:07 +01:00
zmagod
6755ebcbf8 fixes bug with long column names in edit mode [fixes SCI-803] 2016-12-15 15:26:51 +01:00
zmagod
dc6e9dcbd8 fixes compatibility issue on mozilla firefox 2016-12-15 11:57:17 +01:00
Mojca Lorber
69d164da68 add new column on first position 2016-12-15 11:20:40 +01:00
zmagod
9083f84396 Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_789 2016-12-15 11:03:19 +01:00
zmagod
3e31f114d4 app/assets/javascripts/samples/sample_datatable.js 2016-12-15 10:51:17 +01:00
zmagod
b164886270 fixed error mesage scroll 2016-12-15 10:44:23 +01:00
zmagod
b003d192c3 fixed edit mode 2016-12-15 09:54:38 +01:00
zmagod
ba58ac2a77 Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796 2016-12-15 09:26:12 +01:00
zmagod
54fee339f8 cleanup unneeded code 2016-12-15 09:23:38 +01:00
zmagod
4d6a85ed7c fixed sample groups colorpicker [fixes SCI-781] 2016-12-15 09:23:38 +01:00
zmagod
b07f9fae59 fixes new sample group/type link in sample row [fixes SCI-796] 2016-12-15 09:23:38 +01:00
zmagod
6d2fb3b02c Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790 2016-12-14 17:05:00 +01:00
zmagod
dfd472d37d fixed column name after edit 2016-12-14 16:47:39 +01:00
zmagod
a9f8239516 fixed edit action 2016-12-14 16:37:44 +01:00
okriuchykhin
c4ff12be51 Merge pull request #349 from okriuchykhin/ok_SCI_783
Fix columns ordering when deleting custom fields [SCI-783]
2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin
fa1cf1f04d Better handling of columns deleting with fixing columns ordering [SCI-783] 2016-12-14 15:23:00 +01:00
okriuchykhin
2fd7536039 Merge pull request #352 from okriuchykhin/ok_SCI_793
Hide dropdown when user interacts with samples table [SCI-793]
2016-12-14 14:19:38 +01:00
okriuchykhin
6381166eb1 Merge pull request #346 from okriuchykhin/ok_SCI_788
Preserve scroll position in the samples columns dropdown when reordering [SCI-788]
2016-12-14 14:19:15 +01:00
Zmago Devetak
ef4ae1abcb Merge pull request #348 from ZmagoD/zd_SCI_785
fixes samples table dropdown edit mode [fixes SCI-785]
2016-12-14 13:37:09 +01:00
zmagod
1ff98bb6df adds tooltip to samples dropdown and column names 2016-12-14 13:36:10 +01:00
Oleksii Kriuchykhin
9f439cf183 Hide dropdown when user interacts with samples table [SCI-793] 2016-12-13 17:25:01 +01:00
zmagod
d9971b4502 adds error message in samples table dropdown [fixes SCI-789] 2016-12-13 17:08:19 +01:00
Oleksii Kriuchykhin
e414af2fc3 Fix columns ordering when deleting custom fields [SCI-783] 2016-12-13 16:21:17 +01:00
zmagod
fa19bf1de7 fixes samples table dropdown edit mode [fixes SCI-785] 2016-12-13 15:43:31 +01:00
zmagod
2426539715 fixes long names in columns dropdown [fixes SCI-784] 2016-12-13 14:54:37 +01:00
zmagod
c960230bf0 fixes dropdown height bug [fixes SCI-787] 2016-12-13 11:35:50 +01:00
Oleksii Kriuchykhin
de12fac767 Preserve scroll position in the samples coluns dropdown when reordering [SCI_788] 2016-12-13 11:25:35 +01:00
zmagod
8dd8a7e7cd Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777 2016-12-12 15:52:25 +01:00
zmagod
5176f8b459 clean unneeded code [fixes SCI-778] refactor js 2016-12-12 15:40:13 +01:00
Luka Murn
d30a9780f4 Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
2016-12-12 09:57:37 +01:00
okriuchykhin
420daf3a6a Merge pull request #344 from okriuchykhin/ok_SCI_779
Fix adding new samples columns [SCI-779]
2016-12-12 09:29:27 +01:00
Oleksii Kriuchykhin
435a8d20bb Fix columns visability and reordering bug [SCI-779] 2016-12-09 17:37:22 +01:00
Matej Zrimšek
54de13de82 Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701] 2016-12-09 17:22:09 +01:00
Matej Zrimšek
0b12c87b09 Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701] 2016-12-09 16:44:50 +01:00
Oleksii Kriuchykhin
460ca067a2 Fix adding new samples columns [SCI-779] 2016-12-09 16:07:41 +01:00
Oleksii Kriuchykhin
274fd63a41 Initial code commit [SCI-779] 2016-12-09 15:21:26 +01:00
Luka Murn
8a55ef29e4 Remove unused code
Closes SCI-711.
2016-12-09 13:49:19 +01:00
Luka Murn
1a8b141b95 Add delete custom field functionality 2016-12-09 13:49:19 +01:00
Luka Murn
7e32c13d27 Fix edit & delete functionality so it works with draggable 2016-12-09 13:18:59 +01:00
Luka Murn
754c90b612 Edit functionality now works 2016-12-09 13:18:59 +01:00
Luka Murn
54ebdbb06c Update edit mode JS & CSS 2016-12-09 13:18:59 +01:00
Luka Murn
da630ac2cb Make edit, delete buttons clickable & hide them if neccesary 2016-12-09 13:18:59 +01:00
Matej Zrimšek
aea679ec11 Added links for creating new sample type and group when creating new sample. [fixes SCI-701] 2016-12-09 11:39:12 +01:00
Mojca Lorber
0e3526c9ad Merge branch 'mlorb-ml-sci-696' into improved-sample-table
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
2016-12-08 15:44:50 +01:00
Mojca Lorber
1b2a438ed4 remove fixed columns 2016-12-08 15:24:54 +01:00
Mojca Lorber
7d88e247fc refactoring 2016-12-08 14:41:35 +01:00
Mojca Lorber
5b5342de6f make first column fixed 2016-12-07 15:02:18 +01:00
okriuchykhin
cb2abfa7a9 Merge pull request #325 from okriuchykhin/ok_SCI_712
Added form for adding new columns to samples table into dropdown [SCI-712]
2016-12-06 15:00:01 +01:00
Zmago Devetak
49f9e64171 Merge pull request #333 from ZmagoD/zd_SCI_700
Managing sample groups tab
2016-12-06 14:51:09 +01:00
Oleksii Kriuchykhin
e02d780e44 Added Enter key handling and fixed error reporting [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
da7e86c7c2 Fix save/delete buttons after updating datatable and added permissions check [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
f6dd64772a Add columns to samples table without page reload [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
40db8310fd Move code to sample_datatable.js and removed unused modal [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
22dabd2177 Added form for adding new columns to samples table into dropdown [SCI-712] 2016-12-06 13:17:05 +01:00
Oleksii Kriuchykhin
94866e8994 Initial code commit for samples columns dropdown [SCI-712] 2016-12-06 13:16:05 +01:00
Mojca Lorber
1bc0ca9e75 fix bug with first time load 2016-12-06 13:14:29 +01:00
zmagod
787b8b1600 fixed new sample type/group form 2016-12-06 12:01:02 +01:00