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

1077 commits

Author SHA1 Message Date
aignatov-bio
7313b5fa16
Add archived and deleted repositories to reports [SCI-5781] (#3387) 
* Add archived and deleted repositories to reports [SCI-5781]

* Small markup fix [SCI-5781]
 2021-06-16 10:56:08 +02:00
Martin Artnik
6cf9ea5bc0 Implement Activity -> ActivityFilter matching service [SCI-5800] 2021-06-15 16:13:28 +02:00
aignatov-bio
9103fcf356
Add project header to reports [SCI-5798] (#3380) 2021-06-14 12:42:18 +02:00
aignatov-bio
0e87c44c4f
Fix empty elements in docx rtf table [SCI-5659] (#3382) 2021-06-14 12:41:34 +02:00
zmagoD
25802d7043 adopt move/clone my module logic to work with new user assignments (SCI-5805) 2021-06-12 18:51:55 +02:00
Martin Artnik
c17192730e Lock repository_row before inserting RepositoryCell in SavePdfToInventoryItem [SCI-5794] 2021-06-09 15:44:38 +02:00
Miha Mencin
46e2adf2e3
Merge pull request #3334 from okriuchykhin/ok_SCI_5730 
Improve filtering for inventories [SCI-5730]
 2021-06-09 09:50:56 +02:00
Oleksii Kriuchykhin
16bad9eb9c Fix export all functionality [SCI-5776] 2021-06-08 14:21:34 +02:00
Miha Mencin
ef77c9d67d
Merge pull request #3363 from okriuchykhin/ok_SCI_5774 
Fix dates formatting in report templates [SCI-5774]
 2021-05-31 14:23:19 +02:00
Oleksii Kriuchykhin
92821d7f1e Fix dates formatting in report templates [SCI-5774] 2021-05-31 11:51:04 +02:00
Alex Kriuchykhin
cdbcbd0409
Merge pull request #3357 from okriuchykhin/ok_SCI_5751 
Fix deletion of old reports [SCI-5751]
 2021-05-28 13:59:36 +02:00
Oleksii Kriuchykhin
70f0535dbd Fix deletion of old reports [SCI-5751] 2021-05-27 16:31:58 +02:00
aignatov-bio
24f4f6cbb2 Fix report experiments sorting [SCI-5762] 2021-05-27 12:44:45 +02:00
Miha Mencin
30a116fc83
Merge pull request #3346 from okriuchykhin/ok_SCI_5735 
Refactor DOCX report generator [SCI-5735]
 2021-05-24 11:25:13 +02:00
aignatov-bio
f576af078e Fix repository selection in report wizard [SCI-5749] 2021-05-24 09:40:50 +02:00
Oleksii Kriuchykhin
64ce35c8da Refactor DOCX report generator [SCI-5735] 2021-05-21 16:40:38 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin
0ff1277dbf Improve filtering for inventories [SCI-5730] 2021-05-19 22:48:52 +02:00
zmagoD
c23c01c01c remove user projects enpoints, fix the role name display 2021-05-16 12:03:16 +02:00
Oleksii Kriuchykhin
c0ef2eef3c Improve report saving performance and error handling [SCI-5614] 2021-05-06 10:53:40 +02:00
Oleksii Kriuchykhin
1abc0dc1eb Fix tests [SCI-5636] 2021-05-03 13:03:26 +02:00
Oleksii Kriuchykhin
bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
aignatov-bio
7c75f170d0
Add repositories settings to report wizard [SCI-5648] (#3269) 
* Add repositories settings to report wizard [SCI-5648]

* Move repositories from report settings to content [SCI-5648]
 2021-04-28 09:54:00 +02:00
aignatov-bio
d18a54c874
Update create and update action for reports controller [SCI-5641] (#3260) 
Update create and update action [SCI-5641]
 2021-04-20 13:35:40 +02:00
Oleksii Kriuchykhin
fe8f006f6e Fix save report PDF to Inventory [SCI-5613] 2021-04-14 16:06:59 +02:00
Oleksii Kriuchykhin
0a9a656313 Add flash message and notification for generated reports [SCI-5552] 2021-04-14 15:45:51 +02:00
miha
56ebc3dc07 [SCI-5635] add a migration to fix broken steps, fix the api so it sets last_modified_by_id, minor step model refactor 
migration fix

remove the conditoin for set_last_modified_by callback

set the last_modified_by_id in before_save callback (in case it is not set yet)

remove trailing spaces

Set last modified in protocl import service
 2021-04-12 09:59:00 +02:00
Oleksii Kriuchykhin
f7c865974d Switch to graphviz gem [SCI-5596] 2021-03-25 17:42:57 +01:00
Oleksii Kriuchykhin
ab9fd65a19 Add basic API client for BMT [SCI-5531] 2021-03-12 10:53:10 +01:00
aignatov-bio
c6e4d6ef94 Fix activities multiple types selected [SCI-5546] 2021-03-10 12:59:02 +01:00
Urban Rotnik
8202181095
Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications 
Bring back old notifications [SCI-4140]
 2021-03-09 14:54:08 +01:00
Urban Rotnik
8bacc74c17
Merge pull request #3187 from urbanrotnik/ur-sci-5439 
Fix report completed_on time and username [SCI-5439]
 2021-03-09 13:27:24 +01:00
Oleksii Kriuchykhin
2b5709e75f Improve behavior of the scheduler, add caching to system notifications sync service [SCI-5526] 2021-03-02 17:28:07 +01:00
aignatov-bio
0c5a1a3e21 Fix tests [SCI-5528] 2021-02-26 16:29:56 +01:00
Urban Rotnik
8ca8c84efd Fix report completed_on time and username (partially) 
SCI-5439
We cannot realy on last_modified_by, because it can be changed after step completion
 2021-02-25 13:24:21 +01:00
Urban Rotnik
1bb2393655 Use translations 
SCI-4140
 2021-02-25 11:59:26 +01:00
Oleksii Kriuchykhin
e8b4a30b87 Improve inventory table loading speed [SCI-5509] 2021-02-22 10:34:06 +01:00
Alex Kriuchykhin
d3e960fe2b
Merge pull request #3173 from okriuchykhin/ok_SCI_5494 
Multiple small bugfixes [SCI-5494]
 2021-02-18 14:35:40 +01:00
Oleksii Kriuchykhin
7d89088b14 Multiple small bugfixes [SCI-5494] 2021-02-18 13:55:03 +01:00
Urban Rotnik
f29fd76822 Fix archived_on sorting 2021-02-18 09:42:17 +01:00
Urban Rotnik
933dcc93c7 Fix query with counts 2021-02-17 16:50:09 +01:00
aignatov-bio
4f8e15dbc6 Fix activities service [SCI-5485] 2021-02-15 10:23:32 +01:00
aignatov-bio
486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
Alex Kriuchykhin
1466ae114f
Merge pull request #3027 from okriuchykhin/ok_SCI_5246 
Remove Demo project and Samples inventory [SCI-5246][SCI-5248]
 2021-02-04 11:28:09 +01:00
Alex Kriuchykhin
dd9d75a643
Merge pull request #3130 from okriuchykhin/ok_SCI_5458 
Improve visibility of experiment workflow image [SCI-5458]
 2021-02-04 11:27:27 +01:00
aignatov-bio
7726eae4da Add experiments page load logic and connect filters [SCI-5457] 2021-02-03 14:29:50 +01:00
Miha Mencin
259d7d5e7c
Merge pull request #3132 from biosistemika/release/1.21.1 
Release/1.21.1
 2021-02-03 11:49:04 +01:00
Oleksii Kriuchykhin
58ddfe80e4 Improve visibility of experiment workflow image [SCI-5458] 2021-02-02 22:23:11 +01:00
aignatov-bio
e206892864 Add p element to docx list allowed elements [SCI-5461] 2021-02-02 11:26:54 +01:00
Oleksii Kriuchykhin
324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00
aignatov-bio
8be9d3b14c
Merge pull request #3126 from biosistemika/features/new-experiments-page 
Features/new experiments page
 2021-01-29 13:28:11 +01:00
Oleksii Kriuchykhin
75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Alex Kriuchykhin
f1124f9ea0
Add experiments overview service [SCI-5430] (#3116) 2021-01-28 12:57:04 +01:00
Urban Rotnik
ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112) 
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

* Add empty values to hash
 2021-01-22 11:24:08 +01:00
Alex Kriuchykhin
f15d984d47
Fix navigation between archived and active projects [SCI-5419] (#3100) 
* Fix navigation between archived and active projects [SCI-5419]
 2021-01-19 11:28:59 +01:00
aignatov-bio
7cc6ce5659
Fix projects page member filter [SCI-5385] (#3074) 2021-01-12 14:49:24 +01:00
Oleksii Kriuchykhin
78ec862a2c Fix folder creation for archived view [SCI-5383] 2021-01-12 13:06:43 +01:00
Oleksii Kriuchykhin
684674952c Add Restore button to the archived Projects screen [SCI-5344] 2021-01-09 21:27:19 +01:00
Urban Rotnik
be2949b316 Fix tests 2021-01-08 08:05:05 +01:00
Urban Rotnik
427b5d7107
Merge pull request #3059 from biosistemika/features/folders 
Features/folders into develop
 2021-01-08 06:26:44 +01:00
aignatov-bio
0d7da90b15
Small fixes for projects folder cards [SCI-5345] (#3049) 2021-01-07 17:02:25 +01:00
Alex Kriuchykhin
962b3a532e
Merge pull request #3057 from okriuchykhin/ok_SCI_5317 
Add project permissions check to projects toolbar [SCI-5317]
 2021-01-07 13:25:34 +01:00
aignatov-bio
1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) 
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
 2021-01-07 13:16:05 +01:00
Oleksii Kriuchykhin
9882539213 Add project permissions check to projects toolbar [SCI-5317] 2021-01-06 22:23:48 +01:00
aignatov-bio
f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
Oleksii Kriuchykhin
1c27b99ba5 Add default sorting to ProjectsOverviewService [SCI-5361] 2021-01-04 22:37:25 +01:00
Urban Rotnik
a53bfbdd33
Merge pull request #3014 from urbanrotnik/ur-sci-5283-smart-annotation-archived-link 
Add 'archived' to smart annotation for repository item [SCI-5283]
 2021-01-04 11:53:47 +01:00
Oleksii Kriuchykhin
ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Urban Rotnik
4ff1770d50 Remove uniqueness validation on Experiment name 
SCI-5288
 2020-12-18 16:48:50 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Urban Rotnik
d3e38c89f8 Update BE sorting for archived fodlers&projects 
SCI-5306
 2020-12-18 11:27:17 +01:00
Urban Rotnik
7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik
7c967d32f1 Reset invalid state 
SCI-5306
 2020-12-18 09:46:05 +01:00
Urban Rotnik
63a41b123d Fix dropdown JS bug, fix folders_search, apply all new filters to search 
SCI-5306
 2020-12-18 09:43:11 +01:00
Urban Rotnik
87ca79717c Add separate sorting for active/archived view 
[SCI-5306]
 2020-12-18 08:41:51 +01:00
Miha Mencin
6dc4fae45b
Merge pull request #3003 from okriuchykhin/ok_SCI_5268 
Archiving: add 'archived' flag on folder [SCI-5268]
 2020-12-17 13:13:26 +01:00
Oleksii Kriuchykhin
f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
Oleksii Kriuchykhin
0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +01:00
Urban Rotnik
a4fd69c292 Add 'archived' to smart annotation for repository item 2020-12-15 07:36:49 +01:00
Oleksii Kriuchykhin
78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
aignatov-bio
8245f18076 Add h6 render to docx report 2020-11-27 13:33:44 +01:00
Oleksii Kriuchykhin
1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
Urban Rotnik
e3f9087600 Fix search 2020-11-25 19:33:12 +01:00
Urban Rotnik
5717e37f2b Remove obsolete code, fix tests 2020-11-25 18:34:46 +01:00
Urban Rotnik
afc6d12b49 Project and folders sorting 2020-11-25 18:34:39 +01:00
Oleksii Kriuchykhin
0de237cece Implement project search with grouping by folder [SCI-5207] 2020-11-25 11:59:02 +01:00
Alex Kriuchykhin
1380d5873d
Merge pull request #2946 from okriuchykhin/ok_SCI_5136 
Implement search endpoint for Projects & folders search [SCI-5136]
 2020-11-23 13:09:33 +01:00
aignatov-bio
e4e5fc8474
Merge pull request #2944 from aignatov-bio/ai-sci-5058-fix-smart-annotation-for-archived-projects 
Fix smart annotation for archived experiments [SCI-5058]
 2020-11-19 11:18:26 +01:00
aignatov-bio
483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
aignatov-bio
80d6e5e87c Add project folders to team import/export 2020-11-13 14:13:26 +01:00
aignatov-bio
7fd7c2de6a Add download link to reports 2020-11-11 15:48:00 +01:00
Oleksii Kriuchykhin
038cd8d5d7 Fix repository state columns handling [SCI-5190] 2020-11-10 17:24:04 +01:00
Oleksii Kriuchykhin
ee1bcd7aac Implement search endpoint for Projects & folders search [SCI-5136] 2020-11-09 16:16:09 +01:00
aignatov-bio
f3dd749c1d Fix smart annotation for archived experiments 2020-11-06 11:47:18 +01:00
Oleksii Kriuchykhin
f2f08a31d5 Add check for zero page size in repository states [SCI-5190] 2020-11-06 11:42:33 +01:00
aignatov-bio
f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports 
Add filer previews to reports [SCI-5110]
 2020-11-02 18:48:45 +01:00
Urban Rotnik
1295299370 Fix SA in protocol description 2020-10-30 12:55:30 +01:00
Urban Rotnik
f5118e5461
Merge pull request #2901 from okriuchykhin/ok_SCI_5063 
Refactor experiment workflow image generation [SCI-5063]
 2020-10-29 13:55:23 +01:00
Urban Rotnik
c6a891bcea
Merge pull request #2912 from urbanrotnik/ur-sci-5091 
Add current team to smart annotations permission check [SCI-5091]
 2020-10-29 13:32:29 +01:00
Oleksii Kriuchykhin
13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Urban Rotnik
25d050cec4 Add current team to smar annotations permission check 2020-10-29 12:17:40 +01:00
aignatov-bio
2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
Miha Mencin
235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2 
Release/1.20.2
 2020-10-28 13:58:25 +01:00
Urban Rotnik
c5a1d34c36
Merge pull request #1967 from jbargu/jg_sci_2228 
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
 2020-10-23 15:33:22 +02:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Urban Rotnik
a87302a183 Include styled text in list items elements 2020-10-21 08:27:10 +02:00
Urban Rotnik
a728ba2f2d Fix smart annotation in checklist title 2020-10-20 13:02:49 +02:00
Urban Rotnik
e748e1eff3 Fix smart annotations and links styling 2020-10-14 17:58:07 +02:00
Urban Rotnik
a19e0ef846 Refactor 2020-10-13 14:23:39 +02:00
Urban Rotnik
1b860afe30 Move TinyMCE parser to separate class 2020-10-13 09:45:13 +02:00
Urban Rotnik
ae8b2cbf8f Add text to I18n 2020-10-13 08:37:32 +02:00
Urban Rotnik
274293348e Clean up 2020-10-09 09:53:27 +02:00
Urban Rotnik
dfca798e2d Refactored tiny_mce_table parser and renderer 2020-10-09 09:43:36 +02:00
Urban Rotnik
92b4d95c72 Implement lists in DOCX 2020-10-09 09:43:00 +02:00
aignatov-bio
9da27956d3
Merge pull request #2857 from aignatov-bio/ai-sci-4987-fix-smart-annotation-for-archived-projects 
Show smart annotation for archived projects/experiments [SCI-4987]
 2020-09-24 13:29:49 +02:00
aignatov-bio
653fe6fb1d Fix markup 2020-09-24 11:56:17 +02:00
Urban Rotnik
3bda6a987d Fix smart annotation for RepositoryItem 2020-09-24 11:45:03 +02:00
aignatov-bio
fde33e6e63 Fix tests 2020-09-21 14:41:51 +02:00
aignatov-bio
545e13304a Show smart annotation for archived projects/experiments 2020-09-21 14:09:11 +02:00
aignatov-bio
e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
Urban Rotnik
9066586149 Fix duedate for PDF and DOCX 2020-09-09 10:48:42 +02:00
Mojca Lorber
7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +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
Urban Rotnik
5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
Oleksii Kriuchykhin
e0f7e181f6 Fix user deletion script [SCI-4829] 2020-08-21 13:12:14 +02:00
Oleksii Kriuchykhin
e6e47f5106 Fix failing tests [SCI-4829] 2020-08-21 11:58:12 +02:00
Alex Kriuchykhin
121644decf
Merge pull request #2770 from okriuchykhin/ok_SCI_4881 
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
 2020-08-21 11:01:49 +02:00
Alex Kriuchykhin
287f7cce79
Merge pull request #2771 from okriuchykhin/ok_SCI_4889 
Improve handling of old repository table states [SCI-4889]
 2020-08-21 10:59:34 +02:00
Urban Rotnik
0c28b5d667
Merge pull request #2788 from urbanrotnik/ur-sci-4925-report-activities-fix 
Fix activities query [SCI-4925]
 2020-08-13 10:09:45 +02:00
Urban Rotnik
9f74a86ebe Fix activities query 2020-08-12 16:56:49 +02:00
Urban Rotnik
f5ffd685d8
Merge pull request #2773 from urbanrotnik/ur-sci-4879-word-format-fix 
Fix word reports when using headings [SCI-4879]
 2020-08-11 13:01:43 +02:00
aignatov-bio
e9028961db Add border to tinymce table in docx 2020-08-10 13:47:32 +02:00
Oleksii Kriuchykhin
02a4da1a55 Add task status to export all [SCI-4829] 2020-08-06 10:50:11 +02:00
Urban Rotnik
bdf1e62f60 Fix word reports when using headings 2020-08-05 16:25:10 +02:00
Oleksii Kriuchykhin
6a50f7f27e Improve handling of old repository table states [SCI-4889] 2020-08-05 13:15:38 +02:00
Oleksii Kriuchykhin
ce8d12e1c4 Create new activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-08-05 09:59:58 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik
ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items 
Add export for assigned items [SCI-4748]
 2020-08-03 11:30:31 +02:00
aignatov-bio
b644950e4e Fix I18n markup 2020-07-28 09:53:35 +02:00
Alex Kriuchykhin
8b24a0f704
Merge pull request #2754 from urbanrotnik/ur-sci-4730-protocol-error 
Add blacklist for dashboard activities [SCI-4730]
 2020-07-23 15:21:51 +02:00
aignatov-bio
ac1915351d
Merge pull request #2748 from aignatov-bio/ai-sci-4886-add-permission-checks-to-docx 
Add scopes and permission checks for docx report [SCI-4886]
 2020-07-23 14:26:53 +02:00
aignatov-bio
a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
Urban Rotnik
9bcf1a5df5 Add blacklist for dashboard activities 2020-07-23 14:22:58 +02:00
Alex Kriuchykhin
cb9fe04584
Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters 
Fix global activities filters [SCI-4785]
 2020-07-23 10:09:36 +02:00
aignatov-bio
1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio
e170917b10 Add scopes and permission checks for docx report 2020-07-21 14:11:42 +02:00
aignatov-bio
75930b99c3 Fix global activities filters 2020-07-20 15:01:00 +02:00
aignatov-bio
e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
aignatov-bio
2aeb661be9 Fix markup 2020-07-15 09:47:29 +02:00
aignatov-bio
f77902f6d4 Add tinymce table support to docx 2020-07-15 09:44:25 +02:00
Oleksii Kriuchykhin
c7fcc3f89b Fix issue with missing archived items on task page [SCI-4854] 2020-07-10 11:43:06 +02:00
mlorb
73e2654d78
Merge pull request #2701 from mlorb/ml-sci-4793 
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
 2020-07-09 11:49:16 +02:00
Urban Rotnik
950f65b90e
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout 
Improve report layout [SCI-4771]
 2020-07-09 11:48:33 +02:00
mlorb
efbef2c876
Merge pull request #2384 from mlorb/ml-sci-4261 
Clean up controllers for manage repository columns [SCI-4261]
 2020-07-09 09:18:23 +02:00
Alex Kriuchykhin
3534d0c60f
Merge pull request #2712 from okriuchykhin/ok_SCI_4840 
Fix assigned counter on inventory items assigning modal [SCI-4840]
 2020-07-08 13:53:57 +02:00
Urban Rotnik
2e1d1cc210 Clean styles 2020-07-08 11:35:25 +02:00
Urban Rotnik
5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
Oleksii Kriuchykhin
482765e942 Fix assigned counter on inventory items assigning modal [SCI-4840] 2020-07-07 14:40:19 +02:00
aignatov-bio
784788e9f3 Fix smart annotation for archived items 2020-07-06 14:22:45 +02:00
Mojca Lorber
db8c7cd97c Add empty states to inventories datatable and fix filtering bug 2020-07-02 15:51:07 +02:00
Mojca Lorber
22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Alex Kriuchykhin
2125c8bf83
Merge pull request #2683 from mlorb/ml-sci-4742 
Hide archived and not assigned items … [SCI-4742]
 2020-06-24 13:47:22 +02:00
Mojca Lorber
7e645eade4 Add active scope to repository_rows in assigning servise 2020-06-24 13:22:09 +02:00
Alex Kriuchykhin
2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button 
SCI-4780 replace delete button with archive button
 2020-06-24 13:16:11 +02:00
Mojca Lorber
bdf959db1f Hide archived and not assigned items from the assigning screen on the task 2020-06-24 12:06:53 +02:00
Alex Kriuchykhin
8a17b721db
Merge pull request #2678 from urbanrotnik/ur-sci-4878 
Update all rows on repository archive/restore [SCI-4787]
 2020-06-24 12:06:41 +02:00
Urban Rotnik
8dc48e9f95 Remove archiving rows from RepositoryArchiveService 2020-06-24 10:35:24 +02:00
miha
41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
Urban Rotnik
efbc05e00e
Merge pull request #2675 from urbanrotnik/ur-sci-4782 
Include archived columns to inventories export [SCI-4782]
 2020-06-23 16:51:50 +02:00
Urban Rotnik
e89bf58e1c Refactory restore inventory service 2020-06-23 08:24:52 +02:00
Urban Rotnik
d874b6f732 Refactory archive inventory service 2020-06-22 22:45:34 +02:00
Mojca Lorber
be19190ff1 Revert default_scope for active repositories 2020-06-22 14:57:35 +02:00
Urban Rotnik
d1b1b5f268 Include archived columns to inventories export 2020-06-22 14:28:49 +02:00
Mojca Lorber
8d43603789 Fix acivities and error handeling 2020-06-19 09:04:42 +02:00
Mojca Lorber
3d59bbd50e Fix default scope bugs 2020-06-18 18:08:53 +02:00
Mojca Lorber
6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
Urban Rotnik
b498aa54d3
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope 
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
 2020-06-18 14:07:10 +02:00
Urban Rotnik
a05be67d3a
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag 
Add archived tags to assigned repository rows [SCI-4703]
 2020-06-18 13:47:57 +02:00
Urban Rotnik
06fab7d01c Update smart anotation preview for archived items 2020-06-18 13:45:08 +02:00
Urban Rotnik
d5b82f857e Add tag for DOCX 2020-06-18 08:52:59 +02:00
aignatov-bio
a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper 
Add archiving column to datatable helper [SCI-4692]
 2020-06-15 15:35:19 +02:00
aignatov-bio
db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik
c7d6c4d60e Add repository_rows restoring and archiving actions on FE 2020-06-09 22:16:55 +02:00
Urban Rotnik
26db4f3515 Add Archive and Restore service 2020-06-09 18:50:36 +02:00
aignatov-bio
4886d95ad5 Fix variable naming 2020-06-03 17:07:11 +02:00
aignatov-bio
503d19fb90 Add snapshots to team export/import 2020-06-03 17:02:33 +02:00
Mojca Lorber
c673e27109 Merge branch 'develop' into ml-sci-4261 2020-05-28 08:18:24 +02:00
aignatov-bio
8f998ceee9 Fix counter 2020-05-27 16:11:10 +02:00
aignatov-bio
40ad9fbf00 Check duplicate protocol name during import 2020-05-27 12:10:48 +02:00
Urban Rotnik
c7361332ab
Merge pull request #2567 from urbanrotnik/ur-sci-4622-snapshot-in-report 
Show snapshot in report [SCI-4622]
 2020-05-25 14:21:49 +02:00
Urban Rotnik
2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
aignatov-bio
f0bdae8b67 Fix snapshot column ordering by parent_id 2020-05-25 11:19:43 +02:00
Mojca Lorber
40a3ee82d5 Add creator to task 2020-05-20 08:59:07 +02:00
Alex Kriuchykhin
afdd6fd149
Merge pull request #2572 from okriuchykhin/ok_SCI_4629 
Prevent the inventory items editing while snapshot is being created [SCI-4629]
 2020-05-19 10:10:34 +02:00
Oleksii Kriuchykhin
d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
Urban Rotnik
3b08241b0b Fix excel header parsing 2020-05-18 11:39:19 +02:00
Oleksii Kriuchykhin
c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio
d3faec1070 Rename service 2020-05-08 12:28:37 +02:00
aignatov-bio
c3ca0156fb Fix error handling 2020-05-07 13:58:25 +02:00
aignatov-bio
29903f570d Merge assign and unassign service 2020-05-07 13:51:07 +02:00
aignatov-bio
19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
Alex Kriuchykhin
0e865f8e45
Merge pull request #2525 from okriuchykhin/ok_SCI_4552 
Implement background processing of repository snapshots [SCI-4552]
 2020-04-29 12:03:23 +02:00
aignatov-bio
046c9662d1 Fix markup 2020-04-28 19:16:04 +02:00
aignatov-bio
61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
Oleksii Kriuchykhin
e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
Urban Rotnik
9c3fb063c0 Fix counter and error showing for CheckList column type 2020-04-24 16:09:54 +02:00
aignatov-bio
d48997464d Fix markup 2020-04-23 15:25:28 +02:00
aignatov-bio
34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio
10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Urban Rotnik
89b848d21d Fix value rounding for General excel type 2020-04-23 07:19:24 +02:00
Oleksii Kriuchykhin
f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +02:00
Alex Kriuchykhin
436f0bf63d
Merge pull request #2506 from okriuchykhin/ok_SCI_4516 
Add repository snapshots with service, refactor item assigning [SCI-4516]
 2020-04-15 17:32:25 +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
aignatov-bio
087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +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
4c33abff05 Assign user after task created 2020-03-30 15:16:14 +02:00
aignatov-bio
d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout 
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
 2020-03-12 11:26:23 +01:00
aignatov-bio
a32a3db8e5 Split joins scope 2020-03-11 14:30:41 +01:00
aignatov-bio
c13721f842 Fix recent work service and move templates to html 2020-03-11 11:34:59 +01:00
aignatov-bio
63a5459d21 Add error handling to create task modal 2020-03-10 13:16:56 +01:00
aignatov-bio
180b736769 Refactor recent work service 2020-03-09 15:10:51 +01:00
aignatov-bio
5ee406606a Add checks for archived projects and experiments 2020-03-06 15:48:54 +01:00
aignatov-bio
193c4974d2 Add user time zone 2020-03-06 15:24:57 +01:00
aignatov-bio
b89cc1745a Add users scope 2020-03-06 15:12:40 +01:00
aignatov-bio
e729aa043e Add recent work widget 2020-03-06 13:51:18 +01:00
Mojca Lorber
8325ed80f0 Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard 2020-03-04 23:26:01 +01:00
aignatov-bio
294328887a Fix typo 2020-02-25 13:51:54 +01:00
aignatov-bio
3588fb3445 Fix markup 2020-02-25 13:49:35 +01:00
aignatov-bio
32d6f9a43a Split my_module create service to seperate services 2020-02-25 13:46:44 +01:00
aignatov-bio
a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
aignatov-bio
a92bac19e1 Add service for task creating 2020-02-24 15:57:22 +01:00
Alex Kriuchykhin
9c763f2111 Merge pull request #2383 from okriuchykhin/ok_SCI_4220 
Extend inventory import to support new data types [SCI-4220]
 2020-02-10 11:04:34 +01:00
Oleksii Kriuchykhin
6f8f89fbf0 Improve speed of global activities fetching query [SCI-4330] 2020-02-07 13:53:25 +01:00
Mojca Lorber
2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +01:00
Oleksii Kriuchykhin
632b54cb98 Merge branch 'develop' into ok_SCI_4220 2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin
b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
Urban Rotnik
0991a26ee8
Merge pull request #2351 from urbanrotnik/ur-sci-4211-fix-team-import 
Fix import for old activities [SCI-4211]
 2020-01-30 13:08:33 +01:00
Urban Rotnik
503c05805d Move editable? method from helper to model 2020-01-25 09:43:05 +01:00
Urban Rotnik
ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
Urban Rotnik
0a2970c18d Fix import for old activities 2020-01-22 12:24:56 +01:00
Mojca Lorber
404805bef5 Fix constants for email redesign 2020-01-21 09:38:08 +01:00
Oleksii Kriuchykhin
7d8ba7cb32 Fix clonning of date time values [SCI-4204] 2020-01-16 16:03:13 +01:00
Urban Rotnik
507443ba38 Add custom method for repository report JSON data 2020-01-16 14:42:26 +01:00
Alex Kriuchykhin
da26d8a018
Merge pull request #2304 from okriuchykhin/ok_SCI_4204 
Refactor repository cell cloning to support all data types [SCI-4204]
 2020-01-15 13:04:50 +01:00
Alex Kriuchykhin
9412cccc9c
Merge pull request #2306 from urbanrotnik/ur-sci-fix-for-list-items-update 
Fix for list items update
 2020-01-15 12:34:33 +01:00
Urban Rotnik
97954b3930 fixup! Fix list item update 2020-01-15 11:28:31 +01:00
Urban Rotnik
a23b2eab78 Fix list item update 2020-01-15 11:24:50 +01:00
Oleksii Kriuchykhin
9e8bd23616 Merge latest branch 'develop' into ok_SCI_3988 2020-01-15 10:52:20 +01:00
Urban Rotnik
bcce8235cc Add rescue block for setting default repository state 2020-01-14 23:49:02 +01:00
Oleksii Kriuchykhin
eed68a2590 Refactor repository cell clonning to support all data types [SCI-4204] 2020-01-14 16:55:10 +01:00
Oleksii Kriuchykhin
01b8d2226d Optimize repository table counters [SCI-4224] 2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin
7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
Urban Rotnik
9296f0eb4f Add extra format for exports 2020-01-10 11:09:30 +01:00
Oleksii Kriuchykhin
2faab14444 Fix repository table state updates after column creation/deletion [SCI-4196] 2020-01-08 16:16:54 +01:00
Oleksii Kriuchykhin
522ae12f08 Merge branch 'develop' into ok_SCI_3988 2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Alex Kriuchykhin
1e665804ab
Merge pull request #2280 from aignatov-bio/ai-sci-4155-add-new-invetories-to-team-export 
Add new column types to team export/import [SCI-4155]
 2020-01-07 15:47:09 +01:00
Oleksii Kriuchykhin
1b902ff4b3 Merge branch 'develop' into ok_SCI_3988 2020-01-07 15:26:30 +01:00
Oleksii Kriuchykhin
4df8779b19 Fix experiment template exporter [SCI-3988] 2020-01-07 15:26:21 +01:00
aignatov-bio
a69e587706 Change cells loading in report repository helper 2020-01-07 14:21:55 +01:00
aignatov-bio
10b7aad732 Add ned column types to team export/import 2020-01-07 14:12:48 +01:00
aignatov-bio
4895f41238 Add helper for repository tables in docx report 2020-01-06 12:40:09 +01:00
aignatov-bio
3bd44dc5ab
Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model 
Refactor checklist column data structure [SCI-4168]
 2019-12-24 11:12:36 +01:00
aignatov-bio
210292de07 Leave string_agg only for checklists 2019-12-23 21:36:56 +01:00
Urban Rotnik
c286334c1d UpdateRepositoryRowService fix 2019-12-23 14:53:51 +01:00
aignatov-bio
725bb449d5 Fix naming 2019-12-23 09:20:36 +01:00
aignatov-bio
54800cb69b Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model 2019-12-20 15:46:39 +01:00
aignatov-bio
16c4879e56 Merge migrations and update sorting 2019-12-20 15:42:54 +01:00
Alex Kriuchykhin
0566b17d50
Merge pull request #2272 from okriuchykhin/ok_SCI_4166 
Add view/edit renderers for numeric data type [SCI-4166]
 2019-12-19 11:57:13 +01:00
aignatov-bio
dc91893d7e Refactor checklist column data structure 2019-12-18 14:10:41 +01:00
Oleksii Kriuchykhin
e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
Urban Rotnik
7153711570 Move delimiter from column to metadata 2019-12-18 10:22:52 +01:00
aignatov-bio
7664f4be78 Add checklist and list edit mode 2019-12-11 14:49:14 +01:00
Oleksii Kriuchykhin
ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Urban Rotnik
d35f7119b7 Moved delete action to service 2019-12-10 14:29:37 +01:00
Urban Rotnik
dd9880f030 Add CreateRepositoryRowService 2019-12-10 14:29:34 +01:00
Urban Rotnik
98b89e9e80 Add UpdateRepositoryRowService 2019-12-10 14:29:34 +01:00
aignatov-bio
09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio
d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Oleksii Kriuchykhin
03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
Miha Mencin
80579043b2 Merge branch 'SCI-4108-bug-at-report-generation' into release-1-17-7 2019-12-03 09:10:09 +01:00
Alex Kriuchykhin
fbf1a5b6e2
Merge pull request #2239 from okriuchykhin/ok_SCI_4098 
Refactor Azure configuration  and connected accounts [SCI-4098]
 2019-11-29 11:30:33 +01:00
Urban Rotnik
f39af1916f Split DateTime and DateTimeRange column types, rename DateType table 2019-11-29 10:19:16 +01:00
Urban Rotnik
9bf948c3a8 Add statuses validation on FE 2019-11-29 10:19:11 +01:00
Urban Rotnik
b2ce600820 Add delimiter column for repository_column 2019-11-29 10:19:10 +01:00
Urban Rotnik
b2b6296cb5 Improve update items action, JS and views 2019-11-29 10:19:10 +01:00
Urban Rotnik
804e36650e Add service for updating ListColumnItems 2019-11-29 10:19:09 +01:00
Oleksii Kriuchykhin
3481b50796 Fix column reordering for repositories [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin
73be1181ac Fix failing tests for repository states [SCI-4070] 2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin
338b710d81 Refactor inventory edit mode [SCI-4070] 2019-11-29 10:19:05 +01:00
Urban Rotnik
f645ff52ab Refactor ColumnServices 2019-11-29 10:17:52 +01:00
Urban Rotnik
1720623665 Refactor RepositoryListColumn controller 2019-11-29 10:17:50 +01:00
Urban Rotnik
43e81c46b7 Rename CreateColumnService to ColumnService 2019-11-29 10:16:46 +01:00
Urban Rotnik
b55966487e Remove permission helper 2019-11-29 10:16:46 +01:00
Urban Rotnik
14b43d516e Add UpdateStatusColumnService service 2019-11-29 10:16:45 +01:00
Urban Rotnik
de2ee66dd4 Add DeleteStatusColumnService service 2019-11-29 10:16:44 +01:00
Urban Rotnik
5930bdd794 Add StatusColumnsController 2019-11-29 10:16:44 +01:00
Urban Rotnik
bbb8c46fe2 Add CreateStatusColumnService service 2019-11-29 10:16:44 +01:00
Mojca Lorber
dda5ffe4f9 Add create repository column service 2019-11-29 10:16:43 +01:00
aignatov-bio
3d9351c537 Update filter logic for activities 2019-11-27 13:13:19 +01:00
Oleksii Kriuchykhin
6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
Miha Mencin
72c158d3e2 SCI-4108 check if there are any checklist items before rendering the checklist 2019-11-25 11:55:02 +01:00
Oleksii Kriuchykhin
5e8afae1f0 Fix failing tests [SCI-3988] 2019-11-18 15:15:44 +01:00
Oleksii Kriuchykhin
b2862b6c9e Remove Paperclip DB columns and fix experiment templates [SCI-3988] 2019-11-18 14:16:28 +01:00
Alex Kriuchykhin
8b665d4f1c
Merge pull request #2193 from okriuchykhin/ok_SCI_4028 
Fix reports in team importer [SCI-4028]
 2019-11-13 13:10:15 +01:00
aignatov-bio
e4a39bbbe4 Add check for files 2019-11-06 14:41:51 +01:00
aignatov-bio
b56a997aef Fix team import for user with avatars 2019-11-04 14:53:59 +01:00
Oleksii Kriuchykhin
1e748f2d7e Fix reports in team importer [SCI-4028] 2019-10-30 15:47:11 +01:00
Oleksii Kriuchykhin
6c57f56bf4 Fix issue with empty cells for xlsx inventory imports [SCI-4003] 2019-10-21 12:06:45 +02:00
Miha Mencin
0af8629f98 SCI-3994 fix for excel import 2019-10-17 14:37:11 +02:00
Miha Mencin
c673c3960f removin uneeded stuff left there by supidity 2019-10-08 17:23:46 +02:00
Miha Mencin
4f290cacfc remove the unneeded require 2019-10-08 16:22:48 +02:00
Miha Mencin
de89a97e0a Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-3975-team-export 2019-10-08 16:20:40 +02:00
Miha Mencin
5f16926280 SCI-3976 different approach to file download 2019-10-08 16:20:16 +02:00
Oleksii Kriuchykhin
6908a5c3a3 Fix team deletion script [SCI-3960] 2019-10-08 12:04:47 +02:00
Alex Kriuchykhin
076d61d4d0
Merge pull request #2116 from okriuchykhin/ok_SCI_3908 
Remove Paperclip from the codebase [SCI-3908]
 2019-10-04 14:45:42 +02:00
Oleksii Kriuchykhin
9d2ac4179e Fix failing tests [SCI-3908] 2019-10-04 13:02:18 +02:00
Urban Rotnik
81d66ceedd Add CustomDisk Service for ActiveStorage 2019-10-03 13:16:15 +02:00
Oleksii Kriuchykhin
260fcd6e89 Remove Paperclip from codebase [SCI-3908] 2019-10-02 19:45:14 +02:00
Urban Rotnik
e2a779ccfe Activestorage fix for disk storage 
[SCI-3947]
 2019-10-02 14:01:38 +02:00
Anton Ignatov
b382eb607b Fix docx report for active storage 2019-10-01 10:26:24 +02:00
Anton Ignatov
99005cf22e Fix tests for repository row importer 2019-09-30 16:27:45 +02:00
aignatov-bio
856e876b61
Merge pull request #2079 from aignatov-bio/ai-sci-3900-fix-error-on-task-copy 
Fix error on task copy [SCI-3900]
 2019-09-24 14:16:38 +02:00
Anton Ignatov
646107a35b Fix error on task copy 2019-09-23 16:33:57 +02:00
Anton Ignatov
09e3b7c80b Fix repository row import/export 2019-09-23 13:33:02 +02:00
Alex Kriuchykhin
29ffe05442
Merge pull request #1964 from okriuchykhin/ok_SCI_3643 
Add text extraction from MarvinJS for search [SCI-3643]
 2019-09-18 16:22:11 +02:00
Anton Ignatov
b9f6b3a082 Fix error when save report to inventory 2019-09-18 12:50:54 +02:00
Oleksii Kriuchykhin
e12cd0ae9d Fix autoloading issues [SCI-3881] 2019-09-17 10:50:01 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin
bc38c6b29e Fix failing test [SCI-3745] 2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin
c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Alex Kriuchykhin
0d6f011e61
Merge pull request #2006 from okriuchykhin/ok_SCI_3765 
Add path method to custom ActiveStorage S3 service [SCI-3765]
 2019-09-12 15:34:03 +02:00
aignatov-bio
a3b2c7d5fe
Fix report image issues [SCI-3772] (#1983) 
* Fix report image issues

* Small fixes
 2019-09-12 09:02:45 +02:00
aignatov-bio
01d6a17f2b
Fix permission check for inventory (#2039) 2019-09-09 15:11:18 +02:00
aignatov-bio
bc86d5bc40
Fix import items to inventory (#2019) 2019-09-05 08:35:11 +02:00
Oleksii Kriuchykhin
267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
aignatov-bio
5bf3a5d418
Fix sharing check in service [SCI-3798] (#2011) 
* Update shared inventory permissions

* Fix tests and simplify condition for placeholder

* Fix sharing check in service

* Fix rebase conflicts
 2019-08-26 09:36:41 +02:00
Luka Murn
b3eb80f7cf Remove custom_field usage from app/services/team_exporter.rb 2019-08-23 16:04:52 +02:00
Oleksii Kriuchykhin
2298ba4e4e Add path method to custom ActiveStorage S3 service [SCI-3765] 2019-08-21 14:33:28 +02:00
Urban Rotnik
89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
aignatov-bio
710af85743
Fix template generating (#1980) 2019-08-14 09:06:12 +02:00
Oleksii Kriuchykhin
c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Urban Rotnik
7719b825e3 Update wording for sharing activities, rename button, add view-only paragraph 2019-08-09 14:15:51 +02:00
Urban Rotnik
32783576c1 Add controller action 'multiple_update' 
Add controller action, add update permission activity, add JS for handling ajax req
 2019-08-09 14:15:50 +02:00
Urban Rotnik
6cbece9f86 Add service for multiple share 2019-08-09 14:15:49 +02:00
Mojca Lorber
3c1f28ec06 fix smart annotation permission check 2019-08-09 14:13:03 +02:00
Mojca Lorber
71b881cbdf fix failing tests 2019-08-09 14:13:03 +02:00
Mojca Lorber
4c7c7ccdf1 Add ability to browse through shared inventories to smart annotations 2019-08-09 14:13:03 +02:00
Mojca Lorber
cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +02:00
Urban Rotnik
077369d960 Update permissions for Repositories 2019-08-09 14:12:59 +02:00
aignatov-bio
6e5f078dea
Add activities for marvinJS [SCI-3630] (#1950) 
* Add marvinJs activities to step and results

* Add activities for TinyMCE marvinJS assets

* Fix markup
 2019-08-09 09:47:07 +02:00
Oleksii Kriuchykhin
d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
973fc775c0 Enforce file size limits for direct uploads on S3 [SCI-3681] 2019-08-06 17:09:00 +02:00
Jure Grabnar
f71cabcd60 Fix templates tests 2019-08-05 19:05:15 +02:00
Anton Ignatov
e2e876b2a3 Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests 2019-08-05 13:51:04 +02:00
Oleksii Kriuchykhin
a2fe4bee94 Add text extraction from MarvinJS for search [SCI-3643] 2019-08-02 15:17:28 +02:00
Anton Ignatov
f35f4886a3 Fix markup 2019-07-29 10:18:34 +02:00
Anton Ignatov
618f0cc334 Fix tests for services 2019-07-26 14:16:44 +02:00
Anton Ignatov
84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Luka Murn
75d7cce6b7 Remove the samples -> repositories migration service/s & specs 2019-07-26 10:28:05 +02:00
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Anton Ignatov
0702dacc5b Security fixes 2019-07-19 14:10:38 +02:00
Anton Ignatov
ad7130d3b2 Simplify TinyMCE assets for MarvinJS 2019-07-19 09:27:03 +02:00
Anton Ignatov
bdc2dbbac1 Simplify image creation 2019-07-18 14:29:24 +02:00
Anton Ignatov
1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov
3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
Miha Mencin
47d3315d82 SCI-3702 revert the fix and use local variables 2019-07-15 16:20:39 +02:00
Miha Mencin
1c84e46a21 Revert "SCI-3702 replace _to_text with _to_html" 
This reverts commit 93b7c472ac.
 2019-07-15 16:18:26 +02:00
Miha Mencin
93b7c472ac SCI-3702 replace _to_text with _to_html 2019-07-15 16:16:41 +02:00
Jure Grabnar
a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +02:00
Anton Ignatov
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov
7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
aignatov-bio
4bae87e3f7
Styling changes in DOCX report [SCI-3633] (#1899) 
* Styling changes in DOCX report

* Update result comments in docx report

* Fix markup
 2019-07-12 13:48:14 +02:00
aignatov-bio
5ca822a7d8
Add archive lables and fix bright colors in RTE fields (#1923) 2019-07-12 11:38:48 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
Urban Rotnik
cc3cd43270 Log to console when error occur on ProtocolsImport actions 2019-07-09 15:32:43 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
aignatov-bio
c8b0d87054
Fix global links in reports (#1894) 2019-07-09 09:35:43 +02:00
mlorb
7272d838b6
Merge pull request #1875 from mlorb/ml-sci-3618 
Remove unassign_user_from_project notification…[SCI-3618]
 2019-07-08 15:23:06 +02:00
Jure Grabnar
ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646 
[SCI-3646] Add paging functionality to external protocols
 2019-07-08 13:06:19 +02:00
aignatov-bio
0d1ec0d4ed
Fix I18n and constants in DOCX report (#1901) 2019-07-08 12:51:26 +02:00
Alex Kriuchykhin
82708f0124
Merge pull request #1891 from okriuchykhin/ok_SCI_3654 
Fix project page view saving [SCI-3654]
 2019-07-08 11:46:54 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Jure Grabnar
dc7fee51fa Add Show more protocols functionality to external protocols 
Closes SCI-3646
 2019-07-04 15:35:18 +02:00
Oleksii Kriuchykhin
c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration (#1893) 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
Oleksii Kriuchykhin
e16cb513e1 Fix project page view saving [SCI-3654] 2019-07-03 15:34:16 +02:00
Oleksii Kriuchykhin
028e647f4d Upgrade to Rails 5.2.3 [SCI-3651] 2019-07-03 11:15:13 +02:00
Jure Grabnar
4715e8ec4b Fix building of zero steps protocls 
Close SCI-3648
 2019-07-03 09:34:15 +02:00
aignatov-bio
b1a74a893c
Remove strange symbol (#1874) 2019-07-02 11:21:14 +02:00
Mojca Lorber
41935a9471 Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation 2019-07-01 13:44:27 +02:00
Anton Ignatov
1f40fa69fc Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-07-01 11:51:27 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +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
Anton Ignatov
390002f40f Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539 2019-07-01 10:12:26 +02:00
Oleksii Kriuchykhin
5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +02:00
Jure Grabnar
bc4b07cc0f Refactor hardcoded protocol_source in SearchService 2019-06-28 02:26:31 +02:00
Jure Grabnar
0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Urban Rotnik
9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Urban Rotnik
2761079479 Add modal for import 2019-06-27 16:46:02 +02:00
Jure Grabnar
06b8d1fda7 Update ApiClient tests 
Closes SCI-3434
 2019-06-27 14:54:19 +02:00
Jure Grabnar
d31f978e55 DRY up protocols importer services errors 2019-06-27 10:11:36 +02:00
Mojca Lorber
9fd83d54a0 Put network error handeling into api and refactor errors 2019-06-26 14:04:03 +02:00
Mojca Lorber
ebcaa4b014 Implement protocols.io error handling for api client and normalizer 2019-06-18 14:01:57 +02:00
Urban Rotnik
c691ad80b5 Add fields to query params for ApiClient 2019-06-17 12:24:16 +02:00
Urban Rotnik
88d96c0938 Use service in controller 2019-06-17 12:24:15 +02:00
Urban Rotnik
7fad5fc594 Add search service and normalizer for list 2019-06-17 12:24:15 +02:00
Jure Grabnar
eb0d677a36 Refactor pio_protocol -> built_protocol 2019-06-17 12:24:13 +02:00
Urban Rotnik
0d43ecdfab Import protocol service after object is built 2019-06-17 12:24:11 +02:00
Jure Grabnar
eb275c4d12 Add tests for BuildProtocolService and fix bugs 2019-06-17 12:24:11 +02:00
Jure Grabnar
362b0cd45d Hound fixes 2019-06-17 12:24:11 +02:00
Jure Grabnar
640f6c1211 Fix tests after BuildProtocolFromClientService refactor 
Closes SCI-3544
 2019-06-17 12:24:11 +02:00
Jure Grabnar
1e8627c450 Refactor ImportProtocol service to BuildProtocolService 
Closes SCI-3544
 2019-06-17 12:24:10 +02:00
Urban Rotnik
a15596a126 Add ImportProtocolService 2019-06-17 12:24:10 +02:00
Oleksii Kriuchykhin
8920d38a02 Make repositories more extendable [SCI-3528] 2019-06-06 17:28:59 +02:00
Alex Kriuchykhin
36255f82ed
Merge pull request #1817 from okriuchykhin/ok_SCI_3522 
Add system notifications service to health check endpoint [SCI-3522]
 2019-06-04 14:41:43 +02:00
Oleksii Kriuchykhin
552f69b9b1 Add system notifications service to health check endpoint [SCI-3522] 2019-05-31 15:52:47 +02:00
Luka Murn
b21bdddf15 Rename permision_eval - permission_eval 
Hopefully this will help with getting rid of all the errors
that we've been receiving for PermissionEval.

Closes SCI-2991.
 2019-05-31 09:56:54 +02:00
Oleksii Kriuchykhin
5a9640c5d1 Add aditional checks for inventory state objects [SCI-3412] 2019-05-27 17:32:21 +02:00
Mojca Lorber
5c847d5b5d Change author of copied inventory item 2019-05-13 15:37:36 +02:00
Anton Ignatov
652fba0e23 Merge branch 'master-with-note-section' 2019-05-13 11:08:11 +02:00
Urban Rotnik
2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +02:00
Anton Ignatov
7f296b35fa Update team exporter for new tinymce images 2019-05-07 13:22:55 +02:00
Oleksii Kriuchykhin
3c1774d330 Fix sorting by user name with search parameter in inventories [SCI-3391] 2019-04-25 16:29:41 +02:00
aignatov-bio
6968060078
Fix user order bug (#1687) 2019-04-19 15:24:13 +02:00
Alex Kriuchykhin
8fa6bbc0ab
Merge pull request #1679 from okriuchykhin/ok_SCI_3177 
Improve experiment preview image generation [SCI-3177]
 2019-04-17 20:35:29 +02:00
Alex Kriuchykhin
b4cf665c21
Merge pull request #1673 from okriuchykhin/ok_SCI_3294 
Fix team export/import for new activities [SCI-3294]
 2019-04-17 12:49:45 +02:00
Oleksii Kriuchykhin
f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Oleksii Kriuchykhin
2320941b5d Fix team export/import for new activities [SCI-3294] 2019-04-15 15:13:10 +02:00
Alex Kriuchykhin
3250ab70f4
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2 
Switch to kaminari pagination in global activities [SCI-3292]
 2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin
231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00
aignatov-bio
8ba0555922
Add check for tasks complete in project notifications (#1657) 2019-04-12 09:17:34 +02:00
Oleksii Kriuchykhin
d378e33038 Improve global activities pagination and fetching [SCI-3292] 2019-04-10 15:45:17 +02:00
Oleksii Kriuchykhin
01ffb43c23 Include old activites assigned to the task [SCI-3285] 2019-04-02 18:37:55 +02:00
Urban Rotnik
86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Urban Rotnik
8eaeeee9f8 Show date actual value without link 2019-04-02 13:15:34 +02:00
Urban Rotnik
6ec22c0b3b
Merge pull request #1618 from urbanrotnik/ur-sci-3240-missing-activities-of-intentory 
Missing activities, fix for showing report name, add step positions, fixed links [SCI-3240] [SCI-3246]
 2019-04-02 11:02:57 +02:00
aignatov-bio
daaa6a367b
Adding custom scrollbar to global activities [SCI-3206] (#1623) 
* Adding custom scrollbar to global activities
 2019-04-02 09:56:50 +02:00
Urban Rotnik
b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Alex Kriuchykhin
b3aa6be23d
Merge pull request #1621 from okriuchykhin/ok_SCI_3255 
Add global activities to reports [SCI-3255]
 2019-04-01 15:07:06 +02:00
Jure Grabnar
e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163 
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
 2019-04-01 14:32:54 +02:00
Jure Grabnar
83130426e2
Merge pull request #1617 from jbargu/jg_3244 
Duplicated activity, report activity ... [SCI-3244]
 2019-04-01 14:31:53 +02:00
Jure Grabnar
111b0e2b7f
Merge pull request #1615 from jbargu/jg_sci_3252 
Change breadcrumbs for copy as template experiment, missing activity for move workflow [SCI-3252]
 2019-04-01 12:30:48 +02:00
Oleksii Kriuchykhin
98e58ff7eb Add global activities to reports [SCI-3255] 2019-04-01 11:26:51 +02:00