From d82f0b1bbbe3e618f7eb92b23288b23eaf9b5153 Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Thu, 15 Feb 2018 15:03:43 +0100
Subject: [PATCH] FEAT #50 add cond if delay == *
---
.../Views/priorities-administration.component.html | 10 +++++-----
.../Views/priority-administration.component.html | 2 +-
.../priority-administration.component.js | 6 +++---
.../priority-administration.component.ts | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/apps/maarch_entreprise/Views/priorities-administration.component.html b/apps/maarch_entreprise/Views/priorities-administration.component.html
index 7c86134ce68..fec646be593 100755
--- a/apps/maarch_entreprise/Views/priorities-administration.component.html
+++ b/apps/maarch_entreprise/Views/priorities-administration.component.html
@@ -30,10 +30,10 @@
<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">
+ <span *ngIf="element.delays == '*'">
<i style="opacity:0.5">{{lang.processDelayDoctype}}</i>
</span>
- <span *ngIf="element.delays != 0">
+ <span *ngIf="element.delays != '*'">
{{element.delays}}
</span>
</mat-cell>
@@ -41,13 +41,13 @@
<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">
+ <span *ngIf="element.delays == '*'">
<i style="opacity:0.5">{{lang.processDelayDoctype}}</i>
</span>
- <span *ngIf="element.working_days && element.delays != 0">
+ <span *ngIf="element.working_days && element.delays != '*'">
{{lang.workingDays}}
</span>
- <span *ngIf="!element.working_days && element.delays != 0">
+ <span *ngIf="!element.working_days && element.delays != '*'">
{{lang.calDays}}
</span>
</mat-cell>
diff --git a/apps/maarch_entreprise/Views/priority-administration.component.html b/apps/maarch_entreprise/Views/priority-administration.component.html
index 1b3d304c4f9..6799101ce03 100755
--- a/apps/maarch_entreprise/Views/priority-administration.component.html
+++ b/apps/maarch_entreprise/Views/priority-administration.component.html
@@ -30,7 +30,7 @@
</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>
+ <mat-slider [disabled]="!priority.useDoctypeDelay" style="width:100%" name="delays" color="primary" max="60" min="0" thumb-label="true" [(ngModel)]="priority.delays"></mat-slider>
</div>
<div class="col-md-3">
<mat-form-field>
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 53a9de37d9a..237ed6d3842 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
@@ -25,7 +25,7 @@ var PriorityAdministrationComponent = /** @class */ (function () {
this.priority = {
useDoctypeDelay: false,
color: "#135f7f",
- delays: "1",
+ delays: "0",
working_days: "false"
};
}
@@ -56,7 +56,7 @@ var PriorityAdministrationComponent = /** @class */ (function () {
_this.http.get(_this.coreUrl + "rest/priorities/" + _this.id)
.subscribe(function (data) {
_this.priority = data.priority;
- if (_this.priority.delays == 0) {
+ if (_this.priority.delays == '*') {
_this.priority.useDoctypeDelay = false;
}
else {
@@ -78,7 +78,7 @@ var PriorityAdministrationComponent = /** @class */ (function () {
PriorityAdministrationComponent.prototype.onSubmit = function () {
var _this = this;
if (this.priority.useDoctypeDelay == false) {
- this.priority.delays = 0;
+ this.priority.delays = '*';
}
if (this.priority.working_days == "true") {
this.priority.working_days = true;
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 c98c2a087d5..d9c7b7af02e 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
@@ -24,7 +24,7 @@ export class PriorityAdministrationComponent implements OnInit {
priority : any = {
useDoctypeDelay : false,
color : "#135f7f",
- delays : "1",
+ delays : "0",
working_days : "false"
};
selectedWorkingDays: any;
@@ -59,7 +59,7 @@ export class PriorityAdministrationComponent implements OnInit {
this.http.get(this.coreUrl + "rest/priorities/" + this.id)
.subscribe((data : any) => {
this.priority = data.priority;
- if (this.priority.delays == 0) {
+ if (this.priority.delays == '*') {
this.priority.useDoctypeDelay = false;
} else {
this.priority.useDoctypeDelay = true;
@@ -79,7 +79,7 @@ export class PriorityAdministrationComponent implements OnInit {
onSubmit(){
if (this.priority.useDoctypeDelay == false) {
- this.priority.delays = 0;
+ this.priority.delays = '*';
}
if (this.priority.working_days == "true") {
this.priority.working_days = true
--
GitLab