inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-08-07 17:48:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1358] Upload Dialog - Uploaded indicator should take in consideration cancelled files (#2197)

Browse Source 
* indicate the number of files completed over cancelled ones

* changed test names
This commit is contained in:
Cilibiu Bogdan
2017-08-10 17:09:15 +03:00
committed by Denys Vuika
parent 18b5f812bf
commit a4d12127ea
5 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html
View File

@@ -14,13 +14,23 @@
<span
class="upload-dialog__title"
*ngIf="!uploadList.isUploadCompleted() && !uploadList.isUploadCancelled()">
{{ 'FILE_UPLOAD.MESSAGES.UPLOAD_PROGRESS' | translate: { completed: totalCompleted, total: filesUploadingList.length } }}
{{ 'FILE_UPLOAD.MESSAGES.UPLOAD_PROGRESS'
| translate: {
completed: totalCompleted,
total: filesUploadingList.length
}
}}
</span>
<span
class="upload-dialog__title"
*ngIf="uploadList.isUploadCompleted()">
{{ 'FILE_UPLOAD.MESSAGES.UPLOAD_COMPLETED' | translate: { completed: totalCompleted, total: filesUploadingList.length } }}
{{ 'FILE_UPLOAD.MESSAGES.UPLOAD_COMPLETED'
| translate: {
completed: (totalCompleted - uploadList.uploadCancelledFiles.length),
total: filesUploadingList.length
}
}}
</span>
<span
@@ -32,12 +42,12 @@
<section
class="upload-dialog__info"
*ngIf="uploadList.totalErrorFiles()">
*ngIf="uploadList.uploadErrorFiles.length">
{{
(uploadList.totalErrorFiles() > 1
(uploadList.uploadErrorFiles.length > 1
? 'FILE_UPLOAD.MESSAGES.UPLOAD_ERRORS'
: 'FILE_UPLOAD.MESSAGES.UPLOAD_ERROR')
| translate: { total: uploadList.totalErrorFiles() }
| translate: { total: uploadList.uploadErrorFiles.length }
}}
</section>