scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 10:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
10336 commits 69 branches 179 tags 165 MiB
Commit graph

8006 commits

Author SHA1 Message Date
Martin Artnik 403bce6f5f Fixed creating notifications when users are inactive [SCI-5938] 2021-08-18 10:45:29 +02:00
Oleksii Kriuchykhin 33d37d048e Add timestamps to API serializers, allow inclusion of comments [SCI-5983] 2021-08-18 10:00:01 +02:00
aignatov-bio 6e1d51e2f3
Fix bioeddie errors in console [SCI-5989] (#3487) 2021-08-16 18:29:55 +02:00
artoscinote 6f0a65f02f
Merge pull request #3484 from artoscinote/ma_SCI_5999 
Rework molecule registration activities [SCI-5999]
 2021-08-16 14:33:24 +02:00
Martin Artnik 5cc966e11e Remove delete molecule activities [SCI-5999] 2021-08-16 13:58:54 +02:00
aignatov-bio 852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486) 
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
 2021-08-16 10:51:46 +02:00
Oleksii Kriuchykhin 2daacdf62c Fix permission checks in reports controller [SCI-6002] 2021-08-13 16:32:02 +02:00
Martin Artnik 56576960b0 Rework molecule registration activities [SCI-5999] 2021-08-13 15:15:45 +02:00
artoscinote 12bb44147c
Merge pull request #3482 from artoscinote/ma_SCI_5984 
Optimize how printing jobs and statuses work [SCI-5984]
 2021-08-13 09:25:42 +02:00
