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-1577 VRFS-736

This commit is contained in:
Jonathan Kolyer 2014-04-30 20:49:32 +00:00
parent 968dff2829
commit 2cbfae2215
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
web/app/assets/javascripts/rateSessionDialog.js
View File

@ -9,29 +9,53 @@
var $scopeSelector = "[layout-id='rate-session-dialog']";
function showDialog() {
app.layout.showDialog(dialogId);
return true; // false if should not show dialog
if (context.JK.JamServer.clientID) {
app.layout.showDialog(dialogId);
return true; // false if should not show dialog
}
return false;
}
function closeDialog() {
app.layout.closeDialog(dialogId);
if (finishedCallback) {
setTimeout(finishedCallback, 100);
setTimeout(finishedCallback, 10);
}
}
function getRating() {
if ($('#btn-rate-session-down', $scopeSelector).hasClass('selected')) {
return -1;
} else if ($('#btn-rate-session-up', $scopeSelector).hasClass('selected')) {
return 1;
}
return 0;
}
function getComment() {
return $('#txt-rate-session-comment',"[layout-id='rate-session-dialog']").val();
}
function events() {
$('#btn-rate-session-cancel', $scopeSelector).click(function(evt) {
closeDialog();
});
$('#btn-rate-session-up', $scopeSelector).click(function(evt) {
$(this).hasClass('selected') ? $(this).removeClass('selected') : $(this).addClass('selected');
if ($(this).hasClass('selected')) {
$(this).removeClass('selected')
} else {
$(this).addClass('selected');
}
if ($('#btn-rate-session-down').hasClass('selected')) {
$('#btn-rate-session-down').removeClass('selected')
}
});
$('#btn-rate-session-down', $scopeSelector).click(function(evt) {
$(this).hasClass('selected') ? $(this).removeClass('selected') : $(this).addClass('selected');
if ($(this).hasClass('selected')) {
$(this).removeClass('selected')
} else {
$(this).addClass('selected');
}
if ($('#btn-rate-session-up').hasClass('selected')) {
$('#btn-rate-session-up').removeClass('selected')
}
@ -40,7 +64,8 @@
var url = "/api/participant_histories/"+context.JK.JamServer.clientID+"/rating";
$.ajax({
type: "POST",
url: url
url: url,
data: { rating: getRating(), comment: getComment() }
}).done(function (response) {
closeDialog();
});

2
web/app/controllers/api_music_sessions_controller.rb
View File

@ -152,7 +152,7 @@ class ApiMusicSessionsController < ApiController
def participant_rating
if @history = MusicSessionUserHistory.find_by_client_id(params[:client_id])
@history.add_rating(params[:rating])
@history.add_rating(params[:rating], params[:comment])
@history.save
if @history.errors.any?

2
web/app/views/clients/_rateSession.html.erb
View File

@ -8,7 +8,7 @@
<div class="center">
<a id="btn-rate-session-up" class="rate-thumbsup" href="javascript:void(0)"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a id="btn-rate-session-down" href="javascript:void(0)" class="rate-thumbsdown"></a>
<br clear="left"><br>
<textarea class="w80" rows="3">Tell us more about what you liked or didn't like...</textarea>
<textarea id="txt-rate-session-comment" class="w80" rows="3" placeholder="Tell us more about what you liked or didn't like..."></textarea>
<br><br>
<a id="btn-rate-session-send" href="#" class="button-orange">SEND FEEDBACK</a>&nbsp;&nbsp;&nbsp;<a id="btn-rate-session-cancel" href="#" class="button-grey">NOT NOW, THANKS</a>
</div>