Skip to content

Commit

Permalink
fix compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
sgratzl committed Dec 8, 2018
1 parent 8d0aac6 commit 6cfd343
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/model/Column.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import AEventDispatcher from '../internal/AEventDispatcher';
import {similar} from '../internal/math';
import {fixCSS} from '../internal/utils';
import {defaultGroup} from './Group';
import {IColumnDesc, IDataRow, IGroup, IGroupData} from './interfaces';
import {IColumnDesc, IDataRow, IGroup} from './interfaces';
import Ranking, {ISortCriteria} from './Ranking';
import {IEventListener} from '../internal/AEventDispatcher';
import {isSortingAscByDefault} from './annotations';
Expand Down
2 changes: 1 addition & 1 deletion src/model/GroupColumn.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Category, SupportType, toolbar, dialogAddons} from './annotations';
import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, ECompareValueType, dirtyCaches} from './Column';
import {IGroupData, IDataRow, IGroup} from './interfaces';
import {IDataRow, IGroup} from './interfaces';
import {missingGroup} from './missing';
import {IEventListener} from '../internal/AEventDispatcher';
import {ISequence} from '../internal/interable';
Expand Down
2 changes: 1 addition & 1 deletion src/model/ImpositionBoxPlotColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {toolbar, SortByDefault, dialogAddons} from './annotations';
import BoxPlotColumn, {mappingChanged} from './BoxPlotColumn';
import Column, {IColumnDesc, widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
import CompositeColumn, {addColumn, filterChanged, moveColumn, removeColumn} from './CompositeColumn';
import {IDataRow, IGroupData, IGroup} from './interfaces';
import {IDataRow, IGroup} from './interfaces';
import {ESortMethod, IBoxPlotColumn, INumberFilter, isBoxPlotColumn, noNumberFilter} from './INumberColumn';
import {IMappingFunction, ScaleMappingFunction, isMapAbleColumn} from './MappingFunction';
import NumbersColumn from './NumbersColumn';
Expand Down
2 changes: 1 addition & 1 deletion src/model/ImpositionCompositeColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {suffix, IEventListener} from '../internal/AEventDispatcher';
import {toolbar, SortByDefault} from './annotations';
import Column, {IColumnDesc, widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
import CompositeColumn, {addColumn, filterChanged, moveColumn, removeColumn} from './CompositeColumn';
import {IDataRow, IGroupData, IGroup} from './interfaces';
import {IDataRow, IGroup} from './interfaces';
import {isNumberColumn} from './INumberColumn';
import NumberColumn, {INumberColumn, mappingChanged, colorMappingChanged} from './NumberColumn';
import {isMapAbleColumn} from './MappingFunction';
Expand Down
8 changes: 4 additions & 4 deletions src/model/ImpositionCompositesColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {toolbar, dialogAddons, SortByDefault} from './annotations';
import Column, {IColumnDesc, widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
import CompositeColumn, {addColumn, filterChanged, moveColumn, removeColumn} from './CompositeColumn';
import {IKeyValue} from './IArrayColumn';
import {IDataRow, IGroupData} from './interfaces';
import {IDataRow, IGroup} from './interfaces';
import {EAdvancedSortMethod, INumberFilter, INumbersColumn, isNumbersColumn, noNumberFilter} from './INumberColumn';
import {IMappingFunction, ScaleMappingFunction, isMapAbleColumn} from './MappingFunction';
import NumbersColumn, {mappingChanged} from './NumbersColumn';
Expand Down Expand Up @@ -68,7 +68,7 @@ export default class ImpositionCompositesColumn extends CompositeColumn implemen

getColor(row: IDataRow) {
const c = this._children;
switch(c.length) {
switch (c.length) {
case 0:
return Column.DEFAULT_COLOR;
case 1:
Expand Down Expand Up @@ -241,8 +241,8 @@ export default class ImpositionCompositesColumn extends CompositeColumn implemen
return NumbersColumn.prototype.toCompareValueType.call(this);
}

toCompareGroupValue(group: IGroupData) {
return NumbersColumn.prototype.toCompareGroupValue.call(this, group);
toCompareGroupValue(rows: IDataRow[], group: IGroup) {
return NumbersColumn.prototype.toCompareGroupValue.call(this, rows, group);
}

toCompareGroupValueType() {
Expand Down
2 changes: 1 addition & 1 deletion src/model/Ranking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import AEventDispatcher, {suffix} from '../internal/AEventDispatcher';
import {isSortingAscByDefault} from './annotations';
import Column, {IColumnParent, IFlatColumn, visibilityChanged, dirtyValues, dirtyHeader, labelChanged, widthChanged, dirty, ICompareValue, ECompareValueType, dirtyCaches} from './Column';
import {defaultGroup, IOrderedGroup, IndicesArray} from './Group';
import {IDataRow, IGroup, IGroupData} from './interfaces';
import {IDataRow, IGroup} from './interfaces';
import {joinGroups} from './internal';
import NumberColumn, {filterChanged} from './NumberColumn';
import CompositeColumn from './CompositeColumn';
Expand Down
2 changes: 0 additions & 2 deletions src/provider/LocalDataProvider.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import {IAbortAblePromise} from 'lineupengine';
import {IValueStatistics} from '../internal';
import {ISequence, lazySeq} from '../internal/interable';
import Column, {defaultGroup, IColumnDesc, IDataRow, IGroup, IndicesArray, INumberColumn, IOrderedGroup, mapIndices} from '../model';
import Ranking, {EDirtyReason} from '../model/Ranking';
Expand Down
6 changes: 6 additions & 0 deletions src/provider/RemoteDataProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {defaultGroup, IndicesArray} from '../model/Group';
import Ranking from '../model/Ranking';
import ACommonDataProvider from './ACommonDataProvider';
import {IDataProviderOptions} from './interfaces';
import {DirectRenderTasks} from './tasks';

/**
* interface what the server side has to provide
Expand Down Expand Up @@ -71,6 +72,11 @@ export default class RemoteDataProvider extends ACommonDataProvider {
return this.cache.size;
}

getTaskExecutor() {
// FIXME
return new DirectRenderTasks([]);
}

sort(ranking: Ranking) {
//use the server side to sort
return this.server.sort(ranking).then((order) => ({groups: [Object.assign({order}, defaultGroup)], index2pos: createIndex2Pos(order)}));
Expand Down

0 comments on commit 6cfd343

Please sign in to comment.