diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html index 8fdcae6d86..5a6c2285d3 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html @@ -119,6 +119,7 @@ diff --git a/ng2-components/ng2-activiti-analytics/README.md b/ng2-components/ng2-activiti-analytics/README.md index 761d9c3df6..e0120f9ff8 100644 --- a/ng2-components/ng2-activiti-analytics/README.md +++ b/ng2-components/ng2-activiti-analytics/README.md @@ -207,7 +207,7 @@ import { AnalyticsModule } from 'ng2-activiti-analytics';
- +
` @@ -259,8 +259,17 @@ platformBrowserDynamic().bootstrapModule(AppModule); | --- | --- | |`appId` | The application id | |`reportId` | The report id | +|`hideParameters` | Boolean to hide or show the analytics parameters | |`debug` | Flag to enable or disable the Form values in the console log | +You can also use the activiti analytic component to show straight away the charts without show the parameters setting the hideParameters to true + +```html + +``` + +![Analytics-without-parameters](docs/assets/analytics-without-parameters.png) + ## Basic usage example Analytics Generator The component generate and show the charts diff --git a/ng2-components/ng2-activiti-analytics/docs/assets/analytics-without-parameters.png b/ng2-components/ng2-activiti-analytics/docs/assets/analytics-without-parameters.png new file mode 100644 index 0000000000..06146ecd33 Binary files /dev/null and b/ng2-components/ng2-activiti-analytics/docs/assets/analytics-without-parameters.png differ diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css index f703726852..6e9242b6a9 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css @@ -68,6 +68,16 @@ padding-top: 20px; } +.report-icons { + float: right; +} + +.report-icons button { + min-width: 48px; + padding: 0 0px; +} + + .mdl-dialog__title.choose_name{ padding: 0px; } @@ -89,3 +99,7 @@ margin-left: 60%; padding-top: 5px; } + +.hide { + display: none; +} diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html index f2bfcdcbe2..8201575569 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html @@ -1,121 +1,117 @@ -
-
-
-
-
- -
-
- -
- mode_edit -

{{reportParameters.name}}

+
+
+
+
+ +
+
-
- -
-
-
-
- +
+
+ + + + + +
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- {{'ANALYTICS.MESSAGES.UNKNOWN-WIDGET-TYPE' | translate}}: {{field.type}} +
+ mode_edit +

{{reportParameters.name}}

-
-
-
- - -
-
- -
{{action}} report
-
-
{{'DIALOG.SAVE_MESSAGE' | translate}}
-
- - +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+ {{'ANALYTICS.MESSAGES.UNKNOWN-WIDGET-TYPE' | translate}}: {{field.type}} +
-
- - + +
{{action}} report
+
+
{{'DIALOG.SAVE_MESSAGE' | translate}}
+
+ + +
+
+
+ + +
+
+
+

ReportForm valid : {{ reportForm.valid }}

+

ReportForm status : {{ reportForm.errors | json }}

+

ReportForm FormGroup valid : {{reportForm && reportForm.controls.dateRange.valid | json }}

-
-
-

ReportForm valid : {{ reportForm.valid }}

-

ReportForm status : {{ reportForm.errors | json }}

-

ReportForm FormGroup valid : {{reportForm && reportForm.controls.dateRange.valid | json }}

-
- + +
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts index 9a34269c97..53c7cc81e2 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts @@ -57,6 +57,9 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On @Input() reportId: string; + @Input() + hideComponent: boolean = false; + @Input() debug: boolean = false; diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html index 3f16077c5c..9245d6cc62 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html @@ -1,5 +1,6 @@