Commit graph

6507 commits

Author SHA1 Message Date
aignatov-bio
e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio
6ed8757eb1 Merge branch 'features/task-flows' into develop 2020-09-17 14:52:05 +02:00
aignatov-bio
d560470df2
Merge pull request #2844 from aignatov-bio/ai-sci-4950-implement-remember-selection-of-smart-annotation
Add remembered state for smart annotation [SCI-4950]
2020-09-17 14:49:35 +02:00
aignatov-bio
8dbc69aa31 Remove console.log 2020-09-17 14:48:26 +02:00
Urban Rotnik
462fb12a41 Update SQL query 2020-09-17 13:30:27 +02:00
Urban Rotnik
777afd0e9b Add improved search for smart annotations 2020-09-17 13:19:52 +02:00
aignatov-bio
f11f54db33 Small fixes 2020-09-17 13:11:54 +02:00
aignatov-bio
b4102f3cfd Add try/cath for JSON.parse 2020-09-17 11:43:08 +02:00
aignatov-bio
9cb26a1cb9 Fix markup 2020-09-17 11:43:08 +02:00
aignatov-bio
3691d21215 Fix multiple smart annotation selected 2020-09-17 11:43:08 +02:00
aignatov-bio
86667feb6b Add remembered state for smart annotation 2020-09-17 11:43:07 +02:00
mlorb
4acd0c4cb9
Merge pull request #2841 from mlorb/ml-sci-4984
Add saving state for filters on dashboard [SCI-4984]
2020-09-17 09:53:16 +02:00
aignatov-bio
c26f8e7193 Add before send condition for status change 2020-09-16 15:23:53 +02:00
Alex Kriuchykhin
aadc0bebff
Merge pull request #2847 from okriuchykhin/ok_SCI_5004_v2
Fix status consequences execution order [SCI-5004]
2020-09-16 15:21:47 +02:00
Oleksii Kriuchykhin
ff1476d46a Fix status consequences execution order [SCI-5004] 2020-09-16 13:45:58 +02:00
Urban Rotnik
c9de9e857f Fix constant initialization 2020-09-16 12:15:23 +02:00
Mojca Lorber
9cd8e3b7ac Change default status values, add project and experiment to saved state and fix parsing error handeling 2020-09-16 09:48:06 +02:00
aignatov-bio
14acf2b624 Add i18n 2020-09-15 14:47:57 +02:00
Mojca Lorber
3c30ee904e Merge branch 'features/task-flows' into ml-sci-4984 2020-09-15 13:27:34 +02:00
mlorb
bf707a11a9
Merge branch 'features/task-flows' into ml-sci-4976 2020-09-15 12:59:49 +02:00
Alex Kriuchykhin
04686d4ffc
Merge pull request #2842 from okriuchykhin/ok_SCI_5004
Add Completion and Uncompletion consequences [SCI-5004]
2020-09-15 12:56:27 +02:00
Alex Kriuchykhin
6269802be4
Merge pull request #2843 from okriuchykhin/ok_SCI_4881
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-09-15 12:53:01 +02:00
aignatov-bio
67d3a1ad12 Fix markup 2020-09-15 12:06:20 +02:00
Oleksii Kriuchykhin
db3de835f8 Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-09-15 11:58:35 +02:00
aignatov-bio
6dc4422d82 Fix markup 2020-09-15 11:56:44 +02:00
Oleksii Kriuchykhin
57716fd89c Fix API and tests for new task completion logic [SCI-5004] 2020-09-15 11:19:25 +02:00
Mojca Lorber
fe7d922cc5 Refactor complete step button 2020-09-15 11:18:15 +02:00
Oleksii Kriuchykhin
73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
Mojca Lorber
13f719a9e1 Add saving state for filters on dashboard 2020-09-14 18:15:57 +02:00
aignatov-bio
c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
Oleksii Kriuchykhin
a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio
008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio
5a063f070d Clone module before condition validation 2020-09-10 16:53:07 +02:00
aignatov-bio
18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
mlorb
3d2aaed791
Merge pull request #2820 from mlorb/ml-sci-4580
Fix buttons visability on reports page according to new styleguide [SCI-4580]
2020-09-10 09:32:16 +02:00
Mojca Lorber
d055d6e241 Fix quotes again 2020-09-09 14:43:12 +02:00
Urban Rotnik
78c9394b1f Fix aligment due date and status on canvas card 2020-09-09 14:33:25 +02:00
Mojca Lorber
eeb8f4a97a Disable 'complete step' button on locked task 2020-09-09 14:32:37 +02:00
aignatov-bio
7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
Urban Rotnik
0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state
Add error message for locked task, update some permission checks[SCI-4982]
2020-09-09 14:04:08 +02:00
Urban Rotnik
8b10cde6b4 Fix DeepScan error 2020-09-09 13:51:11 +02:00
aignatov-bio
946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses
Add front-end checks for statuses [SCI-4975]
2020-09-09 13:21:04 +02:00
Urban Rotnik
45a09e5a3c Fix tests 2020-09-09 13:17:07 +02:00
aignatov-bio
661220890f Update error handling 2020-09-09 12:25:34 +02:00
aignatov-bio
f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
aignatov-bio
5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions
Add description for conditions [SCI-4983]
2020-09-09 11:33:48 +02:00
Urban Rotnik
9419a16df5
Merge pull request #2833 from urbanrotnik/ur-sci-4988-notes-duplication
Remove notes duplication [SCI-4988]
2020-09-09 11:29:10 +02:00
Urban Rotnik
aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
aignatov-bio
7763d11634 Fix markup 2020-09-09 11:24:54 +02:00
Urban Rotnik
9066586149 Fix duedate for PDF and DOCX 2020-09-09 10:48:42 +02:00