seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-4158, VRFS-4159 - audio/notation attachments work better

This commit is contained in:
Seth Call 2016-05-30 00:32:55 -05:00
parent c6a5321601
commit 197313dfc9
13 changed files with 244 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ruby/lib/jam_ruby/app/mailers/user_mailer.rb
View File

@ -1770,5 +1770,28 @@ module JamRuby
format.html { render :layout => "from_user_mailer" }
end
end
def lesson_attachment(sender, target, lesson_session, attachment)
@sender = sender
@target = target
@lesson_session = lesson_session
@attachment = attachment
email = target.email
@subject = "An attachment has been added to your lesson by #{sender.name}"
unique_args = {:type => "lesson_attachment"}
sendgrid_category "Notification"
sendgrid_unique_args :type => unique_args[:type]
sendgrid_recipients([email])
sendgrid_substitute('@USERID', [@target.id])
mail(:to => email, :subject => @subject) do |format|
format.text
format.html { render :layout => "from_user_mailer" }
end
end
end
end

20
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/lesson_attachment.html.erb Normal file
View File

@ -0,0 +1,20 @@
<% provide(:title, @subject) %>
<% provide(:photo_url, @sender.resolved_photo_url) %>
<% content_for :note do %>
<p>
<% if @attachment.is_a?(JamRuby::MusicNotation) %>
<% if @attachment.is_notation? %>
A music notation has been added to your lesson. You can download <a style="color:#fc0" href="<%= APP_CONFIG.external_root_url + "/api/music_notations/#{@attachment.id}" %>"><%= @attachment.file_name %></a> directly or at any time in the message window for this lesson.
<% else %>
A audio file has been added to your lesson. You can download <a style="color:#fc0" href="<%= APP_CONFIG.external_root_url + "/api/music_notations/#{@attachment.id}" %>"><%= @attachment.file_name %></a> directly or at any time in the message window for this lesson.
<% end %>
<% else %>
A recording named "<%= @attachment.name %>" has been added to your lesson. It can be viewed <a style="color:#fc0" href="<%= APP_CONFIG.external_root_url + "/recordings/#{@attachment.id}" %>">here</a> or found within the message window for this lesson.
<% end %>
<p>
<a href="<%= @lesson_session.web_url %>" style="margin: 8px 0 0 0;background-color: #ed3618;border: solid 1px #F27861;padding: 3px 10px;font-size: 12px;font-weight: 300;cursor: pointer;color: #FC9;text-decoration: none;line-height: 12px;text-align: center;">VIEW LESSON DETAILS</a>
</p>
<% end %>

12
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/lesson_attachment.text.erb Normal file
View File

