Changeset 62

Timestamp:

May 30, 2011, 5:05:18 PM (12 years ago)

Author:

robert@…

Message:

Implemented classification views: percentages classified and overview of classification

Location:

trunk

Files:

• grails-app/controllers/nl/tno/massSequencing/AssaySampleController.groovy (modified) (2 diffs)
• grails-app/controllers/nl/tno/massSequencing/classification/ClassificationController.groovy (modified) (2 diffs)
• grails-app/domain/nl/tno/massSequencing/classification/Classification.groovy (modified) (2 diffs)
• grails-app/services/nl/tno/massSequencing/ClassificationService.groovy (modified) (8 diffs)
• grails-app/views/assay/show.gsp (modified) (2 diffs)
• grails-app/views/classification/percentageClassified.gsp (modified) (4 diffs)
• grails-app/views/classification/show.gsp (added)
• grails-app/views/layouts/main.gsp (modified) (1 diff)
• grails-app/views/run/show.gsp (modified) (2 diffs)
• web-app/css/buttons.css (modified) (3 diffs)
• web-app/css/metagenomics.css (modified) (1 diff)
• web-app/js/dataTables.formatted-num.js (added)
• web-app/js/forms.js (modified) (1 diff)
• web-app/js/paginate.js (modified) (3 diffs)

trunk/grails-app/controllers/nl/tno/massSequencing/AssaySampleController.groovy

