Skip to content

Commit

Permalink
Version 1.4.19
Browse files Browse the repository at this point in the history
CodeFirstWebFramework 1.1.4.
Added charts.
  • Loading branch information
nikkilocke committed Mar 21, 2018
1 parent 421f5ab commit 3fe7ce0
Show file tree
Hide file tree
Showing 17 changed files with 2,048 additions and 152 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@
/Setup/*.msi
/contentFiles
/Setup/Release
/docs
/*.cmd
5 changes: 3 additions & 2 deletions AccountServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="CodeFirstWebFramework, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\CodeFirstWebFramework.1.1.2\lib\net452\CodeFirstWebFramework.dll</HintPath>
<Reference Include="CodeFirstWebFramework, Version=1.1.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\CodeFirstWebFramework.1.1.4\lib\net452\CodeFirstWebFramework.dll</HintPath>
</Reference>
<Reference Include="Markdig, Version=0.14.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Markdig.0.14.9\lib\net40\Markdig.dll</HintPath>
Expand Down Expand Up @@ -121,6 +121,7 @@
<Compile Include="AppModule.cs" />
<Compile Include="Banking.cs" />
<Compile Include="BankingAccounting.cs" />
<Compile Include="Charts.cs" />
<Compile Include="Help.cs" />
<Compile Include="Home.cs" />
<Compile Include="CsvParser.cs" />
Expand Down
45 changes: 45 additions & 0 deletions AccountServer/accounts.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,51 @@ var DocType = {
Gain:16,
Subscriptions:17
};
// Replace default multi select filter with one with negation
Type.multiSelectFilter = {
// Report multi select filter
defaultContent: function(index, col) {
return '<div><select multiple data-col="' + col.name + '" ' + col.attributes + '/>Exclude selected items <input type="checkbox" data-col="' + col.name + '" ' + col.attributes + '/></div>';
},
draw: function(data, rowno, row) {
var select = '<div><select id="r' + rowno + 'c' + this.name + '" data-col="' + this.name + '" multiple />Exclude selected items <input type="checkbox" data-col="' + this.name + '" ' + this.attributes + '/></div>';
var jselect = $(select);
if(this.selectOptions) {
addOptionsToSelect(jselect.find('select'), this.selectOptions, data, this);
select = jselect.html();
_.each(data.items, function(d) {
select = select.replace(' value="' + d + '"', ' value="' + d + '" selected');
});
}
if(data.negate)
jselect.find('input').attr('checked', data.negate);
return select;
},
update: function(cell, data, rowno, row) {
var i = cell.find('select');
if(i.length && i.attr('id')) {
i.val(data);
} else {
cell.html(this.draw(data, rowno, row));
i = cell.find('select');
}
if(i.css('display') != 'none')
i.multiselect({
selectedList: 2,
uncheckAllText: 'No filter',
noneSelectedText: 'No filter'
});
cell.find('input').prop('checked', data.negate);
},
inputValue: function(field, row) {
var cell = $(field).closest('td');
return {
items: cell.find('select').multiselect("getChecked").map(function() { return this.value; }).get(),
negate: cell.find('input').prop('checked')
};
}
};


/**
* When user clicks on an item in a list, open it
Expand Down
10 changes: 10 additions & 0 deletions AccountServer/chart.bundle.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 3fe7ce0

Please sign in to comment.