@ -0,0 +1,12 @@
<% if @attachment.is_a?(JamRuby::MusicNotation) %>
<% if @attachment.is_notation? %>
A music notation has been added to your lesson. You can download (<%= APP_CONFIG.external_root_url + "/api/music_notations/#{@attachment.id}" %>">)<%= @attachment.file_name %> directly or at any time in the message window for this lesson.
<% else %>
A audio file has been added to your lesson. You can download (<%= APP_CONFIG.external_root_url + "/api/music_notations/#{@attachment.id}" %>">)<%= @attachment.file_name %> directly or at any time in the message window for this lesson.
<% end %>
<% else %>
A recording named "<%= @attachment.name %>" has been added to your lesson. It can be viewed (<%= APP_CONFIG.external_root_url + "/recordings/#{@attachment.id}" %>">) here or found within the message window for this lesson.
<% end %>
VIEW LESSON DETAILS (<%= @lesson_session.web_url %>)

3
ruby/lib/jam_ruby/models/music_notation.rb
View File

@ -48,6 +48,9 @@ module JamRuby
s3_manager.sign_url(self[:file_url], {:expires => expiration_time, :secure => true})
end
def is_notation?
self.attachment_type == TYPE_NOTATION
end
private
def self.construct_filename(notation)

8
ruby/spec/factories.rb
View File

@ -1057,5 +1057,13 @@ FactoryGirl.define do
factory :email_blacklist, class: "JamRuby::EmailBlacklist" do
sequence(:email) { |n| "person_#{n}@example.com"}
end
factory :music_notation, class: "JamRuby::MusicNotation" do
attachment_type {JamRuby::MusicNotation::TYPE_NOTATION}
association :user, factory: :user
file_url 'abc'
size 100
file_name 'some_file.jpg'
end
end

20
ruby/spec/mailers/render_emails_spec.rb
View File

@ -162,6 +162,26 @@ describe "RenderMailers", :slow => true do
UserMailer.deliveries.clear
UserMailer.lesson_starting_soon_student(lesson).deliver
end
it "music_notation_attachment" do
@filename = "music_notation_attachment"
lesson = testdrive_lesson(user, teacher)
UserMailer.deliveries.clear
notation = FactoryGirl.create(:music_notation, user: user)
UserMailer.lesson_attachment(user, teacher, lesson, notation).deliver
end
it "recording_attachment" do
@filename = "recording_attachment"
lesson = testdrive_lesson(user, teacher)
UserMailer.deliveries.clear
claim = FactoryGirl.create(:claimed_recording, user: user)
UserMailer.lesson_attachment(user, teacher, lesson, claim).deliver
end
end
end

6
web/app/assets/javascripts/react-components/AttachmentStatus.js.jsx.coffee
View File

@ -24,7 +24,7 @@ AttachmentStore = context.AttachmentStore
notationUploadDone: () ->
logger.debug("AttachmentStatus: notationUploadDone")
context.JK.Banner.showNotice('Notation Uploaded', 'The music notation file has been uploaded, and can be accessed from the Messages window for this lesson.')
#context.JK.Banner.showNotice('Notation Uploaded', 'The music notation file has been uploaded, and can be accessed from the Messages window for this lesson.')
notationUploadFail: () ->
logger.debug("AttachmentStatus: notationUploadFail")
@ -32,11 +32,11 @@ AttachmentStore = context.AttachmentStore
audioSelected: (e) ->
files = $(e.target).get(0).files
logger.debug("audio files selected: ", files)
window.AttachmentActions.uploadAudio.trigger(files, @notationUploadDone, @notationUploadFail)
window.AttachmentActions.uploadAudios.trigger(files, @notationUploadDone, @notationUploadFail)
audioUploadDone: () ->
logger.debug("AttachmentStatus: audioUploadDone")
context.JK.Banner.showNotice('Audio file Uploaded', 'The audio file has been uploaded, and can be accessed from the Messages window for this lesson.')
#context.JK.Banner.showNotice('Audio file Uploaded', 'The audio file has been uploaded, and can be accessed from the Messages window for this lesson.')
audioUploadFail: () ->
logger.debug("AttachmentStatus: audioUploadFail")

49
web/app/assets/javascripts/react-components/MusicNotationUploadDialog.js.jsx.coffee Normal file
View File

@ -0,0 +1,49 @@
context = window
@MusicNotationUploadDialog = React.createClass({
mixins: [Reflux.listenTo(@AppStore, "onAppInit"), Reflux.listenTo(AttachmentStore, "onAttachmentStore")]
getInitialState: () ->
{
uploading: false
}
onAppInit: (@app) ->
onAttachmentStore: (attachmentState) ->
@setState(attachmentState)
handleCloseMessage: (e) ->
e.preventDefault()
@app.layout.closeDialog('music-notation-upload-dialog')
render: () ->
if @state.uploading
state =
`<div>
<h3>Please wait while we upload your attachment to the lesson...</h3>
<div className="spinner spinner-large"></div>
</div>`
else
state =
`<div>
<h3>Your file has been uploaded.</h3>
</div>`
`<div className="MusicNotationUploadDialog">
<div className="content-head">
<img className="content-icon" src="/assets/content/icon_add.png" height={19} width={19}/>
<h1>Uploading Attachment</h1>
</div>
<div className="dialog-inner">
{state}
<div className="actions">
<a className="button-orange " onClick={this.handleCloseMessage}>CLOSE</a>
</div>
</div>
</div>`
})

1
web/app/assets/javascripts/react-components/actions/AttachmentActions.js.coffee
View File

@ -5,4 +5,5 @@ context = window
startAttachNotation: {}
startAttachAudio: {}
uploadNotations: {}
uploadAudios: {}
})

67
web/app/assets/javascripts/react-components/stores/AttachmentStore.js.coffee
View File

@ -105,6 +105,8 @@ AttachmentActions = @AttachmentActions
formData.append('lesson_session_id', @lessonId);
formData.append('attachment_type', 'notation')
@app.layout.showDialog('music-notation-upload-dialog')
rest.uploadMusicNotations(formData)
.done((response) => @doneUploadingNotatations(notations, response, doneCallback, failCallback))
.fail((jqXHR) => @failUploadingNotations(jqXHR, failCallback))
@ -137,6 +139,71 @@ AttachmentActions = @AttachmentActions
else
@app.notifyServerError(jqXHR, "Unable to upload music notations");
onUploadAudios: (notations, doneCallback, failCallback) ->
logger.debug("beginning upload of audio", notations)
@uploading = true
@changed()
formData = new FormData()
maxExceeded = false;
$.each(notations, (i, file) => (
max = 10 * 1024 * 1024;
if file.size > max
maxExceeded = true
return false
formData.append('files[]', file)
))
if maxExceeded
@app.notify({
title: "Maximum Music Audio Size Exceeded",
text: "You can only upload files up to 10 megabytes in size."
})
failCallback()
@uploading = false
@changed()
return
formData.append('lesson_session_id', @lessonId);
formData.append('attachment_type', 'audio')
@app.layout.showDialog('music-notation-upload-dialog')
rest.uploadMusicNotations(formData)
.done((response) => @doneUploadingAudios(notations, response, doneCallback, failCallback))
.fail((jqXHR) => @failUploadingAudios(jqXHR, failCallback))
doneUploadingAudios: (notations, response, doneCallback, failCallback) ->
@uploading = false
@changed()
error_files = [];
$.each(response, (i, music_notation) => (
if music_notation.errors
error_files.push(notations[i].name)
)
)
if error_files.length > 0
failCallback()
@app.notifyAlert("Failed to upload audio files.", error_files.join(', '));
else
doneCallback()
failUploadingAudios: (jqXHR, failCallback) ->
@uploading = false
@changed()
if jqXHR.status == 413
# the file is too big. Let the user know.
# This should happen when they select the file, but a misconfiguration on the server could cause this.
@app.notify({
title: "Maximum Music Audio Size Exceeded",
text: "You can only upload files up to 10 megabytes in size."
})
else
@app.notifyServerError(jqXHR, "Unable to upload music audio files");
changed: () ->
this.trigger({lessonId: @lessonId, uploading: @uploading})
}

