Merge branch 'develop' of https://labs.maarch.org/maarch/MaarchCourrier into develop

apps/maarch_entreprise/Views/doctypes-administration.component.html

@@ -274,31 +274,31 @@
                                     </mat-expansion-panel-header>
                                     <mat-table #table [dataSource]="dataSource">
                                         <ng-container matColumnDef="label">
-                                            <mat-header-cell *matHeaderCellDef>{{field}}</mat-header-cell>
+                                            <mat-header-cell *matHeaderCellDef>{{lang.field}}</mat-header-cell>
                                             <mat-cell *matCellDef="let element"> {{element.label}} </mat-cell>
                                         </ng-container>
                                         <ng-container matColumnDef="use">
-                                            <mat-header-cell *matHeaderCellDef>{{used}}</mat-header-cell>
+                                            <mat-header-cell *matHeaderCellDef>{{lang.used}}</mat-header-cell>
                                             <mat-cell *matCellDef="let element;let i = index">
                                                 <mat-checkbox color="primary" [checked]="element.use" (change)="selectIndexesUse($event, i)"></mat-checkbox>
                                             </mat-cell>
                                         </ng-container>
                                         <ng-container matColumnDef="mandatory">
-                                            <mat-header-cell *matHeaderCellDef>{{mandatory}}</mat-header-cell>
+                                            <mat-header-cell *matHeaderCellDef>{{lang.mandatory}}</mat-header-cell>
                                             <mat-cell *matCellDef="let element;let i = index">
                                                 <mat-checkbox color="primary" [checked]="element.mandatory" (change)="selectIndexesMandatory($event, i)"></mat-checkbox>
                                             </mat-cell>
                                         </ng-container>
                                         <ng-container matColumnDef="type">
-                                            <mat-header-cell *matHeaderCellDef>{{fieldType}}</mat-header-cell>
+                                            <mat-header-cell *matHeaderCellDef>{{lang.fieldType}}</mat-header-cell>
                                             <mat-cell *matCellDef="let element"> {{element.type}} </mat-cell>
                                         </ng-container>                                        
                                         <ng-container matColumnDef="type_field">
-                                            <mat-header-cell *matHeaderCellDef>{{fieldNature}}</mat-header-cell>
+                                            <mat-header-cell *matHeaderCellDef>{{lang.fieldNature}}</mat-header-cell>
                                             <mat-cell *matCellDef="let element"> {{element.type_field}} </mat-cell>
                                         </ng-container>
                                         <ng-container matColumnDef="column">
-                                            <mat-header-cell *matHeaderCellDef>{{databaseColumn}}</mat-header-cell>
+                                            <mat-header-cell *matHeaderCellDef>{{lang.databaseColumn}}</mat-header-cell>
                                             <mat-cell *matCellDef="let element"> {{element.column}} </mat-cell>
                                         </ng-container>
                                         <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>

apps/maarch_entreprise/js/angular/app/administration/administration.component.js

