scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 10:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
10936 commits 69 branches 179 tags 166 MiB
Commit graph

8498 commits

Author SHA1 Message Date
ajugo a4ff347d6e
Fix datatable sort in task assigned repository to task and on first repository load [SCI-6904] (#4164) 
* Enable repository sorting on assigned repository [SCI-6904]

* Fix order at repository table initialization [SCI-6904]
 2022-06-21 10:49:03 +02:00
ajugo c39f0a4e4d
Fix missing bell reminder [SCI-6911] (#4163) 2022-06-17 10:01:36 +02:00
Alex Kriuchykhin 49f05f3df9
Merge pull request #4162 from okriuchykhin/ok_SCI_6907 
Fix repository export with enabled stock management [SCI-6907]
 2022-06-13 10:14:53 +02:00
Oleksii Kriuchykhin 10f7460648 Fix repository export with enabled stock management [SCI-6907] 2022-06-10 15:46:22 +02:00
Alex Kriuchykhin 6148c6accf
Merge pull request #4161 from okriuchykhin/ok_SCI_6907 
Fix repository export in export all [SCI-6907]
 2022-06-10 11:13:14 +02:00
Oleksii Kriuchykhin 9df833111d Fix repository export in export all [SCI-6907] 2022-06-10 11:04:44 +02:00
Alex Kriuchykhin ef5d6e634b
Merge pull request #4156 from okriuchykhin/ok_SCI_6879 
Fix switching between views on experiment canvas [SCI-6879]
 2022-06-10 10:42:15 +02:00
artoscinote 934023e9d8
Update print template to fit with new steps [SCI-6871] (#4153) 2022-06-10 10:41:57 +02:00
Alex Kriuchykhin a57881fac4
Merge pull request #4155 from okriuchykhin/ok_SCI_6805_v2 
Improve inventory stock saving with comment [SCI-6805]
 2022-06-10 10:41:56 +02:00
aignatov-bio 247a8f9a0b
Merge pull request #4159 from aignatov-bio/ai-sci-6887-add-collapse-extend-buttons 
Add collapse/expand buttons to steps [SCI-6887]
 2022-06-10 10:19:13 +02:00
artoscinote 5c051ef8c1
Implement V2 protocols exporter [SCI-6876] (#4142) 
* Implement V2 protocols exporter [SCI-6876]

* Implement new importer [SCI-6877]
 2022-06-10 10:18:55 +02:00
Anton d62f712166 Add collapse/expand buttons to steps [SCI-6887] 2022-06-09 16:16:30 +02:00
Alex Kriuchykhin ded673ebf3
Merge pull request #4151 from okriuchykhin/ok_SCI_6886 
Improve Inventory table loading time [SCI-6886]
 2022-06-09 15:59:41 +02:00
Anton 66212fd703 Finalize inline edit field [SCI-6782] 2022-06-09 14:40:45 +02:00
Oleksii Kriuchykhin 31ae9ffbda Fix switching between views on experiment canvas [SCI-6879] 2022-06-09 14:13:29 +02:00
Oleksii Kriuchykhin f82c2af244 Improve inventory stock saving with comment [SCI-6805] 2022-06-09 13:18:00 +02:00
aignatov-bio 7446e4be9b
Merge pull request #4150 from aignatov-bio/ai-sci-5257-close-all-modals-to-esc 
Fix element closing on select [SCI-5257]
 2022-06-09 12:44:59 +02:00
Anton f84a972f6a Fix show password for invitation/password reset screens [SCI-6791] 2022-06-09 11:40:22 +02:00
artoscinote e114f9b880
Update protocols.io importer and import from repository [SCI-6872] (#4138) 2022-06-08 15:55:50 +02:00
Anton fb9fcb9371 Update team import/export scripts [SCI-6875] 2022-06-08 15:32:59 +02:00
ajugo 5d198924af
DOCX: Render image for step table [SCI-6885] (#4144) 2022-06-08 13:37:03 +02:00
ajugo a5065b82cb
Show error for broken file in repository row [SCI-6838] (#4146) 2022-06-08 13:35:06 +02:00
Oleksii Kriuchykhin 07716e56a5 Improve Inventory table loading time [SCI-6886] 2022-06-08 13:23:39 +02:00
Anton 4ab4f4c6ed Fix element closing on select [SCI-5257] 2022-06-07 15:14:00 +02:00
Anton 46631a1f46 Finalize protocol repository [SCI-6870] 2022-06-07 12:10:10 +02:00
Anton 656d036b2a Fix markup [SCI-6869] 2022-06-07 10:02:10 +02:00
Anton e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
aignatov-bio a8fe943658
Merge pull request #4140 from aignatov-bio/ai-sci-6868-remove-new-protocal-modal 
Remove protocol creation modal [SCI-6868]
 2022-06-05 22:41:57 +02:00
aignatov-bio d7926654ee
Merge pull request #4139 from aignatov-bio/ai-sci-6867-add-view-mode-for-protocol-and-step 
Add view mode to protocol and step [SCI-6867]
 2022-06-03 15:27:15 +02:00
Anton 32273fe169 Fix markup [SCI-6867] 2022-06-03 15:26:16 +02:00
Anton 3910fa34f3 Remove protocol creation modal [SCI-6868] 2022-06-03 15:11:51 +02:00
Anton 2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
ajugo 13798374ed
Add consume column to assigned item export [SCI-6841] (#4115) 
* Add consume column to assigned item export [SCI-6841]

* Fix hound [SCI-6841]
 2022-06-03 10:10:00 +02:00
ajugo 9d4c97f191
Add task assignment API [SCI-6846] (#4123) 
* Add user assignment to task API [SCI-6846]

* Add test for task assignments [SCI-6846]
 2022-06-03 10:09:42 +02:00
Martin Artnik 1df4433074 Fix file activity logging in steps controller 2022-06-02 13:44:03 +02:00
Martin Artnik 8c78920927 Fixed checklist editing 2022-06-02 12:02:34 +02:00
Martin Artnik ded23dc528 Fix checklist update issue 2022-06-02 11:53:24 +02:00
Martin Artnik 02c813bf06 Fix text serializer and file activity logging 2022-06-02 11:32:31 +02:00
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
aignatov-bio 6b4a3f2651
Merge pull request #4130 from aignatov-bio/ai-sci-6856-update-pdf-report 
Update PDF report layout [SCI-6856]
 2022-06-02 11:18:16 +02:00
artoscinote ab5cb19d6e
Add step activities, fix checklists [SCI-6852] (#4136) 
* Add step activities, fix checklists [SCI-6852]

* Linter fix [SCI-6852]
 2022-06-02 11:15:32 +02:00
aignatov-bio c5f3b4affb
Merge pull request #4133 from aignatov-bio/ai-sci-6878-fix-docx-preview-after-replace-file 
Fix Docx preview after replace file [SCI-6878]
 2022-06-02 11:07:40 +02:00
aignatov-bio cd7ca54610
Merge pull request #4135 from aignatov-bio/ai-sci-6865-add-step-text-option-to-report-wizard 
Add step text option to report wizard [SCI-6865]
 2022-06-02 11:06:48 +02:00
Anton 61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
Anton 08e7ea3014 Add step text option to report wizard [SCI-6865] 2022-06-01 15:53:40 +02:00
aignatov-bio 3645200700
Merge pull request #4127 from aignatov-bio/ai-sci-6855-update-docx-report 
Update step structure in report [SCI-6855]
 2022-06-01 15:42:59 +02:00
artoscinote 98d66a3276
Implement reordering activities [SCI-6851] (#4129) 
* Implement reordering activities [SCI-6851]

* Added asset activity types [SCI-SCI-6853]
 2022-06-01 12:30:09 +02:00
Anton cf36ad0fb4 Fix Docx preview after replace file [SCI-6878] 2022-06-01 12:16:19 +02:00
Alex Kriuchykhin d5c80b8ab0
Merge pull request #4101 from okriuchykhin/ok_SCI_6805 
Improve stock consumption recording [SCI-6805]
 2022-06-01 12:01:33 +02:00
artoscinote 95a2cc5298
Fix counts for archived tasks [SCI-6881] (#4132) 2022-06-01 11:43:15 +02:00
Anton b684841718 Update PDF report layout [SCI-6856] 2022-05-31 14:42:46 +02:00
artoscinote 3c63d9a3eb
CSS fix, routes fix [SCI-6844] (#4106) 2022-05-31 09:05:38 +02:00
aignatov-bio 36ffbb0eab
Merge pull request #4125 from aignatov-bio/ai-sci-6854-update-pdf-report 
Update PDF report with new step structure [SCI-6854]
 2022-05-30 13:46:32 +02:00
artoscinote 23872f519b
Implement step element sorting modal [SCI-6849] (#4124) 
* Implement step element sorting modal [SCI-6849]

* Implement step reordering modal [SCI-6850]

* Refactor reorderable items a bit [SCI-6850]
 2022-05-30 13:45:51 +02:00
Anton a2f7f38e31 Update step structure in report [SCI-6855] 2022-05-30 11:33:56 +02:00
Anton 65ab42a938 Update PDF report with new step structure [SCI-6854] 2022-05-27 13:26:40 +02:00
Martin Artnik b7e78f567c Add missing base controller 2022-05-27 12:22:44 +02:00
aignatov-bio 57408e9f4f
Merge pull request #4121 from aignatov-bio/ai-sci-6835-display-user-free-space 
Add the ability to show storage limit [SCI-6835]
 2022-05-26 15:03:45 +02:00
Anton 3983d920e9 Fix localization [SCI-6835] 2022-05-26 15:01:52 +02:00
Anton 9e2c8bf25a Add ability to show storage limit [SCI-6835] 2022-05-26 14:48:57 +02:00
artoscinote 894eb8932d
Implement checklist item ordering [SCI-6847] (#4119) 2022-05-26 14:02:02 +02:00
ajugo e3c337aa3d
Renaming settings section and remove caching for Settings class [SCI-5625] (#4100) 
* Renaming settings section and remove caching for Settings class [SCI-5625]

* Code fix for setting model [SCI-5625]

* Clean code [SCI-5625]
 2022-05-26 13:27:18 +02:00
ajugo 5ceab30aa7
Add tooltip to task names [SCI-6607] (#4109) 2022-05-26 13:21:50 +02:00
ajugo 054ce72d25
Add handle for going over storage limit for inventories [SCI-6604] (#4120) 2022-05-26 13:19:38 +02:00
aignatov-bio 45801950fd
Merge pull request #4116 from aignatov-bio/ai-sci-6814-add-dropable-area-to-step 
Add dropable area to step [SCI-6814]
 2022-05-26 12:57:51 +02:00
Anton 2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +02:00
aignatov-bio 82a3a9de9a
Merge pull request #4090 from aignatov-bio/ai-sci-6810-add-tinymce-component-to-protocol-description 
Add tinyMce field to protocol [SCI-6810]
 2022-05-26 12:46:15 +02:00
aignatov-bio adc87b85f1
Merge pull request #4077 from aignatov-bio/ai-sci-6791-add-show-password-button 
Add show icon for password [SCI-6791]
 2022-05-26 12:46:00 +02:00
aignatov-bio 5fe3613eb8
Merge pull request #4118 from aignatov-bio/ai-sci-6837-add-comments-section 
Add comments to step [SCI-6837]
 2022-05-25 22:01:48 +02:00
Anton 7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
artoscinote df0f001afa
Refactor step elements controllers [SCI-6848] (#4117) 2022-05-25 14:23:35 +02:00
ajugo 047c1620de
Fix remove tag on backspace [SCI-6542] (#4108) 2022-05-25 10:46:42 +02:00
ajugo 0fa2e5f30b
Remove icons from task tabs [SCI-6621] (#4105) 2022-05-25 10:45:08 +02:00
ajugo b03ce665da
Add missing classes for shrinking save button [SCI-6839] (#4102) 
* Add missing classes for shrinking save button [SCI-6839]

* Change type of button for save filter [SCI-6839]
 2022-05-25 10:44:27 +02:00
ajugo b77394a7b2
Responsive filter flyout [SCI-6494] (#4098) 
* Responsive filter flyout [SCI-6494]

* Correct delimiter [SCI-6494]
 2022-05-25 10:42:54 +02:00
ajugo bacb1547f2
Changed clone permissions and UI changes for experiment actions [SCI-6756] (#4074) 2022-05-25 10:22:50 +02:00
ajugo a23eea7523
Hide stock column at importing items after stock is disabled [SCI-6801] (#4093) 
* Add stock column check at importing inventory items [SCI-6801]

* Fix hound message [SCI-6801]
 2022-05-24 11:49:36 +02:00
artoscinote c33b426c03
Add marvinJS integration [SCI-6831] (#4113) 2022-05-24 11:30:15 +02:00
artoscinote 6c797f5825
Integrate WOPI file modal with new steps [SCI-6830] (#4111) 2022-05-24 11:13:47 +02:00
Anton a494051f61 Add placeholder for new files in step [SCI-6833] 2022-05-23 13:44:34 +02:00
Anton 5a275aaeae Move attachments to separate component 2022-05-19 11:16:50 +02:00
ajugo 90db2bace9
API endpoint to generate with ELN data for Validaide [SCI-6663][SCI-6798] (#4012) 
* Manuscript JSON data SCI-6663

* Clean code for generate manuscript data [SCI-6663]

* Include project data into json [SCI-6663]

* Fix hound [SCI-6663]

* Fix hound [SCI-6663]

* Remove manuscript naming [SCI-6663]

* Add local storage assets capabilites [SCI-6663]

* Rename project [SCI-6663]

* Enable multple projects and clean input [SCI-6798]

* Fix hound [SCI-6798]
 2022-05-19 09:08:05 +02:00
Anton 9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +02:00
Oleksii Kriuchykhin 1b63da13b4 Improve stock consumption recording [SCI-6805] 2022-05-18 17:02:12 +02:00
Anton 134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
ajugo e8d7fa50b8
Enable smart annotation notifcation at consumption and some rewording [SCI-6802] (#4094) 2022-05-17 11:41:53 +02:00
Anton 9aaf4a136e Add menu to attachment cards [SCI-6816] 2022-05-17 10:41:34 +02:00
ajugo ee448a9997
Micro-interactions for reminder flyout correction [SCI-6804] (#4096) 2022-05-16 11:16:07 +02:00
Anton 711bd77222 Add manage dropdown to attachments section [SCI-6815] 2022-05-16 11:05:18 +02:00
Anton 8f0789ec72 Add inline asset card [SCI-6811] 2022-05-13 13:09:01 +02:00
ajugo 2097fb1df4
CSS fix overlapping number in task assigned items [SCI-6794] (#4092) 2022-05-13 11:16:07 +02:00
Anton 87450ea821 Add thumbnail and list view [SCI-6812] 2022-05-12 18:04:06 +02:00
Anton 940b0ea744 Add general layout for step attachments [SCI-6811] 2022-05-12 12:26:50 +02:00
Anton 6dce426db4 Add tinyMce field to protocol [SCI-6810] 2022-05-11 16:10:26 +02:00
artoscinote b486f3fd31
Implement checklists [SCI-6789] (#4089) 2022-05-11 15:51:26 +02:00
Anton 24d68da455 Fix tinymce assets for steps [SCI-6809] 2022-05-11 13:01:23 +02:00
Anton c0660d0243 Small fixes [SCI-6808] 2022-05-11 11:32:27 +02:00
Anton 04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +02:00
Alex Kriuchykhin ab665e5f43
Merge pull request #4086 from okriuchykhin/ok_SCI_6824 
Fix display of repository snapshot with stock consumption [SCI-6824]
 2022-05-10 22:26:24 +02:00
Oleksii Kriuchykhin 1e9dd95716 Fix duplicated counters on task card [SCI-6825] 2022-05-10 22:23:42 +02:00
Oleksii Kriuchykhin dfc68b997c Fix display of repository snapshot with stock consumption [SCI-6824] 2022-05-10 22:21:48 +02:00
Alex Kriuchykhin b48d0710a4
Merge pull request #4084 from okriuchykhin/ok_SCI_6822 
Fix archived tasks view [SCI-6822]
 2022-05-10 15:42:03 +02:00
Oleksii Kriuchykhin 6fb44eb78e Fix archived tasks view [SCI-6822] 2022-05-10 15:39:59 +02:00
aignatov-bio d07daa73cb
Merge pull request #4072 from aignatov-bio/ai-sci-6781-add-confirmation-modal-for-step-deletion 
Add delete step modal [SCI-6781]
 2022-05-10 13:28:47 +02:00
Alex Kriuchykhin b04c8ab29c
Merge pull request #4082 from okriuchykhin/ok_SCI_6817 
Fix task dropdown actions [SCI-6817]
 2022-05-10 13:17:47 +02:00
Oleksii Kriuchykhin a8c56891d4 Fix task dropdown actions [SCI-6817] 2022-05-10 11:27:46 +02:00
Oleksii Kriuchykhin 823e552ef6 Fix displaying of stock consumption units [SCI-6795] 2022-05-10 10:19:37 +02:00
aignatov-bio 6cbcac3a22
Merge pull request #4080 from aignatov-bio/ai-sci-6807-fix-stock-consumption-rounding 
Fix stock consumption rounding [SCI-6807]
 2022-05-09 11:55:17 +02:00
Anton 2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
Alex Kriuchykhin c4b524af4b
Merge pull request #4079 from okriuchykhin/ok_SCI_6797 
Improve loading time of canvas view/edit [SCI-6797]
 2022-05-09 11:46:04 +02:00
Oleksii Kriuchykhin e957d7d35e Improve loading time of canvas view/edit [SCI-6797] 2022-05-09 11:40:31 +02:00
artoscinote 98ac1c126f
Stock editing and reminder fixes [SCI-6803] (#4078) 
* Fix stock editing after adding new value [SCI-6803]

* Don't load reminders for snapshots [SCI-6803]
 2022-05-09 11:20:38 +02:00
Alex Kriuchykhin 297c58c0cd
Merge pull request #4075 from okriuchykhin/ok_SCI_6800 
Allow deletion of stock columns when stock management is disabled [SCI-6800]
 2022-05-09 10:26:44 +02:00
Alex Kriuchykhin 87e3a71709
Merge pull request #4071 from okriuchykhin/ok_SCI_6155 
Improve input field for adding new team [SCI-6155]
 2022-05-09 10:26:15 +02:00
Anton 3856fd9cf1 Add show icon for password [SCI-6791] 2022-05-06 16:14:21 +02:00
Anton 252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +02:00
Oleksii Kriuchykhin 2ffb4acb2f Allow deleteion of stock columns when stock management is disabled [SCI-6800] 2022-05-05 15:44:21 +02:00
artoscinote b00968fd55
Implement basic checklist functionality [SCI-6786] (#4073) 
* Implement protocol status bar functionality [SCI-6760]

* Inline edit interactions, checklist name edit improvements [SCI-6786]
 2022-05-05 12:56:31 +02:00
Anton 277e202c90 Add delete step modal [SCI-6781] 2022-05-04 15:57:13 +02:00
Oleksii Kriuchykhin 3d26da9e5e Improve input field for adding new team [SCI-6155] 2022-05-04 14:30:26 +02:00
Alex Kriuchykhin 685032cafb
Fix saving of new date time columns with reminders [SCI-6774] (#4068) 2022-05-04 11:50:57 +02:00
artoscinote 5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
Anton 3b60c62c79 Refactor modal loading [SCI-6780] 2022-05-04 10:36:13 +02:00
Anton e06b398bb4 Add delete action for step components [SCI-6780] 2022-05-03 15:21:47 +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 d71ba2f7a1 Fix serailizer [SCI-6758] 2022-05-03 13:55:08 +02:00
Anton 6a827022f6 Add insert step element dropdown [SCI-6758] 2022-05-03 13:22:26 +02:00
ajugo 2bda271615
Open repository on print view [SCI-6566] (#4055) 2022-05-03 09:30:33 +02:00
artoscinote ac45edb14c
Added validations for date(time) column reminder [SCI-6775] (#4063) 2022-04-28 15:30:20 +02:00
aignatov-bio 0ae5006a10
Merge pull request #4062 from aignatov-bio/ai-sci-6767-repository-css-fixes 
Small CSS fixes for repository [SCI-6767]
 2022-04-28 14:36:46 +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 36ae58872f Show last page message only after second page [SCI-6761] 2022-04-28 14:11:11 +02:00
Anton 189f4335ea Add main layout for step [SCI-6755] 2022-04-28 11:38:33 +02:00
Alex Kriuchykhin 892b5e2348
Merge pull request #4056 from okriuchykhin/ok_SCI_6769 
Fix blank stock consumption representation in reports [SCI-6769]
 2022-04-28 11:18:12 +02:00
Anton 6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +02:00
artoscinote 8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
Oleksii Kriuchykhin b6501fcf36 Fix blank stock consumption representation in reports [SCI-6769] 2022-04-25 17:10:44 +02:00
Alex Kriuchykhin 29bf85de44
Merge pull request #4053 from okriuchykhin/ok_SCI_6776 
Fix duplicated inventories on tasks for export all [SCI-6776]
 2022-04-25 15:56:01 +02:00
artoscinote da8250dba8
Stock / stock consumption display fixes [SCI-6771] (#4054) 2022-04-25 15:23:12 +02:00
Oleksii Kriuchykhin 9f5ebee4e2 Fix duplicated inventories on tasks for export all [SCI-6776] 2022-04-25 13:45:58 +02:00
Alex Kriuchykhin 5d0fb932e7
Merge pull request #4046 from okriuchykhin/ok_SCI_6722 
Add results counter to second navigation [SCI-6722]
 2022-04-25 13:16:18 +02:00
Alex Kriuchykhin 49bc361dee
Fix formatting of stock consumption on tasks [SCI-6737] (#4050) 2022-04-25 13:08:33 +02:00
aignatov-bio 3d78559559
Merge pull request #4047 from aignatov-bio/ai-sci-6754-add-creation-step-functionality 
Add step creation/deletion functionality [SCI-6754]
 2022-04-25 12:46:33 +02:00
aignatov-bio 957e79f46a
Merge pull request #4051 from aignatov-bio/ai-sci-6743-add-newgative-validation-for-treshold 
Add negative validation for threshold [SCI-6743]
 2022-04-25 12:46:20 +02:00
Anton ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
aignatov-bio 95060cecf9
Merge pull request #4052 from aignatov-bio/ai-sci-6770-add-bell-icon-for-negative-stock 
Add bell icon for negative stock [SCI-6770]
 2022-04-25 12:31:40 +02:00
Anton c9d114e71e Add bell icon for negative stock [SCI-6770] 2022-04-25 12:29:10 +02:00
Anton b56f11fc18 Add negative validation for treshold [SCI-6743] 2022-04-25 12:18:22 +02:00
artoscinote d863618846
Enable team normal user to edit repository files [SCI-6765] (#4049) 2022-04-25 12:18:01 +02:00
Oleksii Kriuchykhin b148bd2057 Add results counter to secnd navigation [SCI-6722] 2022-04-22 12:24:14 +02:00
ajugo 2b2888e6f7
Allow tag creation on task level if you have permission [SCI-6573] (#4031) 2022-04-22 11:50:32 +02:00
aignatov-bio 4d429b28a8
Merge branch 'develop' into ai-sci-6743-add-negative-validation-for-stock-modal-and-consumption-modal 2022-04-22 11:15:04 +02:00
aignatov-bio bc80122df0
Merge pull request #4042 from aignatov-bio/ai-sci-6741-stock-consumption-modal-highlight-negative-with-red 
Highlight negative value in consumption modal [SCI-6741]
 2022-04-22 11:13:34 +02:00
artoscinote f9357611a0
Update stock value without reloading the table [SCI-6745] (#4041) 2022-04-22 11:13:00 +02:00
Martin Artnik 4bd5df4e0e Fix snapshot creation with stock consumption [SCI-6762] 2022-04-22 10:49:42 +02:00
Alex Kriuchykhin e15a382e37
Merge pull request #4032 from okriuchykhin/ok_SCI_6712 
Add models for step orderable elements, migrate step descriptions [SCI-6712]
 2022-04-22 09:33:41 +02:00
artoscinote 6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
Anton df2ff32f2e Update general layout for task [SCI-6713] 2022-04-21 14:43:10 +02:00
Anton fc3d47d220 Highlight negative value in consumption modal [SCI-6741] 2022-04-21 12:11:38 +02:00
Anton f8f5791c62 Add negative validation for stock [SCI-6743] 2022-04-20 15:11:05 +02:00
Anton e28095f781 Fix default stock column default units selection [SCI-6744] 2022-04-20 14:52:34 +02:00
Anton fd736f99c1 Add comment to repository stock activities [SCI-6746] 2022-04-20 11:29:16 +02:00
aignatov-bio 918a11a0b0
Fix decimal render function [SCI-6742] (#4037) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-20 11:07:37 +02:00
artoscinote 4daf01feee
Fix snapshot consumption display [SCI-6734] (#4035) 2022-04-20 11:07:26 +02:00
artoscinote e3cbf5903a
Move list-type column includes to param, unify naming [SCI-6738] (#4036) 
* Add default includes for inventory columns with lists [SCI-6738]

* Move list-type column includes to param, unify naming [SCI-6738]
 2022-04-20 11:07:15 +02:00
ajugo 54474b2bba
API GET repository stock column output fix [SCI-6550] (#4030) 
* Add include stock unit items to Stock column get [SCI-6550]

* Fix stock column test [SCI-6550]

* Fix hound [SCI-6550]
 2022-04-19 16:05:17 +02:00
aignatov-bio 1a2a58ff5f
Merge pull request #4033 from aignatov-bio/ai-sci-6740-fix-stock-modal-add-remove-value 
Fix stock modal add/remove value preset value [SCI-6740]
 2022-04-19 13:46:24 +02:00
Anton 1be5ba9dd0 Fix stock modal add/remove value preset value [SCI-6740] 2022-04-19 13:44:53 +02:00
Alex Kriuchykhin 42ae32f81a
Merge pull request #4025 from okriuchykhin/ok_SCI_6419 
Improve stock ledger records creation [SCI-6419]
 2022-04-19 13:32:58 +02:00
Oleksii Kriuchykhin 5a17ad6be9 Add models for step orderable elements, migrate step descriptions [SCI-6712] 2022-04-19 13:26:13 +02:00
Oleksii Kriuchykhin e50d52e8ef Improve stock ledger records creation [SCI-6419] 2022-04-18 16:24:27 +02:00
artoscinote 42605e1a8a
Fix inviting users to team [SCI-6725] (#4026) 2022-04-15 15:31:08 +02:00
aignatov-bio 31f4b35186
Merge branch 'develop' into ai-sci-6731-fix-edit-title-for-stock-consumption-modal 2022-04-15 14:43:51 +02:00
aignatov-bio 85a54cbcdf
Merge pull request #4029 from aignatov-bio/ai-sci-6729-highlight-negative-stock-in-modal-with-red 
Highlight negative stock in modal with red [SCI-6729]
 2022-04-15 14:43:07 +02:00
Anton ed49e93a6a Highlight negative stock in modal with red [SCI-6729] 2022-04-15 12:08:29 +02:00
Anton 2481ba566a Add edit title for stock consumption modal [SCI-6731] 2022-04-15 11:47:49 +02:00
Anton 441f6b977d Fix decimals in stock consumption modal [SCI-6732] 2022-04-15 11:40:47 +02:00
artoscinote 6b309871a3
Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) 2022-04-15 10:55:14 +02:00
ajugo 02677aaaba
Focus authenticator code field [SCI-6716] (#4022) 2022-04-14 15:17:56 +02:00
aignatov-bio 4f2fd79f67
Merge pull request #4023 from aignatov-bio/ai-sci-6735-fix-stock-consumption-in-reports 
Fix stock consumption in reports [SCI-6735]
 2022-04-14 14:51:38 +02:00
Anton c73dc5ea2f Fix markup 2022-04-14 14:47:51 +02:00
Anton 84f91634d3 Fix stock consumption in reports [SCI-6735] 2022-04-14 14:46:09 +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
aignatov-bio 4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination 
Features/projects experiments pagination
 2022-04-14 10:45:27 +02:00
artoscinote f3ce338600
Fix error modal opening on successful snapshot [SCI-6726] (#4019) 2022-04-13 14:22:34 +02:00
artoscinote dd0661a462
Change the way setting stock works [SCI-6730] (#4018) 2022-04-13 14:22:22 +02:00
aignatov-bio ab40275243
Fix red dot for date reminders [SCI-6696] (#4016) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-13 14:20:33 +02:00
aignatov-bio 5ac9f51220
Add aibility to delete stock column [SCI-6723] (#4017) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-13 14:20:23 +02:00
aignatov-bio 36639727a1
Stock small ux fixes [SCI-6714] (#4015) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-13 12:15:30 +02:00
artoscinote 04ab92b8e2
Fix removing stock reminder threshold [SCI-6724] (#4010) 2022-04-13 11:35:45 +02:00
artoscinote ee26204af2
Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) 2022-04-13 11:35:22 +02:00
Alex Kriuchykhin 94083cf270
Revert "tmp (#3935)" (#4014) 
This reverts commit 043086d55f.
 2022-04-13 11:11:07 +02:00
Alex Kriuchykhin 043086d55f
tmp (#3935) 2022-04-13 11:09:48 +02:00
Alex Kriuchykhin f7f03b19c0
Add locking and unique index to repository row assigning [SCI-6591] (#3921) 2022-04-13 10:54:23 +02:00
ajugo 1338d4524f
Align items in assigned item section [SCI-6707] (#4007) 2022-04-13 10:12:01 +02:00
Alex Kriuchykhin 1385c6964c
Fix sorting by time and time range columns [SCI-6683] (#4011) 2022-04-12 15:56:20 +02:00
Anton d091c56e9f Add pagination for experiments [SCI-6656] 2022-04-12 15:16:02 +02:00
artoscinote 83ac50c57d
Add repository snapshot error modal [SCI-6613] (#3993) 2022-04-12 13:29:11 +02:00
artoscinote 2d811cdc4c
Add snapshot error message below task status [SCI-6614] (#4009) 2022-04-12 13:28:26 +02:00