From de30bc85092a3917da97ae677a2aad89e9a21a2e Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Fri, 1 Jun 2018 14:26:27 +0200
Subject: [PATCH] FEAT #7731 Format + clean signatureBook
---
.../js/angular/app/signature-book.component.ts | 12 ++++++------
.../docserver/controllers/DocserverController.php | 5 +++--
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/app/signature-book.component.ts b/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
index fd7ce09482c..4ca464fd68d 100755
--- a/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
@@ -1,15 +1,14 @@
import { Pipe, PipeTransform, Component, OnInit, NgZone } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { DomSanitizer } from '@angular/platform-browser';
-import { LANG } from './translate.component';
import { Router, ActivatedRoute } from '@angular/router';
+import { LANG } from './translate.component';
+import { NotificationService } from './notification.service';
declare function lockDocument(resId: number) : void;
declare function unlockDocument(resId: number) : void;
declare function valid_action_form(a1: string, a2: string, a3: string, a4: number, a5: string, a6: string, a7: string, a8: string, a9: boolean, a10: any) : void;
declare function $j(selector: string) : any;
-declare function successNotification(message: string) : void;
-declare function errorNotification(message: string) : void;
declare function showAttachmentsForm(path: string) : void;
declare function modifyAttachmentsForm(path: string, width: string, height: string) : void;
declare function setSessionForSignatureBook(resId: any) : void;
@@ -26,7 +25,8 @@ export class SafeUrlPipe implements PipeTransform {
}
@Component({
- templateUrl: "../../../Views/signature-book.component.html",
+ templateUrl: "../../../Views/signature-book.component.html",
+ providers: [NotificationService]
})
export class SignatureBookComponent implements OnInit {
@@ -71,7 +71,7 @@ export class SignatureBookComponent implements OnInit {
attachmentsViewerLink : string = "";
- constructor(public http: HttpClient, private route: ActivatedRoute, private router: Router, private zone: NgZone) {
+ constructor(public http: HttpClient, private route: ActivatedRoute, private router: Router, private zone: NgZone, private notify: NotificationService) {
$j("head style").remove();
if ($j("link[href='merged_css.php']").length == 0) {
@@ -164,7 +164,7 @@ export class SignatureBookComponent implements OnInit {
}
}, 0);
}, (err) => {
- errorNotification(JSON.parse(err._body).errors);
+ this.notify.error(err.error.errors);
setTimeout(() => {
this.backToBasket();
}, 2000);
diff --git a/src/app/docserver/controllers/DocserverController.php b/src/app/docserver/controllers/DocserverController.php
index 48581a048b3..eea264deb38 100644
--- a/src/app/docserver/controllers/DocserverController.php
+++ b/src/app/docserver/controllers/DocserverController.php
@@ -33,6 +33,7 @@ class DocserverController
}
$sortedDocservers = [];
+ $types = [];
$docservers = DocserverModel::get();
foreach ($docservers as $docserver) {
$docserver['actual_size_number'] = DocserverController::getDocserverSize(['path' => $docserver['path_template']]);
@@ -43,9 +44,10 @@ class DocserverController
}
$docserver['percentage'] = round($docserver['actual_size_number'] / $docserver['size_limit_number'] * 100, 2);
$sortedDocservers[$docserver['docserver_type_id']][] = $docserver;
+ $types[] = $docserver['docserver_type_id'];
}
- return $response->withJson(['docservers' => $sortedDocservers]);
+ return $response->withJson(['docservers' => $sortedDocservers, 'types' => $types]);
}
public function getById(Request $request, Response $response, array $aArgs)
@@ -55,7 +57,6 @@ class DocserverController
}
$docserver = DocserverModel::getById(['id' => $aArgs['id']]);
-
if(empty($docserver)){
return $response->withStatus(400)->withJson(['errors' => 'Docserver not found']);
}
--
GitLab