LIMS-1622: Move units to column headers

Author: Mark Williams

client/src/js/modules/dc/views/summary.js

@@ -149,15 +149,15 @@ define(['backbone',
             var columns = [
                 { label: '', cell: table.TemplateCell, editable: false, template: '<a href="/dc/visit/'+this.visit+'/id/<%-ID%>" class="button button-notext"><i class="fa fa-search"></i> <span>View Data Collection</span></a>' },
                 { name: 'PREFIX', label: 'Prefix', cell: 'string', editable: false },
-                { name: 'SAMPLE', label: 'Sample', cell: table.TemplateCell, template: '<a href="/samples/sid/<%-BLSAMPLEID%>"><%-SAMPLE%></a>',editable: false },
-                { name: 'ENERGY', label: 'Energy', cell: table.TemplateCell, template: '<%-ENERGY%>eV', editable: false },
-                { name: 'RESOLUTION', label: 'Det Resolution', cell: table.TemplateCell, template: '<%-RESOLUTION%>Å', editable: false },
+                { name: 'SAMPLE', label: 'Sample', cell: table.TemplateCell, template: '<a href="/samples/sid/<%-BLSAMPLEID%>"><%-SAMPLE%></a>', editable: false },
+                { name: 'ENERGY', label: 'Energy (eV)', cell: 'string', editable: false },
+                { name: 'RESOLUTION', label: 'Det Resolution (Å)', cell: 'string', editable: false },
                 { name: 'PIPELINE', label: 'Pipeline', cell: 'string', editable: false },
                 { name: 'SG', label: 'Spacegroup', cell: 'string', editable: false },
-                { name: 'CELL', label: 'Unit Cell', cell: table.TemplateCell, template: '<%-CELL_A%>Å (<%-CELL_AL%>°)<br /><%-CELL_B%>Å (<%-CELL_BE%>°)<br /><%-CELL_C%>Å (<%-CELL_GA%>°)', editable: false },
-                { name: 'RES', label: 'Resolution', cell: table.TemplateCell, template: '<%-OVERALLRLOW%>Å - <%-OVERALLRHIGH%>Å<br /><%-INNERRLOW%>Å - <%-INNERRHIGH%>Å<br /><%-OUTERRLOW%>Å - <%-OUTERRHIGH%>Å', editable: false },
-                { name: 'COMPLETENESS', label: 'Completeness', cell: table.TemplateCell, template: '<span class="<%-OVERALLCOMPLETENESSCLASS%>"><%-OVERALLCOMPLETENESS%>%</span><br /><span class="<%-INNERCOMPLETENESSCLASS%>"><%-INNERCOMPLETENESS%>%</span><br /><span class="<%-OUTERCOMPLETENESSCLASS%>"><%-OUTERCOMPLETENESS%>%</span>', editable: false },
-                { name: 'ANOMCOMPLETENESS', label: 'Anom Completeness', cell: table.TemplateCell, template: '<span class="<%-ANOMOVERALLCOMPLETENESSCLASS%>"><%-ANOMOVERALLCOMPLETENESS%>%</span><br /><span class="<%-ANOMINNERCOMPLETENESSCLASS%>"><%-ANOMINNERCOMPLETENESS%>%</span><br /><span class="<%-ANOMOUTERCOMPLETENESSCLASS%>"><%-ANOMOUTERCOMPLETENESS%>%</span>', editable: false },
+                { name: 'CELL', label: 'Unit Cell (Å (°))', cell: table.TemplateCell, template: '<%-CELL_A%> (<%-CELL_AL%>)<br /><%-CELL_B%> (<%-CELL_BE%>)<br /><%-CELL_C%> (<%-CELL_GA%>)', editable: false },
+                { name: 'RES', label: 'Resolution (Å)', cell: table.TemplateCell, template: '<%-OVERALLRLOW%> - <%-OVERALLRHIGH%><br /><%-INNERRLOW%> - <%-INNERRHIGH%><br /><%-OUTERRLOW%> - <%-OUTERRHIGH%>', editable: false },
+                { name: 'COMPLETENESS', label: 'Completeness (%)', cell: table.TemplateCell, template: '<span class="<%-OVERALLCOMPLETENESSCLASS%>"><%-OVERALLCOMPLETENESS%></span><br /><span class="<%-INNERCOMPLETENESSCLASS%>"><%-INNERCOMPLETENESS%></span><br /><span class="<%-OUTERCOMPLETENESSCLASS%>"><%-OUTERCOMPLETENESS%></span>', editable: false },
+                { name: 'ANOMCOMPLETENESS', label: 'Anom Completeness (%)', cell: table.TemplateCell, template: '<span class="<%-ANOMOVERALLCOMPLETENESSCLASS%>"><%-ANOMOVERALLCOMPLETENESS%></span><br /><span class="<%-ANOMINNERCOMPLETENESSCLASS%>"><%-ANOMINNERCOMPLETENESS%></span><br /><span class="<%-ANOMOUTERCOMPLETENESSCLASS%>"><%-ANOMOUTERCOMPLETENESS%></span>', editable: false },
                 { name: 'INNERRMEAS', label: 'Rmeas Inner', cell: 'string', editable: false },
                 { name: 'OUTERCCHALF', label: 'CC½ Outer', cell: 'string', editable: false },
                 { name: 'INNERCCANOM', label: 'CCanom Inner', cell: 'string', editable: false },