Commit graph

493 commits

Author SHA1 Message Date
Martin Artnik
91533a25ac
Merge pull request #6792 from ivanscinote/SCI-9825-ik
Make Date/Date&Time and Low Stock notifications work when deleting Repository/row record [SCI-9825]
2023-12-11 13:40:26 +01:00
Ivan Kljun
41c5ecf1d8 Make Date/Date&Time and Low Stock notifications work when deleting Repository/row record [SCI-9825] 2023-12-11 11:55:02 +01:00
Anton
36ec0607ee Fix team notifications link [SCI-9861] 2023-12-11 11:27:58 +01:00
Anton
a894d6bd26 Finish main experiments actions [SCI-9800] 2023-12-11 10:47:53 +01:00
Anton
75f7437001 Fix markup 2023-12-11 09:26:13 +01:00
Anton
7ffad5b659 Experiments table migration [SCI-9800] 2023-12-07 12:53:21 +01:00
Anton
65e9e5abb4 Merge branch 'develop' into features/new-datatable 2023-12-07 09:51:45 +01:00
Anton
687bac024a Migrate access modal to VUE [SCI-9799] 2023-12-06 14:12:22 +01:00
Martin Artnik
7c73f284b4 Merge branch 'features/notification-revamp' into develop 2023-12-06 11:36:32 +01:00
Martin Artnik
66feec3074 Merge branch 'develop' into features/asset-sync 2023-12-06 11:23:31 +01:00
Martin Artnik
235d94e1cf Implement SciNote edit button with checks and info [SCI-9756] 2023-12-05 12:35:55 +01:00
wandji
1d52e20f4e
Fix issue showing item card reminder when threshold equals stock value [SCI-9828] (#6753) 2023-12-04 16:21:08 +01:00
Anton
9971de5c4c Finalize projects table 2023-12-01 09:56:14 +01:00
Giga Chubinidze
e509052140 Notification breadcrumb to Experiment page is not working [SCI-9766] 2023-11-30 13:54:40 +04:00
Anton
7fdbc73098 Replace project table [SCI-9680] 2023-11-24 11:15:07 +01:00
Anton
38024d563a Add initial table [SCI-9680] 2023-11-23 10:55:51 +01:00
Anton
8a0dd0258e Merge branch 'develop' into features/new-datatable 2023-11-23 10:47:58 +01:00
Anton
0ec734b467 Merge branch 'develop' into features/notification-revamp 2023-11-23 10:05:42 +01:00
Ivan Kljun
dd2611bb82 Making asset sync feature switchable [SCI-9709] 2023-11-17 07:41:12 +01:00
Oleksii Kriuchykhin
3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Martin Artnik
57d5d03718 Merge branch 'develop' into features/asset-sync 2023-11-14 09:41:42 +01:00
Anton
9abdc8698a Refactor label templates backend [SCI-9676] 2023-11-09 17:12:18 +01:00
ajugo
55308f6a81
Add missing serializers for repository cell value on api and fix some tests [SCI-9613] (#6571) 2023-11-03 14:38:01 +01: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
Martin Artnik
d181465e12 Fix initialization and add download endpoint [SCI-9465] 2023-10-25 09:30:42 +02:00
Ivan Kljun
2031286261 Implement file-checkout localhost call [SCI-9466] 2023-10-25 09:30:42 +02:00
Martin Artnik
7376b363a8 Asset sync model and endpoints [SCI-9465] (#6399) 2023-10-25 09:30:42 +02:00
aignatov-bio
efaef6f182
Merge pull request #6507 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results
Add drag n drop to results [SCI-9576]
2023-10-19 16:03:02 +02:00
Anton
3dd36e1dda Add drag n drop to results [SCI-9576] 2023-10-19 15:58:20 +02:00
wandji
db48eadd6a
Add reminder to stock column when value is negative [SCI-9564] (#6503) 2023-10-19 15:57:53 +02:00
wandji
782d10443d
Use default browser tooltip for shoing tooltips in items card [SCI-9537] (#6490) 2023-10-19 11:02:13 +02:00
Alex Kriuchykhin
ba56876bda
Fix results API endpoint, return result elements in includes block instead of attributes [SCI-9553] (#6472) 2023-10-18 10:05:26 +02:00
Anton
db3f217bba Implement acitvity notifications
[SCI-9512]
2023-10-17 14:59:50 +02:00
wandji
d236ba0a5b
Add reminders to item card [SCI-9154] (#6285)
* Add reminders to item card [SCI-9154]

* Refactor item card reminder component [SCI-9154]
2023-10-11 09:35:10 +02:00
Gregor Lasnibat
cac2b3c37e
Merge pull request #6394 from lasniscinote/gl_SCI_9474
Fixed no file preview on item card [SCI-9474]
2023-10-10 15:16:36 +02:00
Gregor Lasnibat
1b85b251ba Fixed no file preview on item card [SCI-9474] 2023-10-09 17:10:41 +02:00
Martin Artnik
1df8ad6f87
Merge pull request #6383 from G-Chubinidze/gc_SCI_9424
CSS:  Various issues [SCI-9424]
2023-10-09 09:41:48 +02:00
Giga Chubinidze
9b9b486324 CSS: Various issues [SCI-9424] 2023-10-09 11:35:52 +04:00
Martin Artnik
7bdef42523 Fix checklists in read-only mode [SCI-9488] 2023-10-06 13:50:23 +02:00
Anton
254b55772d Add assets_view_mode for result [SCI-9375] 2023-09-25 16:43:14 +02:00
Anton
01e4ab3cd5 Removed variable 2023-09-22 12:07:56 +02:00
Anton
77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00
Giga Chubinidze
f0fdfe2ea3 Result comments issues 2023-09-21 06:21:50 +04:00
Anton
6228a3bc00 Fix css for protocol/results 2023-09-18 15:35:27 +02:00
Anton
af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
ajugo
700df3525e
Fix special characters rendering for asset filenames [SCI-9242] (#6197) 2023-09-13 15:00:28 +02:00
Martin Artnik
ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
Anton
1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
G-Chubinidze
3976e05042
Merge branch 'features/september-release' into gc_SCI_9178 2023-09-06 16:38:25 +04:00
Giga Chubinidze
5a6202aea2 Unable to create a MarvinJS attachment [SCI-9178] 2023-09-05 18:29:15 +04:00
aignatov-bio
7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
aignatov-bio
647fb76910
Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll 2023-09-05 14:40:03 +02:00
Alex Kriuchykhin
f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] (#6122) 2023-09-05 11:36:37 +02:00
artoscinote
8d352b758a
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
2023-09-05 11:09:08 +02:00
Ivan Kljun
56744e2dcd Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182] 2023-09-05 11:02:39 +02:00
artoscinote
c59ee1c358
Merge pull request #6132 from G-Chubinidze/gc_SCI_9179
Archiving results doesn't work [SCI-9179]
2023-09-05 10:53:43 +02:00
Giga Chubinidze
b7da98c1dd Archiving results doesn't work [SCI-9179] 2023-09-05 11:55:15 +04:00
Giga Chubinidze
3b8669ed84 Add timestamps to results [SCI-9181] 2023-09-04 11:40:32 +04:00
Martin Artnik
3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Anton
2d76e628be Add infinite scroll to results [SCI-9108] 2023-08-30 15:51:23 +02:00
Anton
6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
sboursen-scinote
195df7936f Use custom images for marvin and OVE [SCI-9038] 2023-08-25 13:59:18 +02:00
Anton
f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
artoscinote
0bea4a06ef
Add result duplicate action [SCI-8959] (#6019) 2023-08-23 15:05:31 +02:00
Anton
e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Andrej
29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Martin Artnik
5312ddbff6 Fix issues with repository columns [SCI-8994][SCI-8846] 2023-08-21 15:59:17 +02:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
Martin Artnik
23a8872e11 Add some basic result component layout [SCI-8959] 2023-08-17 16:32:42 +02:00
Andrej
6e8dda64b2 Create new sequence attachment on task protocol step [SCI-8948] 2023-08-17 09:38:44 +02:00
Anton
ea299919e3 Fix results api [SCI-9012] 2023-08-16 11:45:37 +02:00
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
Anton
f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Giga Chubinidze
73e35994d5 new icon changes 2023-08-09 04:19:57 +04:00
Martin Artnik
fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
Anton
89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release
Merge features/august release to develop
2023-08-04 14:01:44 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Giga Chubinidze
ab41b5e219 Some icons have the checkboard pattern applied to the background [SCI-5605] 2023-07-25 11:52:31 +04:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
aignatov-bio
67a8729b41
Merge pull request #5847 from aignatov-bio/ai-sci-8880-clean-up-step-elements
Prepare step components for results refactor [SCI-8880]
2023-07-24 14:17:55 +02:00
Anton
aa87b332e4 Prepare step components for results refactor [SCI-8880] 2023-07-24 14:07:11 +02:00
Andrej
ab0d961cc1 Fix nil object rendering for position [SCI-8834] 2023-07-20 08:48:13 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
wandji20
126814aee8 Rename result_table serializer metadata to table_metadata [SCI-8884] 2023-07-19 08:49:20 +01:00
wandji20
7d36c74070 Fix issue when fetching table reults via API [SCI-8884] 2023-07-19 08:45:56 +01:00
ajugo
699860e730
Add position to step elements API [SCI-8834] (#5799) 2023-07-19 09:42:40 +02:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin
fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
aignatov-bio
388915b6d9
Fix big decimal number renderer in repository [SCI-8828] (#5746) 2023-07-11 13:24:07 +02:00
ajugo
6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723)
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
2023-07-06 16:05:03 +02:00
Alex Kriuchykhin
1a430a77fd
Add filtering option for active/archived PET listing API endpoints, add linked tasks to protocol serializer [SCI-7091] (#4381) 2023-05-19 11:34:31 +02:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
Andrej
32d8fc3e0c Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-16 14:26:12 +02:00
ajugo
31b42dc875
Add metadata to table API endpoints [SCI-8376] (#5388) 2023-05-16 10:26:09 +02:00
ajugo
d8945cc627
Fix large asset preview [SCI-8433] (#5408) 2023-05-16 10:24:08 +02:00
Andrej
29a9c3781e Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-04 13:34:45 +02:00
ajugo
a288708368
Add API endpoint for protocol templates [SCI-7456] (#5321)
* Add API endpoint for protocol templates [SCI-7456]

* Create protocol template api serializer [SCI-7456]
2023-05-03 15:55:36 +02:00
ajugo
c4a0ebeadf
Fix protocol dropdown options for private protocol [SCI-7983] (#5337) 2023-04-25 16:00:20 +02:00
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
aignatov-bio
134e7373c7
Merge pull request #5280 from sboursen-scinote/sb_SCI-8237-alternative-solution
Title for publishing template protocol draft must include next version value (Alt) [SCI-8237]
2023-04-14 10:37:51 +02:00
sboursen-scinote
4783ffcc4f Fix the issue with the published version number and refactor the code [SCI-8237] 2023-04-14 09:56:35 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
sboursen-scinote
0b76acbede Change the draft version to be the next one after the latest published [SCI-8237] 2023-04-11 16:29:12 +02:00
sboursen-scinote
b1914468c9 Add version number to protocol details [SCI-8237] 2023-04-11 15:00:21 +02:00
Soufiane
0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] (#5272)
* Load latest protocol version comment in publish modal [SCI-8279]

* Check publish permission before updating the draft comment [SCI-8279]
2023-04-11 12:50:14 +02:00
ajugo
4961243731
Fix protocol dropdown options for the locked tasks and archived protocol template [SCI-8277] (#5264) 2023-04-06 16:29:19 +02:00
Soufiane
4985c2eb88
Added Published on & Published by to Protocol details screen [SCI-8193] (#5239)
Added Published on & Published by to Protocol details screen [SCI-8193]
2023-04-05 15:08:31 +02:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Anton
ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Oleksii Kriuchykhin
cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Alex Kriuchykhin
f94c9e0b36
Avoid double escaping in user's name on protocol and step elements [SCI-8137] (#5150) 2023-03-15 16:36:06 +01:00
Alex Kriuchykhin
483a7aad5b
Improve special character escaping in data attributes [SCI-8137] (#5149) 2023-03-15 16:01:01 +01:00
G-Chubinidze
b68f5ced7a
Protocol permission bugs [SCI-8058] (#5142)
* Protocol permission bugs [SCI-8058]

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-15 11:14:20 +01:00
G-Chubinidze
7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-14 17:07:52 +04:00
ajugo
8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Giga Chubinidze
d5e0c041a8 changed disabled_drafting logic 2023-03-14 14:41:00 +04:00
Giga Chubinidze
67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00
Alex Kriuchykhin
d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
Alex Kriuchykhin
cb1c49762a
Revert "Protocol permissions - button display [SCI-8058]" (#5121) 2023-03-10 11:45:32 +01:00
G-Chubinidze
32d1c2cf6d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-08 21:15:36 +04:00
Giga Chubinidze
553c644811 Protocol permissions - button display [SCI-8058] 2023-03-08 21:12:29 +04:00
aignatov-bio
ff4ef31ebf
Merge pull request #5091 from aignatov-bio/ai-sci-8079-fix-print-button-on-protocol-show-page
Fix print protocol button on protocol show page [SCI-8079]
2023-03-07 14:09:08 +01:00
Alex Kriuchykhin
f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
Anton
25050cb6cc Fix print protocol button on protocol show page [SCI-8079] 2023-03-07 11:25:59 +01:00
Giga Chubinidze
4a02a130f0 Archived protocol template navigation, icon, button [SCI-7954] 2023-03-06 23:44:47 +04:00
aignatov-bio
3735ba51b8
Fix protocol id on protocol show page [SCI-8005] (#5033) 2023-02-27 17:18:12 +01:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Anton
743d901310 Add published view for protocol [SCI-7617] 2023-02-13 10:41:30 +01:00
Anton
3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
ajugo
9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] (#4939) 2023-02-07 10:39:49 +01:00
ajugo
29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
aignatov-bio
bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata
Save handson table metadata [SCI-7834]
2023-02-06 14:24:51 +01:00
Anton
3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
artoscinote
3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837
Step timestamp display [SCI-7837]
2023-02-06 12:03:02 +01:00
Giga Chubinidze
9595f434d0 on/at convention fix 2023-02-05 23:00:20 +04:00
Giga Chubinidze
ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Oleksii Kriuchykhin
fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
Alex Kriuchykhin
1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638
Improve loading speed of inventory table [SCI-7638]
2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin
e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
ajugo
56fb8a4efa
Fix hoover tooltip for company logo [SCI-7766] (#4827) 2023-01-16 10:23:34 +01:00