From ca592566e80a7a83fff85e0b5a11bcca06f7e017 Mon Sep 17 00:00:00 2001 From: Sonja Galovic Date: Tue, 15 Mar 2022 21:27:46 +0100 Subject: Uredjena stranica add-model i komponenta dataset-load. --- .../dataset-load/dataset-load.component.css | 6 + .../dataset-load/dataset-load.component.html | 57 +++- .../dataset-load/dataset-load.component.ts | 43 +++ .../app/_pages/add-model/add-model.component.css | 17 ++ .../app/_pages/add-model/add-model.component.html | 322 +++++++++------------ .../src/assets/images/add_model_background.jpg | Bin 0 -> 56906 bytes frontend/src/assets/images/logo_crop.png | Bin 11447 -> 0 bytes frontend/src/assets/images/logo_dark_crop.png | Bin 10987 -> 0 bytes 8 files changed, 250 insertions(+), 195 deletions(-) create mode 100644 frontend/src/assets/images/add_model_background.jpg delete mode 100644 frontend/src/assets/images/logo_crop.png delete mode 100644 frontend/src/assets/images/logo_dark_crop.png (limited to 'frontend') diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.css b/frontend/src/app/_elements/dataset-load/dataset-load.component.css index e69de29b..05819702 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.css +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.css @@ -0,0 +1,6 @@ +#divInputs { + margin-left: 20px; +} +#divOutputs { + margin-left: 20px; +} \ No newline at end of file diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.html b/frontend/src/app/_elements/dataset-load/dataset-load.component.html index c89add43..16830e11 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html @@ -1,19 +1,21 @@
- + - - - -      -   - -

+ + +      + +      - - - + + + +
@@ -26,7 +28,7 @@
{{item}}
- +
@@ -39,4 +41,35 @@ {{rowsNumber}} x {{colsNumber}} +
+
+
+

Izaberite ulazne kolone:

+
+
+
+ +   + +
+
+
+
+

Izaberite izlaznu kolonu:

+
+
+
+ +   + +
+
+
+
+
+ \ No newline at end of file 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 cde3e8b1..c772dc35 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts @@ -20,6 +20,9 @@ export class DatasetLoadComponent { rowsNumber: number = 0; colsNumber: number = 0; + checkedInputCols: Array = []; + checkedOutputCol: string = ''; + constructor(private ngxCsvParser: NgxCsvParser) { } @@ -51,4 +54,44 @@ export class DatasetLoadComponent { console.log('Error', error); }); } + + getCheckedInputCols() : Array { + this.checkedInputCols = new Array(); + let checkboxes = document.getElementsByName("cbs"); + + for (let i = 0; i < checkboxes.length; i++) { + let thatCb = checkboxes[i]; + if (thatCb.checked) + this.checkedInputCols.push(thatCb.value); + } + //console.log(this.checkedInputCols); + return this.checkedInputCols; + } + getCheckedOutputCol() : string { + this.checkedOutputCol = ''; + let radiobuttons = document.getElementsByName("rbs"); + + for (let i = 0; i < radiobuttons.length; i++) { + let thatRb = radiobuttons[i]; + if (thatRb.checked) { + this.checkedOutputCol = thatRb.value; + break; + } + } + //console.log(this.checkedOutputCol); + return this.checkedOutputCol; + } + validationInputsOutput() { + if (this.checkedInputCols.length == 0) { + alert("Molimo Vas da izaberete ulaznu kolonu/kolone za mrežu.") + return; + } + for (let i = 0; i < this.checkedInputCols.length; i++) { + if (this.checkedInputCols[i] == this.checkedOutputCol) { + let colName = this.checkedOutputCol; + alert("Izabrali ste istu kolonu (" + colName + ") kao ulaznu i izlaznu iz mreže. Korigujte izbor."); + return; + } + } + } } diff --git a/frontend/src/app/_pages/add-model/add-model.component.css b/frontend/src/app/_pages/add-model/add-model.component.css index e69de29b..004b9cac 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.css +++ b/frontend/src/app/_pages/add-model/add-model.component.css @@ -0,0 +1,17 @@ +#header { + background-color: #003459; + padding-top: 25px; + padding-bottom: 20px; +} +#header h1 { + font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + text-align: center; + color: white; +} + +#wrapper { + background-image: url('/assets/images/add_model_background.jpg'); +} +#container { + border-radius: 8px; +} \ No newline at end of file diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html index bc292bb9..e141b228 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.html +++ b/frontend/src/app/_pages/add-model/add-model.component.html @@ -1,189 +1,145 @@ -
- -

Nov model:

-
- -
- -
- -
- -
-
- -
- -
- -
-
- - - -
- - -
- -
-
- - -
-
- -
-
- -

Parametri treniranja

- -
- -
- -
-
- -
- -
- -
-
- -
- -
- +
+
+    + +
+
+
+ +
+ +
+
+
+ +
+

Izvor podataka:

+ +
+ +

Parametri treniranja:

+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
- -
- -
- +

+
+
+ +
-
-
-
- -
- -
\ No newline at end of file + diff --git a/frontend/src/assets/images/add_model_background.jpg b/frontend/src/assets/images/add_model_background.jpg new file mode 100644 index 00000000..d86f0566 Binary files /dev/null and b/frontend/src/assets/images/add_model_background.jpg differ diff --git a/frontend/src/assets/images/logo_crop.png b/frontend/src/assets/images/logo_crop.png deleted file mode 100644 index 1775a465..00000000 Binary files a/frontend/src/assets/images/logo_crop.png and /dev/null differ diff --git a/frontend/src/assets/images/logo_dark_crop.png b/frontend/src/assets/images/logo_dark_crop.png deleted file mode 100644 index d66f13e2..00000000 Binary files a/frontend/src/assets/images/logo_dark_crop.png and /dev/null differ -- cgit v1.2.3
{{col}}