From 8bd0a4d21965416121913641d65ea8826d403818 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 18 Oct 2019 22:51:54 +0100
Subject: [PATCH] FEAT #11954 TIME 0:30 step load converted file
---
rest/index.php | 2 +-
.../app/viewer/document-viewer.component.ts | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/rest/index.php b/rest/index.php
index 7060d7c9876..7f892ea7a8e 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 0db6222696f..e4fc00a429a 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 };
--
GitLab