Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

1 files changed, 8 insertions, 6 deletions

diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index cff77535..c140e100 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -1,9 +1,9 @@
+import { FolderFile } from "./FolderFile";
 import { ProblemType } from "./Model";
-export default class Experiment {
-    _id: string = '';
+export default class Experiment extends FolderFile {
     uploaderId: string = '';
     constructor(
-        public name: string = 'Novi eksperiment',
+        name: string = 'Novi eksperiment',
         public description: string = '',
         public type: ProblemType = ProblemType.Regression,
         public datasetId: string = '',
@@ -11,12 +11,14 @@ export default class Experiment {
         public outputColumn: string = '',
         public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
         public nullValuesReplacers: NullValReplacer[] = [],
-        public dateCreated: Date = new Date(),
-        public lastUpdated: Date = new Date(),
+        dateCreated: Date = new Date(),
+        lastUpdated: Date = new Date(),
         public modelIds: string[] = [],
         public columnTypes: ColumnType[] = [],
         public encodings: ColumnEncoding[] = []//[{columnName: "", columnEncoding: Encoding.Label}]
-    ) { }
+    ) {
+        super(name, dateCreated, lastUpdated)
+    }
 
     _columnsSelected: boolean = false;
 }