Commit graph

721 commits

Author SHA1 Message Date
aignatov-bio
15f58be1c2 Fix snapshot date creation 2020-05-26 15:59:49 +02:00
Urban Rotnik
df8fe20d03 Keep reportElements up to date with active snapshots and repositories 2020-05-25 13:19:33 +02:00
aignatov-bio
cbc578f84b Fix snapshot name column id 2020-05-22 15:10:21 +02:00
aignatov-bio
0aa1c32813 Fix ordering in simple table view 2020-05-21 16:51: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
aignatov-bio
acb1b392fc
Merge pull request #2564 from aignatov-bio/ai-sci-4632-remove-task-inventory-tab
Remove inventory tab from task and routes to inventory page [SCI-4632]
2020-05-18 11:16:17 +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
bac98bdbdc Remove inventory tab from task and routes to inventory page 2020-05-14 22:10:13 +02:00
Miha Mencin
2e4655f9ee
Merge pull request #2548 from urbanrotnik/ur-sci-4609-task-card-due-date
Task card due date fix [SCI-4609]
2020-05-14 11:52:44 +02:00
Oleksii Kriuchykhin
ea740eb2a4 Restore deleted method after rebase [SCI-4596] 2020-05-14 10:57:43 +02:00
Oleksii Kriuchykhin
ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin
c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
Urban Rotnik
8174d63734 Include BoostrapFormHelper in FormBuilder 2020-05-08 20:36:45 +02:00
aignatov-bio
d2a479c2e8
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
2020-05-08 12:39:28 +02:00
aignatov-bio
2728df5bac Move helper method to my_module_helper 2020-05-08 11:56:29 +02:00
aignatov-bio
8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio
8076d8f464 Create helper for partial 2020-05-07 12:51:18 +02:00
aignatov-bio
8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown
Add new protocol template dropdown [SCI-4538]
2020-05-07 08:32:54 +02:00
aignatov-bio
61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
aignatov-bio
ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
aignatov-bio
0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
aignatov-bio
2f7adffcb0 Fix markup 2020-04-23 16:40:14 +02:00
Urban Rotnik
de4e4ca967 Add before_action for team switch 2020-04-23 16:20:01 +02:00
aignatov-bio
c2e456aa27 Fix activities and specs 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
38c198705c Change current_team to target team, add id param to link 2020-04-23 12:40:43 +02:00
Oleksii Kriuchykhin
e0d397ba77 Improve code style in repository_datatable_helper.rb [SCI-4525] 2020-04-22 15:21:04 +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
aignatov-bio
087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
aignatov-bio
9dfc652580 Fix markup 2020-04-07 12:50:58 +02:00
aignatov-bio
845e8c3d6d Fix loading process 2020-04-07 12:36:01 +02:00
aignatov-bio
7fdc169ba2 Add simple view to repository table 2020-04-06 19:52:41 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
aignatov-bio
b9e81f208d Fix i18n 2020-03-27 10:34:06 +01:00
aignatov-bio
8ff4b540e2 Update css for login screen 2020-03-27 09:43:49 +01:00
Oleksii Kriuchykhin
a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
aignatov-bio
8e05908753 Small fixes 2020-02-25 17:19:11 +01:00
aignatov-bio
5c0a769f87 General dashboard layout 2020-02-13 13:50:29 +01:00
aignatov-bio
44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1
Fix small visual bugs [SCI-4254]
2020-01-30 13:42:07 +01:00
Urban Rotnik
fc14bf05be
Merge pull request #2377 from biosistemika/master
Master >> Develop
2020-01-29 14:25:11 +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
aignatov-bio
9524659e1d Demodulize column name in datatable helper 2020-01-24 11:33:30 +01:00
aignatov-bio
4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +01:00
Urban Rotnik
75c7cb7aa8 Keep circles for task page 2020-01-14 13:31:44 +01:00
Urban Rotnik
2468b67de0 Assign column update 2020-01-14 09:02:30 +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
aignatov-bio
d5675c0c33 Add smart annotations to repository text value 2020-01-10 12:56:57 +01:00
Alex Kriuchykhin
9ab07af87b
Merge pull request #2282 from okriuchykhin/ok_SCI_4149
Disable comment edit mode if comment is not editable [SCI-4149]
2020-01-09 15:06:04 +01:00
Oleksii Kriuchykhin
1624f9d5ab Disable comment edit mode if comment is not editable [SCI-4149] 2020-01-08 12:32:59 +01:00
aignatov-bio
54c78cf4d1
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles
Update colors and buttons
2020-01-08 12:30:51 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
aignatov-bio
ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
Oleksii Kriuchykhin
e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
Alex Kriuchykhin
792e6f2eb9
Merge pull request #2263 from okriuchykhin/ok_SCI_4142
Implement SSO with Azure AD [SCI-4142]
2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin
1aa334fdaa Merge branch 'develop' into release-1-17-8 2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin
ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Urban Rotnik
06d87cb4b6 Add I18n to serializers 2019-12-06 11:39:10 +01:00
Urban Rotnik
2c0a6ed085 Remove current_user vars 2019-12-06 11:12:07 +01:00
Oleksii Kriuchykhin
7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Urban Rotnik
5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik
1c9d7ef6e7 Add File type renderer 2019-11-29 10:19:54 +01:00
Urban Rotnik
b2ce600820 Add delimiter column for repository_column 2019-11-29 10:19:10 +01:00
Oleksii Kriuchykhin
371f699a11 Fix AR preloading for repository table [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin
3481b50796 Fix column reordering for repositories [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin
220c3f8eeb Fix repository columns default state [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
aignatov-bio
232e4d78be Add serializers to datatable values 2019-11-29 10:19:03 +01:00
aignatov-bio
0f3c138a7e Fix markup 2019-11-29 10:19:03 +01:00
aignatov-bio
a0f11116d2 Add render views for datatables 2019-11-29 10:18:59 +01:00
Mojca Lorber
467c80da52 Update basic modal layout for creating new column types 2019-11-29 10:16:47 +01:00
aignatov-bio
70d721bb99 Add text method for assets 2019-11-29 10:16:42 +01:00
aignatov-bio
2ed3054c89 Make repository value render more flexible 2019-11-29 10:16:42 +01:00
Oleksii Kriuchykhin
f5abb7c767 Add connected accounts section to settings [SCI-4106] 2019-11-27 23:16:25 +01:00
aignatov-bio
b1f9e7f1ca Fix global activities jsonb field [SCI-3830] (#2030)
* Fix global activities jsonb field

* Fix tests
2019-11-18 13:59:54 +01:00
aignatov-bio
717b70f75b
Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties
Fix avatars in comments and activities [SCI-3995]
2019-10-29 14:11:39 +01:00
aignatov-bio
9950a23188 Replace base64 avatars with url 2019-10-22 12:27:13 +02:00
aignatov-bio
aaf76c0526 Fix avatars in comments and activities 2019-10-22 09:54:36 +02:00
Oleksii Kriuchykhin
53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +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
Mojca Lorber
e8f24b18e2 Fix missing icon on shared inventories in global search 2019-09-10 11:20:18 +02:00
mlorb
ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022) 2019-09-02 10:30:29 +02:00
Miha Mencin
a7bb7a1dd8 additional checking for icon: check also if user is guest 2019-08-26 11:20:18 +02:00
Miha Mencin
b850efbceb Code review remarks, added tooltip for unshared inventory 2019-08-26 10:45:40 +02:00
Miha Mencin
9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +02:00
Mojca Lorber
530d09df64 add i-shared inventory icon 2019-08-19 15:43:55 +02:00
Oleksii Kriuchykhin
32054c5516 Handle situation for assets without blob in list sorting [SCI-3757] 2019-08-09 15:17:19 +02:00
Oleksii Kriuchykhin
c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Mojca Lorber
7d4941015f Update global search, so it will be able to search through shared inventories 2019-08-09 14:13:01 +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
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +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
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +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
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
aignatov-bio
65cf5e5787
Fix activities menu selector highlight (#1877) 2019-07-03 09:18:41 +02:00
Oleksii Kriuchykhin
4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +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
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
6be227b2d3 Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-06-28 10:47:38 +02:00
Anton Ignatov
8240c8baad Initial refactoring for remote api support 2019-06-22 01:51:59 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Anton Ignatov
bc98cac9cc Trunc long protocol name on task page 2019-06-20 15:28:15 +02:00
Alex Kriuchykhin
db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-20 11:31:15 +02:00
aignatov-bio
9653f16196
Convert image to base64 in PDF reports [SCI-3557] (#1835)
* Convert image to base64 in PDF reports

* Fix typo error
2019-06-19 13:57:04 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments (#1838) 2019-06-14 16:20:13 +02:00
Oleksii Kriuchykhin
6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments

* Refactored comments over scinote

* Update events
2019-06-04 14:40:21 +02:00
Anton Ignatov
c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +02:00
aignatov-bio
2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
2019-05-21 15:19:44 +02:00
Oleksii Kriuchykhin
882c12cd31 Remove protocol description from preview popup [SCI-3485] 2019-05-20 15:04:54 +02:00
Anton Ignatov
259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
Miha Mencin
5ff344c208
Merge pull request #1746 from biosistemika/lm-sci-3426
Changes to create new office file button [SCI-3426]
2019-05-13 10:55:58 +02:00
aignatov-bio
d3aa6371cd
Fix report saving [SCI-3443] (#1753)
* Fix report saving

* Fix the report saving by using the reports' structures

* Remove uneccesary yarn.lock (mistake)
2019-05-13 10:55:08 +02:00
aignatov-bio
364f903b3c
Fix protocol preview name (#1749) 2019-05-13 10:17:47 +02:00
aignatov-bio
0b194eb3b1
Revert "Fix report saving (#1748)" (#1752)
This reverts commit 3db6129808.
2019-05-13 09:09:36 +02:00
aignatov-bio
3db6129808
Fix report saving (#1748) 2019-05-13 08:58:47 +02:00
Luka Murn
b78caef915 Fix the file preview modal so it supports WOPI_ENABLED == false 2019-05-10 16:41:11 +02:00
Anton Ignatov
f80d881847 Fix markup 2019-04-28 19:11:41 +02:00
Anton Ignatov
2847ec7609 Add env variable and check for MarvinJS available 2019-04-28 17:08:18 +02:00
Anton Ignatov
46f0e0c0c2 Add marvin js assets to assets sort and name field 2019-04-27 12:46:45 +02:00
Urban Rotnik
c41413234c Use MS office icons for MS files 2019-04-26 09:29:39 +02:00
Urban Rotnik
11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Urban Rotnik
b1dabaca15 New helper for file thumbnails 2019-04-23 13:50:48 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
mlorb
1e3d0e901a
Merge pull request #1667 from mlorb/ml-sci-3304
Fix links in activity message for protocols in repository [SCI-3304]
2019-04-15 11:55:08 +02:00
Anton Ignatov
dd8b3caf65 Fix duplicate activtiy issue and fix link to inventory 2019-04-15 11:35:30 +02:00
Mojca Lorber
252fdaf9a8 Fix links in activity message for protocols in repository 2019-04-12 15:14:41 +02:00
Urban Rotnik
ee3dc571e1 Update attachments view, add ordering on FE 2019-04-09 14:17:40 +02:00
Anton Ignatov
811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
Jure Grabnar
b12916b828 Add main functionality 2019-04-04 17:05:25 +02:00
Oleksii Kriuchykhin
d6bd703ec8 Fix activity genereation with discarded inventories [SCI-3290] 2019-04-03 21:18:48 +02:00
Oleksii Kriuchykhin
8c2b2513b0 Fix user popup in global activities [SCI-3285] 2019-04-03 12:53:52 +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
73dd6678ee Fix for show date value 2019-04-02 10:36:11 +02:00
Urban Rotnik
dc0c629798 Fix to show report name in Activities 2019-04-01 15:58:28 +02:00
Urban Rotnik
0ed96d68de Add step position for steps in Protocol repository. Add default value for blank names also. 2019-04-01 15:58:17 +02:00