-
-
Twoja historia aktywności
+
Twoja historia aktywności
+
{{group?.name}}
Opis grupy:
{{group?.description}}
diff --git a/FrontEnd/src/app/groups/group-details/group-details.component.ts b/FrontEnd/src/app/groups/group-details/group-details.component.ts
index 2bf54a4..0e777f6 100644
--- a/FrontEnd/src/app/groups/group-details/group-details.component.ts
+++ b/FrontEnd/src/app/groups/group-details/group-details.component.ts
@@ -30,10 +30,9 @@ export class GroupDetailsComponent implements OnInit, OnDestroy {
columnDefs = [
- { headerName: 'ID', field: 'id', headerTooltip: 'ID' },
{ headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' },
- { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false },
- { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false },
+ { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena' },
+ { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Max.', hide: false },
{
headerName: '',
suppressMenu: true,
@@ -49,7 +48,7 @@ export class GroupDetailsComponent implements OnInit, OnDestroy {
const currentUsername = JSON.parse(localStorage.getItem('currentUser')).username;
const groupOwnerUsername = localStorage.getItem('groupOwnerUsername');
return groupOwnerUsername === currentUsername ?
- `
+ `
` : '';
}
@@ -159,10 +158,9 @@ export class GroupDetailsComponent implements OnInit, OnDestroy {
onGridSizeChanged(params) {
if (params.clientWidth < 800) {
this.columnDefs = [
- { headerName: 'ID', field: 'id', headerTooltip: 'ID' },
{ headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' },
- { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false },
- { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false },
+ { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena' },
+ { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Max.', hide: true },
{
headerName: '',
suppressMenu: true,
@@ -172,10 +170,9 @@ export class GroupDetailsComponent implements OnInit, OnDestroy {
];
} else {
this.columnDefs = [
- { headerName: 'ID', field: 'id', headerTooltip: 'ID' },
{ headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' },
- { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false },
- { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false },
+ { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena' },
+ { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Max.' },
{
headerName: '',
suppressMenu: true,
diff --git a/FrontEnd/src/app/groups/manage-group/manage-group.component.css b/FrontEnd/src/app/groups/manage-group/manage-group.component.css
index 9b353e3..722b21b 100644
--- a/FrontEnd/src/app/groups/manage-group/manage-group.component.css
+++ b/FrontEnd/src/app/groups/manage-group/manage-group.component.css
@@ -1,4 +1,4 @@
-a.wrapper{
+.wrapper{
width: 100%;
padding: 30px;
min-height: 100%;
diff --git a/FrontEnd/src/app/groups/manage-group/manage-group.component.ts b/FrontEnd/src/app/groups/manage-group/manage-group.component.ts
index 64ba718..453d5fb 100644
--- a/FrontEnd/src/app/groups/manage-group/manage-group.component.ts
+++ b/FrontEnd/src/app/groups/manage-group/manage-group.component.ts
@@ -49,7 +49,7 @@ export class ManageGroupComponent implements OnInit, OnDestroy {
}
customCellRendererFunc(params) {
- return `
+ return `
`;
}
diff --git a/FrontEnd/src/app/groups/my-groups/my-groups.component.ts b/FrontEnd/src/app/groups/my-groups/my-groups.component.ts
index 39c8f53..892f729 100644
--- a/FrontEnd/src/app/groups/my-groups/my-groups.component.ts
+++ b/FrontEnd/src/app/groups/my-groups/my-groups.component.ts
@@ -95,7 +95,7 @@ export class MyGroupsComponent implements OnInit, OnDestroy {
customCellRendererFunc(params) {
if (params.data['role'] === 'Lider') {
return `
-
+
`;
} else {
diff --git a/FrontEnd/src/app/groups/ranking/ranking.component.ts b/FrontEnd/src/app/groups/ranking/ranking.component.ts
index e371f60..7a7c65b 100644
--- a/FrontEnd/src/app/groups/ranking/ranking.component.ts
+++ b/FrontEnd/src/app/groups/ranking/ranking.component.ts
@@ -62,10 +62,17 @@ export class RankingComponent implements OnInit, OnDestroy {
}
downloadCSVResults() {
+ const options = {
+ fieldSeparator: ';',
+ quoteStrings: '',
+ decimalseparator: ',',
+ showLabels: true,
+ headers: ['Punkty', 'Imię', 'Nazwisko']
+ };
const arr = this.data;
arr.map(x => delete x['username']);
// tslint:disable-next-line:no-unused-expression
- new ngxCsv(arr, this.group.name + '_ranking_' + this.typeOfRankingToDisplay);
+ new ngxCsv(arr, this.group.name + '_ranking_' + this.typeOfRankingToDisplay, options);
}
ngOnDestroy(): void {
diff --git a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts
index 4fd37a1..79f7619 100644
--- a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts
+++ b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts
@@ -31,7 +31,7 @@ export class TestsInGroupResultsComponent implements OnInit, OnDestroy {
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 }
+ { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Liczba punktów do zdobycia', hide: false }
];
// showTestResult
@@ -103,8 +103,15 @@ export class TestsInGroupResultsComponent implements OnInit, OnDestroy {
}
downloadCSVResults() {
+ const options = {
+ fieldSeparator: ';',
+ quoteStrings: '',
+ decimalseparator: ',',
+ showLabels: true,
+ headers: ['Imię', 'Nazwisko', 'Wynik', 'Wynik (%)']
+ };
// tslint:disable-next-line:no-unused-expression
- new ngxCsv(this.testdata, this.group.name + '_' + this.selectedTest.title + '_wyniki');
+ new ngxCsv(this.testdata, this.group.name + '_' + this.selectedTest.title + '_wyniki', options);
}
getResults(id: number) {
@@ -148,7 +155,7 @@ export class TestsInGroupResultsComponent implements OnInit, OnDestroy {
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 }
+ { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Liczba punktów do zdobycia', hide: false }
];
params.api.sizeColumnsToFit();
diff --git a/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts b/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts
index 0b95591..66a6188 100644
--- a/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts
+++ b/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts
@@ -323,11 +323,11 @@ export class WaitingResourcesComponent implements OnInit, OnDestroy {
customCellRendererFunc(params) {
return `
-
+
-
+
-
+
`;
}
diff --git a/FrontEnd/src/app/login/login.component.html b/FrontEnd/src/app/login/login.component.html
index dd2ee7a..be7d622 100644
--- a/FrontEnd/src/app/login/login.component.html
+++ b/FrontEnd/src/app/login/login.component.html
@@ -1,15 +1,15 @@
-
Zaloguj przez USOS
+
Zaloguj przez USOS
-
\ No newline at end of file
+
diff --git a/FrontEnd/src/app/materials/materials-add/materials-add.component.css b/FrontEnd/src/app/materials/materials-add/materials-add.component.css
index f5a0a77..4e6af2f 100644
--- a/FrontEnd/src/app/materials/materials-add/materials-add.component.css
+++ b/FrontEnd/src/app/materials/materials-add/materials-add.component.css
@@ -9,7 +9,7 @@
.container {
background-color: #181616;
- padding: 30px;
+ padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@@ -38,7 +38,7 @@
.content{
background-color: #181616;
- padding: 30px;
+ padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@@ -52,4 +52,15 @@ ag-grid-angular{
.buttons-container > div{
margin: 10px;
-}
\ No newline at end of file
+}
+
+.button{
+ font-size: large;
+ padding-left: 30px;
+ padding-right: 30px;
+ margin-bottom: 10px;
+}
+
+p{
+ color:white;
+}
diff --git a/FrontEnd/src/app/materials/materials-add/materials-add.component.html b/FrontEnd/src/app/materials/materials-add/materials-add.component.html
index 9a2c2b8..6cbaa6d 100644
--- a/FrontEnd/src/app/materials/materials-add/materials-add.component.html
+++ b/FrontEnd/src/app/materials/materials-add/materials-add.component.html
@@ -1,7 +1,7 @@