@@ -5 +5 @@
 class AssaySampleController {
         def fastaService
+        def sampleExcelService
 
         /**
@@ -117 +118 @@
                 }
         }
+        
+        /**
+         * Export metadata of selected samples in excel format
+         */
+        def exportMetaData = {
+                def assaySamples = getAssaySamples( params );
+                def name
+
+                if( assaySamples?.size() == 0 ) {
+                        flash.error = "No samples selected";
+                        redirect( action: "list" );
+                        return;
+                }
+
+                name = "samples";
+
+                // Export the metadata
+                try {
+                        // The export functionality needs a assaysSample-tag list, but it
+                        // should be empty when only exporting metadata
+                        def tags = [];
+                        assaySamples.unique().each { assaySample ->
+                                tags << [assaySampleId: assaySample.id, sampleName: assaySample.sample.name, assayName: assaySample.assay.name, studyName: assaySample.assay.study.name, tag: "-"]
+                        }
+                        response.setHeader "Content-disposition", "attachment; filename=${name}.xls"
+
+                        if( !sampleExcelService.exportExcelSampleData( assaySamples.unique(), tags, response.outputStream ) ) {
+                                flash.error = "An error occurred while fetching sample data. Maybe the session has timed out.";
+                                response.setHeader( "Content-disposition", "" );
+                                redirect( action: "index" );
+                        }
+                        response.outputStream.flush();
+                } catch( Exception e ) {
+                        log.error( "Exception occurred during export of sequences. Probably the user has cancelled the download." );
+                        e.printStackTrace();
+                }
+        }
 
         /**

trunk/grails-app/controllers/nl/tno/massSequencing/classification/ClassificationController.groovy

@@ -4 +4 @@
 
 class ClassificationController {
+        def classificationService;
+        
+    def percentageClassified = {
+                def assaySamples = getAssaySamples();
+                
+                if( !assaySamples ) {
+                        flash.error = "No samples selected"
+                        redirect( controller: "run", action: "list" );
+                        return;
+                }
 
-    def percentageClassified = {
+                def result = Classification.percentagesClassified( assaySamples );
+                result[ "assaySamples" ] = assaySamples;
                 
+                // Determine URL to return to
+                def entityType = params.get( 'entityType', 'run' );
+                def entityId = params.long( 'entityId' );
+                def returnUrl = g.createLink( controller: entityType, action: "show", id: entityId );
+                
+                result[ 'returnUrl'] = returnUrl;
+                result[ "entityType" ] = entityType
+                result[ "entityId" ] = entityId
+                
+                return result;
+        }
+        
+        def show = {
+                def assaySamples = getAssaySamples();
+                
+                if( !assaySamples ) {
+                        flash.error = "No samples selected"
+                        redirect( controller: "run", action: "list" );
+                        return;
+        }
+                
+                def classifications = classificationService.retrieveClassifications( assaySamples );
+                
+                // Filter the list of classifications on the level selected
+                def level = params.int( 'level' );
+                def showClassifications
+                
+                if( level > 0 ) {
+                        showClassifications = classifications.findAll { it[ 0 ] == level }
+                } else {
+                        showClassifications = classifications;
+                }
+                
+                // Determine the min/max levels and level names
+                def (maxLevel, minLevel) = Classification.determineMinAndMaxLevels( assaySamples );
+                
+                def levelNames = [:];
+                minLevel.upto( maxLevel ) { levelNumber ->
+                        def levelEnum = Taxon.Level.find { it.number() == levelNumber }
+                        levelNames[ levelNumber ] = levelEnum?.description();
+                }
+                
+                // Determine the output type. Numbers are converted to percentages (if needed) in the view.
+                def outputType = params.outputType == "absolute" ? "absolute" : "percentages";
+                
+                def entityType = params.get( 'entityType', 'run' );
+                def entityId = params.long( 'entityId' );
+                def returnUrl = g.createLink( controller: entityType, action: "show", id: entityId );
+                
+                return [ 
+                        "assaySamples":                 assaySamples, 
+                        "level":                                level, 
+                        "showClassifications":  showClassifications, 
+                        "total":                                classifications[ 0 ], 
+                        
+                        "maxLevel":                     maxLevel, 
+                        "minLevel":                     minLevel, 
+                        "levelNames":                   levelNames, 
+                        
+                        "outputType":                   outputType, 
+                        
+                        'returnUrl':                    returnUrl,
+                        "entityType":                   entityType,
+                        "entityId":                     entityId
+          ];
+        }
+        
+        def export = {
+                def assaySamples = getAssaySamples();
+                
+                if( !assaySamples ) {
+                        flash.error = "No samples selected"
+                        redirect( controller: "run", action: "list" );
+                        return;
+                }
+                
+                // Return headers and classification data
+                response.setHeader "Content-disposition", "attachment; filename=classifications.txt"
+                classificationService.exportClassifications( assaySamples, response.outputStream );
+                response.outputStream.flush();
+        }
+        
+        protected List getAssaySamples() {
                 // Retrieve assaySamples from ids
                 def assaySampleIds = params.list( 'ids' );
@@ -18 +112 @@
                 }
                 
-                def result = Classification.percentagesClassified( assaySamples );
-                result[ "assaySamples" ] = assaySamples;
-                
-                return result;
+                return assaySamples;
         }
 }

trunk/grails-app/domain/nl/tno/massSequencing/classification/Classification.groovy

@@ -39 +39 @@
          * @return
          */
-        public static percentagesClassified( List assaySamples ) {
+        public static Map percentagesClassified( List assaySamples ) {
+                if( !assaySamples ) 
+                        return [:]
+                
                 // Create a hashmap with number of sequences and unclassified for each assaysample
                 def classifications = Classification.executeQuery( "SELECT a.id, ( SELECT SUM(c.unclassified) FROM Classification c WHERE c.assaySample = a), (SELECT SUM(sd.numSequences) FROM SequenceData sd WHERE sd.sample = a) FROM AssaySample a WHERE a IN (:assaySamples) GROUP BY a.id", [ "assaySamples": assaySamples ] );
@@ -125 +128 @@
          */
         public static determineMinAndMaxLevels( List assaySamples ) {
-                return Classification.executeQuery( "SELECT MAX(t.level), MIN(t.level) FROM Classification c LEFT JOIN c.taxon t LEFT JOIN c.assaySample a WHERE a IN (:assaySamples)", [ "assaySamples": assaySamples ] )[ 0 ];
+                def levels = Classification.executeQuery( "SELECT MAX(t.level), MIN(t.level) FROM Classification c LEFT JOIN c.taxon t LEFT JOIN c.assaySample a WHERE a IN (:assaySamples)", [ "assaySamples": assaySamples ] )[ 0 ];
+                
+                if( levels[ 0 ] == null )
+                        levels[ 0 ] = 6;                // Default maximum level
+                         
+                if( levels[ 1 ] == null )
+                        levels[ 1 ] = 1;                // Default minimun level
+                        
+                return levels;
+                
         }
 

trunk/grails-app/services/nl/tno/massSequencing/ClassificationService.groovy

@@ -326 +326 @@
                 return inputFiles.find { it.type == type && it.numLines == numLines && !alreadyStored?.contains( it.filename ) };
         }
-
-        /**
-         * Exports all known data about the classifications of these samples to an excel file
-         * @param assaySamples  Assaysamples to export information about
-         * @param stream                        Outputstream to write the data to
-         * @return
-         */
-        def exportClassifications( def assaySamples, OutputStream stream ) {
-                if( assaySamples == null )
-                        assaySamples = []
-
-                // Create csv file; sheetIndex is ignored
-                def sheetIndex = 0;
-
-                // Create headerrow
-                def headers = [ "level", "rankId", "taxon" ];
-                def ids = [];
-                assaySamples.each { 
-                        headers << it.sample.name 
-                        ids << it.id
-                }
-                
+        
+        /**
+         * Retrieves a list of classifications for the given assaysamples
+         * 
+         * @param assaySamples  List of assaysamples
+         * @param prefix                (optional) prefix that is prepended to the taxon name. e.g. '  ' can be used to indent every new level
+         * @return                              List with classification data
+         * 
+         * The list is returned like:
+         * 
+         * 0    0               root                                    12      0       15      16
+         * 1    0.1             Bacteria                                7               15      13
+         * 2    0.1.1   Firmicutes                              6                       11
+         * 2    0.1.2   Unclassified bacteria   1               15      2
+         * 1    0.2             Unclassified                    5                       3
+         * 
+         * Where the columns are:
+         *      1.      Level number of the taxon on that line
+         *      2.      rank ID: identifier for the given line. The identifier is unique per output file, but can be reused in new output files.
+         *      3.      Taxon name
+         *      4.      Every column shows the number of sequences for that taxon in a an assaysample. The first column matches the first assaySample given etc.
+         */
+        def retrieveClassifications( def assaySamples, String prefix = "" ) {
                 // Structure to store the data in
                 def data = [];
@@ -355 +356 @@
 
                 // Find the maximum level present in this classification list
-                def levels = Classification.determineMinAndMaxLevels( assaySamples ); 
+                def levels = Classification.determineMinAndMaxLevels( assaySamples );
                 def maxLevel = levels[ 0 ]
                 def minLevel = levels[ 1 ]
@@ -392 +393 @@
                 for( def i = 0; i < assaySamples.size(); i++ ) {
                         assaySampleIndex[ assaySamples[ i ].id ] = i;
-                } 
+                }
                 
                 // Append classifications entry to the list with details about the numbers of unclassified sequences
                 //  AND a.id IN (:assaySampleIds)
                 def extraClassifications = Classification.executeQuery( "SELECT a.id, SUM( c.unclassified ), (SELECT SUM(sd.numSequences) FROM SequenceData sd WHERE sd.sample = a) FROM AssaySample a, Classification c WHERE c.assaySample = a AND  a IN (:assaySamples) GROUP BY a.id", [ "assaySamples": assaySamples ] );
-                def rootLine = [ minLevel - 1, rootId, "root" ]
+                def rootLine = [ minLevel - 1, rootId, "root" ] + [ 0 ] * assaySamples.size();
                 extraClassifications.each {
-                        // Add a classification in order to show the 'unclassified' values 
+                        // Add a classification in order to show the 'unclassified' values
                         classifications << [
                                 [ 'total': it[ 2 ], 'unclassified': it[ 2 ] - it[ 1 ] ],
@@ -406 +407 @@
                         ]
                         
-                        // Create a root line
-                        rootLine[ assaySampleIndex[ it[ 0 ] ] + 3 ] = it[ 2 ];
+                        // Create a root line with total numbers of sequences for the given sample
+                        rootLine[ assaySampleIndex[ it[ 0 ] ] + 3 ] = it[ 2 ] ?: 0;
                 }
                 data << rootLine;
@@ -439 +440 @@
                                                         // Each unclassified line should be repeated up to the highest level, in order
                                                         // to have the same number of sequences at every level.
-                                                        def ucl = unClassifiedLines.remove( lvl ); 
+                                                        def ucl = unClassifiedLines.remove( lvl );
                                                         lvl.upto( maxLevel - 1 ) { unclassifiedLevel ->
-                                                                def newLine = [ unclassifiedLevel + 1 ] + rankId( unclassifiedLevel + 1 ) + ucl[2..-1];
+                                                                def name = ( prefix * ( unclassifiedLevel + 1 ) ) + ucl[ 2 ]
+                                                                def newLine = [ unclassifiedLevel + 1 ] + rankId( unclassifiedLevel + 1 ) + name + ucl[3..-1];
                                                                 data << newLine;
-                                                        } 
+                                                        }
                                                 }
                                         }
