diff --git a/apps/maarch_entreprise/Views/priorities-administration.component.html b/apps/maarch_entreprise/Views/priorities-administration.component.html
index fda9943a20e7b90a22bc61c2ac1cc3d3e7d1322c..7c86134ce685b8c21665050981d9a2c1d05429b1 100755
--- a/apps/maarch_entreprise/Views/priorities-administration.component.html
+++ b/apps/maarch_entreprise/Views/priorities-administration.component.html
@@ -1,54 +1,75 @@
+<div class="page-header">
+ <h1>{{lang.administration}} {{lang.priorities}}
+ <small>{{priorities.length}} {{lang.priorities}}</small>
+ </h1>
+</div>
<div *ngIf="loading">
- <i class="fa fa-spinner fa-spin fa-5x" style="margin-left: 50%;margin-top: 16%;font-size: 8em"></i>
+ <mat-spinner style="margin:auto;"></mat-spinner>
</div>
<div *ngIf="!loading" class="container-fluid">
- <h1 style="margin-top: 0"><i class="fa fa-user fa-2x"></i> Administration des priorités</h1>
- <nav class="navbar navbar-default" style="font-size:17px !important;" id="toolBox">
- <div class="container-fluid">
- <div class="navbar-header">
- <a class="navbar-brand" routerLink="/administration" style="cursor: pointer">
- <i class="fa fa-arrow-circle-left" title="{{lang.back}}"></i>
- </a>
- </div>
- <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
- <ul class="nav navbar-nav navbar-right">
- <li style="cursor: pointer" routerLink="/administration/priorities/new">
- <a title="Créer une priorité"><i class="fa fa-user-plus"></i></a>
- </li>
- </ul>
- </div>
- </div>
- </nav>
- <div class="col-md-12" style="margin-top: 1%">
- <table id="prioritiesTable" class="display" style="width: 100%" cellspacing="0" border="0">
- <thead>
- <tr>
- <th style="width:20%;" valign="bottom" align="left"><span>Label</span></th>
- <th style="width:20%;" valign="bottom" align="left"><span>Couleur</span></th>
- <th style="width:20%;" valign="bottom" align="left"><span>Délai de traitement</span></th>
- <th style="width:20%;" valign="bottom" align="left"><span>Méthode de calcul</span></th>
- <th style="width:20%;"><span> </span></th>
- </tr>
- </thead>
- <tbody>
- <tr *ngFor="let priority of priorities" id="{{priority.id}}">
- <td>{{priority.label}}</td>
- <td><input type="color" value="{{priority.color}}" style="background:none;border:none;width:45px;" disabled></td>
- <td>{{priority.delays}}</td>
- <td *ngIf="priority.working_days">Jours ouvrés</td>
- <td *ngIf="!priority.working_days">Jours calendaires</td>
- <td style="text-align:right;">
- <div class="btn-group" role="group" aria-label="...">
- <button routerLink="/administration/priorities/{{priority.id}}" type="button" class="btn btn-default" title="{{lang.edit}}">
- <a><i style="cursor:pointer" class="fa fa-edit"></i></a>
+ <div class="col-md-12">
+ <div class="example-container">
+ <mat-grid-list cols="3" rowHeight="100px">
+ <mat-grid-tile>
+ <mat-paginator #paginator [length]="100" [pageSize]="10" [pageSizeOptions]="[10, 25, 50, 100]">
+ </mat-paginator>
+ </mat-grid-tile>
+ <mat-grid-tile></mat-grid-tile>
+ <mat-grid-tile>
+ <mat-form-field>
+ <input matInput (keyup)="applyFilter($event.target.value)" placeholder="{{lang.filterBy}}">
+ </mat-form-field>
+ </mat-grid-tile>
+ </mat-grid-list>
+ <mat-table #table [dataSource]="dataSource" matSort matSortActive="label" matSortDirection="asc">
+ <ng-container matColumnDef="label">
+ <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.label}}</mat-header-cell>
+ <mat-cell *matCellDef="let element">
+ <input type="color" value="{{element.color}}" style="background:none;border:none;width:45px;" disabled> {{element.label}} </mat-cell>
+ </ng-container>
+ <ng-container matColumnDef="delays">
+ <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.processDelay}}</mat-header-cell>
+ <mat-cell *matCellDef="let element">
+ <span *ngIf="element.delays == 0">
+ <i style="opacity:0.5">{{lang.processDelayDoctype}}</i>
+ </span>
+ <span *ngIf="element.delays != 0">
+ {{element.delays}}
+ </span>
+ </mat-cell>
+ </ng-container>
+ <ng-container matColumnDef="working_days">
+ <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.processType}}</mat-header-cell>
+ <mat-cell *matCellDef="let element">
+ <span *ngIf="element.delays == 0">
+ <i style="opacity:0.5">{{lang.processDelayDoctype}}</i>
+ </span>
+ <span *ngIf="element.working_days && element.delays != 0">
+ {{lang.workingDays}}
+ </span>
+ <span *ngIf="!element.working_days && element.delays != 0">
+ {{lang.calDays}}
+ </span>
+ </mat-cell>
+ </ng-container>
+ <ng-container matColumnDef="actions">
+ <mat-header-cell *matHeaderCellDef style="text-align: right;padding: 10px">
+ <button mat-mini-fab color="accent" matTooltip="{{lang.add}}" routerLink="/administration/priorities/new">
+ <mat-icon class="fa fa-plus" aria-hidden="true"></mat-icon>
+ </button>
+ </mat-header-cell>
+ <mat-cell *matCellDef="let element" style="text-align: right;">
+ <button mat-icon-button color="primary" matTooltip="{{lang.update}}" routerLink="/administration/priorities/{{element.id}}">
+ <mat-icon class="fa fa-edit fa-2x" aria-hidden="true"></mat-icon>
</button>
- <button type="button" class="btn btn-default" title="{{lang.delete}}" (click)="deletePriority(priority.id)">
- <a><i style="cursor:pointer;color: #D9534F" class="fa fa-trash"></i></a>
+ <button mat-icon-button color="warn" matTooltip="{{lang.delete}}" (click)="deletePriority(element.id)">
+ <mat-icon class="fa fa-trash fa-2x" aria-hidden="true"></mat-icon>
</button>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
+ </mat-cell>
+ </ng-container>
+ <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+ <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+ </mat-table>
+ </div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/Views/priority-administration.component.html b/apps/maarch_entreprise/Views/priority-administration.component.html
index 431f793934be059ff2a56d6abd37e9f236eab85e..1b3d304c4f9aea4f792007fe1169aa06ca520a3a 100755
--- a/apps/maarch_entreprise/Views/priority-administration.component.html
+++ b/apps/maarch_entreprise/Views/priority-administration.component.html
@@ -1,64 +1,53 @@
+<div class="page-header">
+ <h1 *ngIf="!creationMode">{{lang.priorityModification}}
+ <small>{{priority.label}}</small>
+ </h1>
+ <h1 *ngIf="creationMode">{{lang.priorityCreation}}
+ <small>{{priority.label}}</small>
+ </h1>
+</div>
<div *ngIf="loading">
- <i class="fa fa-spinner fa-spin fa-5x" style="margin-left: 50%;margin-top: 16%;font-size: 8em"></i>
+ <mat-spinner style="margin:auto;"></mat-spinner>
</div>
<div *ngIf="!loading" class="container-fluid">
- <h1 *ngIf="creationMode" style="margin-top: 0">
- <i class="fa fa-user fa-2x"></i> Création d'une priorité {{priority.label}}
- </h1>
- <h1 *ngIf="!creationMode" style="margin-top: 0">
- <i class="fa fa-user fa-2x"></i> Modif: {{priority.label}}
- </h1>
- <nav class="navbar navbar-default" id="toolBox">
- <div class="container-fluid">
- <div class="navbar-header">
- <a routerLink="/administration/priorities" class="navbar-brand" style="cursor: pointer">
- <i class="fa fa-arrow-circle-left" title="Retour"></i>
- </a>
+ <div class="col-md-6 col-md-offset-3">
+ <form class="form-horizontal" (ngSubmit)="onSubmit()" #priorityForm="ngForm">
+ <div class="col-md-11">
+ <mat-form-field>
+ <input matInput type="text" name="label" title="{{lang.label}}" placeholder="{{lang.label}}" [(ngModel)]="priority.label"
+ maxlength="128" required>
+ </mat-form-field>
+ </div>
+ <div class="col-md-1">
+ <mat-form-field>
+ <input matInput type="color" name="color" [(ngModel)]="priority.color" required>
+ </mat-form-field>
</div>
- </div>
- </nav>
- <div class="row row-eq-height">
- <div class="col-md-offset-4 col-md-4" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #CEE9F1;border-top: solid 2px #FDD16C;border-bottom: solid 2px #FDD16C;padding:10px;">
- <h2>Informations</h2>
- <form class="form-horizontal" (ngSubmit)="onSubmit()" #priorityForm="ngForm">
- <div class="form-group">
- <div class="col-sm-12">
- <div class="input-group">
- <span class="input-group-addon"><i class="fa fa-envelope-o" aria-hidden="true"></i></span>
- <input type="text" class="form-control" name="label" title="{{lang.label}}" placeholder="{{lang.label}}" [(ngModel)]="priority.label" required>
- </div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-sm-12">
- <div class="input-group">
- <span class="input-group-addon"><i class="fa fa-envelope-o" aria-hidden="true"></i></span>
- <input type="color" class="form-control" name="color" [(ngModel)]="priority.color" required>
- </div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-sm-12">
- <div class="input-group">
- <span class="input-group-addon"><i class="fa fa-envelope-o" aria-hidden="true"></i></span>
- <input type="checkbox" class="form-control" name="working_days" title="{{lang.workingDays}}" [(ngModel)]="priority.working_days">
- </div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-sm-12">
- <div class="input-group">
- <span class="input-group-addon"><i class="fa fa-paw" aria-hidden="true"></i></span>
- <input type="number" class="form-control" name="delays" title="{{lang.processDelay}}" placeholder="{{lang.processDelay}}" [(ngModel)]="priority.delays" required>
- </div>
- </div>
- </div>
- <div class="form-group">
- <div style="text-align:center;">
- <button type="submit" class="btn btn-default" [disabled]="!priorityForm.form.valid">{{lang.save}}</button>
- </div>
- </div>
- </form>
- </div>
+ <div class="col-md-3">
+ <mat-form-field>
+ <span matPrefix><mat-checkbox color="primary" name="useDoctypeDelay" [(ngModel)]="priority.useDoctypeDelay" matTooltip="Utiliser ce délai de traitement au lieu de celui définit dans le type document"></mat-checkbox> </span>
+ <input matInput [disabled]="!priority.useDoctypeDelay" type="number" name="delays" placeholder="{{lang.processDelay}}" [(ngModel)]="priority.delays" required pattern="^(?!0*(\.0+)?$)(\d+|\d*\.\d+)$">
+ </mat-form-field>
+ </div>
+ <div class="col-md-6">
+ <mat-slider [disabled]="!priority.useDoctypeDelay" style="width:100%" name="delays" color="primary" max="60" min="1" thumb-label="true" [(ngModel)]="priority.delays"></mat-slider>
+ </div>
+ <div class="col-md-3">
+ <mat-form-field>
+ <mat-select [disabled]="!priority.useDoctypeDelay" name="processType" placeholder="Type de traitement" [(ngModel)]="priority.working_days">
+ <mat-option value="true">
+ {{lang.workingDays}}
+ </mat-option>
+ <mat-option value="false">
+ {{lang.calDays}}
+ </mat-option>
+ </mat-select>
+ </mat-form-field>
+ </div>
+ <div class="col-md-12 text-center" style="padding:10px;">
+ <button mat-raised-button [disabled]="!priorityForm.form.valid" color="primary">{{lang.save}}</button>
+ <button mat-raised-button routerLink="/administration/priorities">{{lang.cancel}}</button>
+ </div>
+ </form>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.js
index a53da2c1accc643ea1cdfac149b1220c25323878..61d11bd1c6ada5b90a43a1dc3c0a240bb44992cb 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.js
@@ -13,6 +13,7 @@ var core_1 = require("@angular/core");
var http_1 = require("@angular/common/http");
var translate_component_1 = require("../translate.component");
var notification_service_1 = require("../notification.service");
+var material_1 = require("@angular/material");
var PrioritiesAdministrationComponent = /** @class */ (function () {
function PrioritiesAdministrationComponent(http, notify) {
this.http = http;
@@ -20,10 +21,16 @@ var PrioritiesAdministrationComponent = /** @class */ (function () {
this.lang = translate_component_1.LANG;
this.loading = false;
this.priorities = [];
+ this.displayedColumns = ['label', 'delays', 'working_days', 'actions'];
}
+ PrioritiesAdministrationComponent.prototype.applyFilter = function (filterValue) {
+ filterValue = filterValue.trim(); // Remove whitespace
+ filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
+ this.dataSource.filter = filterValue;
+ };
PrioritiesAdministrationComponent.prototype.updateBreadcrumb = function (applicationName) {
if ($j('#ariane')[0]) {
- $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>Administration</a> > Priorités";
+ $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>" + this.lang.administration + "</a> > " + this.lang.priorities;
}
};
PrioritiesAdministrationComponent.prototype.ngOnInit = function () {
@@ -35,6 +42,11 @@ var PrioritiesAdministrationComponent = /** @class */ (function () {
.subscribe(function (data) {
_this.priorities = data["priorities"];
_this.loading = false;
+ setTimeout(function () {
+ _this.dataSource = new material_1.MatTableDataSource(_this.priorities);
+ _this.dataSource.paginator = _this.paginator;
+ _this.dataSource.sort = _this.sort;
+ }, 0);
}, function () {
location.href = "index.php";
});
@@ -46,12 +58,23 @@ var PrioritiesAdministrationComponent = /** @class */ (function () {
this.http.delete(this.coreUrl + "rest/priorities/" + id)
.subscribe(function (data) {
_this.priorities = data["priorities"];
+ _this.dataSource = new material_1.MatTableDataSource(_this.priorities);
+ _this.dataSource.paginator = _this.paginator;
+ _this.dataSource.sort = _this.sort;
_this.notify.success(_this.lang.priorityDeleted);
}, function (err) {
_this.notify.error(err.error.errors);
});
}
};
+ __decorate([
+ core_1.ViewChild(material_1.MatPaginator),
+ __metadata("design:type", material_1.MatPaginator)
+ ], PrioritiesAdministrationComponent.prototype, "paginator", void 0);
+ __decorate([
+ core_1.ViewChild(material_1.MatSort),
+ __metadata("design:type", material_1.MatSort)
+ ], PrioritiesAdministrationComponent.prototype, "sort", void 0);
PrioritiesAdministrationComponent = __decorate([
core_1.Component({
templateUrl: angularGlobals["priorities-administrationView"],
diff --git a/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.ts
index 13ab68c818549e54e3d8fb91b44c58c71fb4d3e4..396983cda787312bb2dea7679759ffbdf1f61a4d 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.ts
@@ -1,7 +1,8 @@
-import { Component, OnInit} from '@angular/core';
+import { Component, OnInit, ViewChild} from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { LANG } from '../translate.component';
import { NotificationService } from '../notification.service';
+import { MatPaginator, MatTableDataSource, MatSort} from '@angular/material';
declare function $j(selector: any) : any;
@@ -21,12 +22,22 @@ export class PrioritiesAdministrationComponent implements OnInit {
datatable : any;
+ displayedColumns = ['label', 'delays', 'working_days', 'actions'];
+ dataSource : any;
+ @ViewChild(MatPaginator) paginator: MatPaginator;
+ @ViewChild(MatSort) sort: MatSort;
+ applyFilter(filterValue: string) {
+ filterValue = filterValue.trim(); // Remove whitespace
+ filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
+ this.dataSource.filter = filterValue;
+ }
+
constructor(public http: HttpClient, private notify: NotificationService) {
}
updateBreadcrumb(applicationName: string) {
if ($j('#ariane')[0]) {
- $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>Administration</a> > Priorités";
+ $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>" + this.lang.administration + "</a> > " + this.lang.priorities;
}
}
ngOnInit(): void {
@@ -38,8 +49,12 @@ export class PrioritiesAdministrationComponent implements OnInit {
this.http.get(this.coreUrl + 'rest/priorities')
.subscribe((data : any) => {
this.priorities = data["priorities"];
-
this.loading = false;
+ setTimeout(() => {
+ this.dataSource = new MatTableDataSource(this.priorities);
+ this.dataSource.paginator = this.paginator;
+ this.dataSource.sort = this.sort;
+ }, 0);
}, () => {
location.href = "index.php";
})
@@ -52,6 +67,9 @@ export class PrioritiesAdministrationComponent implements OnInit {
this.http.delete(this.coreUrl + "rest/priorities/" + id)
.subscribe((data : any) => {
this.priorities = data["priorities"];
+ this.dataSource = new MatTableDataSource(this.priorities);
+ this.dataSource.paginator = this.paginator;
+ this.dataSource.sort = this.sort;
this.notify.success(this.lang.priorityDeleted);
}, (err) => {
this.notify.error(err.error.errors);
diff --git a/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.js
index 050729b467f50937d5af700b5f45c43b82b31370..53a9de37d9a5a1dc4e8f8ba92c3a819b05d51332 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.js
@@ -23,30 +23,51 @@ var PriorityAdministrationComponent = /** @class */ (function () {
this.lang = translate_component_1.LANG;
this.loading = false;
this.priority = {
- working_days: false
+ useDoctypeDelay: false,
+ color: "#135f7f",
+ delays: "1",
+ working_days: "false"
};
}
PriorityAdministrationComponent.prototype.updateBreadcrumb = function (applicationName) {
- if ($j('#ariane')[0]) {
- $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>Administration</a> > <a onclick='location.hash = \"/administration/priorities\"' style='cursor: pointer'>Priorités</a>";
+ var breadCrumb = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>" + this.lang.administration + "</a> > <a onclick='location.hash = \"/administration/priorities\"' style='cursor: pointer'>" + this.lang.priorities + "</a> > ";
+ if (this.creationMode == true) {
+ breadCrumb += this.lang.priorityCreation;
}
+ else {
+ breadCrumb += this.lang.priorityModification;
+ }
+ $j('#ariane')[0].innerHTML = breadCrumb;
};
PriorityAdministrationComponent.prototype.ngOnInit = function () {
var _this = this;
- this.updateBreadcrumb(angularGlobals.applicationName);
this.coreUrl = angularGlobals.coreUrl;
this.loading = true;
this.route.params.subscribe(function (params) {
if (typeof params['id'] == "undefined") {
_this.creationMode = true;
+ _this.updateBreadcrumb(angularGlobals.applicationName);
_this.loading = false;
}
else {
_this.creationMode = false;
+ _this.updateBreadcrumb(angularGlobals.applicationName);
_this.id = params['id'];
_this.http.get(_this.coreUrl + "rest/priorities/" + _this.id)
.subscribe(function (data) {
_this.priority = data.priority;
+ if (_this.priority.delays == 0) {
+ _this.priority.useDoctypeDelay = false;
+ }
+ else {
+ _this.priority.useDoctypeDelay = true;
+ }
+ if (_this.priority.working_days === true) {
+ _this.priority.working_days = "true";
+ }
+ else {
+ _this.priority.working_days = "false";
+ }
_this.loading = false;
}, function () {
location.href = "index.php";
@@ -56,6 +77,15 @@ var PriorityAdministrationComponent = /** @class */ (function () {
};
PriorityAdministrationComponent.prototype.onSubmit = function () {
var _this = this;
+ if (this.priority.useDoctypeDelay == false) {
+ this.priority.delays = 0;
+ }
+ if (this.priority.working_days == "true") {
+ this.priority.working_days = true;
+ }
+ else {
+ this.priority.working_days = false;
+ }
if (this.creationMode) {
this.http.post(this.coreUrl + "rest/priorities", this.priority)
.subscribe(function () {
diff --git a/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.ts
index 9a1515e925dfe3ccb35f4f2c087fe6e89989afb3..c98c2a087d5aa75a77f6cba5d1bb1e729e360a3b 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.ts
@@ -22,20 +22,27 @@ export class PriorityAdministrationComponent implements OnInit {
loading : boolean = false;
priority : any = {
- working_days : false
+ useDoctypeDelay : false,
+ color : "#135f7f",
+ delays : "1",
+ working_days : "false"
};
+ selectedWorkingDays: any;
constructor(public http: HttpClient, private route: ActivatedRoute, private router: Router, private notify: NotificationService) {
}
updateBreadcrumb(applicationName: string) {
- if ($j('#ariane')[0]) {
- $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>Administration</a> > <a onclick='location.hash = \"/administration/priorities\"' style='cursor: pointer'>Priorités</a>";
+ var breadCrumb = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>" + this.lang.administration + "</a> > <a onclick='location.hash = \"/administration/priorities\"' style='cursor: pointer'>" + this.lang.priorities + "</a> > ";
+ if (this.creationMode == true) {
+ breadCrumb += this.lang.priorityCreation;
+ } else {
+ breadCrumb += this.lang.priorityModification;
}
+ $j('#ariane')[0].innerHTML = breadCrumb;
}
ngOnInit(): void {
- this.updateBreadcrumb(angularGlobals.applicationName);
this.coreUrl = angularGlobals.coreUrl;
this.loading = true;
@@ -43,14 +50,25 @@ export class PriorityAdministrationComponent implements OnInit {
this.route.params.subscribe((params) => {
if (typeof params['id'] == "undefined") {
this.creationMode = true;
+ this.updateBreadcrumb(angularGlobals.applicationName);
this.loading = false;
} else {
this.creationMode = false;
+ this.updateBreadcrumb(angularGlobals.applicationName);
this.id = params['id'];
this.http.get(this.coreUrl + "rest/priorities/" + this.id)
.subscribe((data : any) => {
this.priority = data.priority;
-
+ if (this.priority.delays == 0) {
+ this.priority.useDoctypeDelay = false;
+ } else {
+ this.priority.useDoctypeDelay = true;
+ }
+ if (this.priority.working_days === true) {
+ this.priority.working_days = "true";
+ } else {
+ this.priority.working_days = "false";
+ }
this.loading = false;
}, () => {
location.href = "index.php";
@@ -60,6 +78,14 @@ export class PriorityAdministrationComponent implements OnInit {
}
onSubmit(){
+ if (this.priority.useDoctypeDelay == false) {
+ this.priority.delays = 0;
+ }
+ if (this.priority.working_days == "true") {
+ this.priority.working_days = true
+ } else {
+ this.priority.working_days = false
+ }
if (this.creationMode) {
this.http.post(this.coreUrl + "rest/priorities", this.priority)
.subscribe(() => {
diff --git a/apps/maarch_entreprise/js/angular/app/app-material.module.js b/apps/maarch_entreprise/js/angular/app/app-material.module.js
index e94bc7084f968998d53188e23f39c64415f6d899..be1a0c9cbdb7f0c8eaec8ba4544a8dddb6b480e4 100644
--- a/apps/maarch_entreprise/js/angular/app/app-material.module.js
+++ b/apps/maarch_entreprise/js/angular/app/app-material.module.js
@@ -42,7 +42,8 @@ var AppMaterialModule = /** @class */ (function () {
material_1.MatListModule,
material_1.MatChipsModule,
material_1.MatStepperModule,
- material_1.MatRadioModule
+ material_1.MatRadioModule,
+ material_1.MatSliderModule
],
exports: [
material_1.MatCheckboxModule,
@@ -72,7 +73,8 @@ var AppMaterialModule = /** @class */ (function () {
material_1.MatListModule,
material_1.MatChipsModule,
material_1.MatStepperModule,
- material_1.MatRadioModule
+ material_1.MatRadioModule,
+ material_1.MatSliderModule
],
providers: [
{ provide: material_1.MatPaginatorIntl, useValue: french_paginator_intl_1.getFrenchPaginatorIntl() }
diff --git a/apps/maarch_entreprise/js/angular/app/app-material.module.ts b/apps/maarch_entreprise/js/angular/app/app-material.module.ts
index 449db8186b6427ae50fc3f2408b0d4a0b29c140d..60f528fa06bdc660d4c583c7c956bb0e228c6a43 100644
--- a/apps/maarch_entreprise/js/angular/app/app-material.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/app-material.module.ts
@@ -31,7 +31,8 @@ import {
MatListModule,
MatChipsModule,
MatStepperModule,
- MatRadioModule
+ MatRadioModule,
+ MatSliderModule
} from '@angular/material';
import { CdkTableModule } from '@angular/cdk/table';
@@ -66,7 +67,8 @@ import { getFrenchPaginatorIntl } from './french-paginator-intl';
MatListModule,
MatChipsModule,
MatStepperModule,
- MatRadioModule
+ MatRadioModule,
+ MatSliderModule
],
exports: [
MatCheckboxModule,
@@ -96,7 +98,8 @@ import { getFrenchPaginatorIntl } from './french-paginator-intl';
MatListModule,
MatChipsModule,
MatStepperModule,
- MatRadioModule
+ MatRadioModule,
+ MatSliderModule
],
providers: [
{ provide: MatPaginatorIntl, useValue: getFrenchPaginatorIntl() }
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.js b/apps/maarch_entreprise/js/angular/lang/lang-en.js
index eb23650236c432f6d5db18d7665e997aef8a12a0..e254e5f431b53cbdd666a0165e5437ffba07417f 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.js
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.js
@@ -41,6 +41,7 @@ exports.LANG_EN = {
"baskets": "Baskets",
"basketsOrder": "Manage baskets order",
"basketUpdated": "Basket updated",
+ "calDays": "calendar days",
"canBeModified": "Index modification",
"canBeSearched": "Searchable",
"cancel": "Cancel",
@@ -164,11 +165,16 @@ exports.LANG_EN = {
"parameterUpdated": "Parameter updated",
"phoneNumber": "Phone number",
"primaryEntity": "Primary entity",
+ "priorities": "Priorities",
"priorityAdded": "Priority added",
+ "priorityCreation": "Priority creation",
"priorityDeleted": "Priority deleted",
+ "priorityModification": "Priority modification",
"priorityUpdated": "Priority updated",
"processAction": "Process action(s)",
"processDelay": "Process delay",
+ "processDelayDoctype": "doctype delay is used",
+ "processType": "Process type",
"pswReseted": "Password reseted",
"record": "element(s)",
"records": "result(s)",
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
index fde82ef007d8194be0e0bcd557ade43ec1bf3e98..e8695655a651dae34cee191bd48794b56dbacd32 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
@@ -39,6 +39,7 @@ export const LANG_EN = {
"baskets" : "Baskets",
"basketsOrder" : "Manage baskets order",
"basketUpdated" : "Basket updated",
+ "calDays" : "calendar days",
"canBeModified" : "Index modification",
"canBeSearched" : "Searchable",
"cancel" : "Cancel",
@@ -162,11 +163,16 @@ export const LANG_EN = {
"parameterUpdated" : "Parameter updated",
"phoneNumber" : "Phone number",
"primaryEntity" : "Primary entity",
+ "priorities" : "Priorities",
"priorityAdded" : "Priority added",
+ "priorityCreation" : "Priority creation",
"priorityDeleted" : "Priority deleted",
+ "priorityModification" : "Priority modification",
"priorityUpdated" : "Priority updated",
"processAction" : "Process action(s)",
"processDelay" : "Process delay",
+ "processDelayDoctype" : "doctype delay is used",
+ "processType" : "Process type",
"pswReseted" : "Password reseted",
"record" : "element(s)",
"records" : "result(s)",
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.js b/apps/maarch_entreprise/js/angular/lang/lang-fr.js
index 22346491252bcf4baab81c9aab5a28cbe350d92f..7cdb92bfe84b5723fb5cd2f4ad23bf1cf5719118 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-fr.js
+++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.js
@@ -44,6 +44,7 @@ exports.LANG_FR = {
"baskets": "Bannettes",
"basketsOrder": "Gerer l'ordre des bannettes",
"basketUpdated": "Bannette modifiée",
+ "calDays": "jour(s) calendaire(s)",
"canBeModified": "Modification des index",
"canBeSearched": "Recherche",
"cancel": "Annuler",
@@ -184,11 +185,16 @@ exports.LANG_FR = {
"phoneNumber": "Numéro de téléphone",
"previous": "Précecdent",
"primaryEntity": "Entité primaire",
+ "priorities": "Priorité(s)",
"priorityAdded": "Priorité ajoutée",
+ "priorityCreation": "Création d'une priorité",
"priorityDeleted": "Priorité supprimée",
+ "priorityModification": "Modification d'une priorité",
"priorityUpdated": "Priorité modifiée",
"processAction": "Action(s) de traitement",
"processDelay": "Délai de traitement",
+ "processDelayDoctype": "utilise le délai selon le type de document",
+ "processType": "Type de traitement",
"pswReseted": "Mot de passe réinitialisé",
"record": "élément(s)",
"records": "résultats",
@@ -264,6 +270,6 @@ exports.LANG_FR = {
"view": "Consulter",
"visa": "Circuit de visa",
"whereClauseAction": "Condition d'apparition de l'action (where clause)",
- "workingDays": "Jours ouvrés",
+ "workingDays": "jour(s) ouvré(s)",
"yes": "Oui",
};
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
index 62ad0613737621fbc830debb9f60bf2bf02451d9..3681b62f2c1a8c06a71db227174e4594f96c0371 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
@@ -40,8 +40,9 @@ 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" : "Gerer l'ordre des bannettes",
"basketUpdated" : "Bannette modifiée",
+ "calDays" : "jour(s) calendaire(s)",
"canBeModified" : "Modification des index",
"canBeSearched" : "Recherche",
"cancel" : "Annuler",
@@ -182,11 +183,16 @@ export const LANG_FR = {
"phoneNumber" : "Numéro de téléphone",
"previous" : "Précecdent",
"primaryEntity" : "Entité primaire",
+ "priorities" : "Priorité(s)",
"priorityAdded" : "Priorité ajoutée",
+ "priorityCreation" : "Création d'une priorité",
"priorityDeleted" : "Priorité supprimée",
+ "priorityModification" : "Modification d'une priorité",
"priorityUpdated" : "Priorité modifiée",
"processAction" : "Action(s) de traitement",
"processDelay" : "Délai de traitement",
+ "processDelayDoctype" : "utilise le délai selon le type de document",
+ "processType" : "Type de traitement",
"pswReseted" : "Mot de passe réinitialisé",
"record" : "élément(s)",
"records" : "résultats",
@@ -262,6 +268,6 @@ export const LANG_FR = {
"view" : "Consulter",
"visa" : "Circuit de visa",
"whereClauseAction" : "Condition d'apparition de l'action (where clause)",
- "workingDays" : "Jours ouvrés",
+ "workingDays" : "jour(s) ouvré(s)",
"yes" : "Oui",
};
\ No newline at end of file