diff --git a/app/assets/images/scinote_logo.png b/app/assets/images/scinote_logo.png new file mode 100644 index 000000000..3cbc3b73a Binary files /dev/null and b/app/assets/images/scinote_logo.png differ diff --git a/app/services/reports/docx/private_methods.rb b/app/services/reports/docx/private_methods.rb index ce0e6abd7..8e5db9780 100644 --- a/app/services/reports/docx/private_methods.rb +++ b/app/services/reports/docx/private_methods.rb @@ -30,9 +30,9 @@ module Reports::Docx::PrivateMethods end def insert_logo - logo_data = File.read(Rails.root.join('app/assets/images/scinote_logo.svg')) + logo_data = File.read(Rails.root.join('app/assets/images/scinote_logo.png')) - @docx.img 'logo.svg' do + @docx.img 'logo.png' do data logo_data height 20 width 100 diff --git a/app/services/reports/html_to_word_converter.rb b/app/services/reports/html_to_word_converter.rb index ea9084293..31dc9beeb 100644 --- a/app/services/reports/html_to_word_converter.rb +++ b/app/services/reports/html_to_word_converter.rb @@ -128,7 +128,8 @@ module Reports image = TinyMceAsset.find_by(id: Base62.decode(elem.attributes['data-mce-token'].value)) return unless image - image_path = Reports::Utils.image_prepare(image).url + image_path = Reports::Utils.image_prepare(image).processed.url + dimension = FastImage.size(image_path) return unless dimension diff --git a/app/services/reports/utils.rb b/app/services/reports/utils.rb index 7f01520b1..055acc567 100644 --- a/app/services/reports/utils.rb +++ b/app/services/reports/utils.rb @@ -11,12 +11,12 @@ module Reports def self.image_prepare(asset) if asset.class == Asset if asset.inline? - asset.large_preview + asset.preview_attachment.representation(resize_to_limit: Constants::MEDIUM_PIC_FORMAT, format: :png) else - asset.medium_preview + asset.preview_attachment.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT, format: :png) end elsif asset.class == TinyMceAsset - asset.image + asset.image.representation(format: :png) end end