@@ -456 +458 @@
                                 
                                 // Create a new line, because we arrived at a new taxon
-                                currentLine = [ taxon.level, rank, taxon.name ]
+                                currentLine = [ taxon.level, rank, ( prefix * Math.max( 0, taxon.level ) ) + taxon.name ]
                                 hasValues = false;
                                 
@@ -464 +466 @@
                                 
                                 // Create as many entries in the list as there are samples
-                                numAssaySamples.times { 
+                                numAssaySamples.times {
                                         currentLine << ""
-                                        unClassifiedLine << "" 
+                                        unClassifiedLine << ""
                                 }
                                 
@@ -493 +495 @@
                 }
                 
+                return data;
+        }
+        
+        /**
+         * Exports all known data about the classifications of these samples to an excel file
+         * @param assaySamples  Assaysamples to export information about
+         * @param stream                Outputstream to write the data to
+         * @return
+         */
+        def exportClassifications( def assaySamples, OutputStream stream ) {
+                if( assaySamples == null )
+                        assaySamples = []
+
+                // Create csv file; sheetIndex is ignored
+                def sheetIndex = 0;
+
+                // Create headerrow
+                def headers = [ "level", "rankId", "taxon" ];
+                def ids = [];
+                assaySamples.each { 
+                        headers << it.sample.name 
+                        ids << it.id
+                }
+                
+                def data = retrieveClassifications( assaySamples );
+                
                 // Create an excel sheet
                 def wb = csvService.create();

trunk/grails-app/views/assay/show.gsp

@@ -65 +65 @@
         </g:if>
         <g:else>
-                <form id="sampleForm"><input type="hidden" name="assayId" value="${assay.id}" /></form>
+                <form id="sampleForm"><input type="hidden" name="assayId" value="${assay.id}" /><input type="hidden" name="entityType" value="assay" /><input type="hidden" name="entityId" value="${assay.id}" /></form>
                 <table class="paginate serverside" rel="<g:createLink controller="assay" action="showSampleData" id="${assay.id}" />" id="samples">
                         <thead>
@@ -115 +115 @@
                                         
                 <p class="options multiple">
-                        <a class="fasta" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="assaySample" action="exportAsFasta" />', '#samples', 'Please select one or more samples to export' ); return false;">Export as fasta</a>
+                        <a class="fasta" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="assaySample" action="exportAsFasta" />', '#samples', 'Please select one or more samples to export' ); return false;">Export as fasta</a><br />
+                        <a class="excel" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="assaySample" action="exportMetaData" />', '#samples', 'Please select one or more samples to export' ); return false;">Export metadata</a><br />
+                        <a class="classification_export" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="classification" action="export" />', '#samples', 'Please select one or more samples to export' ); return false;">Export classification</a><br />
                 </p>
+                
+                <p class="options multiple last">
+                        <a class="classification" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="classification" action="show" />', '#samples', 'Please select one or more samples to view classification' ); return false;">Show classification</a><br />
+                        <a class="classification_percentage" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="classification" action="percentageClassified" />', '#samples', 'Please select one or more samples to view classification' ); return false;">Percentage classified</a><br />
+                </p>            
                 
                 <div style="clear: both;"></div>

trunk/grails-app/views/classification/percentageClassified.gsp

@@ -7 +7 @@
                 <h1>Percentages classified</h1>
                 
-                <table border="0" class="paginate">
+                <table border="0" class="sortable">
                         <thead>
                                 <tr>
@@ -16 +16 @@
                                         
                                         <g:each in="${levels}" var="level">
-                                                <th>${level.value}</th>
+                                                <th class="formatted_num">${level.value}</th>
                                         </g:each>
                                 </tr>
@@ -29 +29 @@
                                         
                                         <g:each in="${item.value.data}" var="data">
-                                                <td>
-                                                        <g:if test="${item.value.numSequences > 0}">
+                                                <td><g:if test="${item.value.numSequences > 0}">
                                                                 <g:formatNumber number="${data.value.percentageClassified * 100}" format="#" />%
-                                                        </g:if>
-                                                </td>
+                                                        </g:if></td>
                                         </g:each>
                                 </tr>
@@ -39 +37 @@
                         </tbody>
                 </table>
+                <form id="sampleForm">
+                        <input type="hidden" name="entityType" value="${entityType}" />
+                        <input type="hidden" name="entityId" value="${entityId}" />
+                        <g:each in="${assaySamples}" var="assaySample"><input type="hidden" name="ids" value="${assaySample.id}"></g:each>
+                </form>
+                <p class="options">
+                        <a class="fasta" href="#" onClick="submitFormAbsoluteUrl( $( '#sampleForm' ), '<g:createLink controller="assaySample" action="exportAsFasta" />' ); return false;">Export as fasta</a>
+                        <a class="classification" href="#" onClick="submitFormAbsoluteUrl( $( '#sampleForm' ), '<g:createLink controller="classification" action="show" />' ); return false;">Show classification</a>
+                        <a class="classification_export" href="#" onClick="submitFormAbsoluteUrl( $( '#sampleForm' ), '<g:createLink controller="classification" action="export" />' ); return false;">Export classification</a>
+                        <a class="back" href="${returnUrl}">Return to ${entityType}</a>
+                </p>                    
         </body>
 </html>

trunk/grails-app/views/layouts/main.gsp

@@ -17 +17 @@
                 <script type="text/javascript" src="${resource(dir: 'js', file: 'topnav.js')}"></script>
                 <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.dataTables.min.js')}"></script>
+                <script type="text/javascript" src="${resource(dir: 'js', file: 'dataTables.formatted-num.js')}"></script>
 
                 <!-- javascript charts using flot -->

trunk/grails-app/views/run/show.gsp

@@ -100 +100 @@
         </g:if>
         <g:else>
-                <form id="sampleForm"><input type="hidden" name="runId" value="${run.id}" /></form>
+                <form id="sampleForm"><input type="hidden" name="runId" value="${run.id}" /><input type="hidden" name="entityType" value="run" /><input type="hidden" name="entityId" value="${run.id}" /></form>
                 <table class="paginate serverside" rel="<g:createLink controller="run" action="showSampleData" id="${run.id}" />" id="samples">
                         <thead>
@@ -165 +165 @@
                         <g:if test="${numReadableAssaySamples > 0}">
                                 <a class="fasta" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="assaySample" action="exportAsFasta" />', '#samples', 'Please select one or more samples to export' ); return false;">Export as fasta</a><br />
+                                <a class="excel" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="assaySample" action="exportMetaData" />', '#samples', 'Please select one or more samples to export' ); return false;">Export metadata</a><br />
+                                <a class="classification_export" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="classification" action="export" />', '#samples', 'Please select one or more samples to export' ); return false;">Export classification</a><br />
                         </g:if>
                         <g:else>
                                 <a class="fasta disabled" href="#" onClick="return false;">Export as fasta</a><br />
-                        </g:else>
-                        
+                                <a class="excel disabled" href="#" onClick="return false;">Export metadata</a><br />
+                                <a class="classification_export disabled" href="#" onClick="return false;">Export classification</a><br />
+                        </g:else>
+                </p>
+                <p class="options multiple last">
                         <g:if test="${numReadableAssaySamples > 0}">
-                                <a class="classification" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="classification" action="percentageClassified" />', '#samples', 'Please select one or more samples to view classification' ); return false;">Percentage classified</a><br />
-                        </g:if>
-                        <g:else>
-                                <a class="classification disabled" href="#" onClick="return false;">Percentage classified</a><br />
-                        </g:else>
-                        
+                                <a class="classification" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="classification" action="show" />', '#samples', 'Please select one or more samples to view classification' ); return false;">Show classification</a><br />
+                                <a class="classification_percentage" href="#" onClick="submitPaginatedForm( $( '#sampleForm' ), '<g:createLink controller="classification" action="percentageClassified" />', '#samples', 'Please select one or more samples to view classification' ); return false;">Percentage classified</a><br />
+                        </g:if>
+                        <g:else>
+                                <a class="classification disabled" href="#" onClick="return false;">Show classification</a><br />
+                                <a class="classification_percentage disabled" href="#" onClick="return false;">Percentage classified</a><br />
+                        </g:else>
                 </p>
                 

trunk/web-app/css/buttons.css

@@ -13 +13 @@
 }
 