Martin Artnik 1d3e0db904 Optimize how printing jobs and statuses work [SCI-5984] 2021-08-12 16:57:25 +02:00
aignatov-bio 87416470f1
Fix empty state for bioEddie [SCI-5987] (#3481) 2021-08-12 15:20:21 +02:00
Martin Artnik 1db06b46f7 Fixed for assets that belong to protocol step [SCI-5996] 2021-08-12 13:45:38 +02:00
artoscinote a65d8ad365
Merge pull request #3477 from artoscinote/ma_SCI_5985 
Fixed handling deletion for asset activity display [SCI-5985]
 2021-08-12 12:23:23 +02:00
Martin Artnik c3fef50d3e Fixed handling deletion for asset activity display [SCI-5985] 2021-08-12 12:18:12 +02:00
artoscinote ad179298fc
Merge pull request #3476 from artoscinote/ma_SCI_5985 
Fixed registering bioeddie molecule on step [SCI-5985]
 2021-08-11 14:12:38 +02:00
Martin Artnik 143e491016 Fixed registering bioeddie molecule on step [SCI-5985] 2021-08-11 14:10:05 +02:00
artoscinote 67330ab27f
Merge pull request #3475 from artoscinote/ma_SCI_5979 
Fix disabled refresh printers button [SCI-5979]
 2021-08-11 13:22:51 +02:00
Martin Artnik 5d5f406e9a Downcase all user emails, downcase when finding user [SCI-5963] 2021-08-11 13:18:58 +02:00
Martin Artnik 9a8a9c7b34 Fix disabled refresh printers button [SCI-5979] 2021-08-11 12:23:18 +02:00
artoscinote 1fc9027d1a
Merge pull request #3466 from aignatov-bio/ai-sci-5964-cancel-changes-after-exit-webhook-edit-mode 
Cancel changes after exit webhook edit mode [SCI-5964]
 2021-08-11 12:14:12 +02:00
aignatov-bio 5eb2c4a28b
Fix image extension in empty printers modal [SCI-5971] (#3470) 2021-08-11 11:43:16 +02:00
Martin Artnik 861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
Martin Artnik 8f3f39f7c7 Fixed handling of activity subject parents when matching activity filters [SCI-5973] 2021-08-06 13:43:30 +02:00
aignatov-bio cfa7937f88 Cancel changes after exit webhook edit mode [SCI-5964] 2021-08-05 12:44:01 +02:00
Martin Artnik 024f9117e6 fix failing specs 2021-08-03 14:16:22 +02:00
Martin Artnik 57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
artoscinote f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration 
Features/bioeddie integration
 2021-08-03 13:32:53 +02:00
artoscinote f24207588c
Merge pull request #3463 from biosistemika/features/webhooks 
Features/webhooks
 2021-08-03 13:32:12 +02:00
artoscinote c41247a5fd
Merge pull request #3439 from artoscinote/ma_SCI_5879 
Implement Save & Register molecule [SCI-5879]
 2021-08-03 12:15:46 +02:00
Martin Artnik 13ddff89a8 Fixed Asset relation handling in activities [ma_SCI_5789] 2021-08-03 09:59:06 +02:00
Martin Artnik a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
artoscinote fe43017ba4
Merge pull request #3445 from artoscinote/ma_SCI_5898 
Fixed UX issues in user invites modal [SCI-5898]
 2021-08-02 15:58:16 +02:00
Martin Artnik a19f109e65 Add printer description [SCI-5942] 2021-08-02 15:50:26 +02:00
Martin Artnik ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
Martin Artnik 123e415a4f Print status backend + FE integration [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio 43571b5692
Print labels changes [SCI-5943] (#3461) 2021-08-02 15:38:37 +02:00
aignatov-bio a782ce50d1
Add bio eddie files to export all [SCI-5877] (#3426) 2021-08-02 13:27:02 +02:00
Martin Artnik e63a665140 Merge branch 'develop' into features/barcodes 2021-08-02 11:15:48 +02:00
Martin Artnik 0f417f9730 Merge branch 'develop' into features/barcodes 2021-07-29 13:32:17 +02:00
artoscinote 3649e2fbe0
Merge pull request #3457 from artoscinote/ma_SCI_5903 
Added print job queue system, job status endpoint [SCI-5903]
 2021-07-29 13:06:34 +02:00
aignatov-bio 02408ae885
Add printing status modal [SCI-5910] (#3454) 2021-07-29 12:24:46 +02:00
artoscinote 21d780e4ca
Merge pull request #3446 from artoscinote/ma_SCI_5893 
Fix style of experiment id in dropdown [SCI-5893]
 2021-07-29 11:44:52 +02:00
Martin Artnik 5c4f923854 Corrected type for 'assignment' activities [SCI-5662] 2021-07-29 10:13:28 +02:00
Martin Artnik 67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
Martin Artnik b41ee028ca Added overridable send permission method to notifications [SCI-5938] 2021-07-28 13:14:07 +02:00
aignatov-bio a54f36a486
Add empty state for barcode printers [SCI-5935] (#3455) 2021-07-28 11:12:46 +02:00
aignatov-bio 8d033274e4
Add barcode scanners support [SCI-5929] (#3456) 2021-07-27 22:01:08 +02:00
Martin Artnik 3f2a294cdc Added wait for printer ready state in print job [SCI-5903] 2021-07-27 16:09:23 +02:00
Martin Artnik e57132dbd0 Added print job queue system, job status endpoint [SCI-5903] 2021-07-27 15:26:18 +02:00
artoscinote 46a9388d8d
Merge pull request #3451 from artoscinote/ma_SCI_5911 
Implemented printer management [SCI-5911]
 2021-07-27 13:19:13 +02:00
aignatov-bio d373c174ee
Add print label button to repository toolbar (#3453) 2021-07-27 12:34:13 +02:00
Martin Artnik 53e072f79e Added error handling to API wrapper [SCI-5939] 2021-07-27 10:36:06 +02:00
Martin Artnik 61919e81b6 Remove FLUICS API client hack [SCI-5939] 2021-07-27 09:41:51 +02:00
Martin Artnik 110ddd872e Added placeholder FLUICS printer setup 2021-07-23 14:56:21 +02:00
Martin Artnik b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
Oleksii Kriuchykhin c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Martin Artnik 662370d2bd Removed auto-disable, fixed ActiveJob + DelayedJob retry handling [SCI-5800] 2021-07-22 13:43:36 +02:00
Martin Artnik 4bb080c25b Merge migrations, code fixes [SCI-5800] 2021-07-22 10:51:03 +02:00
Martin Artnik 04b94d504d Moved activity logging to controller [SCI-5879] 2021-07-22 09:52:04 +02:00
Martin Artnik d54a743e64 Fixed handling of dropdown-selector max height [SCI-5898] 2021-07-22 09:37:25 +02:00
aignatov-bio d4f974ac64
Add inline editing for folder name [SCI-5896] (#3430) 2021-07-21 21:33:13 +02:00
aignatov-bio 7b0ea6f701
Show experiment id for users with read only permission [SCI-5895] (#3434) 2021-07-21 21:33:00 +02:00
aignatov-bio be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447) 
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
 2021-07-21 21:32:42 +02:00
artoscinote 7551432687
Merge pull request #3443 from artoscinote/ma_SCI_5902 
Implement label templates with default ZPL template [SCI-5902]
 2021-07-21 14:53:27 +02:00
aignatov-bio f2e5dc8b2f
Add printers to addon page [SCI-5904][SCI-5931] (#3450) 
* Add printers to addon page [SCI-5904]

* Fix markup
 2021-07-21 13:48:38 +02:00
Alex Kriuchykhin dfa2a7775d
Merge pull request #3422 from okriuchykhin/ok_SCI_5847 
Fix repository cell joining and preloading [SCI-5847]
 2021-07-21 13:18:21 +02:00
Oleksii Kriuchykhin b69ed98e13 Add biomolecular toolkit license endpoint [SCI-5844] 2021-07-21 13:16:27 +02:00
Alex Kriuchykhin e881bf32ae
Merge pull request #3414 from okriuchykhin/ok_SCI_5843 
Add biomolecular toolkit API proxying endpoint [SCI-5843]
 2021-07-21 13:14:04 +02:00
Alex Kriuchykhin dbc54278b2
Merge pull request #3211 from okriuchykhin/ok_SCI_5531 
Add basic API client for BMT [SCI-5531]
 2021-07-21 13:13:52 +02:00
Oleksii Kriuchykhin 36708b47cf Fix code styling [SCI-5531] 2021-07-21 13:10:30 +02:00
aignatov-bio 067758808e
Add download heml button to file preview [SCI-5876] (#3423) 
* Add download heml button to file preview [SCI-5876]

* Remove safe navigation
 2021-07-20 13:22:42 +02:00
aignatov-bio 4de35c983a
Open HELM files in bio eddie [SCI-5890] (#3442) 2021-07-20 13:06:47 +02:00
Martin Artnik c43e1cfbe5 Fixed db error during build 2021-07-20 10:20:47 +02:00
artoscinote 888131a465
Merge branch 'features/bioeddie-integration' into ma_SCI_5879 2021-07-20 09:48:13 +02:00
artoscinote 3a281ce9dc
Merge pull request #3433 from artoscinote/ma_SCI_5607 
Also send notification to the user that was unassigned from task [SCI-5607]
 2021-07-20 09:41:46 +02:00
aignatov-bio 53456988ba
Add bioEddie activities and user licenses [SCI-5845][SCI-5842] (#3411) 
* Add bio eddie licens to users [SCI-5845]

* Add activities for BioEddie [SCI-5842]
 2021-07-19 21:33:28 +02:00
Martin Artnik f55761a491 Invite member search design fixes [SCI-5892] 2021-07-19 15:42:26 +02:00
artoscinote 5f9c04844f
Added prefixed IDs to repository rows (items) [SCI-5909] (#3441) 
* Added prefixed IDs to repository rows (items) [SCI-5909]

* Fix prefixed id queries to work with joins, use subquery in repository search [SCI-5909]

* Fixed accessing repository_row parent code [SCI-5909]

* Better handling of repository_row code display [SCI-5909]

* Fix index warning for id prefixed models issue setting up project [SCI-5909]
 2021-07-19 14:23:36 +02:00
Martin Artnik c4b106f2b8 Fix style of experiment id in dropdown [SCI-5893] 2021-07-19 12:53:15 +02:00
Martin Artnik 71aa418dc6 Fixed UX issues in user invites modal [SCI-5898] 2021-07-19 12:39:18 +02:00
Martin Artnik a8f8ab8ba9 Implement label templates with default ZPL template [SCI-5902] 2021-07-19 09:44:14 +02:00
Oleksii Kriuchykhin 1c8b32dffc Add biomolecular toolkit API proxying endpoint [SCI-5843] 2021-07-16 15:58:40 +02:00
Oleksii Kriuchykhin 7204e47ba5 Fix sorting by role with filtering in team members table [SCI-5908] 2021-07-16 10:49:41 +02:00
Martin Artnik 96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
Martin Artnik ff0ac9f497 Fix free invite users modal [SCI-5900] 2021-07-13 15:51:05 +02:00
Martin Artnik 1985b7a7e0 Also send task unassign notification to the person that was unassigned [SCI-5607] 2021-07-13 12:11:49 +02:00
zmagoD 277da3abcf fix merge issues 2021-07-10 15:20:55 +02:00
artoscinote d78e4713c8
Merge pull request #3425 from artoscinote/ma_SCI_5099 
Fix styling, functionality issues with invite users modal [SCI-5099]
 2021-07-09 11:26:19 +02:00
Martin Artnik 40a8f3a434 Switch to using dropdownSelector for emails input [SCI-5099] 2021-07-09 11:20:48 +02:00
Martin Artnik 3cb395db15 Use where_attributes like in team search [SCI-5099] 2021-07-09 10:49:11 +02:00
Martin Artnik fe06effbd7 Fix linter errors [SCI-5099] 2021-07-09 09:40:06 +02:00
Martin Artnik fb040bee07 Fix styling, functionality issues with invite users modal [SCI-5099] 2021-07-08 16:10:20 +02:00
Miha Mencin d240c9f769
Merge pull request #3421 from artoscinote/ma_SCI_5870 
Added pdf viewer js pack to my_module archive view, fixed issue with files getting stuck in processing [SCI-5870]
 2021-07-08 12:01:31 +02:00
Oleksii Kriuchykhin 549fc8e5a0 Fix repository cell joining and preloading [SCI-5847] 2021-07-07 17:43:51 +02:00
Martin Artnik fdf9c5f6ae Reset file_processing when new file is upladed [SCI-5870] 2021-07-07 14:57:35 +02:00
Oleksii Kriuchykhin d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
Martin Artnik 42ed28676d Added pdf viewer js pack to my_module archive view [SCI-5870] 2021-07-07 11:34:28 +02:00
Martin Artnik 0c63013d8b Made 2fa enable modal accessible globally [SCI-5856] 2021-07-05 16:50:37 +02:00
artoscinote 52946d18e0
Merge pull request #3416 from artoscinote/ma_SCI_5099 
Rework the team invite modal functionality on members page [SCI-5099]
 2021-07-05 12:41:04 +02:00
Martin Artnik 5f528fcdb5 Rework the team invite modal functionality on members page [SCI-5099] 2021-07-05 12:39:54 +02:00
Martin Artnik 1c98d7cdd2 Fixed missing archived column in experiment table [SCI-5866] 2021-07-02 16:10:35 +02:00
Alex Kriuchykhin 0e813791fe
Merge pull request #3413 from aignatov-bio/ai-sci-5832-issue-in-reports-with-pip-file 
Fix file icons in report [SCI-5832]
 2021-07-02 10:20:18 +02:00
Alex Kriuchykhin 6450e221a9
Merge pull request #3412 from aignatov-bio/ai-sci-5568-add-missed-activity-for-tag-removing 
Add missed activity for tag removing [SCI-5568]
 2021-07-02 10:18:26 +02:00
Alex Kriuchykhin 38912b1b38
Merge pull request #3406 from aignatov-bio/ai-sci-5834-update-marvinjs-image-generation 
Update marvinJS image generation [SCI-5834]
 2021-07-02 10:12:48 +02:00
aignatov-bio d0b4a75095 Fix file icons in report 2021-06-30 14:35:23 +02:00
Alex Kriuchykhin f835f88e64
Merge pull request #3410 from okriuchykhin/ok_SCI_5097 
Update Invite new user to team modal [SCI-5097]
 2021-06-30 13:34:06 +02:00
aignatov-bio bef57eacac Add missed activtiy for tag removing [SCI-5568] 2021-06-30 13:34:02 +02:00
Martin Artnik 3662365cac Small code style tweak SCI-5800 2021-06-30 13:15:08 +02:00
Martin Artnik 618f5cfb53 Code style fixes [SCI-5800] 2021-06-30 13:08:16 +02:00
artoscinote 723b594632
Merge pull request #3398 from artoscinote/ma_SCI_5828 
Expose experiment IDs in interface and reports [SCI-5828]
 2021-06-30 12:58:25 +02:00
Martin Artnik e1b0b65465 Improved code style, fixed bug [SCI-5828] 2021-06-29 15:57:23 +02:00
artoscinote 73c86c8423
Merge pull request #3409 from artoscinote/ma_SCI_5851 
Report generation fixes [SCI-5851]
 2021-06-29 14:55:26 +02:00
Martin Artnik b623e2f40f Report generation fixes [SCI-5851] 2021-06-29 13:46:45 +02:00
Oleksii Kriuchykhin ecec1ce194 Update Invite new user to team modal [SCI-5097] 2021-06-29 13:46:02 +02:00
artoscinote 9804e1bd28
Merge pull request #3400 from artoscinote/ma_SCI_5701 
Reworked task view sidebar [SCI-5701]
 2021-06-29 11:26:56 +02:00
zmagoD 9c812e84bd setup logic to group assign all team members and handle the unassignments logic 2021-06-27 13:22:19 +02:00
zmagoD a678f07b47 update extends and remove format from links 2021-06-27 09:45:32 +02:00
aignatov-bio 53b47412ee Update marvinJS image generation [SCI-5834] 2021-06-24 22:36:51 +02:00
aignatov-bio 786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391) 
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
 2021-06-23 19:48:44 +02:00
Martin Artnik b2e2186d9f Remove unnecessary tasks hash from full export [SCI-5840] 2021-06-22 14:57:07 +02:00
Martin Artnik c6c5f75262 Remove unncessary newline 2021-06-22 14:53:03 +02:00
Martin Artnik c4e6b0bbaf Fixed export all report html generation [SCI-5840] 2021-06-22 14:50:47 +02:00
Martin Artnik d67d53b926 Code style fixes 2021-06-22 13:27:03 +02:00
Martin Artnik eaa713f5b8 Fix indices [SCI-5829] 2021-06-22 12:51:25 +02:00
Martin Artnik a32219b1aa Amend how PDF report generation works [SCI-5837] 2021-06-21 14:20:30 +02:00
Martin Artnik 66d2e65114 Fixed report docx generation [SCI-5837] 2021-06-21 12:52:12 +02:00
zmagoD 9b87fce840 add read check to view methods 2021-06-20 11:11:03 +02:00
zmagoD ad10befcc4 add new manage access permission to PET levels 2021-06-19 17:17:57 +02:00
Martin Artnik b6588c2334 Reworked task view sidebar [SCI-5701] 2021-06-18 16:52:19 +02:00
Oleksii Kriuchykhin 7d31b99386 Revert to fontawesome CDN link in reports and update wicked_pdf [SCI-5650] 2021-06-18 15:03:17 +02:00
Martin Artnik 879cf5081d Added experiment code to experiment cards filter [SCI-5829] 2021-06-18 14:38:07 +02:00
Martin Artnik a9d6c4bb94 Code style fixes [SCI-5828] 2021-06-18 14:19:35 +02:00
Martin Artnik afc1b2d8b6 Added experiment code to PDF and DOCX [SCI-5830] 2021-06-18 14:14:02 +02:00
Martin Artnik 29ff910eba Added searching experiments by EX[ID] [SCI-5829] 2021-06-18 14:12:59 +02:00
Martin Artnik 0866a2e251 Added experiment ID to card and table views [SCI-5828] 2021-06-18 14:12:59 +02:00
Oleksii Kriuchykhin bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Alex Kriuchykhin 945d5ea6c6
Merge pull request #3397 from okriuchykhin/ok_SCI_5831 
Fix repositories selection in report wizard and deleted repositories handling [SCI-5831]
 2021-06-18 10:35:59 +02:00
Oleksii Kriuchykhin c03535f027 Code style improvements [SCI-5831] 2021-06-18 10:33:31 +02:00
Martin Artnik 56847e46a6 Don't schedule inactive webhooks 2021-06-18 00:13:37 +02:00
Martin Artnik c6648111f3 Code style fixes [SCI-5800] 2021-06-17 22:00:13 +02:00
Oleksii Kriuchykhin 1e3197875c Fix repositories selection in report wizard and deleted repositories handling [SCI-5831] 2021-06-17 16:23:27 +02:00
Martin Artnik 47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
artoscinote 5cadc388f8
Merge pull request #3395 from artoscinote/ma_SCI_5833 
Fixed generating status update when regenerating pdf [SCI-5833]
 2021-06-17 12:22:06 +02:00
Alex Kriuchykhin 4caa5f9ac1
Merge pull request #3394 from okriuchykhin/ok_SCI_5776_v2 
Fix repository snapshots for export all [SCI-5776]
 2021-06-17 11:35:16 +02:00
Martin Artnik 4b23ca271c Fixed generating status update when regenerating pdf [SCI-5833] 2021-06-17 09:51:25 +02:00
Martin Artnik 4ee50f87d5 Implement webhook service and scheduling jobs [SCI-5801, SCI-5802] 2021-06-17 09:19:04 +02:00
Oleksii Kriuchykhin 85a5cca98a Fix repository snapshots for export all [SCI-5776] 2021-06-16 16:17:12 +02:00
aignatov-bio 12d8b84cfd
Fix snapshots for deleted inventory [SCI-5826] (#3393) 2021-06-16 15:23:34 +02:00
Alex Kriuchykhin 1e830a49f3
Merge pull request #3392 from okriuchykhin/ok_SCI_5816 
Fix API date time serializers [SCI-5816]
 2021-06-16 12:28:16 +02:00
Alex Kriuchykhin b73972dbbf
Merge pull request #3389 from artoscinote/ma_SCI_5819 
Set scinote template if missing when generating reports [SCI-5819]
 2021-06-16 12:27:02 +02:00
Alex Kriuchykhin b053c25757
Merge pull request #3388 from okriuchykhin/ok_SCI_5815 
Fix user preferences date format selector [SCI-5815]
 2021-06-16 12:26:50 +02:00
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
artoscinote 2763f5cf89
Merge pull request #3383 from artoscinote/ma_SCI_5780 
Fixed fade-out gradients in Safari [SCI-5780]
 2021-06-16 10:23:23 +02:00
Oleksii Kriuchykhin 7537542c0a Fix API date time serializers [SCI-5816] 2021-06-15 17:12:55 +02:00
Martin Artnik 6cf9ea5bc0 Implement Activity -> ActivityFilter matching service [SCI-5800] 2021-06-15 16:13:28 +02:00
Martin Artnik 5137a5b1a3 Fix illegal return statement [SCI-5634] 2021-06-15 13:16:51 +02:00
Martin Artnik 2427086372 Set scinote template if missing when generating reports [SCI-5819] 2021-06-15 12:54:48 +02:00
Oleksii Kriuchykhin b132a13698 Fix user preferences date format selector [SCI-5815] 2021-06-15 11:15:46 +02:00
Miha Mencin b7513c6d5f
Merge pull request #3381 from aignatov-bio/ai-sci-5799-add-dynamic-logo-to-reports 
Add dynamic logo to default report [SCI-5799]
 2021-06-15 07:36:48 +02:00
Miha Mencin d25fc077dc
Merge pull request #3386 from artoscinote/ma_SCI_5814 
Fixed emails for successful report file generation [SCI-5814]
 2021-06-15 07:36:10 +02:00
Martin Artnik 380473c825 Fixed emails for successful report file generation [SCI-5814] 2021-06-14 13:25:50 +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
artoscinote 04155f5d60
Merge pull request #3384 from artoscinote/ma_SCI_5810 
Handle old reports with no templates properly [SCI-5810]
 2021-06-14 12:36:20 +02:00
Martin Artnik 1924100b4f Add missing class, so docx report status updates [SCI-5788] 2021-06-14 12:27:25 +02:00
Martin Artnik 20484cfe5c Handle old reports with no templates properly [SCI-5810] 2021-06-14 10:53:46 +02:00
Martin Artnik b5976312ba Fixed fade-out gradients in Safari [SCI-5780] 2021-06-14 09:19:25 +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
zmagoD 9f3195aa76 hide experiment actions dropdown when the user can't manage the experiment (SCI-5790) 2021-06-12 11:15:44 +02:00
zmagoD 7128987418 fix code style 2021-06-12 10:58:26 +02:00
zmagoD 7e4f47f667 update experiment and my_module search 2021-06-12 10:27:53 +02:00
zmagoD 8997ba10d1 mark user assigmetns when they are created manually or automatically 2021-06-12 09:36:41 +02:00
aignatov-bio ea94ce19b1 Add dynamic logo to default report [SCI-5799] 2021-06-10 15:29:28 +02:00
Miha Mencin dc72bfc527
Merge pull request #3379 from okriuchykhin/ok_SCI_5776 
Remove forgotten byebug assertion [SCI-5776]
 2021-06-10 13:08:39 +02:00
Oleksii Kriuchykhin 8b1a9a1b7c Remove forgotten byebug assertion [SCI-5776] 2021-06-10 13:06:31 +02:00
artoscinote d43f7180c1
Merge pull request #3377 from artoscinote/ma_SCI_5794 
Lock repository_row before inserting RepositoryCell  [SCI-5794]
 2021-06-10 12:46:41 +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 60c309e1cd
Merge pull request #3375 from artoscinote/ma_SCI_5787 
Fix changing report project, fix typo [SCI-5787]
 2021-06-09 13:43:23 +02:00
aignatov-bio afe2a19c88
Add webhooks management [SCI-5767] (#3376) 
* Add webhooks managment [SCI-5767]

* Markup fixes [SCI-5676]
 2021-06-09 12:53:11 +02:00
Miha Mencin 48202c88d1
Merge pull request #3350 from aignatov-bio/ai-sci-5601-add-pdf-preview-for-docx-report 
Add pdf preview for docx reports [SCI-5601]
 2021-06-09 11:27:45 +02:00
aignatov-bio e3812aed2c Markup fix [SCI-5601] 2021-06-09 11:02:36 +02:00
aignatov-bio 16f83a3e60 Remove docx preview processing flag [SCI-5601] 2021-06-09 10:58:27 +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
Miha Mencin e4421baf46
Merge pull request #3367 from okriuchykhin/ok_SCI_5640 
Add docx and pdf attributes to API report serializer [SCI-5640]
 2021-06-09 09:49:59 +02:00
Miha Mencin a3312d22ad
Merge pull request #3370 from okriuchykhin/ok_SCI_5785 
Fix date formatting for the API [SCI-5785]
 2021-06-09 08:56:15 +02:00
artoscinote fe5f37b3de
Merge pull request #3373 from artoscinote/ma_SCI_5791 
Skip merging encrypted PDF files in report PDF generation [SCI-5791]
 2021-06-09 08:54:06 +02:00
Miha Mencin 471f6daae7
Merge pull request #3374 from okriuchykhin/ok_SCI_5776 
Fix export all functionality [SCI-5776]
 2021-06-09 08:52:21 +02:00
aignatov-bio 34eaaf6eeb
Update new report link on dashboard page [SCI-5772] (#3369) 2021-06-08 16:00:44 +02:00
aignatov-bio 4a6f6a787a
Update help menu [SCI-5643] (#3368) 2021-06-08 15:34:19 +02:00
Martin Artnik 6d98b7eb2b Fix changing report project, fix typo [SCI-5787] 2021-06-08 15:07:00 +02:00
Oleksii Kriuchykhin 16bad9eb9c Fix export all functionality [SCI-5776] 2021-06-08 14:21:34 +02:00
Martin Artnik 08a5d1cfa5 Skip merging encrypted PDF files in report PDF generation [SCI-5791] 2021-06-08 14:01:37 +02:00
Martin Artnik 193bde632f Fix issue with submit event binding multiple times [SCI-5789] 2021-06-08 10:33:31 +02:00
Oleksii Kriuchykhin 86fcda3c09 Fix date formatting for the API [SCI-5785] 2021-06-07 10:34:58 +02:00
zmagoD fc7214c2f7 add test scenarios for user assignments propagation jobs 2021-06-06 11:46:16 +02:00
zmagoD ddaa4b4c57 replase user_projects with user_assignment where the permissions are calculated 2021-06-06 10:29:01 +02:00
zmagoD 784e43e328 create user_assignments for all child objects when the user is attached to the project 2021-06-06 09:54:47 +02:00
aignatov-bio 9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
Oleksii Kriuchykhin 960d6681ff Add docx and pdf attributes to API report serializer [SCI-5640] 2021-06-03 11:40:01 +02:00
aignatov-bio bf781c2ca4 Small fixes [SCI-5765] 2021-06-01 10:58:05 +02:00
zmagoD 3d79dd32ad update endpoint type 2021-05-31 21:48:18 +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
aignatov-bio 3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
Alex Kriuchykhin 48f3777bdb
Merge pull request #3362 from aignatov-bio/ai-sci-5700-fix-nil-check-for-team-description 
Fix nit issue in team description [SCI-5700]
 2021-05-31 11:54:18 +02:00
Oleksii Kriuchykhin 92821d7f1e Fix dates formatting in report templates [SCI-5774] 2021-05-31 11:51:04 +02:00
aignatov-bio f98aad5853 Fix nit issue in team description [SCI-5700] 2021-05-29 23:10:48 +02:00
zmagoD debff7bc85 fix code style 2021-05-29 19:25:46 +02:00
zmagoD f1c3bf7cf6 fix failng scenarios and remove uneeded code 2021-05-29 17:25:20 +02:00
zmagoD 28cb7ee81d add user roles enpoint and update scenarios 2021-05-29 15:28:10 +02:00
Oleksii Kriuchykhin 2bad60d48c Disable edit button for reports of archived projects [SCI-5755] 2021-05-28 16:17:20 +02:00
Alex Kriuchykhin 27cefe7cbd
Merge pull request #3360 from okriuchykhin/ok_SCI_5774 
Fix date formatting in report jobs [SCI-5774]
 2021-05-28 14:24:46 +02:00
Alex Kriuchykhin d9b7526f11
Merge pull request #3359 from aignatov-bio/ai-sci-5775-fix-snapshots-in-reports 
Fix snapshots render in reports [SCI-5775]
 2021-05-28 14:24:35 +02:00
Alex Kriuchykhin 6d56ea2ee0
Merge pull request #3358 from okriuchykhin/ok_SCI_5773 
Remove experiment from report if it is moved to another project [SCI-5773]
 2021-05-28 14:02:30 +02:00
Alex Kriuchykhin f20b2bd2e8
Merge pull request #3356 from aignatov-bio/ai-sci-5754-add-generate-button-to-old-reports 
Add generate PDF button for old reports [SCI-5754]
 2021-05-28 14:02:18 +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 93a34fc343 Fix date formatting in report jobs [SCI-5774] 2021-05-28 13:49:33 +02:00
aignatov-bio f7849cf677 Fix snapshots render in reports [SCI-5775] 2021-05-28 13:13:56 +02:00
Oleksii Kriuchykhin cc8cc595d7 Remove experiment from report if it is moved to another project [SCI-5773] 2021-05-28 11:31:45 +02:00
Oleksii Kriuchykhin 70f0535dbd Fix deletion of old reports [SCI-5751] 2021-05-27 16:31:58 +02:00
aignatov-bio 519a0534fc Add generate PDF button for old reports [SCI-5754] 2021-05-27 14:55:27 +02:00
Alex Kriuchykhin 1a16fcd6c6
Merge pull request #3355 from okriuchykhin/ok_SCI_5768 
Fix files download URLs in PDF report [SCI-5768]
 2021-05-27 14:30:50 +02:00
Alex Kriuchykhin 29437dc1c8
Merge pull request #3353 from aignatov-bio/ai-sci-5762-fix-experiments-ordering 
Fix report experiments sorting [SCI-5762]
 2021-05-27 14:30:40 +02:00
Alex Kriuchykhin 967ec1fdbf
Merge pull request #3349 from aignatov-bio/ai-sci-5758-small-report-wizard-fixes 
Small report wizard fixes [SCI-5758]
 2021-05-27 14:28:21 +02:00
Oleksii Kriuchykhin 19300294e9 Fix files download URLs in PDF report [SCI-5768] 2021-05-27 14:25:22 +02:00
aignatov-bio 24f4f6cbb2 Fix report experiments sorting [SCI-5762] 2021-05-27 12:44:45 +02:00
Miha Mencin 90b02f9d4a
Merge pull request #3352 from okriuchykhin/ok_SCI_5763 
Fix reports docx job arguments [SCI-5763]
 2021-05-26 16:26:54 +02:00
Oleksii Kriuchykhin 7a5c7e0526 Fix reports docx job arguments [SCI-5763] 2021-05-26 14:34:58 +02:00
aignatov-bio 2be59bf8b2 Add pdf preview for docx reports [SCI-5601] 2021-05-25 15:14:50 +02:00
aignatov-bio f586865696 Small report wizard fixes [SCI-5758] 2021-05-25 13:14:57 +02:00
Miha Mencin e675e4004e
Merge pull request #3348 from aignatov-bio/ai-sci-5753-fix-export-all 
Fast fix for export all [SCI-5753]
 2021-05-24 15:19:11 +02:00
aignatov-bio 2651e8ff35 Fast fix for export all [SCI-5753] 2021-05-24 13:16:43 +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
Miha Mencin 6a663383da
Merge pull request #3347 from aignatov-bio/ai-sci-5749-fix-reports-selection-in-reports-wizard 
Fix repository selection in report wizard [SCI-5749]
 2021-05-24 09:52:58 +02:00
Miha Mencin 2355d8f861
Merge pull request #3345 from aignatov-bio/ai-sci-5750-reports-close-actions-dropdown-on-click 
Reports close actions dropdown on docx generate click [SCI-5750]
 2021-05-24 09:52:23 +02:00
aignatov-bio f576af078e Fix repository selection in report wizard [SCI-5749] 2021-05-24 09:40:50 +02:00
zmagoD 7e6789200a fix new API endpoints and add test cases 2021-05-23 17:31:02 +02:00
zmagoD 300c1521fd add new API endpoints and fix/update ExperimentMember and MyModuleMember modules 2021-05-22 18:36:30 +02:00
zmagoD be94cb09c2 fix code style 2021-05-22 14:41:56 +02:00
zmagoD 67cf09e030 log activities on experiment and my_module assignment change 2021-05-22 13:59:27 +02:00
Oleksii Kriuchykhin 64ce35c8da Refactor DOCX report generator [SCI-5735] 2021-05-21 16:40:38 +02:00
aignatov-bio 4f5939293e Reports close actions dropdown on docx generate click [SCI-5750] 2021-05-21 14:55:11 +02:00
aignatov-bio 8831427b7f Fix multiple user selection in report templates [SCI-5748] 2021-05-21 14:19:58 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Miha Mencin 990628c9c7
Merge pull request #3342 from okriuchykhin/ok_SCI_5741 
Remove task from report if it is moved to another experiment [SCI-5741]
 2021-05-21 10:45:10 +02:00
Miha Mencin afeed9b512
Merge pull request #3341 from okriuchykhin/ok_SCI_5742 
Use the same ordering in PDF report for full results file previews as in the main results section [SCI-5742]
 2021-05-21 09:54:21 +02:00
Oleksii Kriuchykhin 7d9a79456a Remove task from report if it is moved to another experiment [SCI-5741] 2021-05-20 21:21:27 +02:00
Alex Kriuchykhin 371a51c4de
Merge pull request #3340 from aignatov-bio/ai-sci-5714-fix-checkbox-in-report-wizard 
Add indeterminate state to report wizard checkbox [SCI-5714]
 2021-05-20 16:01:41 +02:00
Alex Kriuchykhin 4b7aaceb66
Merge pull request #3339 from okriuchykhin/ok_SCI_5676 
Fix report generation with default template [SCI-5676]
 2021-05-20 15:57:38 +02:00
aignatov-bio 0200cd4b6e Add indeterminate state to report wizard checkbox [SCI-5714] 2021-05-20 15:54:46 +02:00
Oleksii Kriuchykhin 8fd876ab84 Use the same ordering in PDF report for full results file previews as in the main results section [SCI-5742] 2021-05-20 15:54:36 +02:00
Oleksii Kriuchykhin fcfba5a0d9 Fix report generation with default template [SCI-5676] 2021-05-20 15:14:25 +02:00
Miha Mencin b7f4ac5e67
Merge pull request #3337 from aignatov-bio/ai-sci-5729-grayed-edit-button-on-report-generating 
Disable edit button if report generating [SCI-5729]
 2021-05-20 15:13:12 +02:00
Miha Mencin 6142c2d89d
Merge pull request #3336 from aignatov-bio/ai-sci-5740-default-template-selection 
Add default template selection [SCI-5740]
 2021-05-20 15:11:33 +02:00
Miha Mencin 3ab322c241
Merge pull request #3338 from okriuchykhin/ok_SCI_5739 
Render report element children container only if children are present [SCI-5739]
 2021-05-20 15:09:01 +02:00
Oleksii Kriuchykhin 7bfde7dc1e Render report element children container only if children are present [SCI-5739] 2021-05-20 14:16:39 +02:00
aignatov-bio fce89a8a12 Disable edit button if report generating [SCI-5729] 2021-05-20 13:39:27 +02:00
aignatov-bio 1b56190116 Add default template selection [SCI-5740] 2021-05-20 13:18:57 +02:00
aignatov-bio 32682efd92
Check report wizard continue button status on page load [SCI-5736] (#3332) 2021-05-20 12:46:23 +02:00
Oleksii Kriuchykhin 0ff1277dbf Improve filtering for inventories [SCI-5730] 2021-05-19 22:48:52 +02:00
aignatov-bio 7e3a281086 Small fixes for report search [SCI-5551] 2021-05-18 17:00:30 +02:00
Alex Kriuchykhin ed1467635f
Merge pull request #3328 from aignatov-bio/ai-sci-5728-fix-flash-message-in-reports 
Remove default value from pdf/docx_file_status [SCI-5728]
 2021-05-18 15:26:16 +02:00
aignatov-bio 0b97ffe5c6 xRemove default value from pdf/docx_file_status [SCI-5728] 2021-05-18 15:24:13 +02:00
aignatov-bio c961b493fc
Small fixes in reports templates [SCI-5723] (#3327) 
* Small fixes in reports templates [SCI-5723]

* Update template name validation [SCI-5723]
 2021-05-18 15:19:51 +02:00
Alex Kriuchykhin 7556a54213
Merge pull request #3329 from aignatov-bio/ai-sci-5727-fix-results-sorting 
Change results sorting [SCI-5727]
 2021-05-18 14:48:43 +02:00
aignatov-bio e8b115ca7a Change results sorting [SCI-5727] 2021-05-17 15:17:32 +02:00
aignatov-bio ff5d8571a3 Add class name to generate docx button [SCI-5722] 2021-05-17 12:06:12 +02:00
aignatov-bio 8f228d866d Add action to generate docx button [SCI-5722] 2021-05-17 12:06:12 +02:00
Alex Kriuchykhin 8e3e72654c
Merge pull request #3324 from aignatov-bio/ai-sci-5551-add-search-field-to-reports 
Add search field to reports page [SCI-5551]
 2021-05-17 11:50:03 +02:00
Miha Mencin 491dc22294
Merge pull request #3321 from okriuchykhin/ok_SCI_5724 
Fix default empty options for report wizard first page [SCI-5724]
 2021-05-17 10:28:57 +02:00
Miha Mencin d891b8391c
Merge pull request #3326 from okriuchykhin/ok_SCI_5734 
Fix outdated full file previews in PDF reports [SCI-5734]
 2021-05-17 10:17:49 +02:00
Miha Mencin 65004fa65f
Merge pull request #3325 from okriuchykhin/ok_SCI_5709_v2 
Fix table rendering in PDF reports [SCI-5709]
 2021-05-17 10:17:07 +02:00
Miha Mencin d952edd389
Merge pull request #3316 from okriuchykhin/ok_SCI_5702 
Add generation error states to reports [SCI-5702]
 2021-05-17 10:16:06 +02:00
aignatov-bio e058adab08 Add search scope from searchable concern [SCI-5551] 2021-05-17 09:55:59 +02:00
zmagoD c23c01c01c remove user projects enpoints, fix the role name display 2021-05-16 12:03:16 +02:00
zmagoD de4c28069a fix experiment level styling issues and update the dropdown placeholerds 2021-05-16 11:04:04 +02:00
Oleksii Kriuchykhin 513d2151ab Fix outdated full file previews in PDF reports [SCI-5734] 2021-05-14 13:18:33 +02:00
Alex Kriuchykhin 5e06768fa6
Merge pull request #3322 from okriuchykhin/ok_SCI_5726 
Fix default selection of results in reports wizard [SCI-5726]
 2021-05-14 12:02:49 +02:00
Oleksii Kriuchykhin 460807b8c3 Fix table rendering in PDF reports [SCI-5709] 2021-05-14 12:01:09 +02:00
aignatov-bio e953666762 Add search field to reports page [SCI-5551] 2021-05-13 21:41:26 +02:00
Alex Kriuchykhin 34c79d66b8
Merge pull request #3278 from okriuchykhin/ok_SCI_5664 
Add report templates loader and move out templates from the main source tree [SCI-5664]
 2021-05-13 15:51:24 +02:00
Oleksii Kriuchykhin 167ebd3d58 Fix default selection of results in reports wizard [SCI-5726] 2021-05-13 15:44:06 +02:00
Oleksii Kriuchykhin 697809ff6a Fix default empty options for report wizard first page [SCI-5724] 2021-05-13 14:24:47 +02:00
Alex Kriuchykhin dde82423f1
Merge pull request #3320 from aignatov-bio/ai-sci-5718-remove-report-name-uniqness 
Remove report name uniqueness [SCI-5718]
 2021-05-13 11:46:34 +02:00
Alex Kriuchykhin 9675dafd25
Merge pull request #3319 from aignatov-bio/ai-sci-5679-fix-report-wizard-results-collapsing-arrows 
Fix report wizard results collapsing [SCI-5679]
 2021-05-13 11:45:49 +02:00
Alex Kriuchykhin 4d30d9dec1
Merge pull request #3317 from okriuchykhin/ok_SCI_5709 
Improve rendering of inventories in reports [SCI-5709]
 2021-05-13 11:45:26 +02:00
Alex Kriuchykhin 1fc8c9cf72
Merge pull request #3318 from okriuchykhin/ok_SCI_5707 
Fix code formatting in report project content [SCI-5707]
 2021-05-13 11:45:01 +02:00
aignatov-bio 3ba96be787 Remove report name uniqness [SCI-5718] 2021-05-12 14:56:22 +02:00
aignatov-bio 64279f7193 Fix report wizard results collapsing [SCI-5679] 2021-05-12 14:28:54 +02:00
Alex Kriuchykhin 5c57056796
Merge pull request #3307 from aignatov-bio/ai-sci-5712-revert-template-on-warning-modal-close 
Revert selected template on warning modal close [SCI-5712]
 2021-05-12 13:12:16 +02:00
Oleksii Kriuchykhin 4bbf968c18 Fix code formatting in report project content [SCI-5707] 2021-05-12 13:10:01 +02:00
aignatov-bio 285e424ab7 Fix markup [SCI-5712] 2021-05-12 12:31:37 +02:00
aignatov-bio e16b3b0d61
Report wizard add red border to report name [SCI-5703] (#3309) 2021-05-12 12:22:40 +02:00
Alex Kriuchykhin d02f4a7ff9
Merge pull request #3308 from aignatov-bio/ai-sci-5706-fix-ordering-tasks-in-report-and-wizard 
Fix ordering tasks in report and wizard [SCI-5706]
 2021-05-12 12:04:43 +02:00
aignatov-bio 8f8e685793
Change report warning modals size [SCI-5717] (#3315) 2021-05-11 21:31:44 +02:00
aignatov-bio 36f680a444
Add bold to confirmation text in report warning modals [SCI-5710] (#3312) 2021-05-11 21:31:23 +02:00
aignatov-bio 114a590a22
Report wizard fix task and experiments long names [SCI-5711] (#3311) 2021-05-11 21:31:12 +02:00
aignatov-bio 3bd774f8db
Small fixes for report index page [SCI-5695] (#3310) 2021-05-11 21:30:58 +02:00
aignatov-bio 131ff79034
Fix collased arrow in report wizard [SCI-5697] (#3306) 2021-05-11 21:29:59 +02:00
Alex Kriuchykhin 2f52d4f9ce
Merge pull request #3313 from aignatov-bio/ai-sci-5720-fix-handsone-tables-in-pdf-report 
Fix handson table in pdf report [SCI-5720]
 2021-05-11 17:32:39 +02:00
Oleksii Kriuchykhin ca0f5348a1 Improve rendering of inventories in reports [SCI-5709] 2021-05-11 17:09:39 +02:00
Oleksii Kriuchykhin a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
aignatov-bio dcd299f250 Fix handson table in pdf report [SCI-5720] 2021-05-11 12:20:16 +02:00
aignatov-bio 999b6b26a3
Fix results render in pdf report [SCI-5696] (#3305) 2021-05-11 10:12:03 +02:00
aignatov-bio 44a17dc014 Fix ordering tasks in report and wizard [SCI-5706] 2021-05-11 09:40:51 +02:00
zmagoD 5ee38966a0 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-05-11 08:36:39 +02:00
zmagoD 8f9c55d6e4 update locales 2021-05-11 08:30:39 +02:00
aignatov-bio 3b55afb908 Revert selected template on warning modal close [SCI-5712] 2021-05-10 14:03:08 +02:00
Miha Mencin 56a6c0825d
Merge pull request #3296 from okriuchykhin/ok_SCI_5699 
Improve handling of selected inventories in reports [SCI-5699]
 2021-05-10 10:48:09 +02:00
Miha Mencin 1c20c02686
Merge pull request #3289 from biosistemika/SCI-5698-fix-force-2fa 
SCI-5698 fix force 2fa
 2021-05-10 10:47:49 +02:00
Miha Mencin b4b7783cd3
Merge pull request #3301 from okriuchykhin/ok_SCI_5691 
Hide empty projects in reports editor [SCI-5691]
 2021-05-10 10:47:23 +02:00
Miha Mencin 4886a78be9
Merge pull request #3297 from okriuchykhin/ok_SCI_5694 
Add flash messages for report generation [SCI-5694]
 2021-05-10 10:46:49 +02:00
zmagoD ab47c8695f add read permission and controller tests for new endpoints 2021-05-09 18:23:50 +02:00
zmagoD d145dd6d36 add my module assigments modals 2021-05-09 16:59:10 +02:00
zmagoD ac91d9c2c4 add assign user permission to experiment level 2021-05-08 18:06:07 +02:00
zmagoD c0eb38b564 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/new_permissions 2021-05-08 10:33:43 +02:00
zmagoD 331a68e9b6 fix new experiment creation 2021-05-08 10:05:22 +02:00
Oleksii Kriuchykhin b056eb797f Hide empty projects in reports editor [SCI-5691] 2021-05-07 18:28:13 +02:00
Oleksii Kriuchykhin f5eea49116 Add link to generated report preview in notifications [SCI-5553] 2021-05-07 17:21:44 +02:00
Oleksii Kriuchykhin e4d852b9f5 Fix report PDF generation job params [SCI-5708] 2021-05-07 17:00:34 +02:00
Oleksii Kriuchykhin 06109889c5 Add flash messages for report generation [SCI-5694] 2021-05-07 16:23:35 +02:00
Oleksii Kriuchykhin 62b919cd8f Improve handling of selected inventories in reports [SCI-5699] 2021-05-07 14:55:01 +02:00
Alex Kriuchykhin 7bc6abd9bb
Merge pull request #3290 from okriuchykhin/ok_SCI_5614 
Improve report saving performance and error handling [SCI-5614]
 2021-05-07 11:51:57 +02:00
Alex Kriuchykhin eb773d94c5
Merge pull request #3294 from okriuchykhin/ok_SCI_5619 
Add default settings to existing reports [SCI-5619][SCI-5672]
 2021-05-07 11:38:41 +02:00
Alex Kriuchykhin 7a256838c1
Merge pull request #3292 from aignatov-bio/ai-sci-5638-add-missing-activities-for-new-reports 
Add new activities to reports [SCI-5638]
 2021-05-07 11:26:21 +02:00
Alex Kriuchykhin 05855ccf40
Merge branch 'features/new-reports' into ai-sci-5675-add-view-mode-for-checkbox-template-element 2021-05-07 11:03:24 +02:00
Alex Kriuchykhin 4e5e58c66a
Merge pull request #3285 from aignatov-bio/ai-sci-5684-add-warning-modal-for-template-and-project-change 
Add warning modal on project and template change [SCI-5684]
 2021-05-07 10:06:18 +02:00
Oleksii Kriuchykhin b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
Oleksii Kriuchykhin 6a1c073024 Fix file icons in export all [SCI-5685] 2021-05-06 14:53:44 +02:00
aignatov-bio 2fc5bd2521
Fix report processing state after create and update [SCI-5678] (#3276) 2021-05-06 14:22:02 +02:00
aignatov-bio bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +02:00
Oleksii Kriuchykhin 96f85aeb3c Add report templates loader and move out templates from the main source tree [SCI-5664] 2021-05-06 11:27:05 +02:00
Alex Kriuchykhin 57c90a60c4
Merge pull request #3287 from aignatov-bio/ai-sci-5686-add-default-scinote-report-template 
Add Scinote Report Template [SCI-5686]
 2021-05-06 10:59:33 +02:00
Oleksii Kriuchykhin c0ef2eef3c Improve report saving performance and error handling [SCI-5614] 2021-05-06 10:53:40 +02:00
miha 36788db816 SCI-5698 Make the decision to redirect to 2fa more readable 2021-05-06 08:14:39 +02:00
miha f23ff73610 SCI-5693 skip 2fa if bypass is set 2021-05-05 17:29:21 +02:00
aignatov-bio 689967f82c Add Scinote Report Template [SCI-5686] 2021-05-05 15:13:06 +02:00
aignatov-bio 4d685f193b Fix save as bew report [SCI-5684] 2021-05-05 12:25:13 +02:00
aignatov-bio 3fc4ab9892 Add warning modal on project and template change [SCI-5684] 2021-05-05 12:13:52 +02:00
miha 136f0cd17f SCI-5693 refactor of 2fa procedure 2021-05-04 20:51:34 +02:00
Oleksii Kriuchykhin a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
aignatov-bio 9ca7b76a1f Fix report assigned repository items 2021-05-04 12:49:38 +02:00
Oleksii Kriuchykhin e98ccd2860 Add confirmation modal for report regeneration action [SCI-5622] 2021-05-03 16:10:14 +02:00
aignatov-bio 3d80deb51a
Add pagination to report title page [SCI-5667] (#3275) 2021-05-03 15:27:17 +02:00
aignatov-bio 705fb1e43d
Add report front-end validations and close wizard modals [SCI-5666] (#3273) 
* Add report front-end validations and close wizard modals

* Add constant to report name validation [SCI-5666]
 2021-05-03 15:24:27 +02:00
aignatov-bio e25bd039d5
Small css fix for report action dropdown (#3279) 2021-05-03 15:17:46 +02:00
aignatov-bio 01dfd305ab
Add warning modal to report edit mode [SCI-5621] (#3266) 
* Add warning modal to report edit mode [SCI-5621]

* Move report editing modal to partial [SCI-5621]
 2021-05-03 15:17:23 +02:00
aignatov-bio 7752267808
Add styling for template values [SCI-5630] (#3264) 2021-05-03 15:17:09 +02:00
aignatov-bio 931c587af7 Add view mode for checkbox template component [SCI-5675] 2021-05-03 13:44:27 +02:00
Oleksii Kriuchykhin 1abc0dc1eb Fix tests [SCI-5636] 2021-05-03 13:03:26 +02:00
Oleksii Kriuchykhin 1b8265343e Add full-page display to PDF Report of all pages of the attached Word and PDF files in the Results [SCI-5636] 2021-05-03 11:45:45 +02:00
zmagoD 47cb1b31dc fix code style 2021-05-02 11:36:10 +02:00
zmagoD c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22:59 +02:00
zmagoD 63bbc609ef style modal 2021-04-30 16:02:59 +02:00
zmagoD f1ced42ae6 add filtering logic 2021-04-30 15:25:08 +02:00
zmagoD 11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
aignatov-bio 86854b015d Add third template to reports [SCI-5618] 2021-04-29 15:21:58 +02:00
aignatov-bio 6b023603f9
Add second template for reports [SCI-5617] (#3268) 2021-04-29 10:42:17 +02:00
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +02:00
Oleksii Kriuchykhin bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
Oleksii Kriuchykhin 8a915c8acf Fix assets inclusion into report [SCI-5680] 2021-04-28 14:37:16 +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
zmagoD c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +02:00
Alex Kriuchykhin fe48e35cf0
Merge pull request #3263 from okriuchykhin/ok_SCI_5609 
Add additional custom fields for reports [SCI-5609]
 2021-04-23 10:53:59 +02:00
Oleksii Kriuchykhin ecbf747499 Switch to base64 encoded assets in wiked_pdf templates 2021-04-22 14:52:41 +02:00
Oleksii Kriuchykhin fab013b19b Fix file name sanitization in PDF previewer [SCI-5541] 2021-04-20 17:20:16 +02:00
Oleksii Kriuchykhin a67cc619ec Add additional custom fields for reports [SCI-5609] 2021-04-20 13:57:09 +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
zmagoD 04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +02:00
zmagoD 3333241c9a add CTA for project members modal SCI-5645 2021-04-18 12:23:29 +02:00
Miha Mencin 840651a7d6
Merge pull request #3192 from okriuchykhin/ok_SCI_5478 
Add migration for new user assignments to projects [SCI-5478]
 2021-04-18 11:10:08 +02:00
Miha Mencin f95e9402bd
Merge pull request #3258 from okriuchykhin/ok_SCI_5613 
Fix save report PDF to Inventory [SCI-5613]
 2021-04-15 09:30:04 +02:00
Alex Kriuchykhin 80827ce761
Merge pull request #3257 from biosistemika/SCI-5623-add-external-id-to-user 
SCI-5623 add external id to user
 2021-04-14 16:15:43 +02:00
Oleksii Kriuchykhin f13f3691b1 Fix blob permissions check to support multiple attachments [SCI-5613] 2021-04-14 16:07:01 +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
Oleksii Kriuchykhin a2a0aabb62 Implement pooling for Report document creation status [SCI-5557] 2021-04-14 15:16:08 +02:00
miha ac18cb7225 rename partial to include html 2021-04-14 14:07:55 +02:00
Oleksii Kriuchykhin df8354bde3 Move the docx creation to the Delayed job [SCI-5560] 2021-04-14 12:39:36 +02:00
aignatov-bio 85a13b7182 Update condition for project content [SCI-5620] 2021-04-14 11:51:03 +02:00
aignatov-bio bccd474cc6 Add edit mode for report [SCI-5620] 2021-04-14 11:51:03 +02:00
aignatov-bio d991b631fb
Merge pull request #3252 from aignatov-bio/ai-sci-5593-add-logic-for-preparing-wizard-data-for-report 
Add logic for preparing wizard data for report [SCI-5593]
 2021-04-14 11:04:55 +02:00
miha e610683d5c [SCI-5623] added external_id setting to user 2021-04-14 09:44:09 +02:00
Alex Kriuchykhin 1df86c36d9
Merge pull request #3254 from okriuchykhin/ok_SCI_5637 
Implement PDF report generation in delayed job [SCI-5637]
 2021-04-13 16:37:16 +02:00
Oleksii Kriuchykhin f864f551d5 Implement PDF report generation in delayed job [SCI-5637] 2021-04-12 13:04:02 +02:00
aignatov-bio 101d46956c Add logic for preparing wizard data for report [SCI-5593] 2021-04-12 12:42:22 +02:00
miha 4f7f257b78 Remove cascading save from step 2021-04-12 12:20:05 +02:00
miha 2e45093856 fix a stupid2 2021-04-12 10:31:35 +02:00
miha b917a0c3e0 fix a stupid 2021-04-12 10:30:37 +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 67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
aignatov-bio 14f8e97b5f Add I18n for reports wizard second step [SCI-5572] 2021-04-08 12:04:34 +02:00
aignatov-bio e6edbf55f3 Add report wizard step 2 [SCI-5572] 2021-04-08 12:00:08 +02:00
aignatov-bio a1d6c30ef7 Add report wizard step 3 [SCI-5611] 2021-04-07 16:37:08 +02:00
Alex Kriuchykhin aa21d7e415
Merge pull request #3247 from okriuchykhin/ok_SCI_5591 
Add dynamic form elements in report wizard step 1 [SCI-5591]
 2021-04-07 12:05:10 +02:00
aignatov-bio a46b9cb8ea Add document preview to reports [SCI-5559] 2021-04-07 11:15:22 +02:00
Miha Mencin e3ca50d2d0
Merge pull request #3246 from biosistemika/SCI-5631-order-the-inventory-results 
[SCI-5631] Add ordering to inventory item api endpoint
 2021-04-06 18:40:38 +02:00
Oleksii Kriuchykhin a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
miha 961fa9ab4e [SCI-5631] Add ordering to index endpoint so pagination works, limit maximum page size for kaminari 2021-04-06 09:59:24 +02:00
aignatov-bio 5c4099af80 Fix css for repository header [SCI-5628] 2021-04-01 12:55:58 +02:00
aignatov-bio 82be23db81 Add project and template selector [SCI-5570] 2021-03-31 15:32:03 +02:00
Alex Kriuchykhin c9688a58f7
Merge pull request #3241 from aignatov-bio/ai-sci-5571-add-template-partial-to-report 
Add template partials to reports [SCI-5571]
 2021-03-31 11:36:56 +02:00
aignatov-bio d04858d26e Fix markup [SCI-5571] 2021-03-30 23:47:34 +02:00
aignatov-bio ecca155fab Added layout for footer and header [SCI-5571] 2021-03-30 23:43:34 +02:00
aignatov-bio ad8e404bca Add template partials to reports [SCI-5571] 2021-03-30 13:40:36 +02:00
Oleksii Kriuchykhin 2b2b6f7774 Fix for API float parsing in the inventory number type column [SCI-5604] 2021-03-29 15:59:24 +02:00
Miha Mencin 6ad3f7b92f
Merge pull request #3239 from okriuchykhin/ok_SCI_5595_v2 
Remove canvas-to-blob library [SCI-5595]
 2021-03-29 14:03:35 +02:00
Oleksii Kriuchykhin 2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
Miha Mencin 787f2d58db
Merge pull request #3237 from biosistemika/SCI-5577-filter-notifications 
[SCI-5577] Filter notifications
 2021-03-29 11:55:22 +02:00
miha 11284d3b87 [SCI-5577] filter notifications 2021-03-29 09:52:57 +02:00
aignatov-bio 1c93131ff1 Fix folders breadcrumbs [SCI-5597] 2021-03-26 11:58:18 +01:00
Oleksii Kriuchykhin f7c865974d Switch to graphviz gem [SCI-5596] 2021-03-25 17:42:57 +01:00
aignatov-bio 0ba6eec73c
Merge pull request #3232 from aignatov-bio/ai-sci-5564-fix-breadcrumbs-for-experiments-page 
Remove the project from experiments page breadcrumbs [SCI-5564]
 2021-03-25 15:41:49 +01:00
aignatov-bio b5cb46908c
Merge pull request #3225 from aignatov-bio/ai-sci-5563-add-reload-action-to-inline-asset 
Add reload action for assets [SCI-5563]
 2021-03-25 15:40:36 +01:00
Oleksii Kriuchykhin 943c01cada Remove simple_token_authentication [SCI-5595] 2021-03-25 14:55:22 +01:00
aignatov-bio 9281a5631c Remove project from experiments page breadcrumbs [SCI-5564] 2021-03-25 14:32:05 +01:00
aignatov-bio 32b1db629a Change button_to to link_to [SCI-5563] 2021-03-25 14:21:24 +01:00
aignatov-bio 0920d0a5cd Add reports wizzard layout [SCI-5569] 2021-03-25 13:21:54 +01:00
aignatov-bio 9e58380991
Merge pull request #3220 from aignatov-bio/ai-sci-5574-fix-infinite-scroll-for-dashboard 
Fix infinite scroll in current tasks on dashboard [SCI-5574]
 2021-03-24 11:42:26 +01:00
Miha Mencin 4fa1f350e4
Merge pull request #3221 from aignatov-bio/ai-sci-5564-small-breadcrumbs-fixes 
Small breadcrumbs fixes [SCI-5564]
 2021-03-24 09:46:09 +01:00
Miha Mencin 39f8cca364
Merge pull request #3230 from okriuchykhin/ok_SCI_5586 
Fix experiment workflow image loading [SCI-5586]
 2021-03-24 09:45:34 +01:00
Miha Mencin d5c8edd266
Merge pull request #3223 from aignatov-bio/ai-sci-5513-fix-office-icons-in-print-report 
Convert office icons to base64 [SCI-5513]
 2021-03-24 09:44:54 +01:00
Miha Mencin e4edc192c8
Merge pull request #3227 from aignatov-bio/ai-sci-5582-remove-project-folder-on-restore 
Remove project folder on project restore [SCI-5582]
 2021-03-24 09:44:35 +01:00
Miha Mencin 56a71ec426
Merge pull request #3228 from aignatov-bio/ai-sci-5583-fix-smart-annotations-in-experiment-details-modal 
Fix smart annotation in experiment details modal [SCI-5583]
 2021-03-24 09:44:06 +01:00
Oleksii Kriuchykhin f4abb4a6df Fix experiment workflow image loading [SCI-5586] 2021-03-23 23:13:26 +01:00
Alex Kriuchykhin f9f99cc26b
Merge pull request #3224 from okriuchykhin/ok_SCI_5575 
Implement missing missing user smart annotation notifications [SCI-5575]
 2021-03-23 12:03:51 +01:00
aignatov-bio e4256342d9 Fix smart annotation in experiment details modal [SCI-5583] 2021-03-22 15:36:10 +01:00
aignatov-bio a7d0f5050d Remove project on project restore [SCI-5582] 2021-03-22 15:20:47 +01:00
Oleksii Kriuchykhin 0e545dfee0 Fix sorting by status in team members table [SCI-4179] 2021-03-22 13:40:25 +01:00
aignatov-bio 7c573a1ee9 Add reload action for assets [SCI-5563] 2021-03-22 13:02:13 +01:00
Oleksii Kriuchykhin d315b1327b Implement missing missing user smart annotation notifications [SCI-5575] 2021-03-19 17:11:19 +01:00
aignatov-bio c1f0896670 Convert office icons to base64 [SCI-5513] 2021-03-19 15:10:23 +01:00
aignatov-bio d3d79f4288 Small breadcrumbs fixes [SCI-5564] 2021-03-18 14:24:33 +01:00
aignatov-bio 4436876282 Fix infinite scroll in current tasks on dashboard [SCI-5574] 2021-03-18 13:17:30 +01:00
aignatov-bio 3e5c2e83c7 Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550] 2021-03-17 12:54:25 +01:00
Alex Kriuchykhin ee73088a81
Merge pull request #3214 from okriuchykhin/ok_SCI_5555 
Fix filtering on current tasks widget [SCI-5555]
 2021-03-17 10:40:53 +01:00
aignatov-bio a0c506e6fe
Merge pull request #3209 from aignatov-bio/ai-sci-5546-fix-activities-multiple-types-selected 
Fix activities multiple types selected [SCI-5546]
 2021-03-17 10:08:18 +01:00
Alex Kriuchykhin 936322b294
Merge pull request #3210 from urbanrotnik/ur-sci-4179-v2 
Fix Role sorting [SCI-4179]
 2021-03-16 14:08:26 +01:00
aignatov-bio c99e8f19fd Add basic layout [SCI-5548] 2021-03-16 13:11:51 +01:00
Oleksii Kriuchykhin d006b813b9 Add pdf and docx attachments to reports [SCI-5558] 2021-03-15 13:30:03 +01:00
aignatov-bio e8310f9b2e
Merge pull request #3212 from aignatov-bio/ai-sci-5431-implement-flyout-for-long-breadcrumbs 
Add dropdown to breadcrumbs [SCI-5431]
 2021-03-12 14:33:19 +01:00
Urban Rotnik 8107920400 Fix Role sorting for organization admin 2021-03-12 14:06:28 +01:00
Urban Rotnik c20a1f9bb6
Merge pull request #3195 from urbanrotnik/ur-sci-5513-missing-icons 
Fix CSS for missing icons [SCI-5513]
 2021-03-12 13:58:11 +01:00
Oleksii Kriuchykhin 413187e6da Fix filtering on current tasks widget [SCI-5555] 2021-03-12 13:33:37 +01:00
aignatov-bio d97225026c Fix gap after experiment name [SCI-5486] 2021-03-12 12:30:00 +01:00
aignatov-bio 63744b6a04 Add dropdown to breadcrumbs [SCI-5431] 2021-03-12 12:21:10 +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 07ba11c140 Fix icons in export_all and print mode 2021-03-10 12:42:12 +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 ab1477997a Update variables name 2021-03-09 14:50:14 +01:00