aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend/api/api/Services/FillAnEmptyDb.cs2
-rw-r--r--frontend/src/app/_elements/folder/folder.component.css2
-rw-r--r--frontend/src/app/_elements/folder/folder.component.html7
-rw-r--r--frontend/src/app/_elements/folder/folder.component.ts26
-rw-r--r--frontend/src/app/_elements/form-dataset/form-dataset.component.css4
-rw-r--r--frontend/src/app/_elements/form-dataset/form-dataset.component.html2
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 @@
<div class="mx-2 hover-show" *ngIf="selectedTab !== TabType.PublicDatasets && selectedTab !== TabType.PublicModels">
<button class="btn-clear file-button" (click)="deleteFile(file, $event)">
<mat-icon>delete</mat-icon>
- </button>
+ </button>
+ </div>
+ <div class="mx-2 hover-show" *ngIf="selectedTab == TabType.PublicDatasets || selectedTab == TabType.PublicModels">
+ <button class="btn-clear file-button" (click)="addFile(file, $event)">
+ <mat-icon>note_add</mat-icon>
+ </button>
</div>
</div>
<div *ngIf="type == FolderType.Experiment" class="list-view">
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:
+ (<Dataset>file)._id="";
+
+ (<Dataset>file).isPublic=false;
+ this.datasetsService.addDataset(<Dataset>file).subscribe((response) => {
+ this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
+ this.refreshFiles(null);
+ });
+ break;
+ case FolderType.Model:
+ this.modelsService.addModel(<Model>file).subscribe((response) => {
+ this.refreshFiles(null);
+ });
+ break;
+ case FolderType.Experiment:
+ // this.experimentsService.addExperiment(<Model>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 @@
</div>
<div class="row" *ngIf="firstInput">
- <label class=" mt-5">{{filename}}</label>
+ <label class="naslov mt-2">{{filename}}</label>
</div>