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

300 commits

Author SHA1 Message Date
Anton
e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
Anton
32273fe169 Fix markup [SCI-6867] 2022-06-03 15:26:16 +02:00
Anton
2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +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
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
Anton
61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +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
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
Anton
7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +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
9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +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
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
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
04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +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
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
Anton
6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +02:00
Anton
ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +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
artoscinote
6b309871a3
Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) 2022-04-15 10:55:14 +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
433d69c10a
Remove date red dots for snapshots [SCI-6715] (#4004) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-12 13:14:11 +02:00
ajugo
0a5e93a018
API: add endpoint for creating stock column [SCI-6550] (#3956) 
* Add test for repositoty stock column api [SCI-6550]

* Create and update stock column [SCI-6550]

* Change stock unit [SCI-6550]

* Fix hound [SCI-6550]

* Fix on delete [SCI-6550]

* Fix houd [SCI-6550]
 2022-04-08 14:09:00 +02:00
aignatov-bio
a85b78291d
Fix red dot for dates in repository [SCI-6696] (#3991) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-05 14:40:09 +02:00
aignatov-bio
c480f28a09
Fix red dot for datetime columns [SCI-6684] (#3977) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-31 14:57:58 +02:00
artoscinote
229a27750f
Implement stock consumption via the API [SCI-6642] (#3964) 
* Implement stock consumption via the API [SCI-6642]

* Remove unnecessary attribute from InventoryItemSerializer [SCI-6642]

* Amend permission check, add nested transaction support to consume_stock method [SCI-6642]
 2022-03-30 14:33:26 +02:00
ajugo
a89244c537
Displaying low stock warning [SCI-6497] (#3912) 
* Low stock warning [SCI-6497

* Fix some bugs [SCI-6497]

* Fix to long line [SCI-6497]

* Clean not needed information in renderes [SCI-6497]
 2022-03-16 15:06:52 +01:00
Anton
8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
aignatov-bio
d89ea7d77f
Add red dot for date/datetime reminder [SCI-6499] (#3924) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:18:34 +01:00
aignatov-bio
7f7bf0533a
Fix tests [SCI-6486] (#3913) 
* Fix tests [SCI-6486]

* Fix rspec tests [SCI-6486]

Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:12:16 +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
Alex Kriuchykhin
bd47893947
Add inventory archiving to the API [SCI-5584] (#3885) 2022-02-28 10:33:43 +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
Martin Artnik
711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +01:00
aignatov-bio
05547da457
Add stock table renders [SCI-6412] (#3787) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-19 13:19:56 +01:00
aignatov-bio
3e85cc0b4a
Add UI for saving filters [SCI-6231] (#3768) 
* Add UI for saving filters [SCI-6231]

* Fix ajax for deleting filters [6231]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
 2022-01-12 14:39:42 +01:00
Martin Artnik
0db2023baa Add x and y to task serializer [SCI-6394] 2021-12-27 13:29:03 +01:00
Martin Artnik
c9e4a9bab7 Merge branch 'master' into features/bmt-search 2021-12-20 13:08:20 +01:00
Oleksii Kriuchykhin
a8ad7ef826 Add models and controller for repository table filters [SCI-6209] 2021-12-02 14:25:23 +01:00
Anton
a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
artoscinote
ee8cb033fa
Fix keys in connection serializer, fix destroy method [SCI-6087] (#3677) 2021-11-18 16:10:07 +01:00
artoscinote
6b6a49428c
Add additional info to API project_user_assignments type error [SCI-6273] (#3674) 
* Add additional info to API project_user_assignments type error [SCI-6273]

* Generalize user_assignments api controllers [SCI-6237]
 2021-11-17 16:28:02 +01:00
artoscinote
2e84418304
Add create/destroy endpoints to connections API, add tests [SCI-6087] (#3563) 2021-11-17 12:11:22 +01:00
Oleksii Kriuchykhin
a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
Alex Kriuchykhin
17a4afc6fa
Merge pull request #3607 from okriuchykhin/ok_SCI_6142 
Change the assets URL returned by API to pre-signed url [SCI-6142]
 2021-10-28 14:32:47 +02:00
Alex Kriuchykhin
1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
Oleksii Kriuchykhin
38b107b336 Change the assets URL returned by API to pre-signed url [SCI-6142] 2021-10-22 13:48:06 +02:00
Martin Artnik
7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
aignatov-bio
b269f3f612 Add saved filters backend [SCI-5977] (#3509) 
* Add saved filters backend [SCI-5977]

* Rework filter saving [SCI-5977]

Co-authored-by: Martin Artnik <martin@scinote.net>
 2021-08-30 10:49:15 +02:00
Oleksii Kriuchykhin
33d37d048e Add timestamps to API serializers, allow inclusion of comments [SCI-5983] 2021-08-18 10:00:01 +02:00
Oleksii Kriuchykhin
c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Oleksii Kriuchykhin
d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
Oleksii Kriuchykhin
7537542c0a Fix API date time serializers [SCI-5816] 2021-06-15 17:12:55 +02:00
Miha Mencin
e4421baf46
Merge pull request #3367 from okriuchykhin/ok_SCI_5640 
Add docx and pdf attributes to API report serializer [SCI-5640]
 2021-06-09 09:49:59 +02:00
Oleksii Kriuchykhin
86fcda3c09 Fix date formatting for the API [SCI-5785] 2021-06-07 10:34:58 +02:00
Oleksii Kriuchykhin
960d6681ff Add docx and pdf attributes to API report serializer [SCI-5640] 2021-06-03 11:40:01 +02:00
zmagoD
3d79dd32ad update endpoint type 2021-05-31 21:48:18 +02:00
zmagoD
28cb7ee81d add user roles enpoint and update scenarios 2021-05-29 15:28:10 +02:00
zmagoD
7e6789200a fix new API endpoints and add test cases 2021-05-23 17:31:02 +02:00
zmagoD
300c1521fd add new API endpoints and fix/update ExperimentMember and MyModuleMember modules 2021-05-22 18:36:30 +02:00
Urban Rotnik
1bb2393655 Use translations 
SCI-4140
 2021-02-25 11:59:26 +01:00
Urban Rotnik
60a1e602e0 Add ProjectFolders relation to Folder serializer 2021-01-12 17:09:39 +01:00
Urban Rotnik
7c1a0a9044 Add projects to project_folder serializer 2020-12-02 13:15:49 +01:00
Urban Rotnik
97733498d9 Include project_folders at Projects API endpoints 2020-12-02 13:15:48 +01:00
Urban Rotnik
088fa79874 Add Project Folders API endpoints 2020-12-02 13:15:48 +01:00
aignatov-bio
68f31ce7ec Add api endpoints for workflows 2020-09-01 15:01:38 +02:00
Miha Mencin
b333700f40
Merge pull request #2779 from okriuchykhin/ok_SCI_4910 
Fix rendering of RTE in API [SCI-4910]
 2020-08-10 15:26:35 +02:00
Oleksii Kriuchykhin
91d9f5d6ee Fix rendering of RTE in API [SCI-4910] 2020-08-07 16:51:57 +02:00
Oleksii Kriuchykhin
3d3fd1625c Add created_at and user to API Step serializer [SCI-4911] 2020-08-07 14:54:05 +02:00
Oleksii Kriuchykhin
b4fab62d38 Merge branch 'develop' into ok_SCI_4776 2020-07-10 13:40:46 +02:00
Oleksii Kriuchykhin
dc481cf236 Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776] 2020-07-03 16:48:29 +02:00
aignatov-bio
97f5a7e9fc Fix smart annotation in inventory on edit 2020-06-12 11:17:50 +02:00
Urban Rotnik
9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
aignatov-bio
10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
aignatov-bio
af02201b43 Add decimals to repository column API 2020-04-01 13:29:21 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Oleksii Kriuchykhin
4db810c18f Fix taken space display for teams [SCI-4479] 2020-03-23 16:32:05 +01:00
Oleksii Kriuchykhin
9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
Urban Rotnik
13c9dd8cf6 Safe navigation for serializer value of RepositoryListItem 2020-01-28 13:38:37 +01:00
Oleksii Kriuchykhin
fa0bff93ff Switch input type to text for Numbers in repositories [SCI-4258] 2020-01-17 16:04:19 +01:00
Alex Kriuchykhin
077ad7cad1
Merge pull request #2307 from okriuchykhin/ok_SCI_4233 
Unify view and edit modes for number cells [SCI-4233]
 2020-01-15 18:01:41 +01:00
Oleksii Kriuchykhin
470f6ff541 Unifify view and edit modes for number cells [SCI-4233] 2020-01-15 12:16:17 +01:00
Mojca Lorber
9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +01:00
Oleksii Kriuchykhin
7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
aignatov-bio
ac2f431a0b
Merge pull request #2292 from aignatov-bio/ai-sci-4221-fix-big-numbers-in-repository-number-value 
Fix big number in repository number value [SCI-4221]
 2020-01-13 10:42:13 +01:00
aignatov-bio
9ede0ef716 Fix big number in repository number value 2020-01-10 13:00:14 +01:00
aignatov-bio
d5675c0c33 Add smart annotations to repository text value 2020-01-10 12:56:57 +01:00
Urban Rotnik
dfe3c5292e Add TimeRange and DateRange renderer 2019-12-20 14:57:04 +01:00
Urban Rotnik
5d4453470a Add DateTimeRange renderer 2019-12-20 14:56:11 +01:00
Urban Rotnik
2a63854123 Edit and new renderers for DateTime columns 2019-12-20 14:55:11 +01:00
Oleksii Kriuchykhin
ac8aa88b88 Fix RepositoryTextValueSerializer [SCI-4166] 2019-12-18 16:37:21 +01:00
Oleksii Kriuchykhin
e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
aignatov-bio
7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +01:00
Mojca Lorber
8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
aignatov-bio
d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Urban Rotnik
06d87cb4b6 Add I18n to serializers 2019-12-06 11:39:10 +01:00
Urban Rotnik
3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Urban Rotnik
5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik
1c9d7ef6e7 Add File type renderer 2019-11-29 10:19:54 +01:00
Urban Rotnik
24acf1f84b Fix edit mode for File and Text 2019-11-29 10:19:08 +01:00
Urban Rotnik
1e8261ac2a Update InventoryColumns API for new Status Type 2019-11-29 10:19:07 +01:00
Urban Rotnik
7ab12baef9 Add API endpoint for StatusItems 2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin
371f699a11 Fix AR preloading for repository table [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin
e8fdfe7111 Implement datatables renderer for status data type [SCI-4032] 2019-11-29 10:19:04 +01:00
aignatov-bio
232e4d78be Add serializers to datatable values 2019-11-29 10:19:03 +01:00
aignatov-bio
28de55acce Fix url variables for manage columns 2019-11-29 10:18:06 +01:00
Mojca Lorber
305104f639 Refactor text inventory type 2019-11-29 10:17:53 +01:00
Urban Rotnik
cc9d987321 Add update result(file) and create result(file) API endpoint 2019-11-18 11:11:38 +01:00
Urban Rotnik
1be88baab1 Add API endpoint for Attachments resource 2019-11-18 11:11:38 +01:00
Urban Rotnik
e7083e188c Add API endpoint for Step resource 
[SCI-3835]
 2019-11-18 11:11:37 +01:00
Anton Ignatov
a4b2825258 Fix tests for active storage 2019-07-26 15:58:51 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Oleksii Kriuchykhin
94953b03c8 Force UTF-8 encoding for Table contents in API [SCI-3376] 2019-05-15 13:12:54 +02:00
Oleksii Kriuchykhin
4522e6bf06 Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401] 2019-04-30 17:04:48 +02:00
Anton Ignatov
811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
Miha Mencin
d2dfe68e46
Changing double quotes to single quotes 2019-01-31 10:31:03 +01:00
Miha Mencin
3ec62758fe SCI-2982, handle the empty json condition 2019-01-31 09:43:41 +01:00
Oleksii Kriuchykhin
b3a377f949 Return task inputs/outputs as references [SCI-2822] 2018-11-28 11:33:00 +01:00
Oleksii Kriuchykhin
23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Alex Kriuchykhin
d0804c8969
Merge pull request #1350 from okriuchykhin/ok_SCI_2821 
Fix relationships in activities serializer [SCI-2821]
 2018-10-29 14:53:15 +01:00
Alex Kriuchykhin
4320af794b
Merge pull request #1353 from okriuchykhin/ok_SCI_2771 
Fix API endpoints that return file URLs [SCI-2771]
 2018-10-29 13:44:55 +01:00
Oleksii Kriuchykhin
5708e9bbe7 Fix project start day in serializer [SCI-2820] 2018-10-28 19:02:44 +01:00
Oleksii Kriuchykhin
d1e6c64d5e Fix API endpoints that return file URLs [SCI-2771] 2018-10-28 18:39:34 +01:00
Oleksii Kriuchykhin
012447d762 Fix relationships in activities serializer [SCI-2821] 2018-10-26 17:30:04 +02:00
Alex Kriuchykhin
18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772 
Implement inventory column data type name mappings [SCI-2772]
 2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin
ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin
f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Luka Murn
1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes 
Conflicts:
	app/serializers/api/v1/activity_serializer.rb
	app/serializers/api/v1/inventory_column_serializer.rb
	app/serializers/api/v1/project_serializer.rb
 2018-10-15 15:20:26 +02:00
Luka Murn
1e46631c02
Merge pull request #1316 from czbiohub/mc-SCI-2700 
close sci-2700; add unit tests for inventory column update [SCI-2700]
 2018-10-11 10:20:15 +02:00
Luka Murn
c11345d6a1 Minorly update inventory_column_serializer so tests pass 2018-10-11 09:49:54 +02:00
Luka Murn
a217b11bba
Merge pull request #1298 from Zanz2/zz_projects_api_task_2539 
Created read endpoint for projects and related models [SCI-2539]
 2018-10-11 09:03:18 +02:00
Luka Murn
c0f47f03b7 Hound is love, Hound is life 2018-10-11 08:51:14 +02:00
Luka Murn
dd4f7b5d02 Fix project users, activities, comments, reports endpoints 2018-10-10 17:35:09 +02:00
Oleksii Kriuchykhin
bf80aa12a7 Fix failing test [SCI-2765] 2018-10-10 17:00:53 +02:00