Skip to content

Commit 003e6df

Browse files
author
Gaurav SinghaRoy
committed
implemented a modal alert
1 parent 8c70ae9 commit 003e6df

5 files changed

Lines changed: 85 additions & 51 deletions

File tree

‎app/assets/javascripts/query.js.coffee‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,35 @@
2424
return display_sparql_literal(data)
2525

2626
@execute_sparql_query =->
27-
show_loading()
28-
$("#sparql_results_container").hide()
29-
$.getJSON get_server_address()+"/query/execute_sparql",
30-
query: $("#txt_sparql_query").val()
31-
, (data) ->
32-
result_columns = SPARQL.result.columns(data)
33-
result_rows = SPARQL.result.rows(data)
34-
$("#sparql_results_time_taken").html(SPARQL.result.time_taken(data).toString()+" s")
35-
result_table = $("#sparql_results_table")
36-
result_table_header = "<tr><th>#</th>"
37-
$.each result_columns, (key,val) ->
38-
result_table_header += "<th>"+val+"</th>"
39-
result_table_header += "</tr>"
40-
result_table.find("thead").first().html(result_table_header)
41-
hide_loading()
42-
result_table.find("tbody").first().html("")
43-
$("#sparql_results_container").show("fast")
44-
row_counter = 0
45-
while row_counter < result_rows.length
46-
row_counter++
47-
result_rable_rows = "<tr><td>"+row_counter.toString()+"</td>"
48-
$.each result_columns, (key,col) ->
49-
result_rable_rows += display_sparql_row_entry(result_rows[row_counter-1][col])
50-
result_rable_rows += "</tr>"
51-
result_table.find("tbody").first().append(result_rable_rows)
52-
Utils.scroll_to('#sparql_results_container');
27+
if SPARQL.textbox.is_valid()
28+
show_loading()
29+
$("#sparql_results_container").hide()
30+
$.getJSON get_server_address()+"/query/execute_sparql",
31+
query: $("#txt_sparql_query").val()
32+
, (data) ->
33+
result_columns = SPARQL.result.columns(data)
34+
result_rows = SPARQL.result.rows(data)
35+
$("#sparql_results_time_taken").html(SPARQL.result.time_taken(data).toString()+" s")
36+
result_table = $("#sparql_results_table")
37+
result_table_header = "<tr><th>#</th>"
38+
$.each result_columns, (key,val) ->
39+
result_table_header += "<th>"+val+"</th>"
40+
result_table_header += "</tr>"
41+
result_table.find("thead").first().html(result_table_header)
42+
hide_loading()
43+
result_table.find("tbody").first().html("")
44+
$("#sparql_results_container").show("fast")
45+
row_counter = 0
46+
while row_counter < result_rows.length
47+
row_counter++
48+
result_rable_rows = "<tr><td>"+row_counter.toString()+"</td>"
49+
$.each result_columns, (key,col) ->
50+
result_rable_rows += display_sparql_row_entry(result_rows[row_counter-1][col])
51+
result_rable_rows += "</tr>"
52+
result_table.find("tbody").first().append(result_rable_rows)
53+
Utils.scroll_to('#sparql_results_container');
54+
return
5355
return
54-
return
5556

5657
@download_sparql_result_set = (type)->
5758
if type is "csv"
@@ -63,5 +64,6 @@
6364
query: $("#txt_sparql_query").val()
6465
pdf: "true"
6566
@show_sparql_download_modal =->
66-
$("#sparql_download_modal").modal("show")
67+
if SPARQL.textbox.is_valid()
68+
$("#sparql_download_modal").modal("show")
6769

‎app/assets/javascripts/resources/sparql.js‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,39 @@ if (typeof SPARQL == 'undefined') {
33
}
44

55
SPARQL = {
6-
prefix : {
7-
rdf : "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n",
8-
rdfs : "PREFIX rdfs:<http://www.w3.org/2000/01/rdf-schema#> \n",
9-
owl : "PREFIX owl:<http://www.w3.org/2002/07/owl#> \n",
10-
all : function(){
11-
result = "";
12-
result += SPARQL.prefix.rdf;
13-
result += SPARQL.prefix.rdfs;
14-
result += SPARQL.prefix.owl;
15-
return result;
16-
}
17-
},
18-
result : {
19-
columns : function(data){
20-
return data.head.vars;
21-
},
22-
rows : function(data){
23-
return data.results.bindings;
24-
},
25-
time_taken : function(data){
26-
return data.results.time_taken;
27-
}
28-
}
6+
prefix : {
7+
rdf : "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n",
8+
rdfs : "PREFIX rdfs:<http://www.w3.org/2000/01/rdf-schema#> \n",
9+
owl : "PREFIX owl:<http://www.w3.org/2002/07/owl#> \n",
10+
all : function(){
11+
result = "";
12+
result += SPARQL.prefix.rdf;
13+
result += SPARQL.prefix.rdfs;
14+
result += SPARQL.prefix.owl;
15+
return result;
16+
}
17+
},
18+
result : {
19+
columns : function(data){
20+
return data.head.vars;
21+
},
22+
rows : function(data){
23+
return data.results.bindings;
24+
},
25+
time_taken : function(data){
26+
return data.results.time_taken;
27+
}
28+
},
29+
textbox : {
30+
is_valid : function(){
31+
var query = $("#txt_sparql_query").val();
32+
if(query == undefined || query.trim() == ''){
33+
Utils.alert("No SPARQL query inputted in the text box.")
34+
return false;
35+
}
36+
return true;
37+
}
38+
}
39+
2940

3041
};

‎app/assets/javascripts/resources/utilities.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Utils = {
1313
$('html, body').animate({
1414
scrollTop: $(e).offset().top
1515
}, 500);
16+
},
17+
alert : function(message){
18+
$("#alert_modal").find(".modal-body").first().html(message);
19+
$("#alert_modal").modal("show");
1620
}
1721

1822
};

‎app/views/layouts/application.html.erb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
<div id="loading" style="display:none;">
1919
<%=image_tag "jar-loading.gif", :class=>"ajax-loader"%>
2020
</div>
21+
<%= render :partial=>"shared/alert"%>
2122
</body>
2223
</html>

‎app/views/shared/_alert.html.erb‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<div class="modal fade" id="alert_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
2+
<div class="modal-dialog">
3+
<div class="modal-content">
4+
<div class="modal-header">
5+
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
6+
<h4 class="modal-title">Alert !</h4>
7+
</div>
8+
<div class="modal-body">
9+
10+
</div>
11+
<div class="modal-footer">
12+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
13+
</div>
14+
</div>
15+
</div>
16+
</div>

0 commit comments

Comments
 (0)