-.options.multiple { float: left; width: 300px; }
+.options.multiple { float: left; width: 250px; }
+.options.last { float: left; width: 180px; }
 
 .options .separator { margin-left: 20px; }
@@ -19 +20 @@
 #content .options a.disabled { color: #aaa; cursor: default; }
 
+.options a.back {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/arrow_left.png);
+}
 .options a.fasta {
         background-image: url(../plugins/famfamfam-1.0.1/images/icons/brick_go.png);
@@ -52 +56 @@
         background-image: url(../plugins/famfamfam-1.0.1/images/icons/delete.png);
 }
+
+.options a.classification {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/tag_blue.png);
+}
+
+.options a.classification_percentage {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/tag_red.png);
+}
+
+.options a.classification_export {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/tag_green.png);
+}
+

trunk/web-app/css/metagenomics.css

@@ -511 +511 @@
 
 .importProcessedFiles td { vertical-align: middle; }
+
+/* Classification table */
+.filter { margin-bottom: 10px; line-height: 3em; text-align: right; float: right; margin-top: -3em; }
+.filter label { vertical-align: inherit; text-align: right; line-height: 26px; margin-right: 5px;}
+.classification .total td { font-weight: bold; }
+.classification th.sample, .classification td.value { text-align: right; }
+.classification td.level .levelnumber { display: inline-block; width: 20px; *display: inline; zoom: 1; }

