scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
11941 commits 69 branches 179 tags 165 MiB
Commit graph

224 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 3b90225c5a Add new permission checking logic [SCI-5436] 2021-02-22 11:55:48 +01:00
Oleksii Kriuchykhin 1e3e701788 Add models for new permissions objects [SCI-5434] 2021-02-04 14:08:20 +01:00
Alex Kriuchykhin a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341 
Fix restore action for experiments and tasks [SCI-5341]
 2021-01-05 10:09:39 +01:00
Oleksii Kriuchykhin 58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +01:00
Oleksii Kriuchykhin 0cb221609a Fix global activities page [SCI-5324] 2020-12-27 22:05:15 +01:00
Oleksii Kriuchykhin 67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Miha Mencin ba3db65437
Merge pull request #3008 from okriuchykhin/ok_SCI_5273 
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
 2020-12-17 09:44:40 +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
Oleksii Kriuchykhin 62374bee0a Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253] 2020-12-07 11:04:33 +01:00
aignatov-bio 04624692d3 [SCI-5260] Add afterward and backward actions to consequence 2020-12-01 15:07:01 +01:00
aignatov-bio ad960d801d [SCI-5260] Fix markup 2020-11-30 15:20:02 +01:00
aignatov-bio 99ad705d82 [SCI-5260] Fix markup 2020-11-30 15:18:46 +01:00
aignatov-bio 0620da99de [SCI-5260] Add direction condition for status consequences 2020-11-30 12:28:29 +01:00
aignatov-bio da4b8aaf2f Add comments list 2020-11-20 12:29:40 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Urban Rotnik 3de2aee921
Merge pull request #2864 from urbanrotnik/ur-sci-4993 
Assign user to cloned experiment [SCI-4993]
 2020-09-23 13:37:07 +02:00
aignatov-bio 0865802255
Merge pull request #2853 from aignatov-bio/ai-sci-5024-disable-autostrip-on-status-change 
Disable autostrip attrbiutes on status change [SCI-5024]
 2020-09-23 13:18:07 +02:00
Urban Rotnik 5be7a1b32d Assign user to cloned experiment 2020-09-23 11:31:18 +02:00
aignatov-bio bbfd4b1c02 Run autostrip when related field changed 2020-09-22 12:48:52 +02:00
Oleksii Kriuchykhin e456661a98 Fix task archiving and moving [SCI-5030] 2020-09-17 17:15:41 +02:00
aignatov-bio ec9446d0cb Disable autostrip attrbiutes on status change 2020-09-17 15:26:48 +02:00
Oleksii Kriuchykhin ff1476d46a Fix status consequences execution order [SCI-5004] 2020-09-16 13:45:58 +02:00
Oleksii Kriuchykhin 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio 687093e110
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks 
Add completed/uncompleted methods to my_module [SCI-4972]
 2020-09-09 08:20:36 +02:00
aignatov-bio 4083ed1755 Fix tests 2020-09-08 14:52:23 +02:00
aignatov-bio e1255bf942 Remove duplicate action 2020-09-08 09:50:26 +02:00
aignatov-bio 0be99c12c2 revert changes 2020-09-08 09:45:42 +02:00
aignatov-bio ee333a982a Revert back state logic 2020-09-08 09:45:42 +02:00
aignatov-bio bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00
aignatov-bio f2ffe17636 Skip implications for my_module canvas position update 2020-09-07 13:05:26 +02:00
aignatov-bio e1229f5606 Fix test and status validations 2020-09-01 14:49:58 +02:00
aignatov-bio ce84c1546b Fix tests 2020-09-01 12:41:00 +02:00
aignatov-bio 9ff5e8bd7d Add task state change error handling and validation 2020-09-01 12:41:00 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik 8b0b296b90
Merge pull request #2774 from okriuchykhin/ok_SCI_4829 
Add task status to export all [SCI-4829]
 2020-08-31 11:13:44 +02:00
Alex Kriuchykhin 5006173d59
Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard 
Add new statuses to dashboard [SCI-4856]
 2020-08-24 11:09:57 +02:00
Oleksii Kriuchykhin e6e47f5106 Fix failing tests [SCI-4829] 2020-08-21 11:58:12 +02:00
aignatov-bio 56ff4e7702 Add new statuses to dashboard 2020-08-10 09:10:56 +02:00
Oleksii Kriuchykhin 02a4da1a55 Add task status to export all [SCI-4829] 2020-08-06 10:50:11 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Oleksii Kriuchykhin fa62b33a42 Add status implications checks to the permissions [SCI-4825] 2020-07-21 16:00:09 +02:00
Oleksii Kriuchykhin 7fd004baa8 Prepare database structure and relations for statuses phase one [SCI-4825] 2020-07-17 18:04:09 +02:00
Oleksii Kriuchykhin aa38d92982 Improve completed_on generation for steps/my_modules [SCI-4776] 2020-07-07 09:34:51 +02:00
Oleksii Kriuchykhin dc481cf236 Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776] 2020-07-03 16:48:29 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik d5b82f857e Add tag for DOCX 2020-06-18 08:52:59 +02:00
Urban Rotnik 868c1c1fa0 Improve row state passing 2020-06-15 13:42:16 +02:00
Urban Rotnik 9bac0fb867 Add archived tags to assigned repository rows 2020-06-10 14:48:03 +02:00
Urban Rotnik c2ecc1749e Fix assigned items counter 2020-06-04 15:36:31 +02:00
Alex Kriuchykhin b688b0c335
Merge pull request #2616 from okriuchykhin/ok_SCI_4698_v2 
Fix handling of deleted repositories in reports [SCI-4698]
 2020-05-29 16:51:17 +02:00
