scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 19:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
12045 commits 69 branches 179 tags 165 MiB
Commit graph

3946 commits

Author SHA1 Message Date
Anton a17cd78c20 Add view dropdown to experiment screen 2022-11-08 16:39:52 +01:00
Anton 7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +01:00
ajugo dd22d53bda
Implemented pagination for experiment table [SCI-7214] (#4591) 
* Implement pagination for experiment table [SCI-7214]

* Fix table experiment pagination [SCI-7214]

* Move pagination to service [SCI-7214]
 2022-11-07 11:46:54 +01:00
Andrej a88d41ca6a Fixed external protocol icon out of body [SCI-7361] 2022-11-07 11:03:34 +01:00
Anton b3bd165d01 Fix time picket CSS [SCI-7359] 2022-11-04 11:36:21 +01:00
Anton bacd3524e8 Add tags manager to experiment table view [SCI-7368] 2022-11-02 15:17:10 +01:00
Giga Chubinidze d1aa127b7a Merge branch 'features/exposed_ids' of github.com:scinote-eln/scinote-web into gc_SCI_7176 2022-10-28 15:30:28 +04:00
Giga Chubinidze a9287df1a0 exposed experiment ids on card view page / other styling updates [SCI-7176] 2022-10-28 15:16:49 +04:00
G-Chubinidze 81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172 2022-10-28 15:05:38 +04:00
Giga Chubinidze fe488ed00f fixed unstable project name and code styling in cards 2022-10-28 11:38:38 +04:00
Giga Chubinidze b1296adeb3 pitstop 2022-10-28 10:49:13 +04:00
ajugo 29ce28a1af
Implement canvas view navigator [SCI-7198] (#4577) 2022-10-27 14:43:31 +02:00
ajugo bdf56ea2a1
Add comments to the experiment table view [SCI-7217] (#4583) 2022-10-27 14:41:35 +02:00
Anton c2338d677d Fix label preview height in print modal [SCI-7410] 2022-10-27 12:13:25 +02:00
ajugo fedaf703d4
Add view button to experiment title bar [SCI-7216] (#4579) 2022-10-27 09:53:01 +02:00
ajugo 58bca40632
Change zebra label instructions [SCI-7390] (#4572) 2022-10-25 11:44:50 +02:00
Anton 8feaedc0d1 Add core columns to experiment table [SCI-7212] 2022-10-24 15:27:57 +02:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Anton bc86f11404 Add experiment table view [SCI-7174] 2022-10-21 12:22:38 +02:00
Anton ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00
ajugo 3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] (#4551) 2022-10-19 18:09:59 +02:00
Anton 2ae8943d80 Update general canvas layout [SCI-7196] 2022-10-19 11:46:16 +02:00
Anton 1062fbc2fd Replace label template promo logo [SCI-7350] 2022-10-19 11:25:49 +02:00
Anton 689c34e54d Fix css issues for login and signup forms [SCI-7233] 2022-10-18 11:54:10 +02:00
ajugo 64975effc6
Close print label modal at print click [SCI-7327] (#4526) 2022-10-18 10:42:50 +02:00
Alex Kriuchykhin 4cee224180
Merge pull request #4534 from okriuchykhin/ok_SCI_7338 
Fix user role selection when inviting new users [SCI-7338]
 2022-10-17 10:21:37 +02:00
Oleksii Kriuchykhin a5336608f8 Fix user role selection when inviting new users [SCI-7338] 2022-10-14 11:35:35 +02:00
Giga Chubinidze 62febd44dd centered project code for tables 2022-10-13 20:31:37 +04:00
Andrej f3fdcc1204 Remove old label printer modal code [SCI-7305] 2022-10-13 16:49:06 +02:00
ajugo 58acb94977
Remove status from print label modal [SCI-7328] (#4524) 2022-10-12 16:56:58 +02:00
Alex Kriuchykhin 827567c167
Merge pull request #4515 from rekonder/aj_SCI_7314 
Fixed the existing templates  [SCI-7314]
 2022-10-12 11:49:09 +02:00
Andrej 230aea15fc Update experiment templates [SCI-7314] 2022-10-11 15:55:56 +02:00
ajugo e96ccdb1d5
Fix start date on locked task and correct format of number [SCI-7098] (#4366) 2022-10-11 11:31:53 +02:00
Alex Kriuchykhin 3a9b568358
Merge pull request #4508 from rekonder/aj_SCI_7318 
Fix view permission at label template table [SCI-7318]
 2022-10-10 15:59:02 +02:00
Andrej 42193bbe81 Fix view permission at label template table [SCI-7318] 2022-10-07 17:16:40 +02:00
Giga Chubinidze f7472d25b9 more styling fixes 2022-10-07 17:14:43 +04:00
Oleksii Kriuchykhin 0e95b7ea66 Connect update fluics template button with controller action [SCI-7261] 2022-10-07 14:52:23 +02:00
Giga Chubinidze 3f3c2a3504 project name card size change 2022-10-07 15:27:33 +04:00
Alex Kriuchykhin 07d470b2ff
Merge pull request #4479 from okriuchykhin/ok_SCI_7271 
Fix label printing status modal [SCI-7271]
 2022-10-06 15:46:36 +02:00
artoscinote 77b91b467a
Merge pull request #4485 from rekonder/aj_SCI_7270 
Add label printer modal to task [SCI-7270][7296]
 2022-10-06 15:01:31 +02:00
ajugo 5f38464369
Fix open label template in new tab [SCI-7302] (#4503) 2022-10-06 14:57:45 +02:00
ajugo 88d9ece237
Fix zebra printer library load [SCI-7310] (#4502) 2022-10-06 13:52:49 +02:00
ajugo 7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] (#4492) 2022-10-04 09:57:47 +02:00
Oleksii Kriuchykhin b20c2b13a3 Fix label printers dropdown on print modal [SCI-7258] 2022-10-03 10:37:04 +02:00
aignatov-bio 13f24cac08
Merge pull request #4483 from aignatov-bio/ai-sci-7262-css-fixes-label-templates 
CSS fixes for label templates [SCI-7262]
 2022-09-30 09:47:39 +02:00
aignatov-bio 096c285235
Merge pull request #4484 from aignatov-bio/ai-sci-7265-fix-css-label-templates-table-view 
Fix css label templates table view [SCI-7265]
 2022-09-29 20:58:51 +02:00
Andrej e8528e6120 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7270 2022-09-29 16:36:44 +02:00
Andrej eebdee5129 Add label printer modal to task [SCI-7270] 2022-09-29 16:35:51 +02:00
ajugo 69bc48fef8
Add cancel button and fix number input [SCI-7274] (#4478) 2022-09-29 14:45:10 +02:00
Anton 9d9f6e26bb Fix css label templates table view [SCI-7265] 2022-09-29 14:29:25 +02:00
Anton 9dc667f8e1 CSS fixes for label templates [SCI-7262] 2022-09-29 14:09:16 +02:00
aignatov-bio d9dc76c0f9
Merge pull request #4476 from aignatov-bio/ai-sci-7259-label-printer-modal-add-icons-template 
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
 2022-09-29 13:56:39 +02:00
artoscinote d08838bf48
Merge branch 'develop' into master_1_26_0_5 2022-09-29 10:12:29 +02:00
Oleksii Kriuchykhin ac11d41359 Fix label printing status modal [SCI-7271] 2022-09-28 17:01:07 +02:00
Anton 7e06f29a75 Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260] 2022-09-28 11:34:24 +02:00
aignatov-bio 31554d0fd9
Merge pull request #4472 from aignatov-bio/ai-sci-7255-add-label-validation-to-print-modal 
Add label validation and preview in print modal [SCI-7255][SCI-7256]
 2022-09-28 11:32:39 +02:00
Anton 3773fff093 Add label validation and preview in print modal [SCI-7255][SCI-7256] 2022-09-27 15:46:48 +02:00
Anton d22ec4960d Add loading label to settings printers search [SCI-7253] 2022-09-27 12:02:50 +02:00
Oleksii Kriuchykhin 0d656f8976 Fix sorting in label templates datatable [SCI-7263] 2022-09-26 22:21:45 +02:00
aignatov-bio e96b15b241
Merge pull request #4444 from aignatov-bio/ai-sci-7222-update-fluics-template-screen 
Update fluics view and permissions for label templates [SCI-7222]
 2022-09-26 10:22:01 +02:00
Anton 40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00
ajugo b7861f5fdb
Add zebra javascript print library [SCI-7245] (#4455) 2022-09-23 12:34:43 +02:00
ajugo a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] (#4448) 
* Add validation to print modal [SCI-7052]

* Fix dropdown on label modal print [SCI-7052]

* Fix hound [SCI-7052]

* Rename validation endpoint [SCI-7052]

* Add zpl label printing and fix fluics printing [SCI-7221]

* Fix hound [SCI-7221]
 2022-09-22 15:06:36 +02:00
Anton 9bc4610cae Fix checkbox in safari [SCI-7239] 2022-09-22 11:24:02 +02:00
Anton 2d925a3bfe Add help and quick toolbar plugin to tinymce [SCI-7190] 2022-09-21 12:01:08 +02:00
artoscinote 50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
Anton 07f0142789 Fix links in locked step texts elements [SCI-7224] 2022-09-20 15:44:52 +02:00
ajugo 6f3a32f09f
Add label template dropdown to print dialog [SCI-7104] (#4387) 
* Add label template dropdown to print dialog [SCI-7051]

* Add zebra printers in printing progress and modal [SCI-7104]

* Fix hound [SCI-7104]

* Fix hound [SCI-7104]

* Fix hound [SCI-7104]

* Clean code for zebra printer [SCI-7104]
 2022-09-20 14:10:34 +02:00
Anton fed1228adc Update fluics and permissions for label templates [SCI-7222] 2022-09-20 12:59:58 +02:00
aignatov-bio e524355207
Merge pull request #4441 from aignatov-bio/ai-sci-7210-add-code-validation-to-label-templates 
Add validation to label template code [SCI-7210]
 2022-09-20 11:59:59 +02:00
artoscinote cf3a233f4e
Merge branch 'develop' into ma_SCI_7177 2022-09-19 13:58:33 +02:00
Anton 17bf490fef Add validation to label template code [SCI-7210] 2022-09-19 11:59:36 +02:00
Andrej ec77c2a076 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027 2022-09-16 10:44:07 +02:00
Andrej 231dd40602 Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:41:51 +02:00
Andrej 4fb3f7ff3d Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:39:39 +02:00
Andrej ac7c873385 Session end implementation [SCI-7027] 2022-09-16 09:57:40 +02:00
Giga Chubinidze 102eed8241 Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:27:23 +04:00
Giga Chubinidze b31f60026a Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:20:04 +04: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
Anton 0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton 75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Martin Artnik 3d1bdac1f4 Added task code to task details [SCI-7178] 2022-09-13 13:17:18 +02:00
Martin Artnik b836b9a12b Add task IDs to canvas view [SCI-7177] 2022-09-13 12:42:12 +02:00
Giga Chubinidze 2c393a1bef exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:31:04 +04:00
Giga Chubinidze fbbe394029 exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:24:06 +04:00
Anton 7d02b9f26d Fix repository selection in reports [SCI-7167] 2022-09-13 09:59:11 +02:00
Giga Chubinidze 271867710f added scrollbar to task paper dropdown [SCI-7115] 2022-09-09 23:28:37 +04:00
Anton 73917ec4c0 Fix tinymce errors [SCI-7182] 2022-09-09 15:50:59 +02:00
artoscinote fa7e39c6a9
Fix experiment page infinite scroll [SCI-7160] (#4422) 2022-09-09 11:42:37 +02:00
artoscinote 6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
Oleksii Kriuchykhin 557c4b205a Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151] 2022-09-09 10:59:20 +02:00
aignatov-bio 7d9fbb45d5
Merge branch 'features/tiny_mce_6' into ai-sci-7152-update-tinymce-image-toolbar-plugin 2022-09-08 12:13:58 +02:00
Anton 2f01a5a358 Update tinymce placeholder plugin [SCI-7153] 2022-09-07 15:16:03 +02:00
Anton c8af3e1fa8 Update tinymce image toolbar plugin [SCI-7152] 2022-09-07 11:24:54 +02:00
artoscinote 95105b86af
Fix ininite scroll [SCI-7160] (#4414) 2022-09-07 10:01:00 +02:00
Anton 1ebd4046cd Update tinyMCE marvinjs plugin [SCI-7154] 2022-09-06 13:05:56 +02:00
aignatov-bio 2407b95e37
Merge pull request #4411 from aignatov-bio/ai-sci-7169-remove-scroll-before-page-leave 
Remove scroll before page leave [SCI-7169]
 2022-09-06 12:44:20 +02:00
artoscinote d2b022a17d
Remove obsolete code [SCI-7160] (#4412) 2022-09-06 12:10:20 +02:00
artoscinote 21f91089e9
Prevent loading empty next page in P/E infinite scroll [SCI-7160] (#4410) 2022-09-06 11:57:34 +02:00
Anton 90e962ccbf Remove scroll before page leave [SCI-7169] 2022-09-06 11:15:28 +02:00
Anton 47e20d1b27 Add ability to disable zebra printers [SCI-7148] 2022-09-05 12:37:03 +02:00
artoscinote 44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385) 
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]

* Cleanup and refactor [SCI-7081]

* Clean up legacy plugins [SCI-7150]

* Linter fix [SCI-7081]]
 2022-09-05 11:29:19 +02:00
Oleksii Kriuchykhin f85a6b5a2e Make experiment card dropdown menu async [SCI-7158] 2022-09-02 18:15:01 +02:00
Oleksii Kriuchykhin e27d063b61 Make permission checks for card selection async [SCI-7157] 2022-09-02 18:10:16 +02:00
Martin Artnik a2a5e8c4c8 Add caching and improve dynamic reload [SCI-7159] 2022-09-02 16:54:41 +02:00
Martin Artnik ef9cd21ecf Make project action dropdowns async [SCI-7159] 2022-09-02 13:47:45 +02: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
aignatov-bio 2e190510c4
Merge pull request #4397 from aignatov-bio/ai-sci-7136-fix-rte-toolbar-position 
Fix rte toolbar position [SCI-7136]
 2022-09-02 11:20:32 +02:00
aignatov-bio e605471269
Merge pull request #4392 from aignatov-bio/ai-sci-7100-fix-inivitation-modal 
Invite user modal fixes [SCI-7100]
 2022-09-02 11:20:18 +02:00
Anton 312f2a1357 Fix rte toolbar position [SCI-7136] 2022-08-31 13:15:08 +02:00
aignatov-bio 57282069e9
Merge pull request #4361 from aignatov-bio/ai-sci-7084-add-sorting-by-default-template 
Add sorting by default label template [SCI-7084]
 2022-08-31 10:36:02 +02:00
aignatov-bio 17d69131f3
Merge pull request #4383 from aignatov-bio/ai-sci-7124-fix-old-tinymce-big-tables 
Fix overflow issue on step text [SCI-7124]
 2022-08-31 10:13:27 +02:00
aignatov-bio 042e0330a7
Merge pull request #4386 from aignatov-bio/ai-sci-7117-fix-project-scroll-issue 
Fix project/experiment scroll issue [SCI-7117]
 2022-08-31 10:13:10 +02:00
Martin Artnik d3665a940e Fix smart annotations for locked tasks [SCI-7135] 2022-08-31 09:49:47 +02:00
Anton 0862221345 Invite user modal fixes [SCI-7100] 2022-08-29 14:01:31 +02:00
Anton d2639d4633 Fix bell flyout in assigned repository [SCI-7113] 2022-08-29 11:30:39 +02:00
Anton a1117fbc0e Fix project/experiment scroll issue [SCI-7117] 2022-08-26 16:29:53 +02:00
ajugo 185bf0b197
Add label template dropdown to print dialog [SCI-7051] (#4369) 2022-08-26 10:53:55 +02:00
Anton 0747a495c9 Fix overflow issue on step text [SCI-7124] 2022-08-25 15:32:03 +02:00
Anton 9daa3f6d69 Fix css for label view page [SCI-7085] 2022-08-25 13:25:34 +02:00
Anton 771c40d4f0 CSS fixes for label template screen [SCI-7085] 2022-08-24 17:57:34 +02:00
aignatov-bio 6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
artoscinote 7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
artoscinote c2242b6cc8
Amend how checkboxes work with locking [SCI-7122] (#4374) 2022-08-23 10:10:20 +02:00
Andrej 371f5e782b Remove strikethrough for step name and checklist items [SCI-7116] 2022-08-19 16:02:20 +02:00
Anton 46990b3df4 Add sorting by default label template [SCI-7084] 2022-08-18 11:49:22 +02:00
Anton 4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
Anton 46b2b87654 Fix error on task text field [SCI-7033] 2022-08-16 12:21:59 +02:00
Anton 1a13e1bfc6 Fix unexpected error on step attachments [SCI-7032] 2022-08-16 11:22:19 +02:00
Anton 174d33bba8 Add column dropdown to label template editor [SCI-7054] 2022-08-16 10:16:40 +02:00
ajugo 39fbb2a9a0
Fix office modal and protocol status [SCI-7064] (#4352) 2022-08-12 14:57:56 +02:00
ajugo 8dec17f606
Add print label button in view repository role [SCI-7097] (#4351) 2022-08-12 14:55:14 +02:00
artoscinote e4a7aa3dad
Add name prompt for tables with empty names [SCI-7082] (#4348) 
* Add name prompt for tables with empty names [SCI-7082]

* Move to separate component [SCI-7082]
 2022-08-12 10:17:45 +02:00
ajugo 12fc3b0b3b
Fix protocol repository issues [SCI-7003] (#4343) 
* Fix protocol repository issues [SCI-7003]

* Remove unnecessary inRepository [SCI-7003]
 2022-08-10 15:39:45 +02:00
artoscinote a37c236518
Inline edit and checklist improvements [SCI-7031] (#4340) 
* Inline edit and checklist improvements [SCI-7031]

* Fix smart annotations in inline edit [SCI-7031]
 2022-08-10 14:43:23 +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 c106c2d997
Add active reminders filter [SCI-7004] (#4280) 2022-08-09 10:23:40 +02:00
artoscinote 19d2fea4fe
Fix checkboxes [SCI-7057] (#4317) 2022-08-09 09:25:18 +02:00
Anton edbcbffae4 Fix protocol creation from dashboard [SCI-7075] 2022-08-08 11:26:12 +02:00
Anton 51cb951e06 Update labels index page [SCI-7048] 2022-08-08 11:15:46 +02:00
artoscinote eb619184a5
Implement typed label templates [SCI-7046] (#4316) 
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
 2022-08-08 10:06:00 +02:00
aignatov-bio e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen 
Add general layout for template view screen [SCI-7030]
 2022-08-04 14:13:25 +02:00
Anton a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
ajugo b58e3cd4d8
Add zebra settings screen [SCI-7016] (#4310) 
* Add zebra settings screen [SCI-7016]

* Fix hound [SCI-7016]
 2022-08-04 11:14:35 +02:00
artoscinote 9478779218
TinyMCE fixes [SCI-7033] (#4308) 2022-08-04 11:06:25 +02:00
artoscinote ee9c877929
Implement BS tooltips on repository toolbar [SCI-6691] (#4309) 2022-08-04 11:05:55 +02:00
Anton 31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
Anton 8c080ea04c Add promo page for label templates [SCI-7029] 2022-08-02 14:51:18 +02:00
ajugo 8222227712
Fix new step alignment and author list in protocols [SCI-6991] (#4304) 2022-08-02 12:22:29 +02:00
Anton c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
artoscinote 89a3bc8072
Checklist fixes [SCI-7031] (#4302) 2022-08-02 10:18:25 +02:00
Alex Kriuchykhin 61395482a3
Merge pull request #4299 from okriuchykhin/ok_SCI_6978_v2 
Fix long result names in PDF reports [SCI-6978]
 2022-08-01 16:37:23 +02:00
Anton 784c10aec9 Fix image editor callback after save image [SCI-7019] 2022-08-01 13:32:55 +02:00
Oleksii Kriuchykhin fcd0de80ca Fix long result names in PDF reports [SCI-6978] 2022-08-01 13:14:53 +02:00
Anton 67df01711f Add edit actions to label templates [SCI-7019] 2022-07-28 14:42:13 +02:00
aignatov-bio 0249f2a30e
CSS fixes for step attachments [SCI-7001] (#4294) 2022-07-28 09:56:09 +02:00
ajugo ad4f52d912
Add Label template list screen - view mode [SCI-7018] (#4292) 
* Initial label template datatable [SCI-7018]

* Add new columns to LabelTemplate and update datatable view [SCI-7018]

* Fix after rebase [SCI-7018]

* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
 2022-07-27 10:10:32 +02:00
Alex Kriuchykhin a68da49907
Merge pull request #4287 from okriuchykhin/ok_SCI_7002 
Improve repository table loading speed [SCI-7002]
 2022-07-26 13:51:11 +02:00
artoscinote 2800274d7c
Fix table scroll in view mode [SCI-7021] (#4284) 2022-07-26 13:42:00 +02:00
aignatov-bio a2d72338ce
Merge pull request #4286 from aignatov-bio/ai-sci-6971-fix-comments-avatar-image 
Fix comments avatar image [SCI-6971]
 2022-07-26 13:36:42 +02:00
Oleksii Kriuchykhin 382d54320e Improve repository table loading speed [SCI-7002] 2022-07-25 15:39:11 +02:00
Anton 81b0fe3706 Fix comments avatar image [SCI-6971] 2022-07-25 13:38:36 +02:00
aignatov-bio 25b808532d
Merge pull request #4258 from aignatov-bio/ai-sci-6972-fix-viewer-role 
Fix step for viewer role [SCI-6972]
 2022-07-25 11:38:08 +02:00
Anton 3f82666619 Fix step for viewer role [SCI-6972] 2022-07-25 11:35:34 +02:00
artoscinote dabb600e6f
Fix rounded corners on text block [SCI-6996] (#4281) 2022-07-25 11:33:06 +02:00
Anton 70fe27f31b Allow multiline in checklist items [SCI-7008] 2022-07-25 11:21:31 +02:00
artoscinote 6f72777acd
Fix rounded corners on step elements [SCI-6996] (#4279) 2022-07-21 16:36:14 +02:00
artoscinote 5ec1002329
Simplify task locking logic on FE [SCI-6987] (#4278) 2022-07-21 15:49:03 +02:00
Alex Kriuchykhin b9d953b3a4
Fix pdf report styling and bookmarks [SCI-6978] (#4274) 2022-07-21 09:57:28 +02:00
artoscinote 28ca1aaec6
Disable checklist item drag for less than 2 items, fix base element controller [SCI-6997] (#4275) 2022-07-21 09:57:14 +02:00
artoscinote d0cc3155f1
Only activate overlay when dragging files [SCI-6997] (#4272) 2022-07-20 13:39:04 +02:00
artoscinote 088c4c1c94
Add hover state to step checkbox [SCI-6999] (#4271) 2022-07-20 12:24:43 +02:00
artoscinote 6367842e1e
Step table CSS fixes [SCI-6998] (#4270) 2022-07-20 12:07:25 +02:00
artoscinote 087ffb28c3
Step element header style fixes [SCI-6996] (#4268) 2022-07-20 10:14:23 +02:00
Martin Artnik 6227b1f5a1 Added edit overlays, disable more controls [SCI-6983] 2022-07-19 14:22:40 +02:00
Martin Artnik 98b3627219 Implement multiline editing in repositories [SCI-6982] 2022-07-19 12:24:33 +02:00
artoscinote b6b1fed7e2
Fix alignment of items in reorder modal [SCI-6995] (#4264) 2022-07-19 10:10:07 +02:00
artoscinote 0c42e029ae
Fix step title alignments [SCI-6994] (#4263) 
* Fix step title alignments [SCI-6994]

* Fix step serializer [SCI-6994]
 2022-07-19 10:09:33 +02:00
artoscinote 6b8ea376bc
CSS fix for file dropdown [SCI-6990] (#4261) 2022-07-19 10:09:19 +02:00
ajugo ca87d93cb3
Fix protocol metadata alignments [SCI-6991] (#4262) 2022-07-18 16:56:51 +02:00
ajugo 8172523f5a
Protocol alignment fixes [SCI-6988] (#4259) 
* Fix rendering protocol steps

* Fix empty space for step text [SCI-6988]

* Align step number and step name [SCI-6988]

* Align step number and step name [SCI-6988]
 2022-07-18 16:56:06 +02:00
ajugo 0d8d1270ce
Disable double clikc on new repository row [SCI-6977] (#4255) 2022-07-15 10:14:26 +02:00
ajugo ccf95fea24
Fix file block issues [SCI-6966] (#4244) 
* Fix bugs for step attachments [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* 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]

* Fix microinteraction for table editing [SCI-6957] (#4236)

* Fix protocol elements allignments [SCI-6932]

* DOCX layout improvements [SCI-6857] (#4160)

* Fix edit step button [SCI-6938] (#4232)

* Clean storage usage check [SCI-6966]

Co-authored-by: artoscinote <85488244+artoscinote@users.noreply.github.com>
Co-authored-by: Anton <anton@scinote.net>
 2022-07-15 10:13:55 +02:00
aignatov-bio 63c54d9005
Merge pull request #4227 from aignatov-bio/ai-sci-6971-fix-step-comments 
Fix step comments [SCI-6971]
 2022-07-15 10:10:56 +02:00
ajugo bab466d908
Fix grip for checklist elemnt position [SCI-6961] (#4254) 2022-07-15 10:07:31 +02:00
ajugo c85612ee4e
Fix protocol template alignment and placeholders [SCI-6981] (#4253) 
* Fix protocol template alignment and placeholders [SCI-6981]

* Add placeholder text [SCI-6981]
 2022-07-15 10:00:50 +02:00
Alex Kriuchykhin 46cf62368d
Merge pull request #4229 from okriuchykhin/ok_SCI_6969 
Fix file upload and edit interactions on steps page [SCI-6969]
 2022-07-14 09:48:20 +02:00
ajugo 914516ac4c
Fix checklist item alignments and step edit alignment [SCI-6961] (#4242) 2022-07-13 21:02:21 +02:00
aignatov-bio 186f892288
Merge branch 'develop' into ai-sci-6970-step-rearranging-fixes 2022-07-13 18:03:03 +02:00
artoscinote c7ac9190c3
TinyMCE and styling fixes [SCI-6956][SCI-6952][SCI-6948] (#4241) 
* Also validate char count on paste in TinyMCE [SCI-6952]

* Fix new text tinymce init [SCI-6956]

* Fix step head styling [SCI-6952]

* Fix step dropdown icon [SCI-6948]
 2022-07-13 18:02:35 +02:00
Anton 496ade309c Step rearranging fixes [SCI-6970] 2022-07-13 15:17:32 +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
Oleksii Kriuchykhin 747e88fafc Fix file upload and edit interactions on steps page [SCI-6969] 2022-07-12 15:24:12 +02:00
Anton 8e8826d33c Fix step comments [SCI-6971] 2022-07-12 13:54:10 +02:00
Martin Artnik 99e5f7558a Fix CSS syntax error 2022-07-12 10:59:33 +02:00
artoscinote 765e5b99bd
Protocol editing CSS fixes [SCI-6940] (#4194) 2022-07-12 10:43:01 +02:00
aignatov-bio 3184647141
Merge pull request #4221 from aignatov-bio/ai-sci-6959-fix-step-content-blocks-allignment 
Fix elements step elements alignment [SCI-6959]
 2022-07-12 10:38:15 +02:00
aignatov-bio 67dbab97d9
Merge pull request #4220 from aignatov-bio/ai-sci-6944-change-core-colors 
Update accent colors [SCI-6944]
 2022-07-12 10:38:01 +02:00
Anton b5d67d429b Fix elements step elements alignment [SCI-6959] 2022-07-11 13:53:16 +02:00
Anton e472855690 Update accent colors [SCI-6944] 2022-07-11 12:00:13 +02:00
ajugo 045485ff45
Fix checklist item alignments and placeholder text [SCI-6961] (#4211) 2022-07-11 11:52:38 +02:00
ajugo 4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] (#4213) 2022-07-11 11:29:05 +02:00
artoscinote cb113c4bdb
Change reordering icons [SCI-6953] (#4208) 2022-07-11 10:54:18 +02:00
artoscinote 5cb53c774c
Step header fixes [SCI-6948] (#4217) 2022-07-11 10:45:25 +02:00
artoscinote a51ce1c322
Fix text field error states [SCI-6952] (#4216) 2022-07-11 10:44:27 +02:00
Anton 972cc49389 Fix smart annotation for step editing [SCI-6939] 2022-07-08 12:51:43 +02:00
Anton 11b62cca7b Fix task page layout [SCI-6950] 2022-07-07 15:56:36 +02:00
Anton 4e2cb29f48 Fix step complete and name editing [SCI-6949] 2022-07-07 14:33:38 +02:00
aignatov-bio dce755b294
Merge pull request #4205 from aignatov-bio/ai-sci-6933-add-micro-interactions-to-step 
Fix microinteractions for step editing [SCI-6933]
 2022-07-07 09:15:19 +02:00
Anton b3d7c3ff75 Fix microinteractions for step editing [SCI-6933] 2022-07-06 14:31:55 +02:00
artoscinote c9e7e68369
Insert element dropdown fixes [SCI-6925] (#4184) 
* Insert element dropdown fixes [SCI-6925]

* Dropdown bugfix, rounder CSS size [SCI-6925]
 2022-07-06 14:11:48 +02:00
ajugo 9323c5e99a
Enable copy-paste for new members invitation [SCI-6910] (#4186) 
* Enable copy-paste for new memeber invitation [SCI-6910]

* Fix hound [SCI-6910]
 2022-07-06 11:45:24 +02:00
Alex Kriuchykhin 9aeb107635
Fix saving protocol to repository [SCI-6935] (#4190) 2022-07-06 11:45:04 +02:00
ajugo 10e95ad465
Remove datatable for repository item CARD [SCI-6913] (#4188) 2022-07-06 11:44:30 +02:00
Anton 7b0853d00a CSS fixes for steps [SCI-6932] 2022-07-05 12:49:12 +02:00
Martin Artnik 910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
artoscinote a0578e09bb
Fix tags modal css issue [SCI-6926] (#4182) 2022-07-04 13:54:54 +02:00
artoscinote a5ffb90a96
Fix multi modal support, add end of body data-hook to layout [SCI-6922] (#4180) 2022-07-04 13:54:22 +02:00
aignatov-bio 3a5492f875
Merge pull request #4168 from aignatov-bio/ai-sci-6862-fix-css-step-editing 
CSS fixes for step editing [SCI-6862]
 2022-06-27 11:13:18 +02:00
aignatov-bio bd1f65c811
Merge pull request #4171 from aignatov-bio/ai-sci-6921-add-delete-all-button 
Add delete all steps button [SCI-6921]
 2022-06-27 11:13:06 +02:00
Anton 1863e031c5 PDF report fixes [SCI-6924] 2022-06-24 14:38:24 +02:00
Anton 5296b50c2f Add delete all steps button [SCI-6921] 2022-06-24 11:21:47 +02:00
Anton a727fc0d68 Fix css for protocol repository [SCI-6862] 2022-06-21 18:20:52 +02:00
Anton 8d2154d653 CSS fixes for step editing [SCI-6862] 2022-06-21 11:32:27 +02:00
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
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 66212fd703 Finalize inline edit field [SCI-6782] 2022-06-09 14:40:45 +02:00
ajugo a5065b82cb
Show error for broken file in repository row [SCI-6838] (#4146) 2022-06-08 13:35:06 +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
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
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
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
Anton 61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +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
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
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 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 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
Anton 7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
ajugo 047c1620de
Fix remove tag on backspace [SCI-6542] (#4108) 2022-05-25 10:46:42 +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
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
Oleksii Kriuchykhin cac33bed25 Update user invitations with new user roles [SCI-6823] 2022-05-19 09:04:25 +02:00
Anton 134558355d Add file modal [SCI-6828] 2022-05-18 11:12: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
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 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 04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51: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 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
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
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
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 6a827022f6 Add insert step element dropdown [SCI-6758] 2022-05-03 13:22:26 +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
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
artoscinote da8250dba8
Stock / stock consumption display fixes [SCI-6771] (#4054) 2022-04-25 15:23:12 +02:00
Anton b56f11fc18 Add negative validation for treshold [SCI-6743] 2022-04-25 12:18:22 +02:00
Oleksii Kriuchykhin b148bd2057 Add results counter to secnd navigation [SCI-6722] 2022-04-22 12:24:14 +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
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