340 commits

Author	SHA1	Message	Date
Giga Chubinidze	374a474336	removed timeouts	2023-06-19 14:34:54 +04:00
Giga Chubinidze	44a5a1f3b2	Search field on assign/assigned item to task [SCI-8673]	2023-06-19 10:21:04 +04:00
Giga Chubinidze	f8f03e6b51	Double scroller on assign item to task from inventory table [SCI-8526]	2023-06-16 06:50:38 +04:00
Anton	d795f996f2	Merge branch 'develop' into features/ui-revamp	2023-06-14 15:18:50 +02:00
sboursen-scinote	154910602f	Close the Assign from inventory window on success [SCI-8532] ... Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-06-08 15:33:43 +02:00
Giga Chubinidze	a777fd5584	New icons implementation [SCI-8366]	2023-06-08 10:33:37 +04: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
Soufiane	c28f86d46d	Refactor inline events [SCI-8434] (#5403) ... Refactor inline events in task results [SCI-8434]	2023-05-16 09:34:36 +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
Soufiane	df0995d867	Move button for archived task in card view [SCI-8253] (#5322) ... Implemet the Move task functionality for archived tasks cards view [SCI-8253]	2023-05-03 11:15:17 +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
Oleksii Kriuchykhin	7fff3e8f78	Merge branch 'hotfix/1.26.6.2' into develop	2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin	b67691acb5	Merge branch 'develop' into features/protocol_versioning	2023-03-17 13:53:30 +01:00
Alex Kriuchykhin	483a7aad5b	Improve special character escaping in data attributes [SCI-8137] (#5149)	2023-03-15 16:01:01 +01:00
Alex Kriuchykhin	00c63b280e	Fix displaying of escaped fields [SCI-8137] (#5141)	2023-03-15 11:14:52 +01:00
ajugo	8acbf0b4f1	Fix revert protocol action for linked task changes [SCI-8110] (#5125)	2023-03-14 13:03:37 +01:00
Martin Artnik	ca4a5360ed	Fix protocol link and step delete modal styling [SCI-8109]	2023-03-09 13:53:52 +01:00
Alex Kriuchykhin	87153b8899	Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106)	2023-03-09 11:38:47 +01:00
ajugo	8b1bc51950	Fix loading of i icon on protocol [SCI-8051] (#5061)	2023-03-03 09:55:42 +01:00
Martin Artnik	165e012d23	Replace highlight.js with prism.js [SCI-7974]	2023-02-28 16:22:35 +01:00
Soufiane	53f2bc3be0	Merge pull request #4977 from sboursen-scinote/sb_SCI-7910 ... Protocol templates - revert action and alert message [SCI-7910]	2023-02-28 15:33:05 +01:00
sboursen-scinote	1c9d9d8082	Add a small refactor [SCI-7910]	2023-02-28 14:13:18 +01:00
sboursen-scinote	66edffe53a	Use I18n [SCI-7910]	2023-02-28 12:03:00 +01:00
sboursen-scinote	b99d9c485c	Revert "Update the style of the unlink protocol modal [SCI-7909]" ... This reverts commit 0f9dcda99b.	2023-02-28 11:51:42 +01:00
Anton	a95ca75362	Add new protocol modal [SCI-7810]	2023-02-21 14:15:53 +01:00
ajugo	166208f186	Update i flyouts of protocols (task screen) [SCI-7861] (#5003)	2023-02-21 13:44:26 +01:00
sboursen-scinote	0f9dcda99b	Update the style of the unlink protocol modal [SCI-7909]	2023-02-14 16:26:06 +01:00
sboursen-scinote	4b264db343	Update the text of the inlink protocol modal [SCI-7909]	2023-02-14 14:59:05 +01:00
ajugo	cb332f163f	Update the Load protocol template to task modal [SCI-7591] (#4870) ... * Update the Load protocol template to task modal [SCI-7591] * Update the Load protocol template to task modal [SCI-7591] * Load last protocol version from repository to task [SCI-7591] * Fix find_by for load_table [SCI-7591]	2023-02-14 13:19:24 +01:00
Anton	3849b1a7a1	Save handson table metadata [SCI-7834]	2023-02-06 14:21:55 +01:00
artoscinote	c1c8425a93	Merge pull request #4857 from artoscinote/ma_SCI_7778 ... Fix text result creation [SCI-7778]	2023-01-19 13:02:12 +01:00
Anton	a39058ffe5	Fix table overflow for TinyMCE [SCI-7782]	2023-01-19 12:56:15 +01:00
Martin Artnik	6bddd6c716	Fix text result creation [SCI-7778]	2023-01-19 08:58:05 +01:00
Martin Artnik	3e65ae921c	Fix TinyMCE blocking turbolinks [SCI-7729]	2023-01-12 12:09:44 +01:00
Martin Artnik	b559352128	Remove TinyMCE draft auto init functionality [SCI-7729]	2023-01-11 15:31:14 +01:00
aignatov-bio	ea661f3c19	Merge branch 'develop' into features/new_experiment_views	2022-12-22 13:33:25 +01:00
Anton	bacd3524e8	Add tags manager to experiment table view [SCI-7368]	2022-11-02 15:17:10 +01:00
Andrej	745be5a0f7	Remove old step code [SCI-7181]	2022-10-24 13:07:10 +02:00
Anton	d2639d4633	Fix bell flyout in assigned repository [SCI-7113]	2022-08-29 11:30:39 +02:00
Alex Kriuchykhin	9aeb107635	Fix saving protocol to repository [SCI-6935] (#4190)	2022-07-06 11:45:04 +02:00
Martin Artnik	910c36af08	Merge branch 'features/step-editing-improvements' into develop	2022-07-05 10:12:10 +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
Martin Artnik	9abbe22c26	Merge branch 'develop' into features/step-editing-improvements	2022-06-02 11:26:39 +02:00
ajugo	ee448a9997	Micro-interactions for reminder flyout correction [SCI-6804] (#4096)	2022-05-16 11:16:07 +02:00
Oleksii Kriuchykhin	823e552ef6	Fix displaying of stock consumption units [SCI-6795]	2022-05-10 10:19:37 +02:00
Anton	2f20109b0d	Fix stock consumption rounding [SCI-6807]	2022-05-09 11:51:39 +02:00
artoscinote	2515ed5a32	Add collapsing task status buttons [SCI-6721] (#4060)	2022-04-28 14:12:08 +02:00
Anton	b56f11fc18	Add negative validation for treshold [SCI-6743]	2022-04-25 12:18:22 +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
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
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	f3ce338600	Fix error modal opening on successful snapshot [SCI-6726] (#4019)	2022-04-13 14:22:34 +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
ajugo	1338d4524f	Align items in assigned item section [SCI-6707] (#4007)	2022-04-13 10:12:01 +02:00
artoscinote	83ac50c57d	Add repository snapshot error modal [SCI-6613] (#3993)	2022-04-12 13:29:11 +02:00
ajugo	a9fc4c3c44	Adding/changing stock consumption [SCI-6708] (#4005) ... * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708]	2022-04-11 10:47:24 +02:00
ajugo	986e817fdc	Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) ... * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690]	2022-04-08 18:08:55 +02:00
artoscinote	d696239649	Fix collapsing of assigned items tables [SCI-6705] (#4000)	2022-04-08 13:55:53 +02:00
ajugo	bb44152d54	Fix assigning and consuming items [SCI-6686] (#3985)	2022-04-04 11:07:46 +02:00
artoscinote	addd4a9522	Make stock column work properly with different orders [SCI-6677] (#3974)	2022-03-31 14:06:37 +02:00
aignatov-bio	116dfa9247	Fix assign view for task repository [SCI-6648] (#3954) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-23 15:33:19 +01:00
ajugo	7cba738a9b	Date remidner flyout [SCI-6503] (#3937) ... * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503]	2022-03-22 13:33:58 +01:00
aignatov-bio	e6ddefe63b	Add microtransactions to stock consumptions [SCI-6626] (#3948) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-22 13:33:12 +01:00
ajugo	be989245ed	Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) ... * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506]	2022-03-17 11:39:17 +01:00
ajugo	d1610fba53	Low stock flyout reminders [SCI-6502] (#3932) ... * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502]	2022-03-15 10:24:35 +01:00
Anton	8b8e2c6d92	Merge branch 'develop' into features/stock-management	2022-03-14 11:56:38 +01:00
artoscinote	d577fcc824	Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) ... * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554]	2022-03-09 14:13:48 +01:00
artoscinote	20ef08907a	Stock column fixes [SCI-6455] (#3878) ... * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455]	2022-03-08 14:52:45 +01:00
artoscinote	f9a8358d72	Fix archived column hiding issue in snapshots, fix typos [SCI-6589] (#3915)	2022-03-03 13:52:56 +01:00
Alex Kriuchykhin	9c4fca1b86	Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862)	2022-02-16 09:40:48 +01:00
artoscinote	af011a3bb8	Fixed full view assigned items modal stock consumption (#3846)	2022-02-14 10:42:48 +01:00
aignatov-bio	8604319c1b	Add front-end validation for comments field [SCI-6464] (#3829) ... Co-authored-by: Anton <anton@scinote.net>	2022-02-10 10:55:58 +01:00
artoscinote	f1e04cc604	Fix appearance of members pagination, copy fix [SCI-6265] (#3792)	2022-02-02 10:41:29 +01:00
Martin Artnik	b22fde2334	Handle stock management in full table views [SCI-6440]	2022-01-28 17:53:56 +01:00
aignatov-bio	2c88843924	Task stock consumption modal[SCI-6444][SCI-6445] (#3798) ... Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net>	2022-01-28 11:10:56 +01:00
Alex Kriuchykhin	d2b5db13e9	Add stock and consumption to assigned items section [SCI-6434] (#3793)	2022-01-25 12:12:55 +01:00
Oleksii Kriuchykhin	738da6094f	Add advanced filters to repository datatable service [SCI-6210]	2021-12-21 12:38:52 +01:00
aignatov-bio	aa4b765407	Update assign/unassign rows to task [SCI-6150] (#3604) ... Co-authored-by: Anton <anton@scinote.net>	2021-10-26 11:41:08 +02:00
Martin Artnik	6d92af4b2f	Made barcode search globally available [SCI-6022]	2021-08-30 14:41:31 +02:00
Oleksii Kriuchykhin	f76eb170a1	Fix restore action for experiments and tasks [SCI-5341]	2020-12-28 22:21:38 +01:00
Oleksii Kriuchykhin	67b3f853d7	Merge branch 'develop' into features/folders	2020-12-18 14:51:21 +01:00
Urban Rotnik	19f16555c6	Add checkbox and restore button ... [SCI-5275]	2020-12-17 13:11:20 +01:00
Mojca Lorber	2a8c98b7ec	Implement ESC button to exit full-screen modals	2020-11-24 23:20:53 +01:00
aignatov-bio	483ff8f1f2	Merge pull request #2964 from biosistemika/features/office-file-previews ... Features/office file previews merge branch	2020-11-19 11:11:39 +01:00
Oleksii Kriuchykhin	40ab03c38d	Fix cucumber tests for table results [SCI-5047]	2020-11-04 16:46:18 +01:00
Mojca Lorber	8aed48d1ae	Merge branch 'develop' into features/office-file-previews	2020-11-02 13:45:06 +01:00
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +01:00
Mojca Lorber	ec41bdd414	Move open mobile app button to main navigation	2020-10-26 09:28:44 +01:00
Mojca Lorber	6d7b55301f	Fix pwa url and change when banner is displayed	2020-10-21 14:56:20 +02:00
Mojca Lorber	23f01ac6a9	Add 'Open in APP' button to the task	2020-10-19 12:17:03 +02:00
Mojca Lorber	94fea75fda	Fix at long inventory name snapshot in title is not visible	2020-09-24 17:19:41 +02:00
aignatov-bio	ff33cb45e0	Improve smart annotation in TinyMCE fields	2020-09-24 13:29:20 +02:00
aignatov-bio	2d667acdd1	Prevent tinymce edit mode when link click	2020-09-22 10:56:40 +02:00
Urban Rotnik	0ae39678d4	Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state ... Add error message for locked task, update some permission checks[SCI-4982]	2020-09-09 14:04:08 +02:00
Urban Rotnik	aa88b6bdb4	Move redirect to controller	2020-09-09 11:26:43 +02:00
Urban Rotnik	d9b691103c	Add permission error message	2020-09-08 15:42:30 +02:00
Mojca Lorber	9dac4079f8	Replace old arrow with new one and remove redundant javascript for arrow collapsing	2020-09-04 14:43:30 +02:00
Urban Rotnik	5923a4c014	Merge branch 'develop' into features/task-flows	2020-08-25 15:30:22 +02:00
Urban Rotnik	b6495becdb	Set stateDuration to 0	2020-08-24 15:51:35 +02:00