aboutsummaryrefslogtreecommitdiff
path: root/frontend/src
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src')
-rw-r--r--frontend/src/app/_elements/dataset-load/dataset-load.component.ts1
-rw-r--r--frontend/src/app/_elements/model-load/model-load.component.ts2
-rw-r--r--frontend/src/app/_modals/login-modal/login-modal.component.ts1
-rw-r--r--frontend/src/app/_modals/register-modal/register-modal.component.ts2
-rw-r--r--frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts1
-rw-r--r--frontend/src/app/_pages/my-datasets/my-datasets.component.ts4
-rw-r--r--frontend/src/app/_pages/my-models/my-models.component.ts4
-rw-r--r--frontend/src/app/_pages/my-predictors/my-predictors.component.ts4
-rw-r--r--frontend/src/app/_pages/predict/predict.component.ts2
-rw-r--r--frontend/src/app/_pages/profile/profile.component.ts3
-rw-r--r--frontend/src/app/_services/auth.service.ts3
-rw-r--r--frontend/src/app/experiment/experiment.component.html16
-rw-r--r--frontend/src/app/experiment/experiment.component.ts22
13 files changed, 26 insertions, 39 deletions
diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
index dc78ab77..f68277c8 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -53,7 +53,6 @@ export class DatasetLoadComponent {
this.datasets.getMyDatasets().subscribe((datasets) => {
this.myDatasets = datasets;
this.showMyDatasets = true;
- //this.
});
}
diff --git a/frontend/src/app/_elements/model-load/model-load.component.ts b/frontend/src/app/_elements/model-load/model-load.component.ts
index abf19d75..745dc12e 100644
--- a/frontend/src/app/_elements/model-load/model-load.component.ts
+++ b/frontend/src/app/_elements/model-load/model-load.component.ts
@@ -59,7 +59,7 @@ export class ModelLoadComponent implements OnInit {
}
}
- uploadModel() { //console.log(this.selectedModel);
+ uploadModel() {
this.getMetrics();
this.newModel.username = Shared.username;
diff --git a/frontend/src/app/_modals/login-modal/login-modal.component.ts b/frontend/src/app/_modals/login-modal/login-modal.component.ts
index e1535a25..b28d9799 100644
--- a/frontend/src/app/_modals/login-modal/login-modal.component.ts
+++ b/frontend/src/app/_modals/login-modal/login-modal.component.ts
@@ -33,7 +33,6 @@ export class LoginModalComponent implements OnInit {
doLogin() {
if (this.username.length > 0 && this.password.length > 0) {
this.authService.login(this.username, this.password).subscribe((response) => {
- console.log(response);
if (response == "Username doesn't exist" || response == "Wrong password") {
this.wrongCreds = true;
diff --git a/frontend/src/app/_modals/register-modal/register-modal.component.ts b/frontend/src/app/_modals/register-modal/register-modal.component.ts
index 05888589..11f6727d 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.ts
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.ts
@@ -143,13 +143,11 @@ export class RegisterModalComponent implements OnInit {
this.authService.register(user)
.subscribe(
(response) => {
- console.log(response);
if (response == 'User added') {
//nakon sto je registrovan, nek bude ulogovan
this.authService.login(this.username, this.pass1).subscribe((response) => {
this.authService.authenticate(response);
- console.log("close button");
(<HTMLSelectElement>document.getElementById('closeButtonReg')).click();
//(<HTMLSelectElement>document.getElementById('linkToLoginModal')).click();
}, (error) => console.warn(error));
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
index fc146046..c83bf208 100644
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
@@ -38,7 +38,6 @@ export class FilterDatasetsComponent implements OnInit {
newDataset.name=name as string;
if(name!=null && name!="")
this.datasets.addDataset(newDataset).subscribe((response:string)=>{
- console.log(response);
shared.openDialog("Obaveštenje", "Uspešno ste dodali dataset sa nazivom " + newDataset.name);
},(error)=>{
shared.openDialog("Obaveštenje", "U svojoj kolekciji već imate dataset sa ovim imenom. Molimo Vas da unesete drugo ime.");
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
index 19a6832b..8857e371 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
@@ -44,8 +44,6 @@ export class MyDatasetsComponent implements OnInit {
deleteThisDataset(dataset: Dataset): void{
shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete ovaj set podataka?',() => {
this.datasetsS.deleteDataset(dataset).subscribe((response) => {
- console.log("OBRISANO JE", response);
- //na kraju uspesnog
this.getAllMyDatasets();
}, (error) =>{
if (error.error == "Dataset with name = {name} deleted") {
@@ -57,9 +55,7 @@ deleteThisDataset(dataset: Dataset): void{
getAllMyDatasets(): void{
this.datasetsS.getMyDatasets().subscribe(m => {
-
this.myDatasets = m;
- console.log(this.myDatasets);
});
}
diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts
index f3877e2d..92d3fbaa 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.ts
+++ b/frontend/src/app/_pages/my-models/my-models.component.ts
@@ -34,8 +34,6 @@ export class MyModelsComponent implements OnInit {
deleteThisModel(model: Model): void{
shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete model?',() => {
this.modelsS.deleteModel(model).subscribe((response) => {
- console.log("OBRISANOOO JEE", response);
- //na kraju uspesnog
this.getAllMyModels();
}, (error) =>{
if (error.error == "Model with name = {name} deleted") {
@@ -48,9 +46,7 @@ deleteThisModel(model: Model): void{
getAllMyModels(): void{
this.modelsS.getMyModels().subscribe(m => {
-
this.myModels = m;
- console.log(this.myModels);
});
}
diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.ts b/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
index 13cfdab2..17c496fd 100644
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
+++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
@@ -20,8 +20,6 @@ export class MyPredictorsComponent implements OnInit {
if(window.confirm("IZABRANI MODEL ĆE BITI IZBRISAN"))
{
this.predictorsS.deletePredictor(predictor).subscribe((response) => {
- console.log("OBRISANOOO JEE", response);
- //na kraju uspesnog
this.getAllMyPredictors();
}, (error) =>{
if (error.error == "Predictor with name = {name} deleted") {
@@ -35,9 +33,7 @@ export class MyPredictorsComponent implements OnInit {
getAllMyPredictors(): void{
this.predictorsS.getMyPredictors().subscribe(m => {
-
this.predictors = m;
- console.log(this.predictors);
});
}
diff --git a/frontend/src/app/_pages/predict/predict.component.ts b/frontend/src/app/_pages/predict/predict.component.ts
index 1c1c7425..39dec0ae 100644
--- a/frontend/src/app/_pages/predict/predict.component.ts
+++ b/frontend/src/app/_pages/predict/predict.component.ts
@@ -25,7 +25,6 @@ export class PredictComponent implements OnInit {
this.predictor = p;
this.predictor.inputs.forEach((p,index)=> this.inputs[index] = new Column(p, ""));
- console.log(this.predictor);
})
});
}
@@ -34,7 +33,6 @@ export class PredictComponent implements OnInit {
this.predictS.usePredictor(this.predictor, this.inputs).subscribe(p => {
shared.openDialog("Obaveštenje", "Prediktor je uspešno poslat na probu."); //pisalo je "na treniranje" ??
})
- console.log(this.inputs);
}
}
diff --git a/frontend/src/app/_pages/profile/profile.component.ts b/frontend/src/app/_pages/profile/profile.component.ts
index d055fad3..ae9fb12c 100644
--- a/frontend/src/app/_pages/profile/profile.component.ts
+++ b/frontend/src/app/_pages/profile/profile.component.ts
@@ -67,7 +67,6 @@ export class ProfileComponent implements OnInit {
break;
}
}
- console.log(this.user);
});
}
@@ -96,7 +95,6 @@ export class ProfileComponent implements OnInit {
}
shared.openDialog("Obaveštenje", "Podaci su uspešno promenjeni.");
this.user = editedUser;
- console.log(this.user);
this.resetInfo();
}, (error: any) =>{
if (error.error == "Username already exists!") {
@@ -134,7 +132,6 @@ export class ProfileComponent implements OnInit {
this.authService.logOut();
this.router.navigate(['']);
}, (error: any) => {
- console.log("error poruka: ", error.error);
if (error.error == 'Wrong old password!') {
this.wrongPassBool = true;
//(<HTMLSelectElement>document.getElementById("inputPassword")).focus();
diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index d5a16b5b..e474d436 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -52,7 +52,6 @@ export class AuthService {
var username = property['name'];
if (username != "") {
this.refresher = setTimeout(() => {
- console.log('refreshing token!');
this.http.post(`${API_SETTINGS.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => {
this.authenticate(response);
});
@@ -60,7 +59,6 @@ export class AuthService {
}
else {
this.refresher = setTimeout(() => {
- console.log('refreshing token!');
this.getGuestToken().subscribe((response) => {
this.authenticate(response);
});
@@ -87,7 +85,6 @@ export class AuthService {
if (this.cookie.check('token')) {
const token = this.cookie.get('token');
const decodedToken = jwtHelper.decodeToken(token);
- console.log("decoded:", decodedToken);
this.shared.loggedIn = this.isAuthenticated();
this.shared.username = decodedToken.name;
this.shared.userId = decodedToken.id;
diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html
index 337d7369..e46f5bd9 100644
--- a/frontend/src/app/experiment/experiment.component.html
+++ b/frontend/src/app/experiment/experiment.component.html
@@ -67,12 +67,12 @@
class="form-check-input" value="deleteRows" name="fillMissing" id="delRows" checked
data-bs-toggle="collapse" data-bs-target="#fillMissingCustom.show">
<label for="delRows" class="form-check-label">Obriši sve
- redove sa nedostajućim vrednostima ({{selectedDataset.nullRows}} / TODO)</label><br>
+ redove sa nedostajućim vrednostima ({{selectedDataset.nullRows}} od {{selectedDataset.rowCount}})</label><br>
<input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.DeleteColumns"
class="form-check-input" value="deleteCols" name="fillMissing" id="delCols" data-bs-toggle="collapse"
data-bs-target="#fillMissingCustom.show">
<label for="delCols" class="form-check-label">Obriši sve
- kolone sa nedostajućim vrednostima ({{selectedDataset.nullCols}} / TODO)</label><br>
+ kolone sa nedostajućim vrednostima ({{countSelectedNullCols()}} od {{selectedDataset.columnInfo.length}})</label><br>
<input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.Replace"
class="form-check-input" name="fillMissing" id="replace" data-bs-toggle="collapse"
data-bs-target="#fillMissingCustom:not(.show)">
@@ -81,11 +81,11 @@
<div class="collapse" id="fillMissingCustom">
<div>
<label for="columnReplacers" class="form-label">Unesite zamenu za svaku kolonu:</label>
- <div class="my-3" *ngIf="getSelectedNullColumnsArray().length > 0" >
+ <div class="my-3" *ngIf="getSelectedColumnsArrayWithoutNullVals().length > 0" >
<label class="text-center form-control mx-3 text-secondary">
- Kolone <span style="font-style: italic;" *ngFor="let colname of getSelectedNullColumnsArray(); let i = index">
- <span *ngIf="i != getSelectedNullColumnsArray().length - 1">{{colname}}, </span>
- <span *ngIf="i == getSelectedNullColumnsArray().length - 1">{{colname}} </span>
+ Kolone <span style="font-style: italic;" *ngFor="let colname of getSelectedColumnsArrayWithoutNullVals(); let i = index">
+ <span *ngIf="i != getSelectedColumnsArrayWithoutNullVals().length - 1">{{colname}}, </span>
+ <span *ngIf="i == getSelectedColumnsArrayWithoutNullVals().length - 1">{{colname}} </span>
</span>
nemaju nedostajućih vrednosti za popunjavanje.
</label>
@@ -203,8 +203,8 @@
</div>
</div>
- <div id="encodingForColumns" class="my-5">
- <div class="col-3">
+ <div id="encodingForColumns" class="row px-3 my-5">
+ <div class="col-1">
<label for="encoding" class="col-form-label">Enkoding: </label>
</div>
<div class="col-2">
diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts
index a2b5602b..b5e1d1f4 100644
--- a/frontend/src/app/experiment/experiment.component.ts
+++ b/frontend/src/app/experiment/experiment.component.ts
@@ -24,11 +24,12 @@ export class ExperimentComponent implements OnInit {
Object = Object;
selectedColumnsInfoArray: ColumnInfo[] = [];
- selectedNullColumnsArray: string[] = [];
+ selectedNotNullColumnsArray: string[] = [];
tempTestSetDistribution = 90;
- constructor(private modelsService: ModelsService, private experimentsService: ExperimentsService) { }
+ constructor(private modelsService: ModelsService, private experimentsService: ExperimentsService) {
+ }
ngOnInit(): void {
}
@@ -36,7 +37,7 @@ export class ExperimentComponent implements OnInit {
updateDataset(dataset: Dataset) {
this.selectedDataset = dataset;
this.selectedColumnsInfoArray = this.selectedDataset.columnInfo;
- this.selectedNullColumnsArray = [];
+ this.selectedNotNullColumnsArray = [];
}
getInputById(id: string): HTMLInputElement {
@@ -104,7 +105,7 @@ export class ExperimentComponent implements OnInit {
}
}
- getSelectedNullColumnsArray(): string[] {
+ getSelectedColumnsArrayWithoutNullVals(): string[] {
let colNames: string[] = [];
for (let i = 0; i < this.selectedColumnsInfoArray.length; i++) {
@@ -184,7 +185,7 @@ export class ExperimentComponent implements OnInit {
this.experiment = response;
this.selectedColumnsInfoArray = [];
- this.selectedNullColumnsArray = [];
+ this.selectedNotNullColumnsArray = [];
Shared.openDialog("Obaveštenje", "Eksperiment je uspešno kreiran.");
}, (error) => {
@@ -193,4 +194,15 @@ export class ExperimentComponent implements OnInit {
}
});
}
+
+ countSelectedNullCols(): number {
+ let counter: number = 0;
+
+ for (let i = 0; i < this.selectedColumnsInfoArray.length; i++) {
+ let oneColInfo = this.selectedColumnsInfoArray[i];
+ if (oneColInfo.numNulls > 0)
+ ++counter;
+ }
+ return counter;
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-20 07:11:24 +0000