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 |
|
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 |
|
Luka Murn
|
5beaa26224
|
Update utils.js
Closes SCI-811.
|
2016-12-22 10:03:00 +01:00 |
|
Oleksii Kriuchykhin
|
ee5e0ad455
|
Fix flash message display in samples table [SCI-816]
|
2016-12-21 17:26:33 +01:00 |
|
Luka Murn
|
af6bf2aee1
|
Fix jQuery selector, make it work for new samples
|
2016-12-21 16:23:09 +01:00 |
|
Luka Murn
|
e52277bdad
|
Fix sample types & groups when editing sample in samples table
Closes SCI-811.
|
2016-12-21 13:15:55 +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
|
c8631077df
|
Merge pull request #361 from biosistemika/improved-sample-table
Improved sample table
|
2016-12-16 15:37:54 +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
|
b35744d18e
|
Merge pull request #360 from ZmagoD/zd_update_gemfile
updated gemfile
|
2016-12-16 11:53:05 +01:00 |
|
zmagod
|
897e34a23b
|
reinitialize highlight.js after ajax call
|
2016-12-16 11:44:42 +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 |
|
Zmago Devetak
|
daee14bed5
|
Merge pull request #343 from ZmagoD/zd_SCI_780
fixed step description links [fixes SCI-780]
|
2016-12-15 13:12:25 +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 |
|
zmagod
|
50c9dd3f59
|
fixed typo
|
2016-12-14 14:40:56 +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 |
|
Zmago Devetak
|
d54007f69c
|
Merge pull request #337 from ZmagoD/zd_SCI_740
limits max size of all uploaded files at the one time
|
2016-12-13 09:04:14 +01:00 |
|
zmagod
|
b56913cc87
|
refactor
|
2016-12-12 16:21:38 +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 |
|
zmagod
|
e23be6cc0e
|
fixed step description links [fixes SCI-780]
|
2016-12-09 15:26: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 |
|
zmagod
|
9f1e436623
|
limits max size of all uploaded files at the one time [fixes SCI-740]
|
2016-12-07 09:02:04 +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 |
|
zmagod
|
8ca7151df4
|
added constant to load_from_file_size_error local
|
2016-12-06 13:52:07 +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 |
|
Mojca Lorber
|
12088ebfd3
|
add visibility functionality after refresh
|
2016-12-06 09:40:28 +01:00 |
|
Mojca Lorber
|
849f78b4df
|
implement reordering of columns in the samples table and change from local to database storage
|
2016-12-05 11:34:36 +01:00 |
|
zmagod
|
ef2471d3f7
|
fixes inport eln error message and spinner [fixes SCI-752]
|
2016-12-05 10:44:58 +01:00 |
|
zmagod
|
7725374c42
|
refactor sample types/groups [fixes SCI-700]
|
2016-12-02 09:58:35 +01:00 |
|
zmagod
|
83aae59eed
|
adds sample groups index page
|
2016-12-02 09:33:09 +01:00 |
|
Zmago Devetak
|
33adb58950
|
Merge pull request #328 from ZmagoD/zd_SCI_699
Managing sample types tab
|
2016-11-30 16:14:13 +01:00 |
|
Oleksii Kriuchykhin
|
f51f33ec25
|
Added sorting functionality to samples colunmns dropdown [SCI-695]
|
2016-11-30 11:42:05 +01:00 |
|
zmagod
|
a2e13441e5
|
removes create_sample_type modal and related js actions
|
2016-11-30 09:02:34 +01:00 |
|
zmagod
|
4e4a48620c
|
adds validation to input fields
|
2016-11-29 18:08:29 +01:00 |
|
zmagod
|
12848f15fa
|
adds sample_type index view with all crud actions
|
2016-11-29 17:15:54 +01:00 |
|
Zmago Devetak
|
1e870a6e7c
|
Merge pull request #320 from ZmagoD/zd_SCI_698
adds new samples columns dropdown [fixes SCI-698]
|
2016-11-28 16:30:16 +01:00 |
|
zmagod
|
72d1dfb15e
|
cleanup sample_datatable.js
|
2016-11-28 16:28:22 +01:00 |
|