35
web/app/assets/stylesheets/dialogs/MusicNotationUploadDialog.css.scss Normal file
View File

@ -0,0 +1,35 @@
@import "client/common";
#music-notation-upload-dialog {
width: 500px;
max-height:500px;
h3 {
color:white;
margin-bottom:20px;
}
.dialog-inner {
width: auto;
height:100%;
@include border_box_sizing;
margin-top: -29px;
padding: 50px 25px 25px;
}
div[data-react-class="MusicNotationUploadDialog"] {
}
.MusicNotationUploadDialog {
height:100%;
}
.spinner-large {
width:200px;
height:200px;
line-height: 200px;
position:relative;
margin:25px auto;
}
.actions {
text-align:right;
}
}

1
web/app/views/dialogs/_dialogs.html.haml
View File

@ -54,3 +54,4 @@
= render 'dialogs/cancelLessonDialog'
= render 'dialogs/rescheduleLessonDialog'
= render 'dialogs/rateUserDialog'
= render 'dialogs/musicNotationUploadDialog'

2
web/app/views/dialogs/_musicNotationUploadDialog.html.slim Normal file
View File

@ -0,0 +1,2 @@
.dialog.dialog-overlay-sm.top-parent layout='dialog' layout-id='music-notation-upload-dialog' id='music-notation-upload-dialog'
= react_component 'MusicNotationUploadDialog', {}