From 11d83e1ea6c25a851b3eb7559ee85061d77337c9 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sun, 15 May 2022 23:45:29 +0200 Subject: Dodati dugmici za napred i nazad. Napravljen api upit. --- .../src/app/_elements/form-dataset/form-dataset.component.html | 7 +++++-- frontend/src/app/_elements/form-dataset/form-dataset.component.ts | 6 +++++- frontend/src/app/_services/datasets.service.ts | 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index b96276bd..7e836192 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -1,6 +1,5 @@
- - +
@@ -43,10 +42,14 @@
file_upload +
+ + +
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index 94ef9905..11d7faed 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -24,6 +24,8 @@ export class FormDatasetComponent { files: File[] = []; rowsNumber: number = 0; colsNumber: number = 0; + begin:number=-1; + end:number=11; @Input() dataset: Dataset; //dodaj ! potencijalno @@ -40,7 +42,9 @@ export class FormDatasetComponent { } //@ViewChild('fileImportInput', { static: false }) fileImportInput: any; cemu je ovo sluzilo? - + test(){ + console.log("radi"); + } clear(){ this.tableData.hasInput = false; } diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts index 2211996f..6d0e06db 100644 --- a/frontend/src/app/_services/datasets.service.ts +++ b/frontend/src/app/_services/datasets.service.ts @@ -27,6 +27,9 @@ export class DatasetsService { getDatasetFile(fileId: any): any { return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/-1/11`, { headers: this.authService.authHeader(), responseType: 'text' }); } + getDatasetFilePaging(fileId:any,begin:any,end:any){ + return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${begin}/${end}`, { headers: this.authService.authHeader(), responseType: 'text' }); + } getDatasetFilePartial(fileId: any, startRow: number, rowNum: number): Observable { return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${startRow}/${rowNum}`, { headers: this.authService.authHeader(), responseType: 'text' }); } -- cgit v1.2.3 From db4b8cead1c45dfc55d65942769f3ee33d6c369d Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sun, 15 May 2022 23:53:43 +0200 Subject: Omoguceni paging na tabeli. --- .../_elements/form-dataset/form-dataset.component.html | 7 ++++--- .../app/_elements/form-dataset/form-dataset.component.ts | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index 7e836192..bce8f857 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -47,9 +47,10 @@
- - - +
+ + +
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index 11d7faed..fd3637f9 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -42,8 +42,17 @@ export class FormDatasetComponent { } //@ViewChild('fileImportInput', { static: false }) fileImportInput: any; cemu je ovo sluzilo? - test(){ - console.log("radi"); + goBack(){ + if(this.begin-10<=0) + this.begin=-1; + else + this.begin-=10; + this.loadExisting(); + + } + goForward(){ + this.begin+=10; + this.loadExisting(); } clear(){ this.tableData.hasInput = false; @@ -100,7 +109,7 @@ export class FormDatasetComponent { this.tableData.hasInput = true; this.tableData.loaded = false; - this.datasetsService.getDatasetFile(this.dataset.fileId).subscribe((file: string | undefined) => { + this.datasetsService.getDatasetFilePaging(this.dataset.fileId,this.begin,this.end).subscribe((file: string | undefined) => { if (file) { this.tableData.loaded = true; this.tableData.numRows = this.dataset.rowCount; -- cgit v1.2.3 From bbe3675f4909b9e8bdac7787348b0d17af8ac662 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sun, 15 May 2022 23:59:06 +0200 Subject: Dodat broj stranice. --- frontend/src/app/_elements/form-dataset/form-dataset.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index bce8f857..d685458a 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -49,6 +49,7 @@
+ {{((this.begin+1)/10)+1}}
-- cgit v1.2.3 From c69f7ee7d2acbe17766f5b0f0f3cc764354cd151 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 16 May 2022 00:13:08 +0200 Subject: Element se samo prikazuje kada se izabere postojeci dataset. --- frontend/src/app/_elements/folder/folder.component.ts | 4 +++- .../src/app/_elements/form-dataset/form-dataset.component.html | 8 ++++---- frontend/src/app/_elements/form-dataset/form-dataset.component.ts | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index 665659a8..e426e2a0 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -65,8 +65,10 @@ export class FolderComponent implements AfterViewInit { } displayFile() { - if (this.type == FolderType.Dataset) + if (this.type == FolderType.Dataset){ this.formDataset.dataset = this.fileToDisplay; + this.formDataset.existingFlag=false; + } else if (this.type == FolderType.Model) this.formModel.newModel = this.fileToDisplay; } diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index d685458a..8965d451 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -47,10 +47,10 @@
-
- - {{((this.begin+1)/10)+1}} - +
+ +
{{((this.begin+1)/10)+1}}
+
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index fd3637f9..03564939 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -26,6 +26,7 @@ export class FormDatasetComponent { colsNumber: number = 0; begin:number=-1; end:number=11; + existingFlag:boolean=false; @Input() dataset: Dataset; //dodaj ! potencijalno @@ -69,6 +70,7 @@ export class FormDatasetComponent { this.filename = this.files[0].name; this.tableData.loaded = false; + this.existingFlag=false; this.update(); } @@ -77,7 +79,6 @@ export class FormDatasetComponent { update() { this.firstInput = true - if (this.files.length < 1) return; @@ -104,6 +105,7 @@ export class FormDatasetComponent { } loadExisting(){ + this.existingFlag=true; this.firstInput = false; this.tableData.hasInput = true; -- cgit v1.2.3 From 717ed39075bc89aa00741cfdb6a48c27bf34c992 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 16 May 2022 00:20:07 +0200 Subject: Pozicionirano na sredinu u arhivi. Sredjen bug kada ostane zapamcena strana na kojoj se nalazimo ako promenimo dataset. --- frontend/src/app/_elements/folder/folder.component.ts | 4 +++- frontend/src/app/_elements/form-dataset/form-dataset.component.html | 2 +- frontend/src/app/_elements/form-dataset/form-dataset.component.ts | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index e426e2a0..654d5510 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -95,11 +95,13 @@ export class FolderComponent implements AfterViewInit { this.newFileSelected = true; this.listView = false; this.displayFile(); - if (this.type == FolderType.Dataset) + if (this.type == FolderType.Dataset){ this.formDataset.clear(); + } } selectFile(file?: FolderFile) { + this.formDataset.resetPagging(); this.selectedFile = file; this.fileToDisplay = file; if (this.type == FolderType.Experiment && file) { diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index 8965d451..1f91405b 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -47,7 +47,7 @@
-
+
{{((this.begin+1)/10)+1}}
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index 03564939..99583437 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -43,6 +43,9 @@ export class FormDatasetComponent { } //@ViewChild('fileImportInput', { static: false }) fileImportInput: any; cemu je ovo sluzilo? + resetPagging(){ + this.begin=-1; + } goBack(){ if(this.begin-10<=0) this.begin=-1; -- cgit v1.2.3 From 49d213824ee6dda9eaf9ba75041bb059075a30e5 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 16 May 2022 00:30:15 +0200 Subject: Napravljen zahtev koji trazi header Dataseta od api-ja. Dodato da se prikazuje header na stranama posle prve. --- .../app/_elements/form-dataset/form-dataset.component.html | 2 +- .../app/_elements/form-dataset/form-dataset.component.ts | 14 ++++++++------ frontend/src/app/_services/datasets.service.ts | 3 +++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index 1f91405b..e7084c6d 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -49,7 +49,7 @@
-
{{((this.begin+1)/10)+1}}
+
{{(this.begin/10)+1}}
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index 99583437..aa3745d0 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -24,8 +24,8 @@ export class FormDatasetComponent { files: File[] = []; rowsNumber: number = 0; colsNumber: number = 0; - begin:number=-1; - end:number=11; + begin:number=0; + end:number=10; existingFlag:boolean=false; @Input() dataset: Dataset; //dodaj ! potencijalno @@ -44,11 +44,11 @@ export class FormDatasetComponent { //@ViewChild('fileImportInput', { static: false }) fileImportInput: any; cemu je ovo sluzilo? resetPagging(){ - this.begin=-1; + this.begin=0; } goBack(){ if(this.begin-10<=0) - this.begin=-1; + this.begin=0; else this.begin-=10; this.loadExisting(); @@ -113,16 +113,18 @@ export class FormDatasetComponent { this.tableData.hasInput = true; this.tableData.loaded = false; - + this.datasetsService.getDatasetHeader(this.dataset.fileId).subscribe((header: string | undefined)=>{ + this.datasetsService.getDatasetFilePaging(this.dataset.fileId,this.begin,this.end).subscribe((file: string | undefined) => { if (file) { this.tableData.loaded = true; this.tableData.numRows = this.dataset.rowCount; this.tableData.numCols = this.dataset.columnInfo.length; - this.tableData.data = this.csv.csvToArray(file, (this.dataset.delimiter == "razmak") ? " " : (this.dataset.delimiter == "novi red") ? "\t" : this.dataset.delimiter); + this.tableData.data = this.csv.csvToArray(header+'\n'+file, (this.dataset.delimiter == "razmak") ? " " : (this.dataset.delimiter == "novi red") ? "\t" : this.dataset.delimiter); } }); + }); } diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts index 6d0e06db..f5677097 100644 --- a/frontend/src/app/_services/datasets.service.ts +++ b/frontend/src/app/_services/datasets.service.ts @@ -30,6 +30,9 @@ export class DatasetsService { getDatasetFilePaging(fileId:any,begin:any,end:any){ return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${begin}/${end}`, { headers: this.authService.authHeader(), responseType: 'text' }); } + getDatasetHeader(fileId:any){ + return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/-1/1`, { headers: this.authService.authHeader(), responseType: 'text' }); + } getDatasetFilePartial(fileId: any, startRow: number, rowNum: number): Observable { return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${startRow}/${rowNum}`, { headers: this.authService.authHeader(), responseType: 'text' }); } -- cgit v1.2.3 From a2989dc4534837f24f23ac33e5b30515ee6cfae7 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 16 May 2022 00:43:29 +0200 Subject: Ukoliko korisnik pokusa da ide na sledecu stranicu, a na toj stranici nema podataka korisnik ce ostati na stranici na kojoj se nalazio. --- frontend/src/app/_elements/form-dataset/form-dataset.component.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index aa3745d0..79fbe2c9 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -123,6 +123,10 @@ export class FormDatasetComponent { this.tableData.data = this.csv.csvToArray(header+'\n'+file, (this.dataset.delimiter == "razmak") ? " " : (this.dataset.delimiter == "novi red") ? "\t" : this.dataset.delimiter); } + else{ + this.begin-=10; + this.loadExisting(); + } }); }); -- cgit v1.2.3 From 22911bdc9c5ff39ff86d8298179b147c4580f82c Mon Sep 17 00:00:00 2001 From: Ivan Ljubisavljevic Date: Mon, 16 May 2022 00:49:30 +0200 Subject: Uvoz javnih datasetova i modela --- backend/api/api/Services/FillAnEmptyDb.cs | 2 ++ .../src/app/_elements/folder/folder.component.css | 2 +- .../src/app/_elements/folder/folder.component.html | 7 +++++- .../src/app/_elements/folder/folder.component.ts | 26 ++++++++++++++++++++++ .../form-dataset/form-dataset.component.css | 4 ++++ .../form-dataset/form-dataset.component.html | 2 +- 6 files changed, 40 insertions(+), 3 deletions(-) diff --git a/backend/api/api/Services/FillAnEmptyDb.cs b/backend/api/api/Services/FillAnEmptyDb.cs index 32ce5c2e..fc169853 100644 --- a/backend/api/api/Services/FillAnEmptyDb.cs +++ b/backend/api/api/Services/FillAnEmptyDb.cs @@ -83,6 +83,8 @@ namespace api.Services dataset.nullCols = 3; dataset.nullRows = 708; dataset.isPreProcess = true; + dataset.cMatrix = new float[11][]; + dataset.cMatrix[0] = new float[] {1f,-0.005006660707294941f, -0.03514399379491806f,-0.03855886310338974f,0.04293888062238693f,0.03684719651937485f}; _datasetService.Create(dataset); diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css index ada2dba0..3ecba343 100644 --- a/frontend/src/app/_elements/folder/folder.component.css +++ b/frontend/src/app/_elements/folder/folder.component.css @@ -177,7 +177,7 @@ .file-content { width: 100%; - height: 100%; + height: 95%; position: relative; } diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html index 8896e7e5..db4f28f0 100644 --- a/frontend/src/app/_elements/folder/folder.component.html +++ b/frontend/src/app/_elements/folder/folder.component.html @@ -78,7 +78,12 @@
+ +
+
+
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index 665659a8..e62c59f9 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -292,6 +292,32 @@ export class FolderComponent implements AfterViewInit { } } + addFile(file: FolderFile, event: Event) { + event.stopPropagation(); + switch (this.type) { + case FolderType.Dataset: + (file)._id=""; + + (file).isPublic=false; + this.datasetsService.addDataset(file).subscribe((response) => { + this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1); + this.refreshFiles(null); + }); + break; + case FolderType.Model: + this.modelsService.addModel(file).subscribe((response) => { + this.refreshFiles(null); + }); + break; + case FolderType.Experiment: + // this.experimentsService.addExperiment(file).subscribe((response) => { + // console.log(response); + // }); + //todo delete za predictor + break; + } + } + folders: { [tab: number]: FolderFile[] } = {}; tabTitles: { [tab: number]: string } = { diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.css b/frontend/src/app/_elements/form-dataset/form-dataset.component.css index 079711d0..99ed5d40 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.css +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.css @@ -63,4 +63,8 @@ .file-container input{ border-radius: 5px; left: 0%; +} + +.naslov{ + font-size: 30px; } \ No newline at end of file diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index b96276bd..07a3ee1a 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -35,7 +35,7 @@
- +
-- cgit v1.2.3