Commit graph

926 commits

Author SHA1 Message Date
Matej Zrimšek
f847b44067 Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin
fc72453a5b Fix hound warning [SCI-1356] 2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin
e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
Zmago Devetak
cffac82e88 Merge pull request #704 from ZmagoD/zd_SCI_1392
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 17:47:15 +02:00
zmagod
1690d8ebe3 removed reload on hide modal 2017-06-22 16:47:50 +02:00
zmagod
a2e1aa5b36 fixes bug with long text in parse records modal [fixes SCI-1392] 2017-06-22 14:43:01 +02:00
Mojca Lorber
1ba32e19cb allign no. of pages and showing entries per page 2017-06-22 14:23:03 +02:00
zmagod
28129ebb73 refactor 2017-06-21 17:39:20 +02:00
zmagod
bad52ceff1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336 2017-06-21 15:56:07 +02:00
mz3944
568e41f5fa Merge pull request #701 from mz3944/mz-SCI-1383
Removed empty first column of repository export file [SCI-1383]
2017-06-21 10:57:46 +02:00
mz3944
d19bfc8fd8 Merge pull request #700 from mz3944/mz-SCI-1386
Fixed tooltip not showing on mouse over truncated cell text [SCI-1386]
2017-06-21 10:40:37 +02:00
Matej Zrimšek
47407ef40c Removed empty first column of repository export file. [SCI-1383] 2017-06-20 18:40:41 +02:00
Matej Zrimšek
ce97d18e78 Fixed tooltip not showing on mouse over truncated cell text. [SCI-1386] 2017-06-20 17:51:51 +02:00
Matej Zrimšek
d49524a26f Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378] 2017-06-20 16:10:50 +02:00
mlorb
14429a270c Merge pull request #689 from mlorb/ml_sci_1354
Truncate and display text in tooltip in custom repository fields [SCI-1354]
2017-06-19 15:50:38 +02:00
Mojca Lorber
730c4738d5 fix tooltip in edit mode 2017-06-19 15:49:31 +02:00
Mojca Lorber
39dd6daabb small fixes 2017-06-19 15:30:38 +02:00
mlorb
122ac7971f Merge pull request #692 from mlorb/ml_sci_1348
Fix cog position on repositories page [SCI-1348]
2017-06-19 15:16:01 +02:00
mlorb
9a7669bf2a remove empty line 2017-06-19 15:15:27 +02:00
mlorb
ff02c45f5f Merge pull request #695 from mlorb/ml_sci_1353
Retain the same word case in repositories dropdown [SCI-1353]
2017-06-19 14:48:58 +02:00
zmagod
70fa681519 split the import service 2017-06-19 14:05:37 +02:00
Mojca Lorber
f77b1aa4e8 retain the same word case in repositories dropdown 2017-06-19 10:32:12 +02:00
Mojca Lorber
9b941fe374 fix flash when deleting samples of other users 2017-06-16 17:12:04 +02:00
Mojca Lorber
b6f146f177 fix cog position on repositories page 2017-06-16 11:54:31 +02:00
Oleksii Kriuchykhin
94d74b8101 Make assigned column always visible in repositories [SCI-1346] 2017-06-16 11:47:41 +02:00
Mojca Lorber
a195c9a5af truncate and display text in tooltip in custom repository fields 2017-06-15 15:08:33 +02:00
zmagod
5d6fba7153 fixes bug with sorting columns [fixes SCI-1371] 2017-06-14 17:35:41 +02:00
zmagod
2d3b5f4308 refactor 2017-06-14 10:55:24 +02:00
okriuchykhin
da87a41c86 Merge pull request #680 from okriuchykhin/ok_SCI_1365
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-14 10:19:09 +02:00
zmagod
6dd85d6c39 fixes drag'n drop bug in results on safari [fixes SCI-1370] 2017-06-14 09:45:49 +02:00
zmagod
cee052fc19 added service object 2017-06-14 09:11:20 +02:00
Mojca Lorber
849b269d87 fix errors in repo table 2017-06-13 16:56:34 +02:00
Oleksii Kriuchykhin
2e98433abc Remove row selection after assign/unassign in repositories [SCI-1365] 2017-06-13 16:56:28 +02:00
Zmago Devetak
f3f1a68070 Merge pull request #667 from ZmagoD/zd_SCI_1338
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-13 09:33:04 +02:00
okriuchykhin
d88de4009a Merge pull request #674 from okriuchykhin/ok_SCI_1346
Fix reordering columns to the first position [SCI-1346]
2017-06-13 09:01:10 +02:00
okriuchykhin
56c3b891a5 Merge pull request #673 from okriuchykhin/ok_SCI_1350
Fix row selection info after record deletion [SCI-1350]
2017-06-13 09:00:48 +02:00
okriuchykhin
05c77e7298 Merge pull request #672 from okriuchykhin/ok_SCI_1341
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-13 09:00:33 +02:00
Matej Zrimšek
e3db79b3cc Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275] 2017-06-12 17:49:42 +02:00
Oleksii Kriuchykhin
248fd7be06 Fix reordering columns to the first position [SCI-1346] 2017-06-12 17:16:49 +02:00
Oleksii Kriuchykhin
c081cda5f3 Fix row selection info after record deletion [SCI-1350] 2017-06-12 10:23:18 +02:00
Oleksii Kriuchykhin
aa42ca6b8b Fix row selecton after column reorder in repositories [SCI-1341] 2017-06-12 10:07:16 +02:00
Matej Zrimšek
514aa6214b Repository records minor JS refactoring. [SCI-1275] 2017-06-09 19:44:28 +02:00
Matej Zrimšek
29b721365a Moved export form to proper place in the code. [SCI-1275] 2017-06-09 19:44:28 +02:00
rekonder
4df8e1ffe3 Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository 2017-06-09 19:44:28 +02:00
rekonder
ede744849b Export repository [aj-SCI-1275] 2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee Merge pull request #671 from biosistemika/custom-repositories
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
zmagod
d1977d0773 fixes long column names in repository dropdown [fixes SCI-1338] 2017-06-09 11:42:38 +02:00
Zmago Devetak
4873624cec Merge pull request #658 from ZmagoD/zd_SCI_1011
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
zmagod
33b996ffee refactor 2017-06-09 09:49:57 +02:00
Luka Murn
7bb1af3692 Minor JS fix 2017-06-08 15:28:26 +02:00
Mojca Lorber
0004c2b7d5 fix selection of tab after redirection 2017-06-08 14:17:27 +02:00
Mojca Lorber
71c523c406 load tabs with javascript 2017-06-08 13:47:30 +02:00
Luka Murn
2ab31aba2f Merge pull request #660 from Ducz0r/lm-sci-1270
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
27feb46d8f Merge pull request #659 from Ducz0r/lm-sci-1279
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +02:00
Luka Murn
38361e4bb4 Setup initial GUI 2017-06-07 18:43:48 +02:00
Luka Murn
0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
Matej Zrimšek
77a225ec31 Added toggle between assigned and all repository records. [SCI-1276] 2017-06-07 18:13:25 +02:00
Luka Murn
02dd6636ba Allow saving & editing of reports with repository elements
Closes SCI-1279.
2017-06-07 16:55:00 +02:00
Luka Murn
b5f6d1da94 Allow custom repositories to be added to reports 2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin
ad8dd6d740 PR fixes [SCI-1274] 2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin
8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
Zmago Devetak
fcec42ae31 Merge pull request #645 from ZmagoD/zd_SCI_1278
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
c6bb20039b adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285] 2017-06-07 13:29:39 +02:00
Mojca Lorber
51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber
39dda1ad5d refactoring 2017-06-06 13:18:44 +02:00
ajugo
887d9a4f52 Samples - show all/show assigned [SCI-1277] (#644)
* Samples - show all/show assigned [SCI-1277]

* Some fixes in code

* Some minor fixes in code

* Omit present

* Correct missed present

* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
da98788031 small code fixes 2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Luka Murn
f382c04f01 Refactor JS code a bit
Closes SCI-1323.
2017-06-06 08:02:01 +02:00
Luka Murn
1712fc0611 Fix bug with protocol preview modal not working in protocol repo
Closes SCI-1323.
2017-06-05 17:10:13 +02:00
Matej Zrimšek
2c6ad4aa05 Refactored modal popups for repositories to make them general. [fix 1269] 2017-06-05 14:13:24 +02:00
zmagod
ab4961ddb1 adds overlay partial 2017-06-05 11:31:05 +02:00
zmagod
67d902db52 refactor 2017-06-05 10:43:58 +02:00
Matej Zrimšek
d8d54232c3 After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269] 2017-06-02 19:08:51 +02:00
Matej Zrimšek
c82fd66146 Removed unneeded utility JS function. [SCI-1269] 2017-06-02 17:52:04 +02:00
Matej Zrimšek
f8258812ef Repository remove and rename refactoring. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek
21a72da84f Added rename logic and improved remove logic. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek
cdaac6a01b Added remove repository modal logic. [SCI-1269] 2017-06-02 17:50:33 +02:00
Matej Zrimšek
791bb934ca Remove repository modal logic (WIP). [SCI-1269] 2017-06-02 17:50:33 +02:00
zmagod
1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +02:00
ajugo
a9bd86352d Step: wrong last columns of table [fixes SCI-405] (#600)
* Step: wrong last two columns of table after add table results [fixes SCI-405]

* Changing double quotes to single

* Adding empty line back
2017-06-01 15:52:02 +02:00
Luka Murn
fcc3995049 Merge pull request #647 from biosistemika/master
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
zmagod
b527afd12b generates samples csv file in background job [fixes SCI-1278] 2017-05-29 14:42:55 +02:00
Zmago Devetak
1df6265326 Merge pull request #627 from ZmagoD/zd_SCI_1280
prevent to duplicate new step [fixes SCI-1280]
2017-05-29 09:55:22 +02:00
zmagod
5806cb8e67 removes unneeded animateSpinner call 2017-05-29 09:10:11 +02:00
mz3944
9fe3b717c8 Merge pull request #626 from mz3944/mz-SCI-487
Simplify "Add contents to report" popup
2017-05-23 09:57:39 +02:00
Oleksii Kriuchykhin
e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
ajugo
1abaefce4f At importing large sample file, error flash message appears [fixes SCI-903] (#625)
* At importing large sample file, error flash message appears [fixes SCI-903]

* Changing double quotes to single

* Adding animatedSpinner
2017-05-18 09:19:44 +02:00
Matej Zrimšek
20265ddd69 Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487] 2017-05-17 18:18:57 +02:00
Oleksii Kriuchykhin
bbf6d38c50 Fix error handling in result_assets [SCI-1288] 2017-05-17 15:14:35 +02:00
zmagod
b21923cf98 prevent to duplicate new step [fixes SCI-1280] 2017-05-16 11:52:07 +02:00
Matej Zrimšek
79ec3b5e4c Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek
901558c733 Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek
ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek
b97cb91840 Refactoring of modal for adding content to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Matej Zrimšek
27cfd55ea5 Simplified popup modal for adding contents to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
zmagod
9bec7dd96e Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248 2017-05-15 14:49:37 +02:00
zmagod
d34b2520b5 refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248] 2017-05-12 15:59:58 +02:00
zmagod
070a829c49 change new results hendlers 2017-05-12 10:02:33 +02:00
zmagod
81a3cb0a41 adds results js code in modules 2017-05-11 16:54:28 +02:00