diff --git a/src/app/stakeholder/stakeholder.component.html b/src/app/stakeholder/stakeholder.component.html index e5646ea..9aefbb8 100644 --- a/src/app/stakeholder/stakeholder.component.html +++ b/src/app/stakeholder/stakeholder.component.html @@ -119,6 +119,9 @@
+
+
diff --git a/src/app/stakeholder/stakeholder.component.ts b/src/app/stakeholder/stakeholder.component.ts index 52a3810..f2a374e 100644 --- a/src/app/stakeholder/stakeholder.component.ts +++ b/src/app/stakeholder/stakeholder.component.ts @@ -96,7 +96,8 @@ export class StakeholderComponent implements OnInit, OnDestroy, IDeactivateCompo isActive: this.fb.control(topic.isActive), isPublic: this.fb.control(topic.isPublic), defaultId: this.fb.control(topic.defaultId), - categories: this.fb.control(topic.categories) + categories: this.fb.control(topic.categories), + iconUrl: this.fb.control(topic.iconUrl) }); this.subscriptions.push(this.form.get('name').valueChanges.subscribe(value => { let i = 1; diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index a5735eb..e2ae9eb 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -63,117 +63,134 @@

Number Indicators

-
- -
-
-
- -
-
-
-

{{number.title}}

-
- -
-
-
-
- -
- {{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} - {{(indicator.isPublic) ? 'Public' : 'Private'}} +
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+

{{number.title}}

+
+ +
+
+
+
+ +
+ {{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} + {{(indicator.isPublic) ? 'Public' : 'Private'}} +
+
+ {{indicatorUtils.isActiveIcon}} + {{(indicator.isActive) ? 'Active' : 'Inactive'}} +
+
+
-
- {{indicatorUtils.isActiveIcon}} - {{(indicator.isActive) ? 'Active' : 'Inactive'}} -
- -
- more_vert -
- +
+ {{indicator.name ? indicator.name : 'No title available'}} +
+
+
+
+
+ {{indicator.description}} +
+
+ {{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} +
{{(indicator.isPublic) ? 'Public' : 'Private'}}
+
+
+ {{indicatorUtils.isActiveIcon}} +
{{(indicator.isActive) ? 'Active' : 'Inactive'}}
+
-
-
- {{indicator.name ? indicator.name : 'No title available'}}
-
-
-
- {{indicator.description}} + +
+
+
+
+ add + Create a custom Indicator
-
- {{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} -
{{(indicator.isPublic) ? 'Public' : 'Private'}}
-
-
- {{indicatorUtils.isActiveIcon}} -
{{(indicator.isActive) ? 'Active' : 'Inactive'}}
+
+
+
+
+ Create a new number Indicator +
+
+ add +
-
-
-
-
- add - Create a custom Indicator -
-
-
-
-
- Create a new number Indicator -
-
- add -
-
-
+
+
+ + Create a new section
@@ -187,7 +204,8 @@
- +
-
@@ -223,13 +242,15 @@ {{indicatorPath.type + ' Chart'}}
-
+
{{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} {{(indicator.isPublic) ? 'Public' : 'Private'}}
-
+
{{indicatorUtils.isActiveIcon}} @@ -366,7 +387,8 @@ [formGroup]="indicatorPath">
-
+
- close + close
arrow_forward
diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 17703df..54cc2bf 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -130,6 +130,9 @@
+
+
diff --git a/src/app/topic/topic.component.ts b/src/app/topic/topic.component.ts index 226d40b..a2c9e8e 100644 --- a/src/app/topic/topic.component.ts +++ b/src/app/topic/topic.component.ts @@ -137,7 +137,8 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { isActive: this.fb.control(topic.isActive), isPublic: this.fb.control(topic.isPublic), defaultId: this.fb.control(topic.defaultId), - categories: this.fb.control(topic.categories) + categories: this.fb.control(topic.categories), + iconUrl: this.fb.control(topic.iconUrl) }); this.subscriptions.push(this.form.get('name').valueChanges.subscribe(value => { let i = 1;