Commit graph

3661 commits

Author SHA1 Message Date
Alex Kriuchykhin b51f064c28
Merge pull request #1347 from okriuchykhin/ok_SCI_2756
Remove double initialization of comments on steps [SCI-2756]
2018-10-26 14:19:58 +02:00
Jure Grabnar 7d2f2c3b5f
Merge pull request #1337 from jbargu/jg_bug_sci_2805
Add can_export_project? permission to allow archived projects to be exported [SCI-2805]
2018-10-26 11:23:57 +02:00
mz3944 ee2cc90825
Merge pull request #1324 from mz3944/mz-SCI-2732
Export all - Projects view - projects endpoints (unit tests) [SCI-2732]
2018-10-26 11:20:09 +02:00
Jure Grabnar 04b1d0e142 Remove blank line 2018-10-26 11:00:13 +02:00
Jure Grabnar 3903b4a6f2 Refactor read_project/export_project permissions 2018-10-26 10:58:59 +02:00
Alex Kriuchykhin f581829357
Merge pull request #1339 from okriuchykhin/ok_SCI_2804
Fix relative links to files in export all PDF [SCI-2804]
2018-10-26 10:57:04 +02:00
Oleksii Kriuchykhin 6e6bb73d2f Remove double initialization of comments on steps [SCI-2756] 2018-10-26 09:29:42 +02:00
Matej Zrimšek 6447750ff7 Fix showing projects in table view when all are archived [SCI-2787] 2018-10-25 22:31:00 +02:00
Alex Kriuchykhin ababa0b157
Merge pull request #1340 from okriuchykhin/ok_SCI_2793
Fix helpers to use with export all [SCI-2793]
2018-10-25 16:55:39 +02:00
Oleksii Kriuchykhin e9a8826a1e Show all experiments and tasks for archived projects [SCI-2785] 2018-10-24 18:49:59 +02:00
Oleksii Kriuchykhin 641d74829a Fix issue with project dropdown caching [SCI-2783] 2018-10-24 17:52:40 +02:00
Oleksii Kriuchykhin 744ad5b196 Skip missimg files in assets [SCI-2826] 2018-10-24 14:58:59 +02:00
Luka Murn 42793d25b7 Add bottom padding to sign in/up/forgot password pages
Closes SCI-2764.
2018-10-24 13:57:58 +02:00
Luka Murn 95340bcf36 Update team name placeholder & sublabel on sign up pages 2018-10-24 13:43:56 +02:00
Oleksii Kriuchykhin 990d3a34ca Fix link to inventory CSV file [SCI-2804] 2018-10-24 12:59:04 +02:00
Matej Zrimšek c89488e105 Fix displaying projects when all are archived [SCI-2787] 2018-10-24 03:34:13 +02:00
Matej Zrimšek 43fdab561f Fix project archiving and restoring edge case [SCI-2787] 2018-10-24 01:37:57 +02:00
Matej Zrimšek 18e52e2c6f Fix fetching all user projects [SCI-2787] 2018-10-24 00:29:30 +02:00
Matej Zrimšek c8d170f9ec Add default page size when it's not in request params when fetching projects 2018-10-23 19:51:50 +02:00
Oleksii Kriuchykhin b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Oleksii Kriuchykhin 81d751974d Fix helpers to use with export all [SCI-2793] 2018-10-22 14:32:10 +02:00
Oleksii Kriuchykhin 83566cc9d5 Fix relative links to files in export all PDF [SCI-2804] 2018-10-19 16:25:43 +02:00
Alex Kriuchykhin e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770
Add request rate throttling for API [SCI-2770]
2018-10-19 09:38:31 +02:00
Jure Grabnar bd5a2a43fd Add can_export_project? permission
Closes [SCI-2805].
2018-10-19 08:41:39 +02:00
mlorb e5fca1b1cd change the rich text max limit on frontend to 50000 2018-10-18 14:22:15 +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 e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin 02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +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
Jure Grabnar c13e7531ea Change generate_team method name 2018-10-16 11:13:01 +02:00
Jure Grabnar 447cad083d Fix formatting according to HoundBot 2018-10-16 11:01:58 +02:00
Jure Grabnar d50f56e319 Disable/enable export proejct button
Fix filesystem saving
2018-10-16 11:01:58 +02:00
Jure Grabnar ed16e8d479 Fix reviewers errors 2018-10-16 11:00:38 +02:00
Jure Grabnar 6b47165ac1 Fix formatting according to Houndbot 2018-10-16 11:00:38 +02:00
Jure Grabnar 2558b7a313 Fix formatting according to HoundBot 2018-10-16 11:00:38 +02:00
Jure Grabnar 26df1e5a98 Add export project modal
Closes [SCI-2645]
2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin 0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +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
Jure Grabnar b9bb0db62d
Merge pull request #1314 from mz3944/mz-SCI-2752
Render SciNote tables within exported PDF as using HTML Tables [SCI-2752]
2018-10-15 10:03:42 +02:00
Jure Grabnar ab71471a49 Fix inventories attachment/CSV file path 2018-10-15 08:55:00 +02:00
Matej Zrimšek ef5bf42fc2 Refactor table styling for export all PDF; remove 'min-width' from table cells to also display bigger tables nicely 2018-10-15 08:00:04 +02:00
Matej Zrimšek 7fe6837206 Style tables in export all PDF (in same way as in PDF reports) [SCI-2752] 2018-10-15 07:59:28 +02:00
Matej Zrimšek 97e6fe34a1 Add unstyled tables to the export all PDF [SCI-2752] 2018-10-15 07:58:44 +02:00
Matej Zrimšek 46da1e6b7d Fix handling relative URLs in export all PDF after rebase; minor refactoring [SCI-2641] 2018-10-15 07:13:41 +02:00
Matej Zrimšek 9fb5520970 Refactor/match exported filenames in export all PDF [SCI-2641] 2018-10-15 05:54:19 +02:00
Matej Zrimšek 17380ba0ca Refactoring rebased code [SCI-2641] 2018-10-15 01:12:25 +02:00
Matej Zrimšek 1bf16537f6 Add PDF content to the export all ZIP [SCI-2641] 2018-10-14 23:56:10 +02:00
Matej Zrimšek 48a6a64502 Move PDF generation and export logic of export all PDF to the model 2018-10-14 22:52:54 +02:00
Oleksii Kriuchykhin 1cafbd8c50 Move generic code to Viewable Concern [SCI-2733] 2018-10-12 16:14:24 +02:00
Oleksii Kriuchykhin f221d71bbc Fix datatables state restore [SCI-2733] 2018-10-12 15:15:43 +02:00
Matej Zrimšek 69f3a919db Some specification and syntax fixes [SCI-2641] 2018-10-12 07:42:17 +02:00
Matej Zrimšek e242e9a516 Refactor export all PDF content generation [SCI-2641] 2018-10-12 07:40:22 +02:00
Matej Zrimšek 67d51a8880 Refactor ReportsHelper#render_report_element 2018-10-12 07:40:22 +02:00
Matej Zrimšek aa30cf6130 Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641] 2018-10-12 07:40:22 +02:00
Matej Zrimšek 1575da6edb Make filenames and folder names in export all PDF compatible with filesystems (improved function should be used from another PR) [SCI-2641] 2018-10-12 07:40:22 +02:00
Matej Zrimšek d970576d60 Switch between generating report PDF and export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek a16d16bc5b Move export all report business logic to model [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 5ce94b5ecd Remove dynamically created export all report after it's no longer needed 2018-10-12 07:40:21 +02:00
Matej Zrimšek 476b6d50a2 Create export all PDF when it's needed [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek c0dc4f6951 Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek ed6dfc90b0 Also shorten too long folder names, fix filename shortening [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 7152d2f0f1 Fix/update file naming convection for exported files [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek d598bb8366 Make relative links work in export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 6f77c4772c Minor fix for assets & tables naming in export all PDF 2018-10-12 07:40:21 +02:00
Matej Zrimšek 0ebce8e283 Add relative links (not working) to files and tables into the PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek b15cc66b2f Add export project PDF for dummy project 2018-10-12 07:40:21 +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
Oleksii Kriuchykhin 8cf59d8d22 Add request rate throttling for API [SCI-2770] 2018-10-11 09:48:06 +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
Zanz2 4dc1320988
Merge pull request #1326 from Zanz2/zz_pio_upload_button_sci2760
Disabled turbolinks in left navigation bar protocols button [SCI-2760]
2018-10-10 17:14:15 +02:00
Oleksii Kriuchykhin bf80aa12a7 Fix failing test [SCI-2765] 2018-10-10 17:00:53 +02:00
Oleksii Kriuchykhin af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Alex Kriuchykhin 16b29b50a5
Merge pull request #1321 from okriuchykhin/ok_SCI_2731
Add Projects view - list/table view [SCI-2731]
2018-10-08 17:53:35 +02:00
Oleksii Kriuchykhin 7a591273a3 Remove unused variables [SCI-2731] 2018-10-08 13:45:26 +02:00
Oleksii Kriuchykhin 77e2371091 Add tests for inventory cell endpoints [SCI-2765] 2018-10-08 13:25:03 +02:00
Luka Murn a8d56d32e2 Hound is love, Hound is life 2018-10-07 13:28:29 +02:00
Luka Murn 7527dc7352 Fix READ index, READ show, POST create /tasks/:id/results endpoints 2018-10-07 12:58:17 +02:00
Luka Murn fc5cf33614 Fix GET /tasks/:id/activities endpoint 2018-10-07 11:54:11 +02:00
Luka Murn fca580face Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints 2018-10-07 11:35:12 +02:00
Luka Murn 239b974fa0 Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts 2018-10-07 11:29:56 +02:00
Luka Murn 24299ef4c0 Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts 2018-10-07 11:10:41 +02:00
Luka Murn 98544f00e8 Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts 2018-10-07 10:20:01 +02:00
Luka Murn 94e80edc9b Minor variable rename in task_groups_controller.rb 2018-10-07 10:16:00 +02:00
Luka Murn f56e5b1e5a Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts 2018-10-07 10:07:37 +02:00
Luka Murn 0de3c7eb4e Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb 2018-10-07 09:45:24 +02:00
Luka Murn 0643ba216e Fix GET /connections, /connections/:id endpoints 2018-10-07 00:53:39 +02:00
Luka Murn c9a15db85f Fix GET /task_groups endpoints 2018-10-06 20:11:01 +02:00
Luka Murn d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn 9e78de6ef2 Update CREATE, PATCH, DELETE inventory_column endpoints 2018-10-06 17:11:59 +02:00
Luka Murn 6625b4019e Update GET /inventory_columns, GET /inventory_columns/:id endpts 2018-10-06 13:47:41 +02:00
Zanz2 cfe5801856 Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue 2018-10-06 12:56:13 +02:00
Luka Murn eaa8a627a8 Update GET /inventories, GET /inventories/:inventory_id endpoints 2018-10-06 12:39:44 +02:00
Luka Murn 6faaff550b Update GET /teams, GET teams/:team_id endpoints slightly 2018-10-06 12:18:57 +02:00
Jure Grabnar d7c875135e
Merge pull request #1304 from jbargu/jg_zipfile_structure
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
2018-10-05 15:36:56 +02:00
Oleksii Kriuchykhin 0c452f519d Add CRUD endpoints for inventory cells [SCI-2765] 2018-10-05 00:18:42 +02:00
Oleksii Kriuchykhin 363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +02:00