scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
14004 commits 31 branches 181 tags 166 MiB
Commit graph

249 commits

Author SHA1 Message Date
ajugo
e3cc9c9105
Update experiment name field [SCI-7539] (#4689) 2022-12-08 10:16:37 +01:00
ajugo
add6554732
Connect experiment options to the table view [SCI-7554] (#4692) 2022-12-07 14:51:48 +01:00
Giga Chubinidze
c9a6af8de4 logic update | removed automatic redirection 2022-12-06 22:06:34 +04:00
G-Chubinidze
d696128ae1
Merge branch 'features/new_experiment_views' into gc_SCI_7442 2022-12-06 20:15:14 +04:00
Giga Chubinidze
420ec69f20 BE: Column display switch (Task data display) [SCI-7442] 2022-12-06 17:51:11 +04:00
Giga Chubinidze
082745a3dc The View flyout in the Archived tasks view 2022-12-06 03:23:22 +04:00
ajugo
02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] (#4659) 
* Implement experiment table sort flyout [SCI-7451]

* Implement archive sort options for experiment table [SCI-7497]

* Fix hound [SCI-7451]

* Clean code for experiment table view sorting [SCI-7497]

* Fix hound [SCI-7451]
 2022-12-05 10:30:20 +01:00
aignatov-bio
7f87f850b3
Merge branch 'features/new_experiment_views' into ai-sci-7453-add-restore-task-to-experiment-table-view 2022-12-02 13:37:39 +01:00
aignatov-bio
cd0af24a24
Merge pull request #4676 from aignatov-bio/ai-sci-7525-experiment-table-connect-actions-to-context-menu 
Experiment table connect task action in dropdown [SCI-7525]
 2022-12-02 13:36:01 +01:00
ajugo
8ff822c7e5
Implement due date column in experiment table view [SCI-7406] (#4646) 
* Implement due date column in experiment table view [SCI-7406]

* Fix due date [SCI-7406]

* Move text to translation [SCI-7406]

* Fix table due date partial [SCI-7406]

* Fix table due date partial [SCI-7406]
 2022-12-02 11:01:40 +01:00
Anton
12f141b82e Experiment table connect task action in dropdown [SCI-7525] 2022-12-02 10:03:01 +01:00
artoscinote
4664ef1d9b
Implement task cloning in experiments table [SCI-7382] (#4653) 
* Implement task cloning in experiments table [SCI-7382]

* Fix provisioning status polling [SCI-7382]

* Remove unused method [SCI-7382]

* Fix linter issues [SCI-7382]

* Fix fetching last clone number [SCI-7382]

* Fixing experiment duplication [SCI-7382]

* Add truncation to cloned name [SCI-7382]

* Add readable scope to batch clone action [SCI-7382]

* Move 'Clone' to translations, simplify JS [SCI-7382]
 2022-12-01 15:08:59 +01:00
Oleksii Kriuchykhin
b032cfbd35 Add task moving action to experiment table view [SCI-7381] 2022-12-01 13:33:07 +01:00
aignatov-bio
bd0ac95307
Merge pull request #4669 from aignatov-bio/ai-sci-7510-finish-user-assignment-modal 
Finish user assignment for experiment table [SCI-7510]
 2022-12-01 12:59:30 +01:00
G-Chubinidze
2d04357ba8
Merge pull request #4668 from G-Chubinidze/gc_SCI_7494 
Archived table view filters update [SCI-7494]
 2022-12-01 12:32:41 +04:00
Giga Chubinidze
b2bbea5b62 explicit if statement 2022-11-30 20:25:22 +04:00
Anton
234c4dfaeb Finish user assignment for experiment table [SCI-7510] 2022-11-30 15:04:02 +01:00
Giga Chubinidze
8e78938b02 Archived table view filters update [SCI-7494] 2022-11-30 16:47:49 +04:00
Anton
2901c7b627 Add restore action to experiment table [SCI-7453] 2022-11-28 12:45:18 +01:00
Anton
e2cd0dfd91 Update archive module cards header [SCI-7493] 2022-11-25 15:29:15 +01:00
ajugo
80f66736b6
Add new task modal for experiment table view [SCI-7448] (#4638) 
* Add new task modal for experiment table view [SCI-7448]

* Fix placeholder and size of the icon [SCI-7448]

* Reload experiment table [SCI-7448]
 2022-11-24 14:49:42 +01:00
Anton
2e2086a03b Add archived view for experiment table [SCI-7452] 2022-11-24 12:07:52 +01:00
Anton
440800537c Add menu to experiment table row [SCI-7446] 2022-11-23 15:05:13 +01:00
Oleksii Kriuchykhin
49fbc2c561 Add basic modal for direct task creation [SCI-7197] 2022-11-18 17:00:11 +01:00
Anton
85c00c61e0 Add table columns display modal to experiment table [SCI-7441] 2022-11-16 09:54:12 +01:00
Anton
7523535e24 Add archive action to experiment table [SCI-7384] 2022-11-14 11:31:53 +01:00
Anton
0a87513458 Add edit modal to experiment table [SCI-7383] 2022-11-11 11:24:23 +01:00
Anton
63ce422367 Add basic filters for experiment table [SCI-7215] 2022-11-09 15:27:39 +01:00
Anton
a17cd78c20 Add view dropdown to experiment screen 2022-11-08 16:39:52 +01:00
Anton
7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +01:00
ajugo
dd22d53bda
Implemented pagination for experiment table [SCI-7214] (#4591) 
* Implement pagination for experiment table [SCI-7214]

* Fix table experiment pagination [SCI-7214]

* Move pagination to service [SCI-7214]
 2022-11-07 11:46:54 +01:00
Anton
bacd3524e8 Add tags manager to experiment table view [SCI-7368] 2022-11-02 15:17:10 +01:00
ajugo
fedaf703d4
Add view button to experiment title bar [SCI-7216] (#4579) 2022-10-27 09:53:01 +02:00
Anton
bc86f11404 Add experiment table view [SCI-7174] 2022-10-21 12:22:38 +02:00
Anton
2ae8943d80 Update general canvas layout [SCI-7196] 2022-10-19 11:46:16 +02:00
ajugo
bacb1547f2
Changed clone permissions and UI changes for experiment actions [SCI-6756] (#4074) 2022-05-25 10:22:50 +02:00
artoscinote
945fd31538
Move modal copy and design fix [SCI-6248] (#3663) 2021-11-15 12:50:50 +01:00
aignatov-bio
d3e178e5a2
Small CSS fixes for permissions [SCI-6207] (#3638) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 09:26:22 +01:00
aignatov-bio
22034089a6
Update experiment move service [SCI-6149] (#3599) 
* Update experiment move service [SCI-6149]

* Move permission check to helper [SCI-6149]

Co-authored-by: Anton <anton@scinote.net>
 2021-10-27 13:48:52 +02:00
artoscinote
895509a26c
Merge pull request #3543 from artoscinote/ma_SCI_6056 
Reworked MyModule permissions [SCI-6056]
 2021-09-17 15:19:01 +02:00
Oleksii Kriuchykhin
61d4a96a3f Update/implement permission checks in the experiments controller [SCI-6057] 2021-09-16 09:55:59 +02:00
Martin Artnik
e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
aignatov-bio
e4256342d9 Fix smart annotation in experiment details modal [SCI-5583] 2021-03-22 15:36:10 +01:00
Urban Rotnik
401224ae11 Add breadcrumbs on Experiments and Tasks pages 2021-03-04 09:00:58 +01:00
aignatov-bio
171468444d Fix method on experiment archive action 2021-02-16 12:55:41 +01:00
Urban Rotnik
4cd2bce83f Fix Move button on Experiment card 2021-02-11 18:38:23 +01:00
aignatov-bio
9d3d1f8eac Connect toolbar actions to buttons [SCI-5465] 2021-02-09 15:47:15 +01:00
Oleksii Kriuchykhin
c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
aignatov-bio
276d6abe19
Update archive navigation for tasks page [SCI-5347] (#3052) 
* Update archive navigation for tasks page [SCI-5347]
 2021-01-07 17:18:52 +01:00
Oleksii Kriuchykhin
58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +01:00
Oleksii Kriuchykhin
f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +01:00
Urban Rotnik
3eb667b6ba
Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards 
Archived tasks cards [SCI-5274] [SCI-5275]
 2020-12-17 13:17:11 +01:00
Urban Rotnik
19f16555c6 Add checkbox and restore button 
[SCI-5275]
 2020-12-17 13:11:20 +01:00
Urban Rotnik
9a7ffb0645 Add Tags modal to archived tags screen 
[SCI-5274]
 2020-12-17 13:08:57 +01:00
Urban Rotnik
2ae075e893 Use canvas task card for archived task card 
[SCI-5274]
 2020-12-17 13:08:53 +01:00
aignatov-bio
2ca7b81cea
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) 
* Change experiment archived card [SCI-5270]
 2020-12-17 13:07:30 +01:00
Oleksii Kriuchykhin
94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +01:00
Mojca Lorber
5cdab422df Update layout of the navigation for experiments, tasks list and task page 2020-12-10 15:15:36 +01:00
Oleksii Kriuchykhin
dc15accc86 Update sidebar usages in partials [SCI-5177] 2020-12-03 10:21:53 +01:00
Oleksii Kriuchykhin
9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik
8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
aignatov-bio
d93095b489 Fix markup 2020-01-06 10:40:20 +01:00
aignatov-bio
a281f09e7f Add reports and missed modals 2020-01-06 10:40:20 +01:00
aignatov-bio
ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
1128fedc51 Refactor title inline editing permission checking [SCI-3471] 2019-05-20 13:13:31 +02:00
Oleksii Kriuchykhin
2ef926e795 Add permission checking to inline editor fields [SCI-3468] 2019-05-15 17:47:09 +02:00
aignatov-bio
b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) 
* Adding inline editing to experiment title, project title and task title
 2019-03-06 09:17:34 +01:00
mz3944
79d35de794
Merge pull request #1435 from mz3944/mz-SCI-2912 
An error at archiving experiment with locked task [SCI-2912]
 2019-01-24 05:27:58 +01:00
Oleksii Kriuchykhin
3a4b992f4e Code style fixies []SCI-2875] 2019-01-14 16:31:23 +01:00
Oleksii Kriuchykhin
89240659a7 Fix task tags update on canvas cards [SCI-2875] 2019-01-11 17:20:39 +01:00
Matej Zrimšek
c84457e1ed Prevent archiving of experiments with at least one locked task 2018-12-23 21:17:51 +01:00
Oleksii Kriuchykhin
60a19734b2 Enable caching for navigation sidebar [SCI-2757] 2018-11-29 11:28:36 +01:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
8c492e1491 started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute 2018-08-17 16:03:49 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
zmagod
185657c626 adds missing js in experiment canvas view [fixes SCI-2581] 2018-07-05 14:36:54 +02:00
Luka Murn
9a4fdd166e Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix 
Conflicts:
	app/views/projects/index.html.erb
 2018-06-12 17:44:42 +02:00
Luka Murn
0417af716b Remove new experiment button from canvas, change edit canvas btn 2018-06-06 17:41:07 +02:00
zmagod
43a60b632a adds datahook to experiment card [fixes SCI-2373] 2018-06-06 17:28:04 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
mlorb
ed27a7a62a some extra restyling/unifying off app 2018-05-11 18:02:17 +02:00
mlorb
7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
mlorb
d2c0ae241e
Merge pull request #1121 from mlorb/ml-sci-2244 
Update buttons positions and wording throughout app [SCI-2244]
 2018-05-03 11:05:15 +02:00
mlorb
9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
zmagod
503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +02:00
Matej Zrimšek
5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
Matej Zrimšek
0706d16020 Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places. 2018-02-14 14:19:22 +01:00
Matej Zrimšek
d6e7ef465c Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964] 2018-02-14 14:19:22 +01:00
Matej Zrimšek
854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
Matej Zrimšek
13e9a2a132 Corrected some project level permissions; minor refactoring. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
Oleksii Kriuchykhin
c4fe2b1c11 Fix jsPlumb library loading [SCI-1839] 2017-12-01 10:48:07 +01:00
Oleksii Kriuchykhin
6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
Mojca Lorber
f8f6a5f63a fix bug edit canvas not working and fix positioning of cloned task/workflow 2017-05-04 10:54:50 +02:00
Matej Zrimšek
a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +02:00
Luka Murn
53699193a2 Merge branch 'smart-annotations' 
Conflicts:
	app/assets/javascripts/comments.js.erb
	app/assets/javascripts/protocols/index.js
	app/assets/javascripts/protocols/steps.js.erb
	app/assets/javascripts/samples/sample_datatable.js.erb
	app/controllers/my_module_comments_controller.rb
	app/controllers/project_comments_controller.rb
	app/controllers/result_comments_controller.rb
	app/controllers/step_comments_controller.rb
	app/datatables/sample_datatable.rb
	app/views/my_module_comments/_comment.html.erb
	app/views/project_comments/_comment.html.erb
	app/views/projects/show/_experiment.html.erb
	app/views/reports/elements/_experiment_element.html.erb
	app/views/reports/elements/_result_comments_element.html.erb
	app/views/reports/elements/_result_text_element.html.erb
	app/views/reports/elements/_step_checklist_element.html.erb
	app/views/reports/elements/_step_comments_element.html.erb
	app/views/reports/elements/_step_element.html.erb
	app/views/result_comments/_comment.html.erb
	app/views/results/_result_text.html.erb
	app/views/step_comments/_comment.html.erb
	app/views/steps/_step.html.erb
	db/schema.rb
 2017-01-24 14:33:23 +01:00
okriuchykhin
02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
Oleksii Kriuchykhin
75031e17b9 Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin
0350f2f792 Add html escaping to name filelds in the views [SCI-102] 2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin
0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
zmagod
3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
Matej Zrimšek
4b0f47675a Fixes experiment button not being clicable in project overview page. [SCI-849] 2017-01-05 14:42:52 +01:00
Luka Murn
26d04b1f3c Merge branch 'rich-text-formatting' into 'master' 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
 2016-11-17 16:39:33 +01:00
Luka Murn
a3bbf94643 Add a smart_text_area tag & implement it throughout application 
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
 2016-11-16 17:57:01 +01:00
Oleksii Kriuchykhin
b9f982ead7 Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin
a3b00d0ff8 Fixes issue with zoom buttons on canvas [fixes SCI-451] 2016-09-16 16:27:54 +02:00
Zmago Devetak
d37c7b853b Merge pull request #140 from ZmagoD/zd_SCI_341 
adds label to current project in clone experiment modal [fixes SCI-341]
 2016-09-13 11:59:01 +02:00
Zmago Devetak
1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
mlorb
f4029a04fd Merge pull request #142 from mlorb/ml_sci_415 
fixes navbar size when resizing window [SCI-415]
 2016-09-08 12:46:36 +02:00
Mojca Lorber
302a777615 fixes button collision 2016-09-08 12:37:06 +02:00
zmagod
d482dff2e6 adds label to current project in clone experiment modal [fixes SCI-341] 2016-09-07 08:26:36 +02:00
zmagod
b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod
9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
zmagod
de6c03a73b setup experiment modal input validation 2016-09-06 11:44:03 +02:00
Zmago Devetak
9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
Mojca Lorber
47983812e7 minimize buttons on mobile phone 2016-09-06 10:10:49 +02:00
zmagod
667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
zmagod
d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
mlorb
c38a4e2614 Merge pull request #94 from mlorb/ml_sci_375 
add move experiment instructions [SCI-375]
 2016-08-25 09:45:16 +02:00
mlorb
0a066f436f Merge pull request #96 from mlorb/ml_sci_369 
buttons update on experiment overview [SCI-369]
 2016-08-25 08:54:16 +02:00
zmagod
dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Mojca Lorber
2a897432e1 update buttons on canvas view 2016-08-24 17:00:27 +02:00
Mojca Lorber
0558d49e26 buttons update on experiment overview 2016-08-24 13:50:25 +02:00
Mojca Lorber
f554dc6018 add move experiment instructions 2016-08-24 11:36:50 +02:00
Jure Grabnar
3e5e9aed22 Fix 404 on move experiment 
[fixes SCI-378]
 2016-08-24 11:09:03 +02:00
zmagod
cc2ed32ccb fixes canvas bug when no actions are available for the viewer 2016-08-17 13:29:22 +02:00
Jure Grabnar
275106c27c Add check for empty projects on move experiments 2016-08-16 10:20:36 +02:00
Jure Grabnar
e55c66b3d0 Add query for moveable projects 2016-08-16 08:47:04 +02:00
Jure Grabnar
c387439fb2 Fix projects query for experiments 
Remove unneeded word in view
 2016-08-12 11:36:52 +02:00
Jure Grabnar
d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
Jure Grabnar
555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
Jure Grabnar
9173c83502 Select current project in clone modal 2016-08-11 17:20:06 +02:00
Jure Grabnar
5c40d04eb2 Add missing clone modal 2016-08-11 16:59:56 +02:00
Jure Grabnar
a0fe31479f Fix permissions for archived experiments 2016-08-09 10:00:44 +02:00
Jure Grabnar
2bd74866e0 Fix my_modules archive page 2016-08-08 15:04:02 +02:00
zmagod
04d171997e Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41 2016-08-05 15:56:21 +02:00
zmagod
9c5c4f0a3a Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44 2016-08-05 15:23:01 +02:00
zmagod
a4ec558596 start to implement project overview page 2016-08-04 12:57:33 +02:00
zmagod
caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
zmagod
9581e2751f fixes samples page for experiment level [fixes SCI-44] 2016-08-02 08:44:07 +02:00
Luka Murn
b64e200b91 Refactor canvas a lot. 
Also refactor localization files concerning canvas.
 2016-07-28 16:41:10 +02:00
zmagod
e95f518964 refactor canvas_controller, experiments_controller 2016-07-28 16:01:53 +02:00
zmagod
352944fc33 added new/edit experiment modals 2016-07-28 14:44:44 +02:00
zmagod
54c4051906 added canvas under experiments 2016-07-28 09:01:44 +02:00