Commit graph

580 commits

Author SHA1 Message Date
aignatov-bio
75930b99c3 Fix global activities filters 2020-07-20 15:01:00 +02:00
aignatov-bio
e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
aignatov-bio
2aeb661be9 Fix markup 2020-07-15 09:47:29 +02:00
aignatov-bio
f77902f6d4 Add tinymce table support to docx 2020-07-15 09:44:25 +02:00
Oleksii Kriuchykhin
c7fcc3f89b Fix issue with missing archived items on task page [SCI-4854] 2020-07-10 11:43:06 +02:00
mlorb
73e2654d78
Merge pull request #2701 from mlorb/ml-sci-4793
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
2020-07-09 11:49:16 +02:00
Urban Rotnik
950f65b90e
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout
Improve report layout [SCI-4771]
2020-07-09 11:48:33 +02:00
mlorb
efbef2c876
Merge pull request #2384 from mlorb/ml-sci-4261
Clean up controllers for manage repository columns [SCI-4261]
2020-07-09 09:18:23 +02:00
Alex Kriuchykhin
3534d0c60f
Merge pull request #2712 from okriuchykhin/ok_SCI_4840
Fix assigned counter on inventory items assigning modal [SCI-4840]
2020-07-08 13:53:57 +02:00
Urban Rotnik
2e1d1cc210 Clean styles 2020-07-08 11:35:25 +02:00
Urban Rotnik
5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
Oleksii Kriuchykhin
482765e942 Fix assigned counter on inventory items assigning modal [SCI-4840] 2020-07-07 14:40:19 +02:00
aignatov-bio
784788e9f3 Fix smart annotation for archived items 2020-07-06 14:22:45 +02:00
Mojca Lorber
db8c7cd97c Add empty states to inventories datatable and fix filtering bug 2020-07-02 15:51:07 +02:00
Mojca Lorber
22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Alex Kriuchykhin
2125c8bf83
Merge pull request #2683 from mlorb/ml-sci-4742
Hide archived and not assigned items … [SCI-4742]
2020-06-24 13:47:22 +02:00
Mojca Lorber
7e645eade4 Add active scope to repository_rows in assigning servise 2020-06-24 13:22:09 +02:00
Alex Kriuchykhin
2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button
SCI-4780 replace delete button with archive button
2020-06-24 13:16:11 +02:00
Mojca Lorber
bdf959db1f Hide archived and not assigned items from the assigning screen on the task 2020-06-24 12:06:53 +02:00
Alex Kriuchykhin
8a17b721db
Merge pull request #2678 from urbanrotnik/ur-sci-4878
Update all rows on repository archive/restore [SCI-4787]
2020-06-24 12:06:41 +02:00
Urban Rotnik
8dc48e9f95 Remove archiving rows from RepositoryArchiveService 2020-06-24 10:35:24 +02:00
miha
41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
Urban Rotnik
efbc05e00e
Merge pull request #2675 from urbanrotnik/ur-sci-4782
Include archived columns to inventories export [SCI-4782]
2020-06-23 16:51:50 +02:00
Urban Rotnik
e89bf58e1c Refactory restore inventory service 2020-06-23 08:24:52 +02:00
Urban Rotnik
d874b6f732 Refactory archive inventory service 2020-06-22 22:45:34 +02:00
Mojca Lorber
be19190ff1 Revert default_scope for active repositories 2020-06-22 14:57:35 +02:00
Urban Rotnik
d1b1b5f268 Include archived columns to inventories export 2020-06-22 14:28:49 +02:00
Mojca Lorber
8d43603789 Fix acivities and error handeling 2020-06-19 09:04:42 +02:00
Mojca Lorber
3d59bbd50e Fix default scope bugs 2020-06-18 18:08:53 +02:00
Mojca Lorber
6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
Urban Rotnik
b498aa54d3
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
2020-06-18 14:07:10 +02:00
Urban Rotnik
a05be67d3a
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag
Add archived tags to assigned repository rows [SCI-4703]
2020-06-18 13:47:57 +02:00
Urban Rotnik
06fab7d01c Update smart anotation preview for archived items 2020-06-18 13:45:08 +02:00
Urban Rotnik
d5b82f857e Add tag for DOCX 2020-06-18 08:52:59 +02:00
aignatov-bio
a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper
Add archiving column to datatable helper [SCI-4692]
2020-06-15 15:35:19 +02:00
aignatov-bio
db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik
c7d6c4d60e Add repository_rows restoring and archiving actions on FE 2020-06-09 22:16:55 +02:00
Urban Rotnik
26db4f3515 Add Archive and Restore service 2020-06-09 18:50:36 +02:00
aignatov-bio
4886d95ad5 Fix variable naming 2020-06-03 17:07:11 +02:00
aignatov-bio
503d19fb90 Add snapshots to team export/import 2020-06-03 17:02:33 +02:00
Mojca Lorber
c673e27109 Merge branch 'develop' into ml-sci-4261 2020-05-28 08:18:24 +02:00
aignatov-bio
8f998ceee9 Fix counter 2020-05-27 16:11:10 +02:00
aignatov-bio
40ad9fbf00 Check duplicate protocol name during import 2020-05-27 12:10:48 +02:00
Urban Rotnik
c7361332ab
Merge pull request #2567 from urbanrotnik/ur-sci-4622-snapshot-in-report
Show snapshot in report [SCI-4622]
2020-05-25 14:21:49 +02:00
Urban Rotnik
2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
aignatov-bio
f0bdae8b67 Fix snapshot column ordering by parent_id 2020-05-25 11:19:43 +02:00
Mojca Lorber
40a3ee82d5 Add creator to task 2020-05-20 08:59:07 +02:00
Alex Kriuchykhin
afdd6fd149
Merge pull request #2572 from okriuchykhin/ok_SCI_4629
Prevent the inventory items editing while snapshot is being created [SCI-4629]
2020-05-19 10:10:34 +02:00
Oleksii Kriuchykhin
d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
Urban Rotnik
3b08241b0b Fix excel header parsing 2020-05-18 11:39:19 +02:00
Oleksii Kriuchykhin
c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio
d3faec1070 Rename service 2020-05-08 12:28:37 +02:00
aignatov-bio
c3ca0156fb Fix error handling 2020-05-07 13:58:25 +02:00
aignatov-bio
29903f570d Merge assign and unassign service 2020-05-07 13:51:07 +02:00
aignatov-bio
19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
Alex Kriuchykhin
0e865f8e45
Merge pull request #2525 from okriuchykhin/ok_SCI_4552
Implement background processing of repository snapshots [SCI-4552]
2020-04-29 12:03:23 +02:00
aignatov-bio
046c9662d1 Fix markup 2020-04-28 19:16:04 +02:00
aignatov-bio
61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
Oleksii Kriuchykhin
e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
Urban Rotnik
9c3fb063c0 Fix counter and error showing for CheckList column type 2020-04-24 16:09:54 +02:00
aignatov-bio
d48997464d Fix markup 2020-04-23 15:25:28 +02:00
aignatov-bio
34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio
10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Urban Rotnik
89b848d21d Fix value rounding for General excel type 2020-04-23 07:19:24 +02:00
Oleksii Kriuchykhin
f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +02:00
Alex Kriuchykhin
436f0bf63d
Merge pull request #2506 from okriuchykhin/ok_SCI_4516
Add repository snapshots with service, refactor item assigning [SCI-4516]
2020-04-15 17:32:25 +02:00
Oleksii Kriuchykhin
837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin
3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
aignatov-bio
087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
Oleksii Kriuchykhin
a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
aignatov-bio
4c33abff05 Assign user after task created 2020-03-30 15:16:14 +02:00
aignatov-bio
d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
2020-03-12 11:26:23 +01:00
aignatov-bio
a32a3db8e5 Split joins scope 2020-03-11 14:30:41 +01:00
aignatov-bio
c13721f842 Fix recent work service and move templates to html 2020-03-11 11:34:59 +01:00
aignatov-bio
63a5459d21 Add error handling to create task modal 2020-03-10 13:16:56 +01:00
aignatov-bio
180b736769 Refactor recent work service 2020-03-09 15:10:51 +01:00
aignatov-bio
5ee406606a Add checks for archived projects and experiments 2020-03-06 15:48:54 +01:00
aignatov-bio
193c4974d2 Add user time zone 2020-03-06 15:24:57 +01:00
aignatov-bio
b89cc1745a Add users scope 2020-03-06 15:12:40 +01:00
aignatov-bio
e729aa043e Add recent work widget 2020-03-06 13:51:18 +01:00
Mojca Lorber
8325ed80f0 Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard 2020-03-04 23:26:01 +01:00
aignatov-bio
294328887a Fix typo 2020-02-25 13:51:54 +01:00
aignatov-bio
3588fb3445 Fix markup 2020-02-25 13:49:35 +01:00
aignatov-bio
32d6f9a43a Split my_module create service to seperate services 2020-02-25 13:46:44 +01:00
aignatov-bio
a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
aignatov-bio
a92bac19e1 Add service for task creating 2020-02-24 15:57:22 +01:00
Alex Kriuchykhin
9c763f2111 Merge pull request #2383 from okriuchykhin/ok_SCI_4220
Extend inventory import to support new data types [SCI-4220]
2020-02-10 11:04:34 +01:00
Oleksii Kriuchykhin
6f8f89fbf0 Improve speed of global activities fetching query [SCI-4330] 2020-02-07 13:53:25 +01:00
Mojca Lorber
2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +01:00
Oleksii Kriuchykhin
632b54cb98 Merge branch 'develop' into ok_SCI_4220 2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin
b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
Urban Rotnik
0991a26ee8
Merge pull request #2351 from urbanrotnik/ur-sci-4211-fix-team-import
Fix import for old activities [SCI-4211]
2020-01-30 13:08:33 +01:00
Urban Rotnik
503c05805d Move editable? method from helper to model 2020-01-25 09:43:05 +01:00
Urban Rotnik
ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
Urban Rotnik
0a2970c18d Fix import for old activities 2020-01-22 12:24:56 +01:00
Mojca Lorber
404805bef5 Fix constants for email redesign 2020-01-21 09:38:08 +01:00
Oleksii Kriuchykhin
7d8ba7cb32 Fix clonning of date time values [SCI-4204] 2020-01-16 16:03:13 +01:00
Urban Rotnik
507443ba38 Add custom method for repository report JSON data 2020-01-16 14:42:26 +01:00