Commit graph

274 commits

Author SHA1 Message Date
Anton
de35386f29 Fix long protocol name in task protocol flyout [SCI-7581] 2022-12-09 12:48:37 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
Martin Artnik
df4654189b Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]""
This reverts commit 50e7531ffa.
2022-12-06 12:43:30 +01:00
Martin Artnik
c21152b2e2 Add protocol ID to linked protocol dropdown [SCI-7204] 2022-11-23 11:49:53 +01:00
Andrej
745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
artoscinote
50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
artoscinote
cf3a233f4e
Merge branch 'develop' into ma_SCI_7177 2022-09-19 13:58:33 +02:00
artoscinote
500adb346e
Merge pull request #4426 from G-Chubinidze/gc_SCI_7115
added scrollbar to task paper dropdown [SCI-7115]
2022-09-15 15:29:25 +02:00
Martin Artnik
3d1bdac1f4 Added task code to task details [SCI-7178] 2022-09-13 13:17:18 +02:00
Giga Chubinidze
271867710f added scrollbar to task paper dropdown [SCI-7115] 2022-09-09 23:28:37 +04:00
aignatov-bio
491ff286f6
Merge pull request #4390 from aignatov-bio/ai-sci-7113-fix-assigned-repositry-bell-flyout
Fix bell flyout in assigned repository [SCI-7113]
2022-09-02 11:21:17 +02:00
Anton
312f2a1357 Fix rte toolbar position [SCI-7136] 2022-08-31 13:15:08 +02:00
Anton
d2639d4633 Fix bell flyout in assigned repository [SCI-7113] 2022-08-29 11:30:39 +02:00
ajugo
39fbb2a9a0
Fix office modal and protocol status [SCI-7064] (#4352) 2022-08-12 14:57:56 +02:00
ajugo
b6f273410b
Fix protocol repository CSS [SCI-7064] (#4335)
* Fix protocol repository CSS [SCI-7064]

* Fix protocol repository CSS [SCI-7064]

* Fix hound [SCI-7064]
2022-08-10 10:27:15 +02:00
artoscinote
9478779218
TinyMCE fixes [SCI-7033] (#4308) 2022-08-04 11:06:25 +02:00
Anton
c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
Anton
3f82666619 Fix step for viewer role [SCI-6972] 2022-07-25 11:35:34 +02:00
aignatov-bio
b84e77210f
Merge pull request #4237 from aignatov-bio/ai-sci-6932-protocol-section-css-fixes
Fix protocol elements alignments [SCI-6932]
2022-07-13 12:42:22 +02:00
Anton
cbeac82992 Fix protocol elements allignments [SCI-6932] 2022-07-13 12:37:57 +02:00
artoscinote
17eada574e
CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234)
* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]
2022-07-13 10:47:12 +02:00
artoscinote
765e5b99bd
Protocol editing CSS fixes [SCI-6940] (#4194) 2022-07-12 10:43:01 +02:00
ajugo
4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] (#4213) 2022-07-11 11:29:05 +02:00
artoscinote
5cb53c774c
Step header fixes [SCI-6948] (#4217) 2022-07-11 10:45:25 +02:00
Anton
11b62cca7b Fix task page layout [SCI-6950] 2022-07-07 15:56:36 +02:00
Anton
b3d7c3ff75 Fix microinteractions for step editing [SCI-6933] 2022-07-06 14:31:55 +02:00
Anton
7b0853d00a CSS fixes for steps [SCI-6932] 2022-07-05 12:49:12 +02:00
artoscinote
a0578e09bb
Fix tags modal css issue [SCI-6926] (#4182) 2022-07-04 13:54:54 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
artoscinote
894eb8932d
Implement checklist item ordering [SCI-6847] (#4119) 2022-05-26 14:02:02 +02:00
ajugo
2097fb1df4
CSS fix overlapping number in task assigned items [SCI-6794] (#4092) 2022-05-13 11:16:07 +02:00
Anton
6dce426db4 Add tinyMce field to protocol [SCI-6810] 2022-05-11 16:10:26 +02:00
artoscinote
5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
artoscinote
6352a4dd04
Implement protocol options dropdown [SCI-6750, SCI-6751] (#4066)
* Implement protocol options dropdown [SCI-6750, SCI-6751]

* Implement simple API error handling for step status update [SCI-6354]
2022-05-03 15:18:48 +02:00
Anton
98efcc04b5 Small CSS fixes for repository [SCI-6767] 2022-04-28 14:32:34 +02:00
artoscinote
2515ed5a32
Add collapsing task status buttons [SCI-6721] (#4060) 2022-04-28 14:12:08 +02:00
Anton
189f4335ea Add main layout for step [SCI-6755] 2022-04-28 11:38:33 +02:00
Anton
6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +02:00
Anton
df2ff32f2e Update general layout for task [SCI-6713] 2022-04-21 14:43:10 +02:00
artoscinote
30ee6cd40c
Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021)
* Refactor and fix how stock consumption is displayed [SCI-6734]

* Refactor and fix display of stock warnings [SCI-6734]
2022-04-14 14:27:31 +02:00
ajugo
1338d4524f
Align items in assigned item section [SCI-6707] (#4007) 2022-04-13 10:12:01 +02:00
artoscinote
2d811cdc4c
Add snapshot error message below task status [SCI-6614] (#4009) 2022-04-12 13:28:26 +02:00
ajugo
a9fc4c3c44
Adding/changing stock consumption [SCI-6708] (#4005)
* Adding/changing stock consumption [SCI-6708]

* Fix hound [SCI-6708]
2022-04-11 10:47:24 +02:00
ajugo
98144b225c
Fix color on consumption link [SCI-6686] (#3992) 2022-04-07 13:03:18 +02:00
artoscinote
73757c4820
Added styling for failed snapshots in sidebar [SCI-6636] (#3990)
* Added styling for failed snapshots in sidebar [SCI-6636]

* Simplify markup for failed icon [SCI-6636]
2022-04-05 15:45:49 +02:00
ajugo
bb44152d54
Fix assigning and consuming items [SCI-6686] (#3985) 2022-04-04 11:07:46 +02:00
ajugo
7cba738a9b
Date remidner flyout [SCI-6503] (#3937)
* Implement date reminder flyout [SCI-6503]

* Show only days left for date reminder [SCI-6503]

* Pluralize day in reminders [SCI-6503]

* Create partials for different reminders [SCI-6503]

* Unify css for reminder [SCI-6503]
2022-03-22 13:33:58 +01:00
ajugo
a89244c537
Displaying low stock warning [SCI-6497] (#3912)
* Low stock warning [SCI-6497

* Fix some bugs [SCI-6497]

* Fix to long line [SCI-6497]

* Clean not needed information in renderes [SCI-6497]
2022-03-16 15:06:52 +01:00
ajugo
d1610fba53
Low stock flyout reminders [SCI-6502] (#3932)
* Display low stock flyout reminder [SCI-6502]

* Display low stock flyout reminder [SCI-6502]

* Adapt showing stock reminders for every bell icon click [SCI-6502]

* Correct hound error [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix hound [SCI-6502]

* Remove not needed line [SCI-6502]

* Add reminder template [SCI-6502]

* Add clearing messages [SCI-6502]
2022-03-15 10:24:35 +01:00
aignatov-bio
bf058dea03
Add flyout for repository reminders [SCI-6501] (#3926)
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 15:09:49 +01:00
artoscinote
d577fcc824
Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911)
* Implement basic logic for Date/DateTime/Stock reminders [SCI-6554]

* Implement bell icon [SCI-6500]

* Refactor reminder cells scope [SCI-6554]
2022-03-09 14:13:48 +01:00
aignatov-bio
2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798)
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
2022-01-28 11:10:56 +01:00
aignatov-bio
d3e178e5a2
Small CSS fixes for permissions [SCI-6207] (#3638)
Co-authored-by: Anton <anton@scinote.net>
2021-11-09 09:26:22 +01:00
aignatov-bio
aa4b765407
Update assign/unassign rows to task [SCI-6150] (#3604)
Co-authored-by: Anton <anton@scinote.net>
2021-10-26 11:41:08 +02:00
Zmago Devetak
4a4c344a3a
Task UX: Update assigning a Task to user(s) (#3429)
* add dynmic select for user assignment on task

* update the user assignment so it looks like tags picker

* fix code style

* Code style fixes [SCI-5871]

* Code style fixes [SCI-5871]

* Destroy and search action fixes [SCI-5871]

Co-authored-by: Martin Artnik <martin@scinote.net>
2021-10-14 11:49:27 +02:00
Martin Artnik
861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Mojca Lorber
5cdab422df Update layout of the navigation for experiments, tasks list and task page 2020-12-10 15:15:36 +01:00
aignatov-bio
3078e60867 Small css fixes 2020-11-25 16:25:17 +01:00
Mojca Lorber
2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
aignatov-bio
483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews
Features/office file previews merge branch
2020-11-19 11:11:39 +01:00
Mojca Lorber
8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
aignatov-bio
0f80786433 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step 2020-11-02 18:52:46 +01:00
aignatov-bio
eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
aignatov-bio
bddd1956ab Fix font size and font weight for status label 2020-10-26 12:35:40 +01:00
Urban Rotnik
2f99e3a464 Remove border, update copy 2020-10-21 09:58:35 +02:00
Mojca Lorber
5013f224ee Fix ems 2020-10-14 13:16:38 +02:00
Mojca Lorber
a944525d25 Change px to em 2020-10-12 16:59:33 +02:00
Mojca Lorber
94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
aignatov-bio
c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
aignatov-bio
18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +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
aignatov-bio
bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
aignatov-bio
d85703113a Add front-end checks 2020-09-03 14:34:34 +02:00
aignatov-bio
257329ce80 Fix css for status flows 2020-09-02 15:41:07 +02:00
Urban Rotnik
5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
Mojca Lorber
a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
aignatov-bio
15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio
6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +02:00
Urban Rotnik
512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
Urban Rotnik
aacee14fc6 Add Status button 2020-07-22 15:30:47 +02:00
Mojca Lorber
212ba76c16 Fix Settings pages titles 2020-07-13 14:51:51 +02:00
aignatov-bio
e8ea8b5b3f Fix long inventory name issue on task page 2020-06-17 15:08:07 +02:00
aignatov-bio
222e89ea8d Change selected line thickness 2020-06-01 10:30:06 +02:00
aignatov-bio
368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +02:00
aignatov-bio
73c7ff47a5 Fix z-index for full view modal 2020-05-26 12:41:07 +02:00
mlorb
384ec40c4e
Merge pull request #2542 from mlorb/ml-sci-4582
Task details description corrections and some changes of locales [SCI-4582]
2020-05-25 09:10:37 +02:00
Oleksii Kriuchykhin
c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
aignatov-bio
230ec487ba Make snapshots versions buttons full size clickable 2020-05-22 17:16:20 +02:00
Mojca Lorber
12982260b7 Fix css hover effects 2020-05-21 08:37:40 +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
Mojca Lorber
e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +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
Urban Rotnik
ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio
9db19603dc Fix checklist render in fullview 2020-05-18 16:32:27 +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
309f8c1a3d Small snapshots CSS corrections 2020-05-14 16:29:50 +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
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
Mojca Lorber
009dce110b Css fix 2020-05-14 12:18:45 +02:00
Oleksii Kriuchykhin
c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
aignatov-bio
8447a13afd Replace bootstrap popover with bootstrap dropdown 2020-05-13 12:20:25 +02:00
aignatov-bio
bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +02:00
Mojca Lorber
9c4d07f0dd Fix missing corner on opened task inventory 2020-05-11 13:04:31 +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
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
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
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
4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +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
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
8c57ed3109 Fix css for results 2020-05-02 22:37:02 +02:00
aignatov-bio
1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +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
aignatov-bio
b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +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
aignatov-bio
4f941610b2 Small layout changes for protocol 2020-04-24 11:50:03 +02:00
mlorb
1cea6116b5
Merge pull request #2515 from mlorb/ml-sci-4493
Add protocol options dropdown [SCI-4493]
2020-04-23 17:21:26 +02:00
Mojca Lorber
c1138f1d26 fix font 2020-04-23 16:56:09 +02:00
Mojca Lorber
ac709be364 Small fixes 2020-04-23 16:50:16 +02:00
aignatov-bio
34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +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
Mojca Lorber
6fecee8c0c Add protocol options dropdown 2020-04-21 10:03:53 +02:00
aignatov-bio
be47efce74
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list
Add repositories dropdown list [SCI-4506]
2020-04-16 14:17:17 +02:00
mlorb
9584b11d45
Merge pull request #2507 from mlorb/ml-sci-4505
Add the user management section of to the Details section of task layout [SCI-4505]
2020-04-16 13:47:31 +02:00
aignatov-bio
c1cac01b28 Add repositories dropdown list 2020-04-14 12:10:16 +02:00
Mojca Lorber
f22f076e6c Add the user management secion of to the Details section of task layout 2020-04-08 16:24:59 +02:00
aignatov-bio
e4b65aaf6f Finish full view repository 2020-04-08 15:13:21 +02:00
aignatov-bio
087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
aignatov-bio
7fdc169ba2 Add simple view to repository table 2020-04-06 19:52:41 +02:00
aignatov-bio
fc810b5524
Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list
Add assigned repositories list [SCI-4507]
2020-04-03 13:59:26 +02:00
aignatov-bio
9a64ebdfd0 Update sql and add accordion effect 2020-04-03 13:15:56 +02:00
aignatov-bio
9678372dd5 Add assigned repositories list 2020-04-02 12:05:07 +02:00
Mojca Lorber
cb554e815a Add new task layout details section 2020-04-01 13:05:35 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Mojca Lorber
bd177f4f2f Renaming fixes 2020-03-31 11:22:53 +02:00
Mojca Lorber
7006036626 Add new task general layout and add notes section 2020-03-30 12:51:35 +02:00
Mojca Lorber
9045d1a8de Fix tooltips appear wrongly 2020-03-22 17:47:13 +01:00
Oleksii Kriuchykhin
a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
Urban Rotnik
ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
aignatov-bio
b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +01:00
aignatov-bio
e714787c38 Fix markup 2020-01-06 10:40:20 +01:00