diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-alfresco-publish-task.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-alfresco-publish-task.component.html new file mode 100644 index 0000000000..5a7c236f1f --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-alfresco-publish-task.component.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-alfresco-publish-task.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-alfresco-publish-task.component.ts new file mode 100644 index 0000000000..83e4246518 --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-alfresco-publish-task.component.ts @@ -0,0 +1,38 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Component, ElementRef, Input, Output, EventEmitter } from '@angular/core'; + +@Component({ + moduleId: module.id, + selector: 'diagram-alfresco-publish-task', + templateUrl: './diagram-alfresco-publish-task.component.html', + styleUrls: ['./diagram-alfresco-publish-task.component.css'] +}) +export class DiagramAlfrescoPublishTaskComponent { + @Input() + data: any; + + @Output() + onError = new EventEmitter(); + + constructor(public elementRef: ElementRef) {} + + ngOnInit() { + + } +} diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-container-service-task.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-container-service-task.component.html index b6a3404eac..f3c4b005cd 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-container-service-task.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-container-service-task.component.html @@ -8,6 +8,9 @@
+
+ +
diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/index.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/index.ts index bad5086ab6..bf95022371 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/index.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/index.ts @@ -23,6 +23,7 @@ import { DiagramUserTaskComponent } from './diagram-user-task.component'; import { DiagramManualTaskComponent } from './diagram-manual-task.component'; import { DiagramCamelTaskComponent } from './diagram-camel-task.component'; import { DiagramMuleTaskComponent } from './diagram-mule-task.component'; +import { DiagramAlfrescoPublishTaskComponent } from './diagram-alfresco-publish-task.component'; // primitives export * from './diagram-container-service-task.component'; @@ -33,6 +34,7 @@ export * from './diagram-user-task.component'; export * from './diagram-manual-task.component'; export * from './diagram-camel-task.component'; export * from './diagram-mule-task.component'; +export * from './diagram-alfresco-publish-task.component'; export const DIAGRAM_ACTIVITIES_DIRECTIVES: any[] = [ DiagramContainerServiceTaskComponent, @@ -42,5 +44,6 @@ export const DIAGRAM_ACTIVITIES_DIRECTIVES: any[] = [ DiagramUserTaskComponent, DiagramManualTaskComponent, DiagramCamelTaskComponent, - DiagramMuleTaskComponent + DiagramMuleTaskComponent, + DiagramAlfrescoPublishTaskComponent ]; diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-alfresco-publish-task.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-alfresco-publish-task.component.html new file mode 100644 index 0000000000..65394e97f8 --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-alfresco-publish-task.component.html @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-alfresco-publish-task.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-alfresco-publish-task.component.ts new file mode 100644 index 0000000000..4ea09ba1e1 --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/diagram-icon-alfresco-publish-task.component.ts @@ -0,0 +1,46 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Component, ElementRef, Input, Output, EventEmitter } from '@angular/core'; +import { DiagramColorService } from './../services/diagram-color.service'; + +@Component({ + moduleId: module.id, + selector: 'diagram-icon-alfresco-publish-task', + templateUrl: './diagram-icon-alfresco-publish-task.component.html', + styleUrls: ['./diagram-icon-alfresco-publish-task.component.css'] +}) +export class DiagramIconAlfrescoPublishTaskComponent { + @Input() + data: any; + + @Output() + onError = new EventEmitter(); + + position: any; + + options: any = {stroke: '', fillColors: '', fillOpacity: '', strokeWidth: ''}; + + constructor(public elementRef: ElementRef, + private diagramColorService: DiagramColorService) {} + + ngOnInit() { + this.position = {x: this.data.x + 4, y: this.data.y + 4}; + this.options.stroke = 'none' ; + this.options.fillColors = '#87C040' ; + } +} diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/index.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/index.ts index 33f5fad116..9860f0a81c 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/index.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/icons/index.ts @@ -21,6 +21,7 @@ import { DiagramIconUserTaskComponent } from './diagram-icon-user-task.component import { DiagramIconManualTaskComponent } from './diagram-icon-manual-task.component'; import { DiagramIconCamelTaskComponent } from './diagram-icon-camel-task.component'; import { DiagramIconMuleTaskComponent } from './diagram-icon-mule-task.component'; +import { DiagramIconAlfrescoPublishTaskComponent } from './diagram-icon-alfresco-publish-task.component'; // primitives export * from './diagram-icon-service-task.component'; @@ -29,6 +30,7 @@ export * from './diagram-icon-user-task.component'; export * from './diagram-icon-manual-task.component'; export * from './diagram-icon-camel-task.component'; export * from './diagram-icon-mule-task.component'; +export * from './diagram-icon-alfresco-publish-task.component'; export const DIAGRAM_ICONS_DIRECTIVES: any[] = [ DiagramIconServiceTaskComponent, @@ -36,5 +38,6 @@ export const DIAGRAM_ICONS_DIRECTIVES: any[] = [ DiagramIconUserTaskComponent, DiagramIconManualTaskComponent, DiagramIconCamelTaskComponent, - DiagramIconMuleTaskComponent + DiagramIconMuleTaskComponent, + DiagramIconAlfrescoPublishTaskComponent ]; diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/index.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/index.ts index 1c76a761ae..567f1ebad5 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/raphael/index.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/index.ts @@ -31,6 +31,7 @@ import { RaphaelIconUserDirective } from './raphael-icon-user.component'; import { RaphaelIconManualDirective } from './raphael-icon-manual.component'; import { RaphaelIconCamelDirective } from './raphael-icon-camel.component'; import { RaphaelIconMuleDirective } from './raphael-icon-mule.component'; +import { RaphaelIconAlfrescoPublishDirective } from './raphael-icon-alfresco-publish.component'; // primitives export * from './raphael-circle.component'; @@ -48,6 +49,7 @@ export * from './raphael-icon-user.component'; export * from './raphael-icon-manual.component'; export * from './raphael-icon-camel.component'; export * from './raphael-icon-mule.component'; +export * from './raphael-icon-alfresco-publish.component'; export const RAPHAEL_DIRECTIVES: any[] = [ RaphaelCircleDirective, @@ -63,5 +65,6 @@ export const RAPHAEL_DIRECTIVES: any[] = [ RaphaelIconUserDirective, RaphaelIconManualDirective, RaphaelIconCamelDirective, - RaphaelIconMuleDirective + RaphaelIconMuleDirective, + RaphaelIconAlfrescoPublishDirective ]; diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-alfresco-publish.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-alfresco-publish.component.ts new file mode 100644 index 0000000000..a013b1f9bb --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-alfresco-publish.component.ts @@ -0,0 +1,182 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core'; +import { Point } from './models/point'; +import { RaphaelBase } from './raphael-base'; +import { RaphaelService } from './raphael.service'; + +@Directive({selector: 'raphael-icon-alfresco-publish'}) +export class RaphaelIconAlfrescoPublishDirective extends RaphaelBase implements OnInit { + @Input() + paper: any; + + @Input() + position: Point; + + @Input() + text: string; + + @Output() + onError = new EventEmitter(); + + @Input() + strokeWidth: number; + + @Input() + fillColors: any; + + @Input() + stroke: any; + + @Input() + fillOpacity: any; + + constructor(public elementRef: ElementRef, + raphaelService: RaphaelService) { + super(elementRef, raphaelService); + } + + ngOnInit() { + console.log(this.elementRef); + this.draw(this.position); + } + + public draw(position: Point) { + + let startX = position.x + 2; + let startY = position.y + 2; + + let path1 = this.paper.path(`M4.11870968,2.12890323 L6.12954839,0.117935484 L3.10993548,0.118064516 L3.10270968,0.118064516 + C1.42941935,0.118064516 0.0729032258,1.47458065 0.0729032258,3.14774194 C0.0729032258,4.82116129 1.42929032,6.17754839 + 3.10258065,6.17754839 C3.22967742,6.17754839 3.35470968,6.16877419 3.47767742,6.15354839 C2.8163871,4.85083871 + 3.02954839,3.21793548 4.11870968,2.12890323M6.57032258,3.144 L6.57032258,0.300258065 L4.43522581,2.4356129 L4.43006452,2.44064516 + C3.24683871,3.62387097 3.24683871,5.54219355 4.43006452,6.72541935 C5.61329032,7.90864516 7.5316129,7.90864516 + 8.71483871,6.72541935 C8.80464516,6.6356129 8.88529032,6.54025806 8.96154839,6.44270968 C7.57341935,5.98864516 + 6.57045161,4.68387097 6.57032258,3.144`).attr({ + 'stroke': this.stroke, + 'fill': '#87C040', + 'stroke-width': this.strokeWidth + }); + + let startX1 = startX + 1.419355; + let startY1 = startY + 8.387097; + path1.transform('T' + startX1 + ',' + startY1); + + path1 = this.paper.path(`M10.4411613,10.5153548 L8.43032258,8.50451613 L8.43032258,11.5313548 C8.43032258,13.2047742 9.78683871, + 14.5611613 11.460129,14.5611613 C13.1334194,14.5611613 14.4899355,13.2047742 14.4899355,11.5314839 C14.4899355,11.4043871 + 14.4811613,11.2793548 14.4659355,11.1563871 C13.1632258,11.8178065 11.5303226,11.6045161 10.4411613,10.5153548M15.0376774, + 5.91935484 C14.947871,5.82954839 14.8526452,5.74890323 14.7550968,5.67264516 C14.3010323,7.06064516 12.996129,8.06374194 + 11.4563871,8.06374194 L8.61277419,8.06374194 L10.7529032,10.204 C11.936129,11.3872258 13.8545806,11.3872258 15.0376774,10.204 + C16.2209032,9.02077419 16.2209032,7.10245161 15.0376774,5.91935484`).attr({ + 'stroke': this.stroke, + 'fill': '#87C040', + 'stroke-width': this.strokeWidth + }); + path1.transform('T' + startX + ',' + startY); + + path1 = this.paper.path(`M5.9083871,1.5636129 C5.78129032,1.5636129 5.65625806,1.57225806 5.53329032,1.58748387 + C6.19458065,2.89032258 5.98141935,4.52309677 4.89225806,5.61225806 L2.88154839,7.62309677 L5.9083871,7.62309677 + C7.58154839,7.62309677 8.93806452,6.26658065 8.93806452,4.59329032 C8.93819355,2.92 7.58167742,1.5636129 + 5.9083871,1.5636129`).attr({ + 'stroke': this.stroke, + 'fill': '#ED9A2D', + 'stroke-width': this.strokeWidth + }); + + let startX2 = startX + 5.548387; + path1.transform('T' + startX2 + ',' + startY); + + path1 = this.paper.path(`M4.58090323,1.0156129 C3.39767742,-0.167483871 1.47935484,-0.167483871 0.296129032,1.01574194 + C0.206451613,1.10554839 0.125806452,1.20077419 0.0495483871,1.29845161 C1.43754839,1.75251613 2.44064516,3.05729032 + 2.44064516,4.59703226 L2.44064516,7.44077419 L4.57574194,5.30554839 L4.58090323,5.30051613 C5.76412903,4.11729032 + 5.76412903,2.19896774 4.58090323,1.0156129`).attr({ + 'stroke': this.stroke, + 'fill': '#5698C6', + 'stroke-width': this.strokeWidth + }); + path1.transform('T' + startX2 + ',' + startY); + + path1 = this.paper.path(`M5.54051613,5.61432258 L5.62670968,5.70425806 L7.54632258,7.62387097 L7.5483871,7.62387097 + L7.5483871,4.604 L7.5483871,4.59677419 C7.5483871,2.92348387 6.19187097,1.56696774 4.51858065,1.56696774 C2.84529032,1.56696774 + 1.48877419,2.92335484 1.48890323,4.59664516 C1.48890323,4.72348387 1.49754839,4.84812903 1.51264516,4.97083871 + C2.81625806,4.30993548 4.45122581,4.52503226 5.54051613,5.61432258M1.23251613,10.4292903 C1.25625806,10.3588387 + 1.28180645,10.2894194 1.30980645,10.2210323 C1.31329032,10.2123871 1.3163871,10.2036129 1.32,10.1952258 C1.35070968,10.1216774 + 1.38451613,10.0500645 1.42,9.97935484 C1.42774194,9.96374194 1.43574194,9.9483871 1.44387097,9.93277419 C1.4803871,9.86258065 + 1.51883871,9.79354839 1.55987097,9.72632258 C1.56425806,9.71909677 1.56903226,9.71225806 1.57341935,9.70529032 + C1.6123871,9.64245161 1.65354839,9.58141935 1.6963871,9.52141935 C1.70516129,9.50903226 1.71380645,9.49651613 + 1.72283871,9.48425806 C1.76890323,9.42154839 1.81690323,9.36064516 1.86683871,9.30129032 C1.87703226,9.28916129 + 1.88735484,9.27741935 1.89780645,9.26567742 C1.94658065,9.20916129 1.99690323,9.15406452 2.04916129,9.10090323 + C2.05380645,9.09625806 2.05806452,9.09135484 2.06270968,9.08670968 C2.11832258,9.03083871 2.17625806,8.97741935 + 2.23548387,8.92554839 C2.2483871,8.91419355 2.26129032,8.90296774 2.27432258,8.89187097 C2.33393548,8.84103226 + 2.39496774,8.79212903 2.45780645,8.74529032 C2.46606452,8.73922581 2.47470968,8.73354839 2.48296774,8.7276129 + C2.54167742,8.68490323 2.60180645,8.64412903 2.66322581,8.60503226 C2.67535484,8.59729032 2.68735484,8.58929032 + 2.6996129,8.58167742 C2.76593548,8.54064516 2.83380645,8.50206452 2.90296774,8.46541935 C2.91754839,8.45780645 + 2.93225806,8.45045161 2.94696774,8.44296774 C3.016,8.40774194 3.08593548,8.37406452 3.15741935,8.34348387 C3.16090323,8.34206452 + 3.16425806,8.3403871 3.16774194,8.33883871 C3.24167742,8.30748387 3.31729032,8.27948387 3.39380645,8.25316129 + C3.41032258,8.24748387 3.42670968,8.24180645 3.44335484,8.2363871 C3.51909677,8.21174194 3.59587097,8.18903226 + 3.67380645,8.16929032 C3.68567742,8.16645161 3.69793548,8.16387097 3.70980645,8.16116129 C3.78206452,8.14374194 + 3.85509677,8.12877419 3.92890323,8.116 C3.94270968,8.11367742 3.9563871,8.11083871 3.97019355,8.10877419 C4.05032258,8.09587097 + 4.13148387,8.08619355 4.21329032,8.07896774 C4.23096774,8.07741935 4.24877419,8.07625806 4.26645161,8.07483871 + C4.35109677,8.06877419 4.43612903,8.06451613 4.52232258,8.06451613 L7.36606452,8.0643871 L5.22580645,5.92412903 + C4.04258065,4.74103226 2.12412903,4.74090323 0.941032258,5.92412903 C-0.242193548,7.10735484 -0.242193548,9.02567742 + 0.941032258,10.2089032 C1.03070968,10.2985806 1.12464516,10.3814194 1.22206452,10.4575484 C1.22529032,10.448 1.22929032,10.4388387 + 1.23251613,10.4292903`).attr({ + 'stroke': this.stroke, + 'fill': '#5698C6', + 'stroke-width': this.strokeWidth + }); + path1.transform('T' + startX + ',' + startY); + + path1 = this.paper.path(`M5.23290323,5.92412903 L6.92748387,7.61870968 L4.64980645,7.61870968 L4.52064516,7.62141935 + C3.13354839,7.62141935 1.96425806,6.68929032 1.60477419,5.41729032 C2.75870968,4.77019355 4.24619355,4.93754839 + 5.22787097,5.91909677 L5.23290323,5.92412903M7.54722581,4.59612903 L7.54722581,6.99264516 L5.93664516,5.38206452 + L5.84348387,5.29264516 C4.86258065,4.31187097 4.69483871,2.82580645 5.34012903,1.67225806 C6.61367742,2.03070968 + 7.54722581,3.20090323 7.54722581,4.58890323 L7.54722581,4.59612903M10.1385806,5.29819355 L8.444,6.99290323 L8.444,4.71522581 + L8.44129032,4.58606452 C8.44129032,3.19896774 9.37341935,2.02954839 10.6454194,1.67019355 C11.2925161,2.82412903 + 11.1251613,4.3116129 10.1436129,5.29316129 L10.1385806,5.29819355`).attr({ + 'stroke': this.stroke, + 'fill': '#446BA5', + 'stroke-width': this.strokeWidth + }); + path1.transform('T' + startX + ',' + startY); + + path1 = this.paper.path(`M11.4548387,7.61677419 L9.05832258,7.61677419 L10.6689032,6.00619355 L10.7583226,5.91303226 + C11.7390968,4.93212903 13.2251613,4.7643871 14.3787097,5.40967742 C14.0202581,6.68322581 12.8500645,7.61677419 + 11.4620645,7.61677419 L11.4548387,7.61677419`).attr({ + 'stroke': this.stroke, + 'fill': '#FFF101', + 'stroke-width': this.strokeWidth + }); + path1.transform('T' + startX + ',' + startY); + + path1 = this.paper.path(`M10.7470968,10.192 L9.05251613,8.49741935 L11.3301935,8.49741935 L11.4593548,8.49470968 + C12.8464516,8.49483871 14.0157419,9.42696774 14.3752258,10.6989677 C13.2211613,11.3459355 11.7338065,11.1787097 + 10.752129,10.1970323 L10.7470968,10.192M8.43729032,11.5174194 L8.43729032,9.12090323 L10.047871,10.7314839 L10.1411613,10.8209032 + C11.1219355,11.8018065 11.2896774,13.2876129 10.6443871,14.4412903 C9.37083871,14.0828387 8.43729032,12.9127742 + 8.43729032,11.5245161 L8.43729032,11.5174194M5.86193548,10.8296774 L7.55651613,9.13496774 L7.55651613,11.4126452 + L7.55922581,11.5418065 C7.55922581,12.9289032 6.62709677,14.0983226 5.35509677,14.4578065 C4.708,13.3036129 4.87535484,11.8162581 + 5.85690323,10.8347097 L5.86193548,10.8296774M4.53251613,8.50993548 L6.92903226,8.50993548 L5.31845161,10.1205161 + L5.22903226,10.2136774 C4.24812903,11.1945806 2.76219355,11.3623226 1.60851613,10.7170323 C1.96709677,9.44335484 + 3.13716129,8.50993548 4.52529032,8.50993548 L4.53251613,8.50993548`).attr({ + 'stroke': this.stroke, + 'fill': '#45AB47', + 'stroke-width': this.strokeWidth + }); + path1.transform('T' + startX + ',' + startY); + } +}