diff --git a/rest/index.php b/rest/index.php index 7060d7c9876b467fd3bb4bd8291722477f4e8085..7f892ea7a8e1c7515bab5167872fde838c3b9c22 100755 --- a/rest/index.php +++ b/rest/index.php @@ -26,7 +26,7 @@ if (file_exists("custom/{$customId}/src/core/lang/lang-{$language}.php")) { require_once("src/core/lang/lang-{$language}.php"); -$app = new \Slim\App(['settings' => ['displayErrorDetails' => true, 'determineRouteBeforeAppMiddleware' => true, 'addContentLengthHeader' => false ]]); +$app = new \Slim\App(['settings' => ['displayErrorDetails' => true, 'determineRouteBeforeAppMiddleware' => true, 'addContentLengthHeader' => true ]]); //Authentication $app->add(function (\Slim\Http\Request $request, \Slim\Http\Response $response, callable $next) { diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts index 0db6222696ff290c3f21cb94b7943af9b2a3b10f..e4fc00a429ae52204e86c2b60c5fde9cb3aadc78 100644 --- a/src/frontend/app/viewer/document-viewer.component.ts +++ b/src/frontend/app/viewer/document-viewer.component.ts @@ -218,12 +218,12 @@ export class DocumentViewerComponent implements OnInit { switch (event.type) { case HttpEventType.DownloadProgress: - this.loadingInfo.mode = 'indeterminate'; - - const kbLoaded = Math.round(event.loaded / 125); - this.loadingInfo.message = `${this.lang.downloadConvertedFile}... ${kbLoaded} Ko`; + const downloadProgress = Math.round(100 * event.loaded / event.total); + this.loadingInfo.percent = downloadProgress; + this.loadingInfo.mode = 'determinate'; + this.loadingInfo.message = `3/3 ${this.lang.downloadConvertedFile}...`; - return { status: 'progress', message: '' }; + return { status: 'progress', message: downloadProgress }; case HttpEventType.UploadProgress: const progress = Math.round(100 * event.loaded / event.total); @@ -231,10 +231,10 @@ export class DocumentViewerComponent implements OnInit { if (progress === 100) { this.loadingInfo.mode = 'indeterminate'; - this.loadingInfo.message = `${this.lang.convertingFile}...`; + this.loadingInfo.message = `2/3 ${this.lang.convertingFile}...`; } else { this.loadingInfo.mode = 'determinate'; - this.loadingInfo.message = `${this.lang.loadingFile}...`; + this.loadingInfo.message = `1/3 ${this.lang.loadingFile}...`; } return { status: 'progress', message: progress };