Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.18 -r1.19 --- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties 24 Sep 2013 16:49:12 -0000 1.18 +++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties 7 Oct 2013 20:22:53 -0000 1.19 @@ -179,3 +179,4 @@ label.you.ve.got =You''ve got {0} label.your.answer =Your answer: label.other.groups =Other groups: +label.all =All Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/summary.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp 24 Sep 2013 16:49:12 -0000 1.9 +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp 7 Oct 2013 20:22:53 -0000 1.10 @@ -101,15 +101,15 @@ ], colModel:[ {name:'id', index:'id', width:0, sorttype:"int", hidden: true}, - {name:'userName', index:'userName', width:200}, + {name:'groupName', index:'groupName', width:200}, {name:'feedback', index:'feedback', width:570} ], caption: "" }); jQuery("#reflections").addRowData(${i.index + 1}, { id:"${i.index + 1}", - userName:"${reflectDTO.fullName}", + groupName:"${reflectDTO.groupName}", feedback:"" }); @@ -148,6 +148,22 @@ launchPopup(userSummaryUrl, "MonitoringReview"); } }); + + //filter reflections by group name + $("#reflection-group-selector").change(function() { + var grid = $("#reflections"); + var searchFiler = $(this).val(); + + if (searchFiler.length === 0) { + grid[0].p.search = false; + $.extend(grid[0].p.postData,{filters:""}); + } + var f = {groupOp:"OR",rules:[]}; + f.rules.push({field:"groupName",op:"cn",data:searchFiler}); + grid[0].p.search = true; + $.extend(grid[0].p.postData,{filters:JSON.stringify(f)}); + grid.trigger("reloadGrid",[{page:1,current:true}]); + }); }); function exportExcel(){ @@ -209,7 +225,6 @@
- + + + + + +