Oleksii Kriuchykhin 8027cc6a49 Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712] 2020-05-28 16:15:05 +02:00
Oleksii Kriuchykhin b430d507cf Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 12:15:19 +02:00
Alex Kriuchykhin 8ed8f148a3 Revert "Fix handling of deleted repositories in reports [SCI-4698]" 2020-05-27 10:39:44 +02:00
Oleksii Kriuchykhin 6424bd23da Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 08:21:55 +02:00
Urban Rotnik d9690115f8 Move refresh reference from controller to model 2020-05-25 13:19:34 +02:00
Urban Rotnik df8fe20d03 Keep reportElements up to date with active snapshots and repositories 2020-05-25 13:19:33 +02:00
Urban Rotnik 359517eb17 Add deleted repositories to report 2020-05-25 13:19:30 +02:00
Urban Rotnik 2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
Urban Rotnik 9536939b3b Show snapshot rows in report 2020-05-25 13:19:28 +02:00
Oleksii Kriuchykhin c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
Oleksii Kriuchykhin 9c70fa1990 Fix code style [SCI-4596] 2020-05-13 18:00:58 +02:00
Oleksii Kriuchykhin ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
aignatov-bio 8076d8f464 Create helper for partial 2020-05-07 12:51:18 +02:00
aignatov-bio b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
aignatov-bio 0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
aignatov-bio 10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Oleksii Kriuchykhin 837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin 3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
Oleksii Kriuchykhin a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
aignatov-bio 9a64ebdfd0 Update sql and add accordion effect 2020-04-03 13:15:56 +02:00
aignatov-bio dd3f2cb219 Update my_module assigned repository method 2020-04-03 12:33:42 +02:00
aignatov-bio 9678372dd5 Add assigned repositories list 2020-04-02 12:05:07 +02:00
aignatov-bio 4c33abff05 Assign user after task created 2020-03-30 15:16:14 +02:00
Oleksii Kriuchykhin a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
aignatov-bio eb4a783337 Fix task visibility for current task widget 2020-03-03 13:13:46 +01:00
Oleksii Kriuchykhin 78ceb41a9e Improve loading of tasks statistics for dashboard [SCI-4356] 2020-02-28 16:17:32 +01:00
Miha Mencin 1fd876bb40
Merge pull request #2425 from mlorb/ml-sci-4348 
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
 2020-02-28 12:11:31 +01:00
Mojca Lorber 3c09923d96 Refactoring current tasks backend 2020-02-28 11:51:08 +01:00
Mojca Lorber 415721112a Optimize completed_steps_percentage 2020-02-27 17:12:31 +01:00
Mojca Lorber 9bd2e8bec4 Dashboard current tasks visual layout and backend 2020-02-21 10:41:42 +01:00
aignatov-bio cf4dbd5ff4 Add calendar widget 2020-02-20 17:02:38 +01:00
Urban Rotnik 507443ba38 Add custom method for repository report JSON data 2020-01-16 14:42:26 +01:00
aignatov-bio 43ff9f6f26 Fix experiment copy 2019-12-02 15:34:42 +01:00
Urban Rotnik dcfca76602 Update method 'update_canvas' to work with new DB constraint 2019-11-18 11:11:41 +01:00
Urban Rotnik b8bf7bbd9b Rename validation 2019-11-18 11:11:40 +01:00
Urban Rotnik 43e3763ec8 Update x, y, experiment unqiue validation 
[SCI-3887]
 2019-11-18 11:11:40 +01:00
Urban Rotnik 24033bec7a Add API endpoint for Task creation 2019-11-18 11:11:37 +01:00
Urban Rotnik 7802d5ee8b Add uniq validation for x and y position scoped to experiment 2019-11-18 11:11:36 +01:00
Oleksii Kriuchykhin 53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Anton Ignatov 646107a35b Fix error on task copy 2019-09-23 16:33:57 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Jure Grabnar bbdc5ce6c3 Remove couple of Samples related logic/comments 2019-08-05 14:09:13 +02:00
Anton Ignatov 84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Luka Murn 83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
aignatov-bio 2793777463
Features/docx report (#1873) 
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
 2019-07-01 10:14:16 +02:00
Oleksii Kriuchykhin a3f5974dbd Update limits for new rich text enabled fileds [SCI-3264] 2019-04-24 13:37:22 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00