scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 14:46:00 +08:00
Code Issues Projects Releases Packages Wiki Activity
14245 commits 31 branches 181 tags 167 MiB
Commit graph

306 commits

Author SHA1 Message Date
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
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik
cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
Urban Rotnik
ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items 
Add export for assigned items [SCI-4748]
 2020-08-03 11:30:31 +02:00
aignatov-bio
15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio
68fc6ec58a Add sorting my module statuses 2020-07-27 16:36:21 +02:00
aignatov-bio
6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +02:00
aignatov-bio
e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
Mojca Lorber
9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +02:00
Mojca Lorber
39ae1ed25e Fix search status 2020-07-10 12:52:07 +02:00
Mojca Lorber
21f0d431b0 Remove search state load from repositories table 2020-07-10 11:05:22 +02:00
Miha Mencin
2cb3720602
Merge pull request #2720 from aignatov-bio/ai-sci-4842-snapshot-archived-label-wrong-position 
Add archived label to correct column [SCI-4842]
 2020-07-09 14:49:54 +02:00
aignatov-bio
c240474f76 Add archived label to correct column 2020-07-09 13:39:26 +02:00
Urban Rotnik
d16a2ed9c9 Fix Datatable header adjustments on repositories index 2020-07-07 09:49:05 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik
a05be67d3a
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag 
Add archived tags to assigned repository rows [SCI-4703]
 2020-06-18 13:47:57 +02:00
Urban Rotnik
868c1c1fa0 Improve row state passing 2020-06-15 13:42:16 +02:00
aignatov-bio
db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik
9bac0fb867 Add archived tags to assigned repository rows 2020-06-10 14:48:03 +02:00
Mojca Lorber
c0c93772ff Fix protocol duplication at saving protocol from task to repository 2020-06-09 11:45:03 +02:00
aignatov-bio
368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +02:00
aignatov-bio
7b36392a19
Merge pull request #2606 from aignatov-bio/ai-sci-4621-resize-simple-table-header-size-on-sidebar-colapse 
Resize simple table header on sidebar collapse [SCI-4621]
 2020-05-27 09:35:40 +02:00
aignatov-bio
f86b71144d Resize simple table header on sidebar collapse 2020-05-25 16:21:28 +02:00
Mojca Lorber
76a1f73989 Change order of snapshots versions 2020-05-25 12:15:24 +02:00
aignatov-bio
230ec487ba Make snapshots versions buttons full size clickable 2020-05-22 17:16:20 +02:00
aignatov-bio
ce53235cb9
Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view 
Fix ordering in simple table view [SCI-4621]
 2020-05-22 16:52:45 +02:00
aignatov-bio
cbc578f84b Fix snapshot name column id 2020-05-22 15:10:21 +02:00
Mojca Lorber
92861fdd32 Expand assigned inventory after updating assigned items on task 2020-05-21 22:36:09 +02:00
aignatov-bio
0aa1c32813 Fix ordering in simple table view 2020-05-21 16:51:07 +02:00
aignatov-bio
40b266ee0d Clear full view repository modal before open 2020-05-19 16:44:47 +02:00
Urban Rotnik
ea0e97d046 Hide sidebar on modal close 2020-05-19 09:46:38 +02:00
Alex Kriuchykhin
e9a05d2e3d
Merge pull request #2575 from okriuchykhin/ok_SCI_4637 
Fix selection of the default snapshot on tasks [SCI-4637]
 2020-05-18 14:25:26 +02:00
aignatov-bio
1f24adddf9
Merge pull request #2562 from aignatov-bio/ai-sci-4627-remove-search-word-from-task-table-state 
Remove search from state load in task repository [SCI-4627]
 2020-05-18 11:16:27 +02:00
aignatov-bio
343356cab7
Merge pull request #2571 from aignatov-bio/ai-sci-4639-select-correct-button-for-assign-modal 
Select correct button name for assign modal [SCI-4639]
 2020-05-18 11:16:07 +02:00
aignatov-bio
f2d81cb199
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable 
Make snapshot creation info text switchable [SCI-4617]
 2020-05-18 11:15:46 +02:00