Commit graph

4593 commits

Author SHA1 Message Date
Giga Chubinidze
33527d14c8 [CAPA] Unable to view assigned persons within a task [SCI-9811] 2023-12-05 12:05:35 +04:00
Martin Artnik
a5bbc190f9 Merge branch 'develop' into features/inventory-items-relationships 2023-11-29 15:16:22 +01:00
sboursen-scinote
b242a42da7 Fix activity for delete inventory item [SCI-9787] 2023-11-28 13:22:19 +01:00
Gregor Lasnibat
3dd15ed1a5 Implement the 'Add relationship' modal, only front end [SCI-9671] 2023-11-28 12:44:57 +01:00
Martin Artnik
f3ee9a854f Merge branch 'develop' into features/notification-revamp 2023-11-28 10:26:51 +01:00
Martin Artnik
5aff062a76 Copy changes for report wizard [SCI-9693] 2023-11-27 12:56:33 +01:00
Oleksii Kriuchykhin
f6bd599a41 Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-24 15:58:16 +01:00
Martin Artnik
0c5171911e Add missing notification mailer files 2023-11-24 15:37:15 +01:00
Oleksii Kriuchykhin
fa35de6a58 Merge branch 'develop' into features/inventory-items-relationships 2023-11-24 14:04:18 +01:00
wandji
3b165ba92d
Read inventory item number column decimal value from backend [SCI-9764] (#6698) 2023-11-23 17:45:50 +01:00
ajugo
7b09c43c22
Merge pull request #6695 from rekonder/aj_SCI_9770
Fix manage edit card permission propagation [SCI-9770]
2023-11-23 11:33:50 +01:00
Oleksii Kriuchykhin
9983d70eec Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-23 11:11:46 +01:00
Andrej
7c5109fb12 Fix manage edit card permission propagation [SCI-9770] 2023-11-23 11:11:43 +01:00
Oleksii Kriuchykhin
01219f09eb Merge branch 'develop' into features/inventory-items-relationships 2023-11-23 11:08:42 +01:00
Martin Artnik
854ecc0092
Merge pull request #6677 from artoscinote/ma_SCI_9693
Fix report result content toggling [SCI-9693]
2023-11-23 10:37:49 +01:00
Anton
0ec734b467 Merge branch 'develop' into features/notification-revamp 2023-11-23 10:05:42 +01:00
Martin Artnik
e13314349c Merge branch 'release/1.28.0' into develop 2023-11-22 15:13:57 +01:00
Martin Artnik
18b5222227 Merge branch 'features/inventory-item-card-edit' into develop 2023-11-22 15:09:10 +01:00
Soufiane
bc2904823d
Add link to assigned item to task for snapshots version [SCI-9689] (#6656) 2023-11-22 14:53:08 +01:00
Anton
ffa22377f9 Fix clearable date on canvas 2023-11-21 21:00:46 +01:00
Anton
25048ddd4e Fix filters and missing barcode icon [SCI-9748] 2023-11-21 13:51:16 +01:00
Martin Artnik
64e192fac2 Fix report result content toggling [SCI-9693] 2023-11-21 13:05:07 +01:00
Anton
d68367eb37 Fix filters layout [SCI-9697] 2023-11-20 16:38:45 +01:00
Anton
2b51a4f4bd Vue3 migration mfixes [SCI-9733][SCI-9735][SCI-9736][SCI-9738] 2023-11-20 11:41:30 +01:00
Anton
6cff10ec7c Fixes vue3 migration [SCI-9726][SCI-9728][SCI-9729] 2023-11-17 14:19:26 +01:00
ajugo
91f5f2b587
Add missing collapse all icon [SCI-9717] (#6663) 2023-11-17 14:19:04 +01:00
Oleksii Kriuchykhin
f7d8fc96ac Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-17 10:44:32 +01:00
aignatov-bio
5dbfed20c8
Merge pull request #6647 from aignatov-bio/ai-sci-9706-fix-time-inconsistent
Fix time format and picker position [SCI-9706]
2023-11-17 10:04:32 +01:00
Martin Artnik
3547b7c2d1
Merge pull request #6655 from scinote-eln/e2e
Merge e2e
2023-11-16 13:23:13 +01:00
Oleksii Kriuchykhin
cc8b993430 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-16 11:12:50 +01:00
Oleksii Kriuchykhin
e8abbbbcdf Merge branch 'develop' into features/inventory-items-relationships 2023-11-16 11:04:27 +01:00
Anton
13eca7e035 Fix time format and picker position [SCI-9706] 2023-11-15 16:18:00 +01:00
wandji
0987ebf637
Update viewer and technician interaction on shareable link modal [SCI-9047] (#6568) 2023-11-15 15:55:48 +01:00
aignatov-bio
8d5a666b57
Merge pull request #6646 from scinote-eln/features/datetime-picker
Features/datetime picker
2023-11-15 14:50:55 +01:00
Anton
8d2187815b Fix turbolinks cache settings [SCI-9700][SCI-9701] 2023-11-15 11:02:50 +01:00
Oleksii Kriuchykhin
3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Martin Artnik
9db6fb2ef5
Revert "Fix result settings for reports [SCI-9693]" 2023-11-15 09:23:38 +01:00
Anton
6abc643aec Merge branch 'develop' into features/datetime-picker 2023-11-14 18:08:03 +01:00
Martin Artnik
3ff7e69109 Fix result settings for reports [SCI-9693] 2023-11-14 16:57:57 +01:00
Soufiane
12006bc286
Add relationships section to the items sidebar [SCI-9668] (#6623) 2023-11-14 14:04:46 +01:00
Anton
b7f876aa37 Date time picker improvments [SCI-9678][SCI-9688] 2023-11-14 11:26:27 +01:00
Oleksii Kriuchykhin
29f43d42af Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships 2023-11-10 09:26:05 +01:00
Oleksii Kriuchykhin
0b72740062 Merge branch 'develop' into features/inventory-items-relationships 2023-11-10 09:19:45 +01:00
Anton
dcf206368e Merge branch 'features/datetime-picker' of github.com:scinote-eln/scinote-web into features/datetime-picker 2023-11-08 14:57:29 +01:00
Anton
ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Anton
b09bd8a3c5 Add style styling to datetime pixker [SCI-9627] 2023-11-08 13:55:08 +01:00
Anton
a6b22b958c Fix datetime picker css 2023-11-07 16:10:17 +01:00
Anton
2ab479950a Replace datetime picker in activties and create task 2023-11-07 15:15:37 +01:00
Anton
d4f555da40 Replace datepicker in filters [SCI-9626] 2023-11-06 10:12:06 +01:00
ivanscinote
e6e7805c29
Apply layout for Grover PDF library [SCI-9566] (#6547) 2023-11-03 13:19:46 +01:00
Anton
9cb9680c55 Replace datetime picker in canvas [SCI-9630] 2023-11-02 13:36:47 +01:00
Anton
04fc356175 Replace datepicker in task table [SCI-9631] 2023-11-02 13:11:06 +01:00
Anton
70bbc0af47 Add new datetime picker [SCI-9127] 2023-10-30 15:19:39 +01:00
wandji
a16de72611
Mange stock modal improvements [SCI-9591] (#6545)
* Mange stock modlla improvements [SCI-9591]

* Fix manage stock modal close button [SCI-9591]

* Update manage stock url after update stock value [SCI-9591]
2023-10-30 09:47:10 +01:00
sboursen-scinote
b93baeb730 Replace Scinote Icons [SCI-9557] 2023-10-28 12:51:11 +02:00
Oleksii Kriuchykhin
ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +02:00
Martin Artnik
6308779668 Merge branch 'develop' into features/notification-revamp 2023-10-27 12:04:07 +02:00
wandji
c22d1e226b
Add new stock management modal and edit itemm card stock fields [SCI-9415] (#6474)
* Add edit fetaure to item card stock field [SCI-9415]

* Replace manage stock modal [SCI-9415]

* Fix issue displaying item card [SCI-9415]

* Minor improvements [SCI-9415]

* Enable stock modal in assigned inventories [SCI-9415]

* Use toggleable reminder value [SCI-9415]
2023-10-27 10:31:38 +02:00
Oleksii Kriuchykhin
6235a03595 Merge branch 'develop' into e2e 2023-10-26 15:36:36 +02:00
Anton
226d189789 Add new datetime pciker [SCI-9127] 2023-10-26 15:01:26 +02:00
ajugo
7c54509c58
Add editing of asset files for repository items sidebar [SCI-9413] (#6448) 2023-10-26 12:59:11 +02:00
Martin Artnik
e8299c2851 Remove max with from result and step text fields [SCI-9587] 2023-10-26 10:23:14 +02:00
aignatov-bio
ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize
Features/navigator resize
2023-10-25 14:05:14 +02:00
Soufiane
e8cb940665
Fix 500 error when clicking on another item [SCI-9595] (#6527) 2023-10-25 13:47:06 +02:00
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Soufiane
809aaa8aa3
Implement field editing for the new item card [SCI-9412] (#6421)
- Created new checklist component.
- updated the functionality of the select-search component.
- Name field.
- Text fields.
- Numeric fields.
- List fields.
- Status fields.
- Checklist fields.
2023-10-24 15:49:37 +02:00
Martin Artnik
2850135e96 Revert "Fixed Item card smart annotation link [SCI-9583]"
This reverts commit 0a3ba6a366.
2023-10-24 13:14:23 +02:00
Martin Artnik
1d3c17206c
Merge pull request #6514 from lasniscinote/gl_SCI_9583
Fixed Item card smart annotation link [SCI-9583]
2023-10-23 13:59:37 +02:00
Martin Artnik
ee076c7f3b Fix user smart annotations [SCI-9574] 2023-10-23 11:50:24 +02:00
Martin Artnik
d74cd77e41
Merge pull request #6516 from scinote-eln/develop
Merge develop
2023-10-23 11:14:50 +02:00
Martin Vražič
0f1ec8eada added e2e tag on create button - inventory dialog 2023-10-23 11:11:06 +02:00
Gregor Lasnibat
0a3ba6a366 Fixed Item card smart annotation link [SCI-9583] 2023-10-22 08:56:51 +02:00
mvrazic
77b3e7a44f
Merge branch 'e2e' into mv_SCI_9581 2023-10-20 15:06:30 +02:00
Martin Vražič
c392b5114f Modified and added new tags mostly for inventories section. 2023-10-20 11:23:51 +02:00
Alex Kriuchykhin
8a18bc6ad3
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] (#6506) 2023-10-19 16:35:23 +02:00
Oleksii Kriuchykhin
ae7995fee2 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-19 12:59:45 +02:00
Martin Artnik
4e76fbe087
Merge pull request #6436 from okriuchykhin/ok_SCI_9372
Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372]
2023-10-19 11:44:02 +02:00
Soufiane
e0a1a62bd5
Fix zebra print progress modal close button and padding [SCI-9536] (#6487) 2023-10-19 10:59:56 +02:00
Martin Artnik
fb9204df64 Merge branch 'develop' into features/bugfixes-and-css 2023-10-18 14:51:35 +02:00
ajugo
965deded98
Fix collapsing/extending containers on shareable results [SCI-9555] (#6476) 2023-10-18 10:15:43 +02:00
Giga Chubinidze
c865fedb7f Remove 'More [...]' button from the preview screens [SCI-9236] 2023-10-18 10:37:33 +04:00
Soufiane
fc52b7bdab
Fix item card css issues [SCI-9536] (#6458) 2023-10-17 17:09:11 +02:00
ajugo
9f1c668a10
Fix result assets download for shareable links [SCI-9542] (#6460) 2023-10-17 11:35:16 +02:00
wandji
c8359cdf3a
Add controller action to update inventory item cell data [SCI-9478] (#6379) 2023-10-16 17:43:53 +02:00
Alex Kriuchykhin
80ccd0039c
Apply saved custom columns order to the inventory item card [SCI-9540] (#6462) 2023-10-16 16:38:43 +02:00
wandji
550aa9df48
Update font size for stock edit modals [SCI-9451] (#6461) 2023-10-16 15:24:25 +02:00
Martin Artnik
606089a2c2
Merge pull request #6459 from G-Chubinidze/gc_SCI_9489_v2
Fix modal back arrow issue [SCI-9489]
2023-10-16 14:26:40 +02:00
Giga Chubinidze
b267c46865 Fix modal back arrow issue [SCI-9489] 2023-10-16 16:25:31 +04:00
Gregor Lasnibat
3b4fbc944f Added archived columns [SCI-9469] 2023-10-16 13:02:28 +02:00
ajugo
67008a54d6
Fix item sidebar showing on full view of inventory [SCI-9525] (#6447) 2023-10-16 10:18:22 +02:00
Anton
cb954ed605 Fix comments in shareable tasks [SCI-9476] 2023-10-16 09:55:52 +02:00
Anton
225193387a Update notifications settings saving 2023-10-16 09:41:38 +02:00
Anton
16b5df353f Refactor user settings page [SCI-9513] 2023-10-16 09:41:37 +02:00
Gregor Lasnibat
86d337541a
Fixed creating MS office file with empty name freezes modal [SCI-9497] (#6440) 2023-10-13 16:09:16 +02:00
Oleksii Kriuchykhin
984ad7757f Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372] 2023-10-13 13:38:41 +02:00
Martin Artnik
9c302f186b
Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable 2023-10-13 10:33:37 +02:00
Martin Artnik
a83235b23c
Merge pull request #6417 from aignatov-bio/ai-sci-9476-update-shared-tasks
Update css for shared protocol [SCI-9476]
2023-10-13 10:30:48 +02:00
Martin Artnik
43522c54a0
Merge pull request #6424 from G-Chubinidze/gc_SCI_9489
CSS: Signatures modal issues [SCI-9489]
2023-10-13 10:28:58 +02:00
Gregor Lasnibat
b5ece3429f
Fixed missing inventory columns on item card [SCI-9469] (#6416) 2023-10-13 09:51:50 +02:00
ajugo
04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00