Commit graph

6095 commits

Author SHA1 Message Date
aignatov-bio
0aa1c32813 Fix ordering in simple table view 2020-05-21 16:51:07 +02:00
aignatov-bio
d3781a7048
Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view
Add private tasks to assigned task list [SCI-4660]
2020-05-21 12:57:59 +02:00
Oleksii Kriuchykhin
388f52a064 Make a snapshot name synced with the inventory name if changed [SCI-4656] 2020-05-21 11:51:37 +02:00
Alex Kriuchykhin
bc70ceb120
Merge pull request #2590 from biosistemika/SCI-4628-schedule-snapshots-for-locked-tasks
[SCI-4628] moving snapshot provisioning logic into repository model, ma…
2020-05-21 09:53:04 +02:00
Mojca Lorber
12982260b7 Fix css hover effects 2020-05-21 08:37:40 +02:00
Miha Mencin
7de12990a9 SCI-4628 moving snapshot provisioning logic into repository model, making snapshot unique selection validation conditional 2020-05-21 00:36:24 +02:00
Oleksii Kriuchykhin
f2043f111b Change display of the live version for a deleted inventory [SCI-4659] 2020-05-20 21:50:39 +02:00
aignatov-bio
d16930e987 Add private tasks to assigned task list 2020-05-20 17:23:48 +02:00
Urban Rotnik
a5b1f1cfd5
Merge pull request #2587 from urbanrotnik/ur-sci-4634-v2
Inventory import fix [SCI-4634] v2
2020-05-20 14:45:57 +02:00
Mojca Lorber
e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +02:00
Urban Rotnik
32df6f2568 Skip cell import if value is nil 2020-05-20 09:56:08 +02:00
mlorb
29370cf82e
Merge pull request #2586 from mlorb/ml-sci-4615
Fix missing creator in task details [SCI-4615]
2020-05-20 09:47:08 +02:00
aignatov-bio
51d9f054ee
Merge pull request #2584 from aignatov-bio/ai-sci-4654-clear-fullview-modal-before-open
Clear full view repository modal before open [SCI-4654]
2020-05-20 09:45:26 +02:00
aignatov-bio
4e7a26bdd0
Merge pull request #2583 from aignatov-bio/ai-sci-4651-fix-repository-ordering
Fix repositories order in dropdown [SCI-4651]
2020-05-20 09:45:13 +02:00
Urban Rotnik
2283491629 Conver to string if not importing into Number column 2020-05-20 09:09:14 +02:00
Mojca Lorber
40a3ee82d5 Add creator to task 2020-05-20 08:59:07 +02:00
aignatov-bio
40b266ee0d Clear full view repository modal before open 2020-05-19 16:44:47 +02:00
aignatov-bio
d714b4b7bf
Merge pull request #2579 from aignatov-bio/ai-sci-4635-fix-checklist-appearance-in-fullview
Fix checklist render in full view [SCI-4635]
2020-05-19 16:18:45 +02:00
aignatov-bio
f8b246eb2a Fix repositories order in dropdown 2020-05-19 16:18:01 +02:00
Urban Rotnik
431bd0c53b
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix
Fonts size update [SCI-4650]
2020-05-19 14:55:22 +02:00
mlorb
7cbbcff86a
Merge pull request #2576 from mlorb/ml-sci-4619
Fix manage permissions on views [SCI-4619]
2020-05-19 14:29:11 +02:00
Urban Rotnik
ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio
2dcada4bc5
Merge pull request #2580 from aignatov-bio/ai-sci-4647-add-custom-tinymce-plugins-to-asset-pipeline
Add custom tinymce plugins to assets pipeline [SCI-4647]
2020-05-19 10:31:51 +02:00
aignatov-bio
c00b96ff7e
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation
Fix collapse animation for task sections [SCI-4646]
2020-05-19 10:31:36 +02:00
Urban Rotnik
1dc0e2b40b
Merge pull request #2581 from urbanrotnik/ur-sci-4640-wrong-snapshot-displayed
Hide sidebar Versions by default [SCI-4640]
2020-05-19 10:27:57 +02:00
Alex Kriuchykhin
49a35f43c5
Merge pull request #2578 from okriuchykhin/ok_SCI_4645
Fix error message for file upload limit on steps [SCI-4645]
2020-05-19 10:27:12 +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
Urban Rotnik
ea0e97d046 Hide sidebar on modal close 2020-05-19 09:46:38 +02:00
aignatov-bio
3047af759f Add custom tinymce plugins to assets pipeline 2020-05-18 18:06:52 +02:00
aignatov-bio
9db19603dc Fix checklist render in fullview 2020-05-18 16:32:27 +02:00
Oleksii Kriuchykhin
bc1ee1bd8d Fix error message for file upload limit on steps [SCI-4645] 2020-05-18 16:16:39 +02:00
aignatov-bio
9f4457642d Fix collapse animation for task sections 2020-05-18 16:01:26 +02:00
Mojca Lorber
6b6fba591e Fix manage permissions on views 2020-05-18 15:54:32 +02:00
Urban Rotnik
7e009ab8ee
Merge pull request #2574 from urbanrotnik/ur-sci-4634
Fix excel header parsing [SCI-4634]
2020-05-18 14:56:22 +02:00
Alex Kriuchykhin
e9a05d2e3d
Merge pull request #2575 from okriuchykhin/ok_SCI_4637
Fix selection of the default snapshot on tasks [SCI-4637]
2020-05-18 14:25:26 +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
aignatov-bio
1f24adddf9
Merge pull request #2562 from aignatov-bio/ai-sci-4627-remove-search-word-from-task-table-state
Remove search from state load in task repository [SCI-4627]
2020-05-18 11:16:27 +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
aignatov-bio
343356cab7
Merge pull request #2571 from aignatov-bio/ai-sci-4639-select-correct-button-for-assign-modal
Select correct button name for assign modal [SCI-4639]
2020-05-18 11:16:07 +02:00
aignatov-bio
f2d81cb199
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable
Make snapshot creation info text switchable [SCI-4617]
2020-05-18 11:15:46 +02:00
aignatov-bio
2b3dda8ce0
Merge pull request #2569 from aignatov-bio/ai-sci-4613-add-title-for-assign-modal
Add a title for full view assign modal [SCI-4613]
2020-05-18 11:15:36 +02:00
Oleksii Kriuchykhin
8b968f6f67 Fix selection of the default snapshot on tasks [SCI-4637] 2020-05-18 11:06:42 +02:00
aignatov-bio
820514789d Update tinymce gem version 2020-05-17 17:36:26 +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
aignatov-bio
f921ac75d8 Select correct button name for assign modal 2020-05-15 15:37:48 +02:00
aignatov-bio
bc81a48b00 Make snapshot creation info text switchable 2020-05-15 14:44:26 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio
69abccbbd6 Add title for full view assign modal 2020-05-15 14:22:20 +02:00
aignatov-bio
dc2caca4f3 Small css fixes and test fix 2020-05-15 11:04:17 +02:00
mlorb
dbd03a09ef
Merge pull request #2565 from mlorb/ml-sci-4511
Add New Task layout Collapsed/Expanded States saving [SCI-4511]
2020-05-15 09:23:05 +02:00
Urban Rotnik
e290f555f4
Merge pull request #2561 from urbanrotnik/ur-sci-4625-import-fix
Fix for empty status cell [SCI-4625]
2020-05-15 08:44:30 +02:00
Mojca Lorber
4c15c89cf5 Add New Task layout Collapsed/Expanded States saving 2020-05-15 00:49:23 +02:00
aignatov-bio
51e3c70a4d
Merge pull request #2563 from aignatov-bio/ai-sci-4638-fix-step-content-aligment
Fix align for step content [SCI-4638]
2020-05-14 22:10:50 +02:00
aignatov-bio
bac98bdbdc Remove inventory tab from task and routes to inventory page 2020-05-14 22:10:13 +02:00
aignatov-bio
443c301ca1 Fix align for step content 2020-05-14 21:53:00 +02:00
aignatov-bio
c9a9cd2e75 Remove search from state load in task repository 2020-05-14 21:49:01 +02:00
Urban Rotnik
ba68eef044 Fix for empty status cell 2020-05-14 17:59:25 +02:00
mlorb
1e0fed75d1
Merge pull request #2551 from mlorb/ml-sci-4620
Fix missing corner on opened task inventory [SCI-4620]
2020-05-14 17:25:39 +02:00
aignatov-bio
e49d2dfbae
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections
Small task inventories corrections [SCI-4605]
2020-05-14 16:45:45 +02:00
aignatov-bio
ce1540aaa9 Small task inventories corrections 2020-05-14 16:41:02 +02:00
aignatov-bio
af4ac7c53b Add const to dropdown library 2020-05-14 16:29:50 +02:00
aignatov-bio
309f8c1a3d Small snapshots CSS corrections 2020-05-14 16:29:50 +02:00
aignatov-bio
78b4067c50
Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections
Small snapshot css corrections [SCI-4604]
2020-05-14 15:18:13 +02:00
aignatov-bio
8f946c45c3
Merge pull request #2553 from aignatov-bio/ai-sci-4518-optimize-task-mobile-view
Small CSS improvments for mobile [SCI-4518]
2020-05-14 14:20:40 +02:00
aignatov-bio
9b685fdaa6
Merge pull request #2554 from aignatov-bio/ai-sci-4613-add-icon-to-cancel-button
Add icon to cancel button [SCI-4613]
2020-05-14 13:19:20 +02:00
aignatov-bio
445f55acc7
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
2020-05-14 13:19:08 +02:00
aignatov-bio
99e1affa73
Merge pull request #2556 from aignatov-bio/ai-sci-4515-fix-smart-annotation-position
Fix smart annotation position for horizontal scroll [SCI-4515]
2020-05-14 13:18:57 +02:00
aignatov-bio
5bdf1ff586
Merge pull request #2558 from aignatov-bio/ai-sci-4608-fix-pdf-report-time-position
Prevent time to go newline in reports [SCI-4608]
2020-05-14 13:18:31 +02:00
Alex Kriuchykhin
384b107c6c
Merge pull request #2560 from biosistemika/SCI-4601-fix-snapshot-bugs
SCI-4601 fix the associations, renaming variable
2020-05-14 13:09:10 +02:00
Miha Mencin
15508a5065 codestyle fix 2020-05-14 12:57:16 +02:00
Miha Mencin
26caeed04f
increase pooling interval to 10s 2020-05-14 12:39:13 +02:00
Mojca Lorber
009dce110b Css fix 2020-05-14 12:18:45 +02:00
Miha Mencin
0e5ce1054e decrease pooling time for snapshots 2020-05-14 12:03:07 +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
Miha Mencin
76232f0298 SCI-4601 fix the associations, minor styling changes 2020-05-14 11:47:19 +02:00
Alex Kriuchykhin
f089e4abc8
Merge pull request #2559 from okriuchykhin/ok_SCI_4596
Restore deleted method after rebase [SCI-4596]
2020-05-14 11:20:08 +02:00
Oleksii Kriuchykhin
ea740eb2a4 Restore deleted method after rebase [SCI-4596] 2020-05-14 10:57:43 +02:00
Alex Kriuchykhin
a341bd533b
Merge pull request #2557 from okriuchykhin/ok_SCI_4596
Make snapshots selectable [SCI-4596]
2020-05-14 10:15:44 +02:00
Urban Rotnik
fbd44a4e23
Merge pull request #2547 from urbanrotnik/ur-sci-4557-update-permissions
Update permissions and automatic snapshots [SCI-4557] [SCI-4624]
2020-05-14 10:04:56 +02:00
aignatov-bio
9076fab12f Prevent time to go newline in reports 2020-05-13 18:46:58 +02:00
Oleksii Kriuchykhin
9c70fa1990 Fix code style [SCI-4596] 2020-05-13 18:00:58 +02:00
Oleksii Kriuchykhin
ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin
c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
Alex Kriuchykhin
76d1196724
Merge pull request #2544 from okriuchykhin/ok_SCI_4597
Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597]
2020-05-13 16:42:47 +02:00
aignatov-bio
cbaaa7413c Fix smart annotation position for horizontal scroll 2020-05-13 12:45:22 +02:00
aignatov-bio
8447a13afd Replace bootstrap popover with bootstrap dropdown 2020-05-13 12:20:25 +02:00
aignatov-bio
f6b239c144 Add icon to cancel button 2020-05-13 11:09:19 +02:00
aignatov-bio
bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +02:00
Urban Rotnik
334da7c3ec Fix for assign view 2020-05-12 19:38:45 +02:00
Mojca Lorber
9c4d07f0dd Fix missing corner on opened task inventory 2020-05-11 13:04:31 +02:00
Urban Rotnik
a96d19d5ea Add table name attribute to export schema 2020-05-11 11:25:41 +02:00
aignatov-bio
f94ea51ecb Small snapshot css corrections 2020-05-10 13:08:19 +02:00
Urban Rotnik
8174d63734 Include BoostrapFormHelper in FormBuilder 2020-05-08 20:36:45 +02:00
aignatov-bio
8e20dccc66
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab
Add recent protocol tab to load protocal from repository [SCI-4509]
2020-05-08 13:17:26 +02:00
aignatov-bio
6997586357
Merge pull request #2541 from aignatov-bio/ai-sci-4591-merge-assign-unassign-service
Merge assign and unassign service [SCI-4591]
2020-05-08 13:15:06 +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
d3faec1070 Rename service 2020-05-08 12:28:37 +02:00
aignatov-bio
e9c54f10fb Fix markup 2020-05-08 11:58:40 +02:00
aignatov-bio
2728df5bac Move helper method to my_module_helper 2020-05-08 11:56:29 +02:00
Oleksii Kriuchykhin
17cd991868 Update Canaid and Rails [SCI-4597] 2020-05-08 10:58:36 +02:00
aignatov-bio
c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
aignatov-bio
dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Mojca Lorber
b3bce933e5 Task details description corrections and some changes of locales 2020-05-07 16:11:22 +02:00
aignatov-bio
fe658a9b23
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view
Update CSS for full view assigned rows modal [SCI-4594]
2020-05-07 15:22:06 +02:00
aignatov-bio
c3ca0156fb Fix error handling 2020-05-07 13:58:25 +02:00
aignatov-bio
30ce49b731
Merge pull request #2538 from aignatov-bio/ai-sci-4574-result-office-button-position
Fix office button position [SCI-4574]
2020-05-07 13:55:15 +02:00
aignatov-bio
29903f570d Merge assign and unassign service 2020-05-07 13:51:07 +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
912b01d34b
Merge pull request #2539 from aignatov-bio/ai-sci-4573-small-css-fixes-for-protocols
Fix css for comments and fix modal title size [SCI-4573]
2020-05-07 12:59:56 +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
Urban Rotnik
a38b850601
Merge pull request #2520 from urbanrotnik/ur-sci-4522-activity-links
Activities links [SCI-4522] &  [SCI-4514]
2020-05-06 22:11:58 +02:00
Oleksii Kriuchykhin
25f9c5bc7d Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597] 2020-05-06 15:17:54 +02:00
Urban Rotnik
a6ab14de99
Merge pull request #2536 from urbanrotnik/ur-sci-4586-hide-icon-if-there-is-no-users-for-assign
Hide icon [SCI-4586]
2020-05-06 14:19:18 +02:00
Urban Rotnik
715d6ab8fa
Merge pull request #2537 from urbanrotnik/ur-sci-4587-activities-start-date-fix
Fix activity message for start date [SCI-4587]
2020-05-06 14:18:52 +02:00
aignatov-bio
5972c3fdf6 Fix css for comments and fix modal title size 2020-05-06 13:54:39 +02:00
aignatov-bio
b74b717d03 Fix office button position 2020-05-06 13:42:30 +02:00
Urban Rotnik
8ff7c33431 Fix start date activity message 2020-05-06 12:34:45 +02:00
aignatov-bio
4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +02:00
Urban Rotnik
4c4d0a2403 Hide icon if there is no users 2020-05-06 09:47:39 +02:00
aignatov-bio
a29db548f8 Update CSS for full view assigned rows modal 2020-05-05 18:17:14 +02:00
Mojca Lorber
8b4110c0af Css fixes for avatars for assigned users on tasks 2020-05-05 16:11:11 +02:00
Alex Kriuchykhin
7e9054e6d2
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
2020-05-05 13:20:01 +02:00
aignatov-bio
85dae268fe
Merge pull request #2498 from aignatov-bio/ai-sci-4481-fix-notification-when-search-field-active
Fix notification when search field active [SCI-4481]
2020-05-05 12:59:32 +02:00
aignatov-bio
c556fd2478
Merge pull request #2530 from aignatov-bio/ai-sci-4574-fix-css-for-results-page
Fix CSS for results [SCI-4574]
2020-05-05 12:58:35 +02:00
aignatov-bio
f3046c8515
Merge pull request #2529 from aignatov-bio/ai-sci-4584-fix-handsone-table
Fix Handson table for collapsed protocol section [SCI-4584]
2020-05-05 12:58:04 +02:00
aignatov-bio
cf2508c5d0
Merge pull request #2522 from aignatov-bio/ai-sci-4508-small-protocol-layout-fixes
Small layout changes for protocol [SCI-4508]
2020-05-05 12:57:40 +02:00
Urban Rotnik
429519e930
Merge pull request #2521 from urbanrotnik/ur-sci-4513-counter-fix
Fix items count validation [SCI-4513]
2020-05-05 12:31:00 +02:00
Urban Rotnik
4947255015
Merge pull request #2528 from urbanrotnik/ur-sci-4542-user-filter
Fix for user filter in task activity page [SCI-4542]
2020-05-05 10:25:26 +02:00
aignatov-bio
1b57040c37 Fix deepscan issues 2020-05-05 09:44:38 +02:00
aignatov-bio
8c57ed3109 Fix css for results 2020-05-02 22:37:02 +02:00
aignatov-bio
9d006aac9e Fix handson table for colapsed protocol section 2020-05-02 22:15:38 +02:00
aignatov-bio
1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +02:00
Urban Rotnik
760c2fba8f
Merge pull request #2523 from urbanrotnik/ur-sci-4549-sidebar-fix
Fix icon position and hover effect in repositories sidebar [SCI-4549]
2020-04-30 09:32:20 +02:00
Urban Rotnik
1fe1b782f1 Fix for user filter in task activity page 2020-04-30 09:20:29 +02:00
aignatov-bio
938f00484b Fix markup 2020-04-29 15:17:15 +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
Urban Rotnik
276351bbed Remove Tooltips JS code 2020-04-28 12:51:59 +02:00
aignatov-bio
be8ef5a310 Add I18n 2020-04-28 12:49:19 +02:00
Urban Rotnik
5c72200801 Remove tooltips settings for user 2020-04-28 12:44:47 +02:00
aignatov-bio
b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
Urban Rotnik
8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +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
0a87bd3dcf Fix markup 2020-04-24 15:48:40 +02:00
aignatov-bio
ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00