From 2332b964094236026c0cbd64cd42ab0ab3f2bfd8 Mon Sep 17 00:00:00 2001 From: "florian.azizian" <florian.azizian@maarch.org> Date: Mon, 19 Oct 2020 10:53:49 +0200 Subject: [PATCH] FEAT #13271 TIME 0:05 clean console.log --- .../search/controllers/SearchController.php | 54 +++++++++---------- src/frontend/app/about-us.component.ts | 1 - ...cknowledgement-receipt-action.component.ts | 4 +- .../print-deposit-list-action.component.ts | 1 - .../list/import/contact-import.component.ts | 2 - .../entities-administration.component.ts | 2 - .../notifications-administration.component.ts | 1 - .../attachment-create.component.ts | 6 +-- .../contact-autocomplete.component.ts | 1 - .../folder-pinned/folder-pinned.component.ts | 3 -- .../indexing-form/indexing-form.component.ts | 3 -- .../prerequisite/prerequisite.component.ts | 1 - .../registered-mail-import.component.ts | 5 -- .../criteria-tool/criteria-tool.component.ts | 1 - .../app/viewer/document-viewer.component.ts | 2 - .../autocomplete-list.component.ts | 2 - .../collabora-online-viewer.component.ts | 1 - .../onlyoffice-viewer.component.ts | 1 - src/lang/lang-fr.json | 4 +- 19 files changed, 32 insertions(+), 63 deletions(-) diff --git a/src/app/search/controllers/SearchController.php b/src/app/search/controllers/SearchController.php index 0f6319263b6..2e52b169270 100644 --- a/src/app/search/controllers/SearchController.php +++ b/src/app/search/controllers/SearchController.php @@ -1468,11 +1468,11 @@ class SearchController $priorities = []; $rawPriorities = DatabaseModel::select([ - 'select' => ['count(1)', 'priority'], - 'table' => ['search_tmp_' . $GLOBALS['id']], - 'where' => $wherePriorities, - 'data' => $dataPriorities, - 'groupBy' => ['priority'] + 'select' => ['count(1)', 'priority'], + 'table' => ['search_tmp_' . $GLOBALS['id']], + 'where' => $wherePriorities, + 'data' => $dataPriorities, + 'groupBy' => ['priority'] ]); if (!empty($body['filters']['priorities']) && is_array($body['filters']['priorities'])) { foreach ($body['filters']['priorities'] as $filter) { @@ -1510,11 +1510,11 @@ class SearchController $categories = []; $rawCategories = DatabaseModel::select([ - 'select' => ['count(1)', 'category_id'], - 'table' => ['search_tmp_' . $GLOBALS['id']], - 'where' => $whereCategories, - 'data' => $dataCategories, - 'groupBy' => ['category_id'] + 'select' => ['count(1)', 'category_id'], + 'table' => ['search_tmp_' . $GLOBALS['id']], + 'where' => $whereCategories, + 'data' => $dataCategories, + 'groupBy' => ['category_id'] ]); if (!empty($body['filters']['categories']) && is_array($body['filters']['categories'])) { foreach ($body['filters']['categories'] as $key => $filter) { @@ -1545,11 +1545,11 @@ class SearchController $statuses = []; $rawStatuses = DatabaseModel::select([ - 'select' => ['count(1)', 'status'], - 'table' => ['search_tmp_' . $GLOBALS['id']], - 'where' => $whereStatuses, - 'data' => $dataStatuses, - 'groupBy' => ['status'] + 'select' => ['count(1)', 'status'], + 'table' => ['search_tmp_' . $GLOBALS['id']], + 'where' => $whereStatuses, + 'data' => $dataStatuses, + 'groupBy' => ['status'] ]); if (!empty($body['filters']['statuses']) && is_array($body['filters']['statuses'])) { foreach ($body['filters']['statuses'] as $key => $filter) { @@ -1587,11 +1587,11 @@ class SearchController $docTypes = []; $rawDocTypes = DatabaseModel::select([ - 'select' => ['count(1)', 'type_id'], - 'table' => ['search_tmp_' . $GLOBALS['id']], - 'where' => $whereDocTypes, - 'data' => $dataDocTypes, - 'groupBy' => ['type_id'] + 'select' => ['count(1)', 'type_id'], + 'table' => ['search_tmp_' . $GLOBALS['id']], + 'where' => $whereDocTypes, + 'data' => $dataDocTypes, + 'groupBy' => ['type_id'] ]); if (!empty($body['filters']['doctypes']) && is_array($body['filters']['doctypes'])) { foreach ($body['filters']['doctypes'] as $key => $filter) { @@ -1626,11 +1626,11 @@ class SearchController $entities = []; $rawEntities = DatabaseModel::select([ - 'select' => ['count(1)', 'destination'], - 'table' => ['search_tmp_' . $GLOBALS['id']], - 'where' => $whereEntities, - 'data' => $dataEntities, - 'groupBy' => ['destination'] + 'select' => ['count(1)', 'destination'], + 'table' => ['search_tmp_' . $GLOBALS['id']], + 'where' => $whereEntities, + 'data' => $dataEntities, + 'groupBy' => ['destination'] ]); if (!empty($body['filters']['entities']) && is_array($body['filters']['entities'])) { foreach ($body['filters']['entities'] as $key => $filter) { @@ -1669,8 +1669,8 @@ class SearchController $resources = DatabaseModel::select([ 'select' => ['res_id'], 'table' => ['search_tmp_' . $GLOBALS['id']], - 'where' => $whereFolders, - 'data' => $dataFolders + 'where' => $whereFolders, + 'data' => $dataFolders ]); $resources = !empty($resources) ? array_column($resources, 'res_id') : [0]; diff --git a/src/frontend/app/about-us.component.ts b/src/frontend/app/about-us.component.ts index d19266d293f..f356112fc6e 100755 --- a/src/frontend/app/about-us.component.ts +++ b/src/frontend/app/about-us.component.ts @@ -42,7 +42,6 @@ export class AboutUsComponent implements OnInit { this.http.get('../rest/commitInformation').pipe( tap((data: any) => { this.commitHash = data.hash !== null ? data.hash : this.translate.instant('lang.undefined'); - console.log(data); resolve(true); }), catchError((err: any) => { diff --git a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts index f250255b143..dbc92aa4706 100644 --- a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts +++ b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts @@ -17,7 +17,6 @@ declare var tinymce: any; }) export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDestroy { - loading: boolean = false; loadingInit: boolean = false; @@ -98,7 +97,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe subject : this.emailsubject, content : tinymce.get('emailSignature').getContent(), manual : true - } + }; } this.http.put(this.data.processActionRoute, { resources: this.realResSelected, note: this.noteEditor.getNote(), data }).pipe( tap((data: any) => { @@ -107,7 +106,6 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe } if (data && data.errors != null) { this.notify.error(data.errors); - console.log(data.errors); } this.dialogRef.close(this.realResSelected); }), diff --git a/src/frontend/app/actions/print-deposit-list-action/print-deposit-list-action.component.ts b/src/frontend/app/actions/print-deposit-list-action/print-deposit-list-action.component.ts index 731f3d7f4e3..123f8dc4f21 100644 --- a/src/frontend/app/actions/print-deposit-list-action/print-deposit-list-action.component.ts +++ b/src/frontend/app/actions/print-deposit-list-action/print-deposit-list-action.component.ts @@ -71,7 +71,6 @@ export class PrintDepositListActionComponent implements OnInit { tap((data: any) => { if (data && data.errors != null) { this.notify.error(data.errors); - console.log(data.errors); } if (!this.functions.empty(data.data.encodedFile)) { diff --git a/src/frontend/app/administration/contact/list/import/contact-import.component.ts b/src/frontend/app/administration/contact/list/import/contact-import.component.ts index 333a2a78bd1..923a317e20c 100644 --- a/src/frontend/app/administration/contact/list/import/contact-import.component.ts +++ b/src/frontend/app/administration/contact/list/import/contact-import.component.ts @@ -209,8 +209,6 @@ export class ContactImportComponent implements OnInit { reader.onload = (value: any) => { this.papa.parse(value.target.result, { complete: (result) => { - // console.log('Parsed: ', result); - rawCsv = result.data; rawCsv = rawCsv.filter(data => data.length === rawCsv[0].length); diff --git a/src/frontend/app/administration/entity/entities-administration.component.ts b/src/frontend/app/administration/entity/entities-administration.component.ts index 5d9b3c64bc5..9b53150c6f7 100755 --- a/src/frontend/app/administration/entity/entities-administration.component.ts +++ b/src/frontend/app/administration/entity/entities-administration.component.ts @@ -32,7 +32,6 @@ export class EntitiesAdministrationComponent implements OnInit { dialogRef: MatDialogRef<any>; - loading: boolean = false; entities: any[] = []; @@ -794,7 +793,6 @@ export class EntitiesAdministrationComponent implements OnInit { ] }) export class EntitiesAdministrationRedirectModalComponent { - constructor(public translate: TranslateService, public http: HttpClient, @Inject(MAT_DIALOG_DATA) public data: any, public dialogRef: MatDialogRef<EntitiesAdministrationRedirectModalComponent>) { console.log(this.data.entity.redirectEntity); diff --git a/src/frontend/app/administration/notification/notifications-administration.component.ts b/src/frontend/app/administration/notification/notifications-administration.component.ts index 4edc05f1770..15fec0ecaab 100755 --- a/src/frontend/app/administration/notification/notifications-administration.component.ts +++ b/src/frontend/app/administration/notification/notifications-administration.component.ts @@ -202,7 +202,6 @@ export class NotificationsAdministrationComponent implements OnInit { /* FEATURE TOUR */ onNext() { - console.log('next'); this.sidenavRight.open(); return false; } diff --git a/src/frontend/app/attachments/attachment-create/attachment-create.component.ts b/src/frontend/app/attachments/attachment-create/attachment-create.component.ts index 8f471178340..79079b8ae47 100644 --- a/src/frontend/app/attachments/attachment-create/attachment-create.component.ts +++ b/src/frontend/app/attachments/attachment-create/attachment-create.component.ts @@ -404,14 +404,12 @@ export class AttachmentCreateComponent implements OnInit { } updateFile(index: number) { - if (this.functions.empty(this.attachments[this.asyncIndexTab].encodedFile.value)) { - console.log('ca passe!'); - + if (this.functions.empty(this.attachments[this.asyncIndexTab].encodedFile.value)) { this.appDocumentViewer.toArray()[this.asyncIndexTab].getFile().pipe( take(1), tap((data) => { console.log(data); - + this.attachments[this.asyncIndexTab].encodedFile.setValue(data.content); this.attachments[this.asyncIndexTab].format.setValue(data.format); this.asyncIndexTab = index; diff --git a/src/frontend/app/contact/autocomplete/contact-autocomplete.component.ts b/src/frontend/app/contact/autocomplete/contact-autocomplete.component.ts index 9b3b9afcdb3..384f0f20ba0 100755 --- a/src/frontend/app/contact/autocomplete/contact-autocomplete.component.ts +++ b/src/frontend/app/contact/autocomplete/contact-autocomplete.component.ts @@ -257,7 +257,6 @@ export class ContactAutocompleteComponent implements OnInit { }), finalize(() => this.loadingValues = false), catchError((err: any) => { - console.log(err); this.notify.error(err.error.errors); return of(false); }) diff --git a/src/frontend/app/folder/folder-pinned/folder-pinned.component.ts b/src/frontend/app/folder/folder-pinned/folder-pinned.component.ts index 406c5c9f27a..c46725f76ca 100644 --- a/src/frontend/app/folder/folder-pinned/folder-pinned.component.ts +++ b/src/frontend/app/folder/folder-pinned/folder-pinned.component.ts @@ -12,8 +12,6 @@ import { FoldersService } from '../folders.service'; }) export class FolderPinnedComponent implements OnInit { - - subscription: Subscription; @Input('noInit') noInit: boolean = false; @@ -25,7 +23,6 @@ export class FolderPinnedComponent implements OnInit { ) { // Event after process action this.subscription = this.foldersService.catchEvent().subscribe((result: any) => { - //console.log(result); }); } diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts index b14a741488d..0f2109b59a0 100755 --- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts +++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts @@ -1049,9 +1049,6 @@ export class IndexingFormComponent implements OnInit { const controlErrors: ValidationErrors = this.indexingFormGroup.get(key).errors; if (controlErrors != null) { this.indexingFormGroup.controls[key].markAsTouched(); - /*Object.keys(controlErrors).forEach(keyError => { - console.log('Key control: ' + key + ', keyError: ' + keyError + ', err value: ', controlErrors[keyError]); - });*/ } }); } diff --git a/src/frontend/app/installer/prerequisite/prerequisite.component.ts b/src/frontend/app/installer/prerequisite/prerequisite.component.ts index 8679867da66..2828c6c9729 100644 --- a/src/frontend/app/installer/prerequisite/prerequisite.component.ts +++ b/src/frontend/app/installer/prerequisite/prerequisite.component.ts @@ -132,7 +132,6 @@ export class PrerequisiteComponent implements OnInit { install_phpVersionValid_desc: this.translate.instant('lang.currentVersion') + ' : ' + this.prerequisites['phpVersion'] } }, true); - console.log(this.translate); } }); }); diff --git a/src/frontend/app/registeredMail/import/registered-mail-import.component.ts b/src/frontend/app/registeredMail/import/registered-mail-import.component.ts index fe0593a8e6e..738e85b1ff3 100644 --- a/src/frontend/app/registeredMail/import/registered-mail-import.component.ts +++ b/src/frontend/app/registeredMail/import/registered-mail-import.component.ts @@ -265,9 +265,6 @@ export class RegisteredMailImportComponent implements OnInit { changeColumn(coldb: any, colCsv: any) { this.contactData = []; - // console.log(this.associatedColumns); - // console.log(this.csvData); - for (let index = this.hasHeader ? 1 : 0; index < this.csvData.length; index++) { const data = this.csvData[index]; @@ -308,8 +305,6 @@ export class RegisteredMailImportComponent implements OnInit { reader.onload = (value: any) => { this.papa.parse(value.target.result, { complete: (result) => { - // console.log('Parsed: ', result); - rawCsv = result.data; rawCsv = rawCsv.filter(data => data.length === rawCsv[0].length); diff --git a/src/frontend/app/search/criteria-tool/criteria-tool.component.ts b/src/frontend/app/search/criteria-tool/criteria-tool.component.ts index fad842abc8b..2efc4b30d52 100644 --- a/src/frontend/app/search/criteria-tool/criteria-tool.component.ts +++ b/src/frontend/app/search/criteria-tool/criteria-tool.component.ts @@ -179,7 +179,6 @@ export class CriteriaToolComponent implements OnInit { } } catch (error) { - // console.log(error); } } diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts index ffddd90402f..e2a13fa69a9 100755 --- a/src/frontend/app/viewer/document-viewer.component.ts +++ b/src/frontend/app/viewer/document-viewer.component.ts @@ -445,7 +445,6 @@ export class DocumentViewerComponent implements OnInit, OnDestroy { ); } - onError(error: any) { console.log(error); } @@ -1080,7 +1079,6 @@ export class DocumentViewerComponent implements OnInit, OnDestroy { return new Promise((resolve, reject) => { this.http.post(`../rest/convertedFile/encodedFile`, { format: format, encodedFile: base64Content }).pipe( tap((data: any) => { - console.log(data); this.file = { name: 'maarch', format: format, diff --git a/src/frontend/plugins/autocomplete-list/autocomplete-list.component.ts b/src/frontend/plugins/autocomplete-list/autocomplete-list.component.ts index 6347fe491ce..7365548ebba 100644 --- a/src/frontend/plugins/autocomplete-list/autocomplete-list.component.ts +++ b/src/frontend/plugins/autocomplete-list/autocomplete-list.component.ts @@ -120,8 +120,6 @@ export class AutocompleteListComponent implements OnInit { } remove(option: string): void { - console.log(option); - const index = this.datasFormControl.value.indexOf(option); if (index >= 0) { diff --git a/src/frontend/plugins/collabora-online/collabora-online-viewer.component.ts b/src/frontend/plugins/collabora-online/collabora-online-viewer.component.ts index d13bee9a283..11760672a0e 100644 --- a/src/frontend/plugins/collabora-online/collabora-online-viewer.component.ts +++ b/src/frontend/plugins/collabora-online/collabora-online-viewer.component.ts @@ -62,7 +62,6 @@ export class CollaboraOnlineViewerComponent implements OnInit, AfterViewInit, On @HostListener('window:message', ['$event']) onMessage(e: any) { - // console.log(e); const response = JSON.parse(e.data); // EVENT TO CONSTANTLY UPDATE CURRENT DOCUMENT if (response.MessageId === 'Doc_ModifiedStatus' && response.Values.Modified === false) { diff --git a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts index 473d65c59f7..f50aacc215a 100644 --- a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts +++ b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts @@ -76,7 +76,6 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit, OnD @HostListener('window:message', ['$event']) onMessage(e: any) { - // console.log(e); const response = JSON.parse(e.data); // EVENT TO CONSTANTLY UPDATE CURRENT DOCUMENT if (response.event === 'onDownloadAs') { diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json index edea8ef73bc..b03074dd904 100644 --- a/src/lang/lang-fr.json +++ b/src/lang/lang-fr.json @@ -2095,9 +2095,9 @@ "casEnabled": "Authentification CAS activée", "displayAsTechnicalData" : "Afficher en tant que donnée technique", "displayInForm" : "Afficher dans le formulaire", - "formDescription" : "Permet d'utiliser ce champs dans les modèle d'enregistrement", + "formDescription" : "Permet d'utiliser ce champ dans les modèles d'enregistrement", "technicalInformations" : "Informations techniques", - "technicalDescription" : "Ce type est persistant et n'as pas besoin d'être associé à un modèle d'enregistrement", + "technicalDescription" : "Ce type est persistant et n'a pas besoin d'être associé à un modèle d'enregistrement", "displayMode" :"Mode d'affichage", "connections" :"Connexions", "connectionsDesc" :"Administrer les modes de connexion de l'application" -- GitLab