trunk/web-app/js/forms.js

@@ -1 +1 @@
 function submitForm( form, url ) {
+        submitFormAbsoluteUrl( form, baseUrl + url );
+}
+
+function submitFormAbsoluteUrl( form, url ) {
         if( form == undefined || !form )
                 return;
 
-        form.attr( 'action', baseUrl + url );
+        form.attr( 'action', url );
         form.submit();
 }

trunk/web-app/js/paginate.js

@@ -24 +24 @@
                         iDisplayLength: 10,                                     // Number of items shown on one page.
                         aoColumnDefs: [
-                                { "bSortable": false, "aTargets": ["nonsortable"] }     // Disable sorting on all columns with th.nonsortable
+                                { "bSortable": false, "aTargets": ["nonsortable"] },                            // Disable sorting on all columns with th.nonsortable
+                                { "sSortDataType": "formatted-num", "aTargets": ["formatted-num"] }     // Make sorting possible on formatted numbers
                         ]                                               
                 });
@@ -54 +55 @@
                         iDisplayLength: 10,                                     // Number of items shown on one page.
                         aoColumnDefs: [
-                                { "bSortable": false, "aTargets": ["nonsortable"] }     // Disable sorting on all columns with th.nonsortable
+                                { "bSortable": false, "aTargets": ["nonsortable"] },                            // Disable sorting on all columns with th.nonsortable
+                                { "sSortDataType": "formatted-num", "aTargets": ["formatted-num"] }     // Make sorting possible on formatted numbers
                         ],
                         
@@ -81 +83 @@
         });
         
+        // Initialize tables that should be sortable, but not paginated
+        $( selector + ' .sortable').each(function(idx, el) {
+                var $el = $(el);
+                
+                $el.dataTable({ 
+                        bJQueryUI: true, 
+                        bAutoWidth: false,
+                        bFilter: false, 
+                        bLengthChange: false, 
+                        bPaginate: false,
+                        iCookieDuration: 86400,                         // Save cookie one day
+                        sScrollY: '350px',
+                        sScrollX: '100%',
+                        bScrollCollapse: true,
+                        aoColumnDefs: [
+                                { "bSortable": false, "aTargets": ["nonsortable"] },                    // Disable sorting on all columns with th.nonsortable
+                                { "sType": "formatted-num", "aTargets": ["formatted_num"] }             // Make sorting possible on formatted numbers
+                        ]                                               
+                });
+        });     
+        
         // Show hide paginated buttons
         showHidePaginatedButtons( selector );