Skip to content
Snippets Groups Projects
Commit e148c2b2 authored by Brian Moe's avatar Brian Moe
Browse files

whatever. this is a mess.

parent b4f5f8ad
No related branches found
No related tags found
No related merge requests found
......@@ -407,7 +407,7 @@ def search(request, format=""):
limit = 1000
form2 = None
if format == "frex":
if format == "flex":
response = HttpResponse(mimetype='application/json')
rows = [
{ 'id': 1, 'cell':
......@@ -422,19 +422,21 @@ def search(request, format=""):
]
d = {
'page': 1, #self.page,
'total': 1, #p.count,
'total': 1,
'records' : 3,
'rows': rows
}
msg = simplejson.dumps(d)
response['Content-length'] = len(msg)
response.write(msg)
query = request.POST['query']
#query = request.POST['query']
query = "blah"
f = open('/tmp/foo', 'a')
f.write('hello\n')
f.write(str(request.POST))
f.write("query is: %s\n" % request.POST['query'])
#f.write("query is: %s\n" % request.POST['query'])
f.write('\n\n')
f.close()
return response
......@@ -607,10 +609,15 @@ def timeline(request):
def flexigridResponse(request, objects):
response = HttpResponse(mimetype='application/json')
sortname = request.POST.get('sortname', None)
sortorder = request.POST.get('sortorder', 'desc')
page = int(request.POST.get('page', 1))
rp = int(request.POST.get('rp', 10))
#sortname = request.POST.get('sortname', None)
#sortorder = request.POST.get('sortorder', 'desc')
#page = int(request.POST.get('page', 1))
#rp = int(request.POST.get('rp', 10))
sortname = request.POST.get('sidx', None) # get index row - i.e. user click to sort
sortorder = request.POST.get('sord', 'desc') # get the direction
page = int(request.POST.get('page', 1)) # get the requested page
rp = int(request.POST.get('rows', 10)) # get how many rows we want to have into the grid
if sortname:
if sortorder == "desc":
......@@ -619,6 +626,11 @@ def flexigridResponse(request, objects):
start = (page-1) * rp
rows = []
total = objects.count()
total_pages = total / rp
if page > total_pages:
page = total_pages
for object in objects[start:start+rp]:
rows.append(
{ 'id' : object.id,
......@@ -631,8 +643,6 @@ def flexigridResponse(request, objects):
object.group.name,
object.get_analysisType_display(),
object.gpstime,
#'<a href="#">Hello Links</a>',
'<a href="%s">Data</a> <a href="%s">Wiki</a>' %
(object.weburl(), object.wikiurl()),
str(object.created),
......@@ -641,7 +651,8 @@ def flexigridResponse(request, objects):
)
d = {
'page': page,
'total': objects.count(),
'total': total_pages,
'records': total,
'rows': rows,
}
try:
......
......@@ -6,10 +6,10 @@
{% block pageid %}search{% endblock %}
{% block jscript %}
<link rel="stylesheet" href="/gracedb-static/css/flexigrid/flexigrid.css" />
<!-- <link rel="stylesheet" href="jquery.jqGrid.min.js" /> -->
<script type="text/javascript" src="/gracedb-static/js/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="/gracedb-static/js/flexigrid.js"></script>
<script type="text/javascript" src="/gracedb-static/js/jquery.jqGrid.min.js"></script>
<script type="text/javascript">
<!--
function toggle_visibility(id) {
......@@ -25,7 +25,7 @@
<!--
function test() { alert("test"); }
$(document).ready(function(){
$("#flex1").flexigrid
$("#flex1").jqGrid
(
{
url: 'https://moe.phys.uwm.edu/gracedb/events/search/flex',
......@@ -40,15 +40,6 @@
{display: 'Links', name : 'links', width : 100, sortable : false, align: 'center'},
{display: 'Submitted', name : 'created', width : 100, sortable : true, align: 'right'},
],
buttons : [
//{name: 'Add', bclass: 'add', onpress : test},
//{name: 'Delete', bclass: 'delete', onpress : test},
//{separator: true}
],
// searchitems : [
// {display: 'UID', name : 'id'},
// //{display: 'Name', name : 'name', isdefault: true}
// ],
sortname: "id",
sortorder: "desc",
usepager: true,
......@@ -61,6 +52,7 @@
}
);
});
jQuery("#flex1").jqGrid('navGrid','#pager1',{edit:false,add:false,del:false});
-->
</script>
{% endblock %}
......@@ -137,6 +129,7 @@
<table id="flex1"></table>
<div id="pager1"></div>
{% endblock %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment