PUNKT-28 Ranking studentów per test
This commit is contained in:
parent
35983aaa6d
commit
92097b2237
@ -41,6 +41,7 @@
|
|||||||
"popper.js": "^1.12.9",
|
"popper.js": "^1.12.9",
|
||||||
"primeicons": "^1.0.0",
|
"primeicons": "^1.0.0",
|
||||||
"primeng": "^6.1.7",
|
"primeng": "^6.1.7",
|
||||||
|
"ngx-csv": "^0.3.1",
|
||||||
"rxjs": "^5.5.2",
|
"rxjs": "^5.5.2",
|
||||||
"zone.js": "^0.8.14"
|
"zone.js": "^0.8.14"
|
||||||
},
|
},
|
||||||
|
@ -46,6 +46,7 @@ import { BagdesComponent } from './user/bagdes/bagdes.component';
|
|||||||
import { RankingComponent } from './groups/ranking/ranking.component';
|
import { RankingComponent } from './groups/ranking/ranking.component';
|
||||||
import { HistoryOfActivityInGroupComponent } from './groups/history-of-activity-in-group/history-of-activity-in-group.component';
|
import { HistoryOfActivityInGroupComponent } from './groups/history-of-activity-in-group/history-of-activity-in-group.component';
|
||||||
import { LoginUsosComponent } from './login/login-usos/login-usos.component';
|
import { LoginUsosComponent } from './login/login-usos/login-usos.component';
|
||||||
|
import { TestsInGroupResultsComponent } from './groups/tests-in-group-results/tests-in-group-results.component';
|
||||||
|
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
@ -87,7 +88,8 @@ const routes: Routes = [
|
|||||||
{ path: 'groups/ranking/:id', component: RankingComponent , canActivate: [AuthGuard] },
|
{ path: 'groups/ranking/:id', component: RankingComponent , canActivate: [AuthGuard] },
|
||||||
{ path: 'groups/waiting-resources/:id', component: WaitingResourcesComponent, canActivate: [AuthGuard] },
|
{ path: 'groups/waiting-resources/:id', component: WaitingResourcesComponent, canActivate: [AuthGuard] },
|
||||||
{ path: 'groups/waiting-resources/:id', component: WaitingResourcesComponent, canActivate: [AuthGuard] },
|
{ path: 'groups/waiting-resources/:id', component: WaitingResourcesComponent, canActivate: [AuthGuard] },
|
||||||
{ path: 'groups/history/:id', component: HistoryOfActivityInGroupComponent, canActivate: [AuthGuard] }
|
{ path: 'groups/history/:id', component: HistoryOfActivityInGroupComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'groups/tests-results/:id', component: TestsInGroupResultsComponent, canActivate: [AuthGuard] }
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
@ -6,6 +6,9 @@
|
|||||||
|
|
||||||
<button class="btn btn-study-cave float-right mr-1" (click)="goToRankings()"><i class="fas fa-trophy"></i>
|
<button class="btn btn-study-cave float-right mr-1" (click)="goToRankings()"><i class="fas fa-trophy"></i>
|
||||||
Rankingi</button>
|
Rankingi</button>
|
||||||
|
|
||||||
|
<button *ngIf="group?.owner===currentUser.username" class="btn btn-study-cave float-right mr-1" (click)="goToTestsResults()"><i class="fas fa-trophy"></i>
|
||||||
|
Wyniki za testy</button>
|
||||||
<div style="clear: both;"></div>
|
<div style="clear: both;"></div>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
|
@ -249,6 +249,10 @@ export class GroupDetailsComponent implements OnInit, OnDestroy {
|
|||||||
this.router.navigate(['groups/ranking', this.id]);
|
this.router.navigate(['groups/ranking', this.id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
goToTestsResults() {
|
||||||
|
this.router.navigate(['groups/tests-results', this.id]);
|
||||||
|
}
|
||||||
|
|
||||||
goToHistory() {
|
goToHistory() {
|
||||||
this.router.navigate(['groups/history', this.id]);
|
this.router.navigate(['groups/history', this.id]);
|
||||||
}
|
}
|
||||||
|
@ -30,3 +30,20 @@ export class ActivityHistory {
|
|||||||
|
|
||||||
constructor() {}
|
constructor() {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class TestsInGroup {
|
||||||
|
public id: number;
|
||||||
|
public title: string;
|
||||||
|
public maxScore: number;
|
||||||
|
|
||||||
|
constructor() {}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class TestsInGroupResults {
|
||||||
|
public name: string;
|
||||||
|
public surname: string;
|
||||||
|
public userScore: number;
|
||||||
|
public percent: number;
|
||||||
|
|
||||||
|
constructor() {}
|
||||||
|
}
|
||||||
|
@ -30,6 +30,7 @@ import { MaterialToGroupPreviewComponent } from './waiting-resources/material-to
|
|||||||
import { FlashcardsToGroupPreviewComponent } from './waiting-resources/flashcards-to-group-preview/flashcards-to-group-preview.component';
|
import { FlashcardsToGroupPreviewComponent } from './waiting-resources/flashcards-to-group-preview/flashcards-to-group-preview.component';
|
||||||
import { RankingComponent } from './ranking/ranking.component';
|
import { RankingComponent } from './ranking/ranking.component';
|
||||||
import { HistoryOfActivityInGroupComponent } from './history-of-activity-in-group/history-of-activity-in-group.component';
|
import { HistoryOfActivityInGroupComponent } from './history-of-activity-in-group/history-of-activity-in-group.component';
|
||||||
|
import { TestsInGroupResultsComponent } from './tests-in-group-results/tests-in-group-results.component';
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
@ -63,7 +64,8 @@ import { HistoryOfActivityInGroupComponent } from './history-of-activity-in-grou
|
|||||||
MaterialToGroupPreviewComponent,
|
MaterialToGroupPreviewComponent,
|
||||||
FlashcardsToGroupPreviewComponent,
|
FlashcardsToGroupPreviewComponent,
|
||||||
RankingComponent,
|
RankingComponent,
|
||||||
HistoryOfActivityInGroupComponent
|
HistoryOfActivityInGroupComponent,
|
||||||
|
TestsInGroupResultsComponent
|
||||||
|
|
||||||
],
|
],
|
||||||
providers: [GroupsService, ConfirmationService]
|
providers: [GroupsService, ConfirmationService]
|
||||||
|
@ -28,6 +28,9 @@ export class GroupsService {
|
|||||||
|
|
||||||
private getActivityHistoryURL = 'groups/{groupId}/users/activity?sort={sort}';
|
private getActivityHistoryURL = 'groups/{groupId}/users/activity?sort={sort}';
|
||||||
|
|
||||||
|
private getTestsInGroupsURL = 'groups/{groupId}/tests';
|
||||||
|
private getResultsInTestsURL = 'groups/{groupId}/tests/{testId}/results';
|
||||||
|
|
||||||
constructor(private httpClient: HttpClient, private authenticationService: AuthenticationService) {
|
constructor(private httpClient: HttpClient, private authenticationService: AuthenticationService) {
|
||||||
this.setHeaders();
|
this.setHeaders();
|
||||||
}
|
}
|
||||||
@ -45,6 +48,18 @@ export class GroupsService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getTestsInGroups(groupId: number): Observable<any> {
|
||||||
|
this.setHeaders();
|
||||||
|
const url = this.getTestsInGroupsURL.replace('{groupId}', groupId.toString());
|
||||||
|
return this.httpClient.get(url, { headers: this.headers });
|
||||||
|
}
|
||||||
|
|
||||||
|
getResultsInTests(groupId: number, testId: number): Observable<any> {
|
||||||
|
this.setHeaders();
|
||||||
|
const url = this.getResultsInTestsURL.replace('{groupId}', groupId.toString()).replace('{testId}', testId.toString());
|
||||||
|
return this.httpClient.get(url, { headers: this.headers });
|
||||||
|
}
|
||||||
|
|
||||||
getGroups(): Observable<any> {
|
getGroups(): Observable<any> {
|
||||||
this.setHeaders();
|
this.setHeaders();
|
||||||
const url = this.getGroupsURL;
|
const url = this.getGroupsURL;
|
||||||
|
@ -0,0 +1,24 @@
|
|||||||
|
.wrapper{
|
||||||
|
width: 100%;
|
||||||
|
padding: 30px;
|
||||||
|
min-height: 100%;
|
||||||
|
margin-bottom: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content{
|
||||||
|
background-color: #181616;
|
||||||
|
padding: 30px;
|
||||||
|
margin-top: 2rem;
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
text-align: center;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
ag-grid-angular{
|
||||||
|
margin: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.buttons-container > div{
|
||||||
|
margin: 10px;
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
<div class="wrapper">
|
||||||
|
<div class="content">
|
||||||
|
<h1>{{group?.name}}</h1>
|
||||||
|
<br />
|
||||||
|
<div>
|
||||||
|
<h2>Wybierz test aby zobaczyć wyniki:</h2>
|
||||||
|
<br />
|
||||||
|
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="data" [columnDefs]="columnDefs"
|
||||||
|
[enableSorting]="true" [enableFilter]="true" (gridReady)="onGridReady($event)" [gridOptions]="gridOptions"
|
||||||
|
[pagination]="true" [paginationAutoPageSize]="true" [localeText]="localeText" (gridColumnsChanged)="onGridColumnsChanged($event)"
|
||||||
|
(rowClicked)="onRowClicked($event)" (gridSizeChanged)="onGridSizeChanged($event)">
|
||||||
|
</ag-grid-angular>
|
||||||
|
</div>
|
||||||
|
<br /><br />
|
||||||
|
<div *ngIf="selectedTest">
|
||||||
|
<h2>Wybrany test: {{selectedTest.title}}</h2>
|
||||||
|
<br />
|
||||||
|
<button class="btn btn-study-cave float-right mr-1" (click)="downloadCSVResults()">Pobierz plik CSV z wynikami</button>
|
||||||
|
<div style="clear: both;"></div>
|
||||||
|
<br />
|
||||||
|
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="testdata" [columnDefs]="testcolumnDefs"
|
||||||
|
[enableSorting]="true" [enableFilter]="true" (gridReady)="testonGridReady($event)" [gridOptions]="testgridOptions"
|
||||||
|
[pagination]="true" [paginationAutoPageSize]="true" [localeText]="localeText" (gridColumnsChanged)="testonGridColumnsChanged($event)"
|
||||||
|
(rowClicked)="testonRowClicked($event)" (gridSizeChanged)="testonGridSizeChanged($event)">
|
||||||
|
</ag-grid-angular>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { TestsInGroupResultsComponent } from './tests-in-group-results.component';
|
||||||
|
|
||||||
|
describe('TestsInGroupResultsComponent', () => {
|
||||||
|
let component: TestsInGroupResultsComponent;
|
||||||
|
let fixture: ComponentFixture<TestsInGroupResultsComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ TestsInGroupResultsComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(TestsInGroupResultsComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
@ -0,0 +1,189 @@
|
|||||||
|
import { Component, OnInit, OnDestroy } from '@angular/core';
|
||||||
|
import { ActivatedRoute } from '@angular/router';
|
||||||
|
import { GroupsService } from '../groups.service';
|
||||||
|
import { Group, TestsInGroup, TestsInGroupResults } from '../group';
|
||||||
|
import { Subscription } from 'rxjs/Subscription';
|
||||||
|
import localeText from './../../../assets/localeText';
|
||||||
|
import { GridOptions, RowDoubleClickedEvent } from 'ag-grid-community/main';
|
||||||
|
import { MatSnackBar } from '@angular/material';
|
||||||
|
|
||||||
|
import { ngxCsv } from 'ngx-csv/ngx-csv';
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-tests-in-group-results',
|
||||||
|
templateUrl: './tests-in-group-results.component.html',
|
||||||
|
styleUrls: ['./tests-in-group-results.component.css']
|
||||||
|
})
|
||||||
|
export class TestsInGroupResultsComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
|
id: number;
|
||||||
|
currentUser;
|
||||||
|
subs: Subscription[] = [];
|
||||||
|
public group: Group;
|
||||||
|
public selectedTest: TestsInGroup;
|
||||||
|
|
||||||
|
public localeText = localeText;
|
||||||
|
|
||||||
|
// chooseTests
|
||||||
|
public data: TestsInGroup[] = [];
|
||||||
|
public gridApi;
|
||||||
|
public gridOptions: GridOptions;
|
||||||
|
public columnDefs = [
|
||||||
|
{ headerName: 'ID', field: 'id', headerTooltip: 'ID' },
|
||||||
|
{ headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' },
|
||||||
|
{ headerName: 'Liczba punktów do zdobycia', field: 'maxScore', headerTooltip: 'Liczba punktów do zdobycia', hide: false }
|
||||||
|
];
|
||||||
|
|
||||||
|
// showTestResult
|
||||||
|
public testdata: TestsInGroupResults[] = [];
|
||||||
|
public testgridApi;
|
||||||
|
public testgridOptions: GridOptions;
|
||||||
|
public testcolumnDefs = [
|
||||||
|
{ headerName: 'Imię', field: 'name', headerTooltip: 'Imię' },
|
||||||
|
{ headerName: 'Nazwisko', field: 'surname', headerTooltip: 'Nazwisko' },
|
||||||
|
{ headerName: 'Wynik', field: 'userScore', headerTooltip: 'Wynik', hide: false },
|
||||||
|
{ headerName: 'Wynik (%)', field: 'percent', headerTooltip: 'Wynik (%)', hide: false }
|
||||||
|
];
|
||||||
|
|
||||||
|
constructor(private route: ActivatedRoute,
|
||||||
|
private groupService: GroupsService,
|
||||||
|
public snackBar: MatSnackBar) { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.id = this.route.snapshot.params.id;
|
||||||
|
this.currentUser = JSON.parse(localStorage.getItem('currentUser'));
|
||||||
|
this.subs.push(
|
||||||
|
this.groupService.getGroupDetails(this.id)
|
||||||
|
.subscribe(
|
||||||
|
data => {
|
||||||
|
this.group = data;
|
||||||
|
this.getTests();
|
||||||
|
localStorage.setItem('groupOwnerUsername', this.group.owner);
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
this.gridOptions = {
|
||||||
|
rowHeight: 50,
|
||||||
|
headerHeight: 25,
|
||||||
|
getRowStyle: function (params) {
|
||||||
|
return {
|
||||||
|
cursor: 'pointer'
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
this.testgridOptions = {
|
||||||
|
rowHeight: 50,
|
||||||
|
headerHeight: 25,
|
||||||
|
getRowStyle: function (params) {
|
||||||
|
return {
|
||||||
|
cursor: 'pointer'
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
getTests() {
|
||||||
|
this.subs.push(this.groupService.getTestsInGroups(this.id).subscribe(
|
||||||
|
success => {
|
||||||
|
this.data = success;
|
||||||
|
},
|
||||||
|
error => {
|
||||||
|
console.log(error);
|
||||||
|
this.snackBar.open('Nie udało się załadować listy testów!', null,
|
||||||
|
{ duration: 3000, verticalPosition: 'top', panelClass: ['snackbar-error'] });
|
||||||
|
}
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
goTo(event: RowDoubleClickedEvent) {
|
||||||
|
this.selectedTest = event.data;
|
||||||
|
this.getResults(event.data.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
downloadCSVResults() {
|
||||||
|
// tslint:disable-next-line:no-unused-expression
|
||||||
|
new ngxCsv(this.testdata, this.selectedTest.title + '_wyniki');
|
||||||
|
}
|
||||||
|
|
||||||
|
getResults(id: number) {
|
||||||
|
this.subs.push(this.groupService.getResultsInTests(this.id, id).subscribe(
|
||||||
|
success => {
|
||||||
|
this.testdata = success;
|
||||||
|
},
|
||||||
|
error => {
|
||||||
|
console.log(error);
|
||||||
|
this.snackBar.open('Nie udało się załadować wyników za test!', null,
|
||||||
|
{ duration: 3000, verticalPosition: 'top', panelClass: ['snackbar-error'] });
|
||||||
|
}
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy() {
|
||||||
|
if (this.subs) {
|
||||||
|
this.subs.forEach(x => x.unsubscribe());
|
||||||
|
}
|
||||||
|
|
||||||
|
localStorage.removeItem('groupOwnerUsername');
|
||||||
|
}
|
||||||
|
|
||||||
|
// chooseTests
|
||||||
|
public onRowClicked(e) {
|
||||||
|
if (e.event.target !== undefined) {
|
||||||
|
this.goTo(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onGridReady(params) {
|
||||||
|
this.gridApi = params.api;
|
||||||
|
this.gridApi.sizeColumnsToFit();
|
||||||
|
}
|
||||||
|
|
||||||
|
onGridColumnsChanged(params) {
|
||||||
|
params.api.sizeColumnsToFit();
|
||||||
|
}
|
||||||
|
|
||||||
|
onGridSizeChanged(params) {
|
||||||
|
this.columnDefs = [
|
||||||
|
{ headerName: 'ID', field: 'id', headerTooltip: 'ID' },
|
||||||
|
{ headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' },
|
||||||
|
{ headerName: 'Liczba punktów do zdobycia', field: 'maxScore', headerTooltip: 'Liczba punktów do zdobycia', hide: false }
|
||||||
|
];
|
||||||
|
|
||||||
|
params.api.sizeColumnsToFit();
|
||||||
|
}
|
||||||
|
|
||||||
|
onGidColumnsChanged(params) {
|
||||||
|
params.api.sizeColumnsToFit();
|
||||||
|
}
|
||||||
|
|
||||||
|
// showTestResult
|
||||||
|
public testonRowClicked(e) {}
|
||||||
|
|
||||||
|
testonGridReady(params) {
|
||||||
|
this.testgridApi = params.api;
|
||||||
|
this.testgridApi.sizeColumnsToFit();
|
||||||
|
}
|
||||||
|
|
||||||
|
testonGridColumnsChanged(params) {
|
||||||
|
params.api.sizeColumnsToFit();
|
||||||
|
}
|
||||||
|
|
||||||
|
testonGridSizeChanged(params) {
|
||||||
|
this.testcolumnDefs = [
|
||||||
|
{ headerName: 'Imię', field: 'name', headerTooltip: 'Imię' },
|
||||||
|
{ headerName: 'Nazwisko', field: 'surname', headerTooltip: 'Nazwisko' },
|
||||||
|
{ headerName: 'Wynik', field: 'userScore', headerTooltip: 'Wynik', hide: false },
|
||||||
|
{ headerName: 'Wynik (%)', field: 'percent', headerTooltip: 'Wynik (%)', hide: false }
|
||||||
|
];
|
||||||
|
|
||||||
|
params.api.sizeColumnsToFit();
|
||||||
|
}
|
||||||
|
|
||||||
|
testonGidColumnsChanged(params) {
|
||||||
|
params.api.sizeColumnsToFit();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -49,7 +49,7 @@ const localeText = {
|
|||||||
toolPanelButton: 'Narzędzia',
|
toolPanelButton: 'Narzędzia',
|
||||||
|
|
||||||
// other
|
// other
|
||||||
noRowsToShow: 'Brak testów do wyświetlenia',
|
noRowsToShow: 'Brak elementów do wyświetlenia',
|
||||||
|
|
||||||
// enterprise menu
|
// enterprise menu
|
||||||
pinColumn: 'Przypiąta kolumna',
|
pinColumn: 'Przypiąta kolumna',
|
||||||
|
Loading…
Reference in New Issue
Block a user