Add Features from cwohlman fork

KoGrid.css

@@ -1,4 +1,4 @@
-
+
 /******** Grid Global ********/
 .kglabel {
     display: block;
@@ -186,16 +186,30 @@
     position: absolute;
     border-bottom: 1px solid rgb(229, 229, 229);
 }
+/* 
+    For Grids with group totals we can use a simple css even selector since 
+    we want grouped rows to also have a striped background color,
+    we'll want to move this css change to a binding when we add in an option for group totals vs group labels.
+*/
+/*
 .kgRow.even {
     background-color: rgb(243, 243, 243);
 }
 .kgRow.odd {
     background-color: rgb(253, 253, 253);
 }
+*/
+.kgRow:nth-child(even):not(.selected) {
+  background-color: #c4dcf2;
+}
 .kgRow.selected {
     background-color: rgb(189, 208, 203);
 }
 
+.kgCell.selected {
+    background-color: rgb(169, 178, 173);
+}
+
 /******** Cells ********/
 
 .kgCell {
@@ -285,25 +299,44 @@ input {
     line-height: 20px;
     white-space:nowrap;
 }
-.kgAggArrowExpanded {
+.kgAggArrowExpanded, .kgAggArrowCollapsed {
+    left: 0;
+    bottom: 0;
+    width: 20px;
+    height: 20px;
+    cursor: pointer;
+    margin-top: 10px;
+    margin-left: 5px;
+    margin-right: 5px;
+    float: right;
+    position: relative;
+}
+.icon- {
     position: absolute;
+    left: 7px;
+    bottom: 8px;
+}
+.kgAggArrowExpanded i.icon- {
+    background-position: -433px -96px;
+/*    position: absolute;
     left: 8px;
     bottom: 10px;
     width: 0;
     height: 0;
     border-style: solid;
     border-width: 0 0 9px 9px;
-    border-color: transparent transparent #000000 transparent;
+    border-color: transparent transparent #000000 transparent;*/
 }
-.kgAggArrowCollapsed {
-    position: absolute;
+.kgAggArrowCollapsed i.icon- {
+    background-position: -408px -96px;
+/*    position: absolute;
     left: 8px;
     bottom: 10px;
     width: 0;
     height: 0;
     border-style: solid;
     border-width: 5px 0 5px 8.7px;
-    border-color: transparent transparent transparent #000000;
+    border-color: transparent transparent transparent #000000;*/
 }
 
 .kgHeaderButton {

README.md

@@ -1,3 +1,17 @@
+#A koGrid Fork
+This is a koGrid fork with several features and bugfixes:
+
+ - Added grouped rows and aggregation
+ - Add a footer row which will show totals for each column
+ - Improve the naming of the group column
+ - Support for sorting grouped grids
+ - Create Expand/Collapse-all buttons
+ - Improve speed of grouped grid, esp when expanding and collapsing rows
+ - Add an amd module output to the build process
+ - Add cell selection and improve row selection
+
+To see the grid in action please see the [example page] (http://cwohlman.github.io/KoGrid/)
+
 #koGrid : A Knockout DataGrid#
 
 __Contributors:__

build/build-order.txt

@@ -5,9 +5,10 @@
 ..\src\templates\gridTemplate.html
 ..\src\templates\rowTemplate.html
 ..\src\templates\cellTemplate.html
-..\src\templates\aggregateTemplate.html
+..\src\templates\aggregateTemplate.js
 ..\src\templates\headerRowTemplate.html
 ..\src\templates\headerCellTemplate.html
+..\src\templates\aggCellTemplate.html
 ..\src\bindingHandlers\ko-grid.js
 ..\src\bindingHandlers\kg-row.js
 ..\src\bindingHandlers\kg-cell.js
@@ -24,6 +25,7 @@
 ..\src\classes\row.js
 ..\src\classes\searchProvider.js
 ..\src\classes\selectionService.js
+..\src\classes\aggregationProvider.js
 ..\src\classes\styleProvider.js
 ..\src\classes\sortService.js
 ..\src\classes\domUtilityService.js

build/build.bat

@@ -0,0 +1,2 @@
+powershell .\build.ps1
+powershell .\buildamd.ps1

build/build.ps1

@@ -15,7 +15,7 @@ Set-Content $TempFile "/***********************************************";
 Add-Content $TempFile "* koGrid JavaScript Library";
 Add-Content $TempFile "* Authors: https://github.com/ericmbarnard/koGrid/blob/master/README.md";
 Add-Content $TempFile "* License: MIT (http://www.opensource.org/licenses/mit-license.php)";
-Add-Content $TempFile "* Compiled At: $compileTime";
+#Add-Content $TempFile "* Compiled At: $compileTime";
 Add-Content $TempFile "***********************************************/`n"
 Add-Content $TempFile "(function (window) {";
 Add-Content $TempFile "'use strict';";
@@ -39,4 +39,4 @@ Add-Content $TempFile "}(window));";
 Get-Content $TempFile | Set-Content $OutputFile;
 Remove-Item $TempFile -Force;
 Copy-Item $OutputFile $FinalFile;
-Write-Host "Build Succeeded!"
+Write-Host "Build Succeeded!"

build/buildamd.ps1

@@ -0,0 +1,44 @@
+
+$CurrentDir = (Get-Location).Path;
+$OutPutFile = $CurrentDir + "\koGrid.AMD.debug.js";
+$TempFile = $OutPutFile + ".temp";
+$FinalFile = "..\koGrid-2.1.1.AMD.debug.js";
+$BuildOrder = $CurrentDir + "\build-order.txt";
+$commentStart = "<!--";
+$commentEnd = "-->";
+
+Write-Host "JSBuild Starting...";
+$files = Get-Content $BuildOrder;
+$compileTime = Get-Date;
+
+Set-Content $TempFile "/***********************************************";
+Add-Content $TempFile "* koGrid JavaScript Library";
+Add-Content $TempFile "* Authors: https://github.com/ericmbarnard/koGrid/blob/master/README.md";
+Add-Content $TempFile "* License: MIT (http://www.opensource.org/licenses/mit-license.php)";
+#Add-Content $TempFile "* Compiled At: $compileTime";
+Add-Content $TempFile "***********************************************/`n"
+Add-Content $TempFile "define(['jquery', 'knockout'], function (`$, ko) {";
+Add-Content $TempFile "(function (window) {";
+Add-Content $TempFile "'use strict';";
+Foreach ($file in $files){
+	# Wrap each file output in a new line
+	Write-Host "Building... $file";
+	Add-Content $TempFile "`n/***********************************************`n* FILE: $file`n***********************************************/";
+	$fileContents = Get-Content $file | where {!$_.StartsWith("///")};
+	if ($fileContents[0].StartsWith("<!--")){
+	    $compiledContent = $fileContents[0].TrimStart($commentStart).TrimEnd($commentEnd).Trim() + " = function(){ return '";
+	    for ($indx = 1; $indx -lt $fileContents.Length; $indx++){
+		    $compiledContent += $fileContents[$indx].Trim().Replace("'", "\'");
+		}
+	    $compiledContent += "';};";
+		Add-Content $TempFile $compiledContent; 
+	} else {
+	    Add-Content $TempFile $fileContents;
+	}
+}
+Add-Content $TempFile "}(window));";
+Add-Content $TempFile "return kg;});";
+Get-Content $TempFile | Set-Content $OutputFile;
+Remove-Item $TempFile -Force;
+Copy-Item $OutputFile $FinalFile;
+Write-Host "Build Succeeded!"