@@ -54,7 +54,6 @@ var AdministrationComponent = /** @class */ (function () {
         this.loading = true;
         this.http.get(this.coreUrl + 'rest/administration')
             .subscribe(function (data) {
-            console.log();
             _this.organisationServices = data.administrations.organisation;
             _this.productionServices = data.administrations.production;
             _this.classementServices = data.administrations.classement;
@@ -63,7 +62,6 @@ var AdministrationComponent = /** @class */ (function () {
         });
     };
     AdministrationComponent.prototype.goToSpecifiedAdministration = function (service) {
-        console.log(service);
         if (service.angular == "true") {
             this.router.navigate([service.servicepage]);
         }

apps/maarch_entreprise/js/angular/app/administration/administration.component.ts

@@ -61,7 +61,6 @@ export class AdministrationComponent implements OnInit {
 
         this.http.get(this.coreUrl + 'rest/administration')
             .subscribe((data: any) => {
-                console.log();
                 this.organisationServices = data.administrations.organisation;
                 this.productionServices = data.administrations.production;
                 this.classementServices = data.administrations.classement;
@@ -72,7 +71,6 @@ export class AdministrationComponent implements OnInit {
     }
 
     goToSpecifiedAdministration(service: any): void {
-        console.log(service);
         if (service.angular == "true") {
             this.router.navigate([service.servicepage]);
         } else {

apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.js

@@ -84,7 +84,6 @@ var BasketsAdministrationComponent = /** @class */ (function () {
     };
     BasketsAdministrationComponent.prototype.updateBasketOrder = function (currentBasket) {
         var _this = this;
-        console.log(this.basketsOrder);
         this.http.put(this.coreUrl + "rest/sortedBaskets/" + currentBasket.basket_id, this.basketsOrder)
             .subscribe(function (data) {
             _this.baskets = data['baskets'];

apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.ts

@@ -98,7 +98,6 @@ export class BasketsAdministrationComponent implements OnInit {
     }
 
     updateBasketOrder(currentBasket: any) {
-        console.log(this.basketsOrder);
         this.http.put(this.coreUrl + "rest/sortedBaskets/" + currentBasket.basket_id, this.basketsOrder)
             .subscribe((data: any) => {
                 this.baskets = data['baskets'];

apps/maarch_entreprise/js/angular/app/administration/groups-administration.component.js

@@ -84,7 +84,6 @@ var GroupsAdministrationComponent = /** @class */ (function () {
             this.config = { data: { id: group.id, group_desc: group.group_desc, groupsForAssign: this.groupsForAssign, users: group.users } };
             this.dialogRef = this.dialog.open(GroupsAdministrationRedirectModalComponent, this.config);
             this.dialogRef.afterClosed().subscribe(function (result) {
-                console.log(result);
                 if (result) {
                     if (result == "_NO_REPLACEMENT") {
                         _this.deleteGroup(group);

apps/maarch_entreprise/js/angular/app/administration/groups-administration.component.ts

@@ -92,7 +92,6 @@ export class GroupsAdministrationComponent implements OnInit {
             this.config = { data: { id: group.id, group_desc: group.group_desc, groupsForAssign: this.groupsForAssign, users: group.users } };
             this.dialogRef = this.dialog.open(GroupsAdministrationRedirectModalComponent, this.config);
             this.dialogRef.afterClosed().subscribe((result: string) => {
-                console.log(result);
                 if (result) {
                     if (result == "_NO_REPLACEMENT") {
                         this.deleteGroup(group);

apps/maarch_entreprise/js/angular/app/administration/history-administration.component.js

@@ -68,7 +68,6 @@ var HistoryAdministrationComponent = /** @class */ (function () {
     };
     HistoryAdministrationComponent.prototype.refreshHistory = function (event) {
         var _this = this;
-        console.log(event);
         this.http.get(this.coreUrl + 'rest/administration/history/eventDate/' + this.minDate.toJSON())
             .subscribe(function (data) {
             _this.data = data.historyList;

apps/maarch_entreprise/js/angular/app/administration/history-administration.component.ts

@@ -81,7 +81,6 @@ export class HistoryAdministrationComponent implements OnInit {
     }
 
     refreshHistory(event: MatDatepickerInputEvent<Date>) {
-        console.log(event);
         this.http.get(this.coreUrl + 'rest/administration/history/eventDate/' + this.minDate.toJSON())
             .subscribe((data: any) => {
                 this.data = data.historyList;

apps/maarch_entreprise/js/angular/lang/lang-en.js

@@ -303,7 +303,7 @@ exports.LANG_EN = {
     "documentTypeUpdated": "Document type updated",
     "documentTypeDeleted": "Document type deleted",
     "documentTypeReplacement": "Document type replacement",
-    "transferToDoctype": "TReplace by this document type",
+    "transferToDoctype": "Replace by this document type",
     "complementaryFields": "Complementary fields",
     "archival": "Archival",
     "field": "Field",

apps/maarch_entreprise/js/angular/lang/lang-en.ts

@@ -301,10 +301,10 @@ export const LANG_EN = {
     "documentTypeUpdated"                 : "Document type updated",
     "documentTypeDeleted"                 : "Document type deleted",
     "documentTypeReplacement"                 : "Document type replacement",
-    "transferToDoctype"                 : "TReplace by this document type",
+    "transferToDoctype"                 : "Replace by this document type",
     "complementaryFields"                 : "Complementary fields",
     "archival"                 : "Archival",
-    "field"                 : "Field",
+    "field"                 : "Field", 
     "mandatory"                 : "Mandatory",
     "fieldType"                 : "Field type",
     "fieldNature"                 : "Field nature",

apps/maarch_entreprise/js/angular/lang/lang-fr.js

@@ -48,7 +48,7 @@ exports.LANG_FR = {
     "basketModification": "Modification d'une bannette",
     "basketNotification": "Activer / désactiver la notification de cette bannette",
     "baskets": "Bannettes",
-    "basketsOrder": "Gerer l'ordre des bannettes",
+    "basketsOrder": "Gérer l'ordre des bannettes",
     "basketUpdated": "Bannette modifiée",
     "calDays": "jour(s) calendaire(s)",
     "canBeModified": "Modification des index",

apps/maarch_entreprise/js/angular/lang/lang-fr.ts

@@ -46,7 +46,7 @@ export const LANG_FR = {
     "basketModification"           : "Modification d'une bannette",
     "basketNotification"           : "Activer / désactiver la notification de cette bannette",
     "baskets"                      : "Bannettes",
-    "basketsOrder"                 : "Gerer l'ordre des bannettes",
+    "basketsOrder"                 : "Gérer l'ordre des bannettes",
     "basketUpdated"                : "Bannette modifiée",
     "calDays"                      : "jour(s) calendaire(s)",
     "canBeModified"                : "Modification des index",

modules/templates/js/change_doctype.js

@@ -28,7 +28,6 @@ function doctype_template(args)
 			model_frame = args[i]['value'];
 		}
 	}
-	console.log(file_iframe.src.includes("display=true&module=templates&page=file_iframe&model_id"));
 	if(is_generated == true)
 	{
 		if(choose_file_div != null)