From 39f9fcb303924c3f9dd8fce3f332d4bc4aa14a9d Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Tue, 12 Apr 2022 19:01:22 +0200 Subject: Reorganizovani su item-dataset, item-model, my-datasets, my-models. Dodat je yes-no-dialog. 123 --- .../_elements/item-model/item-model.component.css | 23 ++++++++ .../_elements/item-model/item-model.component.html | 67 +++++++++++++++++++--- .../_elements/item-model/item-model.component.ts | 15 +++++ 3 files changed, 98 insertions(+), 7 deletions(-) (limited to 'frontend/src/app/_elements/item-model') diff --git a/frontend/src/app/_elements/item-model/item-model.component.css b/frontend/src/app/_elements/item-model/item-model.component.css index e69de29b..5ea24c72 100644 --- a/frontend/src/app/_elements/item-model/item-model.component.css +++ b/frontend/src/app/_elements/item-model/item-model.component.css @@ -0,0 +1,23 @@ +.card{ + margin: 0.5rem; + padding: 0; +} +.p-2{ + margin: 0; + padding: 0; +} +hr{ + margin: 0; + padding: 0; +} +b{ + margin-left: 5px; + margin-right: 10px; +} +th{ + margin: 10px; + padding: 10px; +} +p{ + text-align: justify; +} \ No newline at end of file diff --git a/frontend/src/app/_elements/item-model/item-model.component.html b/frontend/src/app/_elements/item-model/item-model.component.html index 695c580e..c64f8ca1 100644 --- a/frontend/src/app/_elements/item-model/item-model.component.html +++ b/frontend/src/app/_elements/item-model/item-model.component.html @@ -1,13 +1,66 @@
-
- {{model.name}} +
+ +
Naziv
+
{{model.name}}
-
+
+ +
+ Opis

- {{"Opis: "+ model.description}}
- {{"Datum kreiranja: " + model.dateCreated}}
- {{"Poslednje ažuriranje: " + model.lastUpdated}}
+ {{model.description}}opis1234564654768798768

- +
+ +
+ + + + +
+ + + + Kreirano{{model.dateCreated |date}}
+ + + Poslednja izmena{{model.lastUpdated |date}}
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + +
Tip problema{{model.type}}
Optimizator{{model.optimizer}}
Funkcija gubitka{{model.lossFunction}}
Batch size{{model.batchSize}}
Broj epoha{{model.epochs}}
+ +
\ No newline at end of file diff --git a/frontend/src/app/_elements/item-model/item-model.component.ts b/frontend/src/app/_elements/item-model/item-model.component.ts index 7f85f43f..b837667b 100644 --- a/frontend/src/app/_elements/item-model/item-model.component.ts +++ b/frontend/src/app/_elements/item-model/item-model.component.ts @@ -9,10 +9,25 @@ import Model from 'src/app/_data/Model'; export class ItemModelComponent implements OnInit { @Input() model: Model = new Model(); + isShowDiv = true; + randomOrd=''; + toggleDisplayDiv() { + this.isShowDiv = !this.isShowDiv; + } + constructor() { } ngOnInit(): void { + /*if(this.model.randomOrder) + { + this.randomOrd='Da'; + } + else + { + this.randomOrd='Ne'; + } +*/ } } -- cgit v1.2.3 From dc4d2497435a7c038034f02641542cde10cf31a1 Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Tue, 12 Apr 2022 22:50:14 +0200 Subject: Izmena --- .../item-dataset/item-dataset.component.css | 2 +- .../item-dataset/item-dataset.component.html | 31 ++++++++-------------- .../item-dataset/item-dataset.component.ts | 23 ++++++++++++++-- .../_elements/item-model/item-model.component.html | 16 +++-------- 4 files changed, 37 insertions(+), 35 deletions(-) (limited to 'frontend/src/app/_elements/item-model') diff --git a/frontend/src/app/_elements/item-dataset/item-dataset.component.css b/frontend/src/app/_elements/item-dataset/item-dataset.component.css index 1457311f..dc851671 100644 --- a/frontend/src/app/_elements/item-dataset/item-dataset.component.css +++ b/frontend/src/app/_elements/item-dataset/item-dataset.component.css @@ -1,5 +1,5 @@ .card{ - margin-top:10%; + margin-top:0; padding: 0; } .p-2{ diff --git a/frontend/src/app/_elements/item-dataset/item-dataset.component.html b/frontend/src/app/_elements/item-dataset/item-dataset.component.html index 142a9194..11ff61c3 100644 --- a/frontend/src/app/_elements/item-dataset/item-dataset.component.html +++ b/frontend/src/app/_elements/item-dataset/item-dataset.component.html @@ -6,42 +6,33 @@
Opis -

{{dataset.description}}opis1234564654768798768

+

{{dataset.description}}

-
- - +
+

{{dataset.extension}}

- - - + {{visibleicon}} +
+
+ {{accessibleicon}}
- +
- - +
{{column}}{{column.columnName}}
- - - + +
- - - - Kreirano{{dataset.dateCreated |date}}
- - - Poslednja izmena{{dataset.lastUpdated |date}}
calendar_today Kreirano{{dataset.dateCreated |date}}
edit_calendar Poslednja izmena{{dataset.lastUpdated |date}}
diff --git a/frontend/src/app/_elements/item-dataset/item-dataset.component.ts b/frontend/src/app/_elements/item-dataset/item-dataset.component.ts index 320cb10f..44b95310 100644 --- a/frontend/src/app/_elements/item-dataset/item-dataset.component.ts +++ b/frontend/src/app/_elements/item-dataset/item-dataset.component.ts @@ -9,13 +9,32 @@ import Dataset from 'src/app/_data/Dataset'; export class ItemDatasetComponent { @Input() dataset: Dataset = new Dataset(); - + visibleicon=''; + accessibleicon=''; isShowDiv = true; toggleDisplayDiv() { this.isShowDiv = !this.isShowDiv; } constructor() { } - + ngOnInit(): void { + if(this.dataset.isPublic==true) + { + this.visibleicon='visibility' + } + else + { + this.visibleicon='visibility_off'; + } + + if(this.dataset.accessibleByLink==true) + { + this.accessibleicon='link' + } + else + { + this.accessibleicon='link_off'; + } + } } diff --git a/frontend/src/app/_elements/item-model/item-model.component.html b/frontend/src/app/_elements/item-model/item-model.component.html index c64f8ca1..447f023e 100644 --- a/frontend/src/app/_elements/item-model/item-model.component.html +++ b/frontend/src/app/_elements/item-model/item-model.component.html @@ -9,23 +9,15 @@
Opis

- {{model.description}}opis1234564654768798768 + {{model.description}}

- - - -
- - - - Kreirano{{model.dateCreated |date}}
- - - Poslednja izmena{{model.lastUpdated |date}}
+ calendar_today Kreirano{{model.dateCreated |date}} + edit_calendar Poslednja izmena{{model.lastUpdated |date}} +
-- cgit v1.2.3