diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html index 8ca4031676..2e394bdbd2 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html @@ -1,7 +1,7 @@
- {{filesUploadingList.length}} {{'FILE_UPLOAD.MESSAGES.COMPLETED' | translate}} + {{totalCompleted}} {{'FILE_UPLOAD.MESSAGES.COMPLETED' | translate}}
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts index b32a97ba81..21c1a49f04 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, ChangeDetectorRef } from 'angular2/core'; +import { Component, ChangeDetectorRef, OnInit } from 'angular2/core'; import { FileModel } from '../models/file.model'; import { FileUploadingListComponent } from './file-uploading-list.component'; import { AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; @@ -43,12 +43,14 @@ declare let __moduleName: string; host: {'[class.dialog-show]': 'toggleShowDialog'}, pipes: [AlfrescoPipeTranslate] }) -export class FileUploadingDialogComponent { +export class FileUploadingDialogComponent implements OnInit{ isDialogActive: boolean = false; filesUploadingList: FileModel []; + totalCompleted: number = 0; + private _isDialogMinimized: boolean = false; constructor(private cd: ChangeDetectorRef, @@ -62,6 +64,10 @@ export class FileUploadingDialogComponent { this.cd.detectChanges(); } }); + this._uploaderService.totalCompleted$.subscribe((total: number) => { + this.totalCompleted = total; + this.cd.detectChanges(); + }); } /** diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html index 59ad028f90..655ac7e99c 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html @@ -26,7 +26,6 @@ remove_circle_outline remove_circle - pause diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts index 8548f4ce83..407125ee4b 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -43,13 +43,18 @@ export class UploadService { private _queue: FileModel[] = []; filesUpload$: Observable; + totalCompleted$: Observable; private _filesUploadObserver: Observer; + private _totalCompletedObserver: Observer; private _alfrescoClient: any; + public totalCompleted: number = 0; + constructor(private settings: AlfrescoSettingsService) { console.log('UploadService constructor'); this.filesUpload$ = new Observable(observer => this._filesUploadObserver = observer).share(); + this.totalCompleted$ = new Observable(observer => this._totalCompletedObserver = observer).share(); this._alfrescoClient = this.getAlfrescoClient(); } @@ -195,6 +200,11 @@ export class UploadService { xmlHttpRequest.statusText, xmlHttpRequest.response ); + if (!uploadingFileModel.abort && !uploadingFileModel.error) { + if (this._totalCompletedObserver) { + this._totalCompletedObserver.next(++this.totalCompleted); + } + } } }; return xmlHttpRequest;