From 6521326fec0cd79bc2e379c66549337fab745b18 Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Fri, 4 Nov 2016 20:32:34 +0000 Subject: [PATCH] Improved user-info design --- .../src/components/user-info.component.css | 33 +++++- .../src/components/user-info.component.html | 101 ++++++++++-------- .../src/components/user-info.component.ts | 36 +++++-- .../src/img/blueBanner.png | Bin 0 -> 6393 bytes .../src/img/orangeBanner.png | Bin 0 -> 5031 bytes .../src/services/bpm-user.service.spec.ts | 5 +- .../src/services/bpm-user.service.ts | 17 ++- 7 files changed, 123 insertions(+), 69 deletions(-) create mode 100644 ng2-components/ng2-alfresco-userinfo/src/img/blueBanner.png create mode 100644 ng2-components/ng2-alfresco-userinfo/src/img/orangeBanner.png diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.css b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.css index ddda950182..0c25fe1069 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.css +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.css @@ -7,6 +7,7 @@ cursor: pointer; border: 1px solid #999999; vertical-align: middle; + background-color:white;; } .button-profile { @@ -16,7 +17,6 @@ } .detail-user-profile-list-mdl{ - margin-right: 10px; padding: 0px 0; } @@ -24,6 +24,7 @@ max-height: 450px; min-width: 450px; overflow: auto; + padding:0px; } .header-profile{ @@ -53,3 +54,33 @@ span.role-label-user{ .truncate-long-names{ text-overflow: ellipsis; } +.demo-card-wide.mdl-card { + width: inherit; +} +.demo-card-wide > .mdl-card__title { + color: #fff; + height: 176px; +} +.demo-card-wide > .mdl-card__menu { + color: #fff; +} + +.card-title__option{ + height: 100px!important; +} + +img.profile-picture { + background-color: white; + background-size: cover; + border-radius: 50%; + box-shadow: inset 1px 1px 3px rgba(0,0,0,0.2), 1px 1px 4px rgba(0,0,0,0.3); + height: 80px; + width: 80px; + z-index: 3; + margin-left: 0px; + margin-right: 8px; +} + +.menu-container__items{ + +} diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html index a5cccc1539..2e17fc6186 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html @@ -1,65 +1,74 @@
- {{ecmUser.firstName || ecmUser.lastName}} - - {{ formatValue(bpmUser.firstName) || - formatValue(bpmUser.lastName) || - formatValue(bpmUser.fullname) }} - -
- +
+
-
-
-
- BPM -
  • +
    • +
    + - +
    +
    + - - diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts index e2d5968d75..a32c794c5b 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts @@ -61,12 +61,30 @@ export class UserInfoComponent implements OnInit { .subscribe((res) => { this.bpmUser = res; }); - this.bpmUserService.getCurrentUserProfileImage() - .subscribe( - (res) => { - this.bpmUserImage = res; - } - ); + this.bpmUserImage = this.bpmUserService.getCurrentUserProfileImage(); + } + } + + onImageLoadingError(event) { + if (event) { + let element = event.target; + element.src = this.anonymousImageUrl; + } + } + + stopClosing(event) { + event.stopPropagation(); + } + + getUserNameHeaderFor(env: string) { + if (this.ecmUser && env === 'ECM') { + return this.ecmUser.firstName || this.ecmUser.lastName; + } + + if (this.bpmUser && env === 'BPM') { + return this.formatValue(this.bpmUser.firstName) || + this.formatValue(this.bpmUser.lastName) || + this.formatValue(this.bpmUser.fullname); } } @@ -75,15 +93,15 @@ export class UserInfoComponent implements OnInit { } getUserAvatar() { - return this.ecmUserImage || this.bpmUserImage || this.anonymousImageUrl; + return this.ecmUserImage || this.bpmUserImage; } getBpmUserAvatar() { - return this.bpmUserImage || this.anonymousImageUrl; + return this.bpmUserImage; } getEcmUserAvatar() { - return this.ecmUserImage || this.anonymousImageUrl; + return this.ecmUserImage; } formatValue(value: string) { diff --git a/ng2-components/ng2-alfresco-userinfo/src/img/blueBanner.png b/ng2-components/ng2-alfresco-userinfo/src/img/blueBanner.png new file mode 100644 index 0000000000000000000000000000000000000000..923f00885dfd862554b16a100f2182c98bd30892 GIT binary patch literal 6393 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 literal 0 HcmV?d00001 diff --git a/ng2-components/ng2-alfresco-userinfo/src/img/orangeBanner.png b/ng2-components/ng2-alfresco-userinfo/src/img/orangeBanner.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0a39ae5a7124a3da764e1436b2f0201ee1e550 GIT binary patch literal 5031 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 { - let service, injector, authService; + let service, injector, authService, apiService; beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ @@ -39,6 +39,7 @@ describe('Bpm User service', () => { beforeEach(() => { service = injector.get(BpmUserService); authService = injector.get(AlfrescoAuthenticationService); + apiService = injector.get(AlfrescoApiService); jasmine.Ajax.install(); }); @@ -47,7 +48,7 @@ describe('Bpm User service', () => { }); it('can instantiate service with authorization', () => { - let serviceTest = new BpmUserService(authService); + let serviceTest = new BpmUserService(authService, apiService); expect(serviceTest instanceof BpmUserService).toBe(true, 'new service should be ok'); }); diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts index 0f2f445f8e..d5d85eb18f 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; @@ -29,7 +29,8 @@ import { BpmUserModel } from '../models/bpm-user.model'; @Injectable() export class BpmUserService { - constructor(private authService: AlfrescoAuthenticationService) { + constructor(private authService: AlfrescoAuthenticationService, + private alfrescoJsApi: AlfrescoApiService) { } /** @@ -37,19 +38,13 @@ export class BpmUserService { * @param userName - the user name */ getCurrentUserInfo(): Observable { - return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.profileApi.getProfile()) + return Observable.fromPromise(this.alfrescoJsApi.getInstance().activiti.profileApi.getProfile()) .map((data) => data) .catch(this.handleError); } - getCurrentUserProfileImage(): Observable { - return Observable.fromPromise(this.callGetProfilePictureApi()) - .map((data) => data) - .catch(this.handleError); - } - - private callGetProfilePictureApi() { - return this.authService.getAlfrescoApi().activiti.profileApi.getProfilePicture(); + getCurrentUserProfileImage(): string { + return this.alfrescoJsApi.getInstance().activiti.profileApi.getProfilePictureUrl(); } /**