hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Replace NGX Datatable with ANgular Material Tables #39

Merged
hardi merged 1 commits from task/1.8.0-material-scoreboard into release/v1.8.0 2018-07-15 13:21:14 +02:00
Conversation 0 Commits 1 Files Changed 4
4 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
static/package-lock.json generated
View File

@ -644,11 +644,6 @@
}
}
},
"@swimlane/ngx-datatable": {
"version": "13.0.1",
"resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-13.0.1.tgz",
"integrity": "sha512-jjMEzQhXcdD+jfKNp+7U61lWx9ZzSGDn9QbpY6pJOJwz+E2CKeek6OouT5Qcc4MY4oFL9g/SZoPjLf90cbNIRw=="
},
"@types/jasmine": {
"version": "2.5.38",
"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.38.tgz",

1
static/package.json
View File

@ -29,7 +29,6 @@
"@angular/platform-browser-dynamic": "^6.0.7",
"@angular/router": "^6.0.7",
"@swimlane/ngx-charts": "^8.1.0",
"@swimlane/ngx-datatable": "^13.0.1",
"bootstrap": "^3.3.7",
"d3": "^4.11.0",
"file-saver": "^1.3.8",

37
static/src/app/statistic/campaign/highscore/highscore.component.html
View File

@ -49,42 +49,5 @@
</table>
</div>
</div>
<!--<ngx-datatable-->
<!--[rows]="players[attributeMap.prop]"-->
<!--[messages]="emptyMessage"-->
<!--[headerHeight]="cellHeight"-->
<!--[rowHeight]="cellHeight"-->
<!--[cssClasses]='customClasses'-->
<!--[columnMode]="'force'"-->
<!--[scrollbarV]="true"-->
<!--[selectionType]="'single'">-->
<!--<ngx-datatable-column [width]="numberColWidth" name="#" prop="num"></ngx-datatable-column>-->
<!--<ngx-datatable-column name="Spieler" prop="name" [width]="nameColWidth" style="padding-left:10px">-->
<!--<ng-template ngx-datatable-cell-template let-row="row" let-value="value">-->
<!--<span class="player-name"-->
<!--[style.color]="row['fraction'] === 'BLUFOR' ? fraction.COLOR_BLUFOR : fraction.COLOR_OPFOR">-->
<!--{{value}}-->
<!--</span>-->
<!--</ng-template>-->
<!--</ngx-datatable-column>-->
<!--<ngx-datatable-column [width]="valueColWidth" prop="{{attributeMap.prop}}">-->
<!--<ng-template ngx-datatable-header-template let-sort="sortFn">-->
<!--<span class="datatable-header-cell-wrapper">-->
<!--<span class="datatable-header-cell-label text-truncate" matTooltip="{{attributeMap.head}}" (click)="sort()">-->
<!--<img src="../../../../assets/scoreboard/{{attributeMap.prop}}.png" alt="{{attributeMap.head}}">-->
<!--</span>-->
<!--</span>-->
<!--</ng-template>-->
<!--<ng-template ngx-datatable-cell-template let-row="row" let-value="value">-->
<!--<span style="padding-left: 7px;">-->
<!--{{value}}-->
<!--</span>-->
<!--</ng-template>-->
<!--</ngx-datatable-column>-->
<!--</ngx-datatable>-->
<!--</div>-->
</div>

5
static/src/app/statistic/stats.module.ts
View File

@ -5,7 +5,6 @@ import {statsRouterModule, statsRoutingComponents} from './stats.routing';
import {WarService} from '../services/logs/war.service';
import {NgxChartsModule} from '@swimlane/ngx-charts';
import {CampaignService} from '../services/logs/campaign.service';
import {NgxDatatableModule} from '@swimlane/ngx-datatable';
import {PlayerService} from '../services/logs/player.service';
import {LogsService} from '../services/logs/logs.service';
import {MatButtonModule, MatButtonToggleModule, MatExpansionModule, MatTableModule, MatSortModule} from '@angular/material';
@ -13,8 +12,8 @@ import {MatButtonModule, MatButtonToggleModule, MatExpansionModule, MatTableModu
@NgModule({
declarations: statsRoutingComponents,
imports: [CommonModule, SharedModule, statsRouterModule, NgxChartsModule, NgxDatatableModule,
MatButtonModule, MatExpansionModule, MatButtonToggleModule, MatTableModule, MatSortModule],
imports: [CommonModule, SharedModule, statsRouterModule, NgxChartsModule, MatButtonModule, MatExpansionModule,
MatButtonToggleModule, MatTableModule, MatSortModule],
providers: [WarService, CampaignService, PlayerService, LogsService]
})
export class StatsModule {