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 --- .../item-dataset/item-dataset.component.html | 62 +++++++++++++++++----- 1 file changed, 48 insertions(+), 14 deletions(-) (limited to 'frontend/src/app/_elements/item-dataset/item-dataset.component.html') 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 dc4221f4..142a9194 100644 --- a/frontend/src/app/_elements/item-dataset/item-dataset.component.html +++ b/frontend/src/app/_elements/item-dataset/item-dataset.component.html @@ -1,16 +1,50 @@
-
- {{dataset.name}} +
+ +
Naziv
+
{{dataset.name}}
+
+
+ Opis +

{{dataset.description}}opis1234564654768798768

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

- {{dataset.description}} -

- - - - - -
{{column}}
-
-
\ No newline at end of file +
+
+ +
+ + + + + +
{{column}}
+
+
+ + + + +
+ + + + Kreirano{{dataset.dateCreated |date}}
+ + + Poslednja izmena{{dataset.lastUpdated |date}}
+ +
+
+ +
\ No newline at end of file -- 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-dataset/item-dataset.component.html') 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