diff --git a/apps/maarch_entreprise/xml/features.xml b/apps/maarch_entreprise/xml/features.xml
index bb62a03e8271ed4b467a14233c430b5555da7379..a4648a7e40412f7c8ecc8b51b18430ae5e2aa785 100755
--- a/apps/maarch_entreprise/xml/features.xml
+++ b/apps/maarch_entreprise/xml/features.xml
@@ -11,7 +11,6 @@
<font>helvetica,10</font> <!-- Setup the font name and her size, ex: helvetica,10 -->
<text_color>20,192,30</text_color> <!-- Setup the color of the text, ex: 192,192,192 -->
</watermark>
- <type_calendar>workingDay</type_calendar><!-- calendar or workingDay -->
<send_to_contact_with_mandatory_attachment>true</send_to_contact_with_mandatory_attachment><!-- if true, requirement to had a attachment, if false, no mandatory to had a attachment -->
<notes_in_print_page><!-- Libellé des notes dans la fiche de liaison V1-->
<label>NOTE 1</label>
diff --git a/migration/19.12/1912-postScript.sql b/migration/19.12/1912-postScript.sql
index f3d43cdb5fe56c05d3c946253fd1fee65e268729..de3bad8ee93816f606f96de6f1733f843b76afa4 100644
--- a/migration/19.12/1912-postScript.sql
+++ b/migration/19.12/1912-postScript.sql
@@ -20,3 +20,5 @@ DROP TABLE IF EXISTS groupbasket_status;
DROP TABLE IF EXISTS indexingmodels;
DROP TABLE IF EXISTS mlb_coll_ext;
+
+--
\ No newline at end of file
diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql
index e1fad4e1ada5ee802f5ea867bca1bed1452d3070..e7a22caaca67f66abc872d66bfa9f0b856defbbf 100644
--- a/migration/19.12/1912.sql
+++ b/migration/19.12/1912.sql
@@ -363,7 +363,7 @@ DROP TABLE IF EXISTS foldertypes_doctypes_level1;
DROP TABLE IF EXISTS foldertypes_indexes;
ALTER TABLE doctypes DROP COLUMN IF EXISTS coll_id;
DROP TABLE IF EXISTS mlb_doctype_ext;
-
+ALTER TABLE priorities DROP COLUMN IF EXISTS working_days;
/* RE CREATE VIEWS */
CREATE OR REPLACE VIEW res_view_letterbox AS
diff --git a/migration/19.12/migrate.sh b/migration/19.12/migrate.sh
index 0bcf589fc8a604bf67130dae50426c4b174b7172..e7a4fb0994e9a7635ffe0fb267fdd6bd2835d33c 100755
--- a/migration/19.12/migrate.sh
+++ b/migration/19.12/migrate.sh
@@ -13,3 +13,4 @@ php ./exportFolders.php
php ./removeProcessModes.php
php ./migrateCategories.php
php ./migrateOldIndexingModels.php
+php ./migrateWorkingDays.php
diff --git a/migration/19.12/migrateCategories.php b/migration/19.12/migrateCategories.php
index 0688dd5c78b0be268f79e1fa3fde8936b072182a..21ef67d382e914cfa53a82681bf515ffb2193109 100644
--- a/migration/19.12/migrateCategories.php
+++ b/migration/19.12/migrateCategories.php
@@ -13,7 +13,6 @@ foreach ($customs as $custom) {
continue;
}
- $natures = [];
$path = "custom/{$custom}/apps/maarch_entreprise/xml/config.xml";
if (file_exists($path)) {
if (!is_readable($path) || !is_writable($path)) {
@@ -78,6 +77,22 @@ foreach ($customs as $custom) {
if ($fp) {
fwrite($fp, $res);
}
+
+ //Default Priority
+ $defaultPriority = \Priority\models\PriorityModel::get([
+ 'select' => ['id'],
+ 'where' => ['default_priority = ?'],
+ 'data' => [1]
+ ]);
+ if (!empty($defaultPriority)) {
+ \SrcCore\models\DatabaseModel::update([
+ 'set' => ['default_value' => json_encode($defaultPriority[0]['id'])],
+ 'table' => 'indexing_models_fields',
+ 'where' => ['identifier = ?', 'model_id in (SELECT id FROM indexing_models WHERE private = FALSE)'],
+ 'data' => ['priority']
+ ]);
+ }
+
$migrated++;
}
}
diff --git a/sql/data_en.sql b/sql/data_en.sql
index 8766f43d7330e0827efaa657af1fa703a46648cf..8ee6182013f906dd2e74a548e66b5197ac68b01f 100644
--- a/sql/data_en.sql
+++ b/sql/data_en.sql
@@ -918,7 +918,8 @@ INSERT INTO parameters (id, description, param_value_string, param_value_int, pa
INSERT INTO parameters (id, description, param_value_string) VALUES ('homepage_message', 'Texte apparaissant dans la bannière sur la page d''accueil, mettre un espace pour supprimer la bannière.', 'Bienvenue dans votre <b>G</b>estion <b>E</b>lectronique du <b>C</b>ourrier.');
INSERT INTO parameters (id, description, param_value_string) VALUES ('thumbnailsSize', 'Résolution des imagettes', '750x900');
INSERT INTO parameters (id, description, param_value_int) VALUES ('keepDestForRedirection', 'If enabled (1), put recipient in copy for diffusion list when redirecting', 0);
-INSERT INTO parameters (id, description, param_value_int) VALUES ('QrCodePrefix', 'Si enabled (1), add "Maarch_" before the content in QrCode. (Can be use with MaarchCapture >= 1.4)', 0);
+INSERT INTO parameters (id, description, param_value_int) VALUES ('QrCodePrefix', 'If enabled (1), add "Maarch_" before the content in QrCode. (Can be use with MaarchCapture >= 1.4)', 0);
+INSERT INTO parameters (id, description, param_value_int) VALUES ('workingDays', 'If enabled (1), processing time are calculated in working days (Monday to Friday). Otherwise, in calendar days', 1);
------------
--DIFFLIST_TYPES
@@ -1468,9 +1469,9 @@ Select setval('templates_seq', (select max(template_id)+1 from templates), false
--PRIORITES
------------
TRUNCATE TABLE priorities;
-INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1357nbvc', 'Normal', '#009dc5', TRUE, null, TRUE, 1);
-INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1379nbvc', 'Urgent', '#ffa500', TRUE, 8, FALSE, 2);
-INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1391nbvc', 'Very urgent', '#ff0000', TRUE, 4, FALSE, 3);
+INSERT INTO priorities (id, label, color, delays, "order") VALUES ('poiuytre1357nbvc', 'Normal', '#009dc5', 0, 1);
+INSERT INTO priorities (id, label, color, delays, "order") VALUES ('poiuytre1379nbvc', 'Urgent', '#ffa500', 8, 2);
+INSERT INTO priorities (id, label, color, delays, "order") VALUES ('poiuytre1391nbvc', 'Very urgent', '#ff0000', 4, 3);
------------
--NOTIFICATIONS
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index f913e1a73289cb7eda0362b5f4c6abdc4bcca86f..ecda6d92ce74391f938d916203f36c8bf47d0627 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1014,6 +1014,7 @@ INSERT INTO parameters (id, description, param_value_string) VALUES ('loginpage_
INSERT INTO parameters (id, description, param_value_string) VALUES ('thumbnailsSize', 'Résolution des imagettes', '750x900');
INSERT INTO parameters (id, description, param_value_int) VALUES ('keepDestForRedirection', 'Si activé (1), met le destinataire en copie de la liste de diffusion lors d''une action de redirection', 0);
INSERT INTO parameters (id, description, param_value_int) VALUES ('QrCodePrefix', 'Si activé (1), ajoute "Maarch_" dans le contenu des QrCode générés. (Utilisable avec MaarchCapture >= 1.4)', 0);
+INSERT INTO parameters (id, description, param_value_int) VALUES ('workingDays', 'Si activé (1), les délais de traitement sont calculés en jours ouvrés (Lundi à Vendredi). Sinon, en jours calendaire', 1);
------------
--DIFFLIST_TYPES
@@ -1599,9 +1600,9 @@ Select setval('templates_seq', (select max(template_id)+1 from templates), false
--PRIORITES
------------
TRUNCATE TABLE priorities;
-INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1357nbvc', 'Normal', '#009dc5', TRUE, null, TRUE, 1);
-INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1379nbvc', 'Urgent', '#ffa500', TRUE, 8, FALSE, 2);
-INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1391nbvc', 'Très urgent', '#ff0000', TRUE, 4, FALSE, 3);
+INSERT INTO priorities (id, label, color, delays, "order") VALUES ('poiuytre1357nbvc', 'Normal', '#009dc5', 0, 1);
+INSERT INTO priorities (id, label, color, delays, "order") VALUES ('poiuytre1379nbvc', 'Urgent', '#ffa500', 8, 2);
+INSERT INTO priorities (id, label, color, delays, "order") VALUES ('poiuytre1391nbvc', 'Très urgent', '#ff0000', 4, 3);
------------
--NOTIFICATIONS
diff --git a/sql/structure.sql b/sql/structure.sql
index 2db0eec815ad8fe14fed5aeafc0f47afde1fafe4..9da72952637e9f99b3e43d3dedc7728007a0c9a6 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -1259,9 +1259,7 @@ CREATE TABLE priorities
id character varying(16) NOT NULL,
label character varying(128) NOT NULL,
color character varying(128) NOT NULL,
- working_days boolean NOT NULL,
delays integer,
- default_priority boolean NOT NULL DEFAULT FALSE,
"order" integer,
CONSTRAINT priorities_pkey PRIMARY KEY (id)
)
diff --git a/src/app/priority/controllers/PriorityController.php b/src/app/priority/controllers/PriorityController.php
index 1cfd802ab990d3e54714d372c88f062f6059327f..7fc03312ebce483ede899a38912cd0c1caeff4e1 100755
--- a/src/app/priority/controllers/PriorityController.php
+++ b/src/app/priority/controllers/PriorityController.php
@@ -49,17 +49,10 @@ class PriorityController
$check = Validator::stringType()->notEmpty()->validate($data['label']);
$check = $check && Validator::stringType()->notEmpty()->validate($data['color']);
$check = $check && (Validator::intVal()->notEmpty()->validate($data['delays']) || $data['delays'] == null || $data['delays'] == 0);
- $check = $check && Validator::boolType()->validate($data['working_days']);
- $check = $check && Validator::boolType()->validate($data['default_priority']);
- if (!$check) {
- return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
- }
- if ($data['default_priority']) {
- PriorityModel::resetDefaultPriority();
+ if (!$check) {
+ return $response->withStatus(400)->withJson(['errors' => 'Body (label, color or delays) is empty or type is incorrect']);
}
- $data['working_days'] = $data['working_days'] ? 'true' : 'false';
- $data['default_priority'] = $data['default_priority'] ? 'true' : 'false';
$id = PriorityModel::create($data);
HistoryController::add([
@@ -84,18 +77,12 @@ class PriorityController
$check = Validator::stringType()->notEmpty()->validate($data['label']);
$check = $check && Validator::stringType()->notEmpty()->validate($data['color']);
$check = $check && (Validator::intVal()->notEmpty()->validate($data['delays']) || $data['delays'] == null);
- $check = $check && Validator::boolType()->validate($data['working_days']);
- $check = $check && Validator::boolType()->validate($data['default_priority']);
+
if (!$check) {
- return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
+ return $response->withStatus(400)->withJson(['errors' => 'Body (label, color or delays) is empty or type is incorrect']);
}
- if ($data['default_priority']) {
- PriorityModel::resetDefaultPriority();
- }
$data['id'] = $aArgs['id'];
- $data['working_days'] = empty($data['working_days']) ? 'false' : 'true';
- $data['default_priority'] = empty($data['default_priority']) ? 'false' : 'true';
PriorityModel::update($data);
HistoryController::add([
diff --git a/src/app/priority/models/PriorityModelAbstract.php b/src/app/priority/models/PriorityModelAbstract.php
index dc944d86e93c01d7e98ec8c279fec3a16ab3501b..441ee70329a93cb573a555f5953a1f835bb411d3 100755
--- a/src/app/priority/models/PriorityModelAbstract.php
+++ b/src/app/priority/models/PriorityModelAbstract.php
@@ -59,11 +59,10 @@ abstract class PriorityModelAbstract
public static function create(array $aArgs)
{
- ValidatorModel::notEmpty($aArgs, ['label', 'color', 'working_days', 'default_priority']);
- ValidatorModel::stringType($aArgs, ['label', 'color', 'working_days', 'default_priority']);
+ ValidatorModel::notEmpty($aArgs, ['label', 'color']);
+ ValidatorModel::stringType($aArgs, ['label', 'color']);
ValidatorModel::intVal($aArgs, ['delays']);
- //working_days => true (monday to friday) => false (monday to sunday)
$id = CoreConfigModel::uniqueId();
DatabaseModel::insert([
'table' => 'priorities',
@@ -71,9 +70,7 @@ abstract class PriorityModelAbstract
'id' => $id,
'label' => $aArgs['label'],
'color' => $aArgs['color'],
- 'working_days' => $aArgs['working_days'],
'delays' => $aArgs['delays'],
- 'default_priority' => $aArgs['default_priority'],
]
]);
@@ -82,19 +79,16 @@ abstract class PriorityModelAbstract
public static function update(array $aArgs)
{
- ValidatorModel::notEmpty($aArgs, ['id', 'label', 'color', 'working_days', 'default_priority']);
- ValidatorModel::stringType($aArgs, ['id', 'label', 'color', 'working_days', 'default_priority']);
+ ValidatorModel::notEmpty($aArgs, ['id', 'label', 'color']);
+ ValidatorModel::stringType($aArgs, ['id', 'label', 'color']);
ValidatorModel::intVal($aArgs, ['delays']);
- //working_days => true (monday to friday) => false (monday to sunday)
DatabaseModel::update([
'table' => 'priorities',
'set' => [
'label' => $aArgs['label'],
'color' => $aArgs['color'],
- 'working_days' => $aArgs['working_days'],
'delays' => $aArgs['delays'],
- 'default_priority' => $aArgs['default_priority']
],
'where' => ['id = ?'],
'data' => [$aArgs['id']]
@@ -121,20 +115,6 @@ abstract class PriorityModelAbstract
return true;
}
- public static function resetDefaultPriority()
- {
- DatabaseModel::update([
- 'table' => 'priorities',
- 'set' => [
- 'default_priority' => 'false'
- ],
- 'where' => ['default_priority = ?'],
- 'data' => ['true']
- ]);
-
- return true;
- }
-
public static function delete(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['id']);
@@ -148,5 +128,4 @@ abstract class PriorityModelAbstract
return true;
}
-}
-
+}
\ No newline at end of file
diff --git a/src/app/resource/controllers/IndexingController.php b/src/app/resource/controllers/IndexingController.php
index bc76704c59b9efc02bd06e3b669b4bebb9fcd906..0b4f72ba4cefbda2ab07edd7bfe3f29903129d63 100755
--- a/src/app/resource/controllers/IndexingController.php
+++ b/src/app/resource/controllers/IndexingController.php
@@ -18,6 +18,7 @@ use Action\models\ActionModel;
use Doctype\models\DoctypeModel;
use Entity\models\EntityModel;
use Group\models\GroupModel;
+use Parameter\models\ParameterModel;
use Priority\models\PriorityModel;
use Respect\Validation\Validator;
use Slim\Http\Request;
@@ -138,8 +139,8 @@ class IndexingController
$priority = PriorityModel::getById(['id' => $queryParams['priority'], 'select' => ['delays']]);
$delay = $priority['delays'];
}
- if (empty($delay)) {
- return $response->withStatus(400)->withJson(['errors' => 'Delay is empty']);
+ if (!Validator::intVal()->validate($delay)) {
+ return $response->withStatus(400)->withJson(['errors' => 'Delay is not a numeric value']);
}
$processLimitDate = IndexingController::calculateProcessDate(['date' => date('c'), 'delay' => $delay]);
@@ -183,14 +184,15 @@ class IndexingController
public static function calculateProcessDate(array $args)
{
- ValidatorModel::notEmpty($args, ['date', 'delay']);
+ ValidatorModel::notEmpty($args, ['date']);
ValidatorModel::intVal($args, ['delay']);
$date = new \DateTime($args['date']);
- $calendarType = 'calendar';
+ $workingDays = ParameterModel::getById(['id' => 'workingDays', 'select' => ['param_value_int']]);
- if ($calendarType == 'workingDay') {
+ // Working Day
+ if ($workingDays['param_value_int'] == 1 && !empty($args['delay'])) {
$hollidays = [
'01-01',
'01-05',
@@ -207,16 +209,19 @@ class IndexingController
$processDelayUpdated = 1;
for ($i = 1; $i <= $args['delay']; $i++) {
- $tmpDate = new \DateTime($args['delay']);
+ $tmpDate = new \DateTime($args['date']);
$tmpDate->add(new \DateInterval("P{$i}D"));
if (in_array($tmpDate->format('N'), [6, 7]) || in_array($tmpDate->format('d-m'), $hollidays)) {
++$args['delay'];
}
- ++$processDelayUpdated;
+ if ($i+1 <= $args['delay']) {
+ ++$processDelayUpdated;
+ }
}
$date->add(new \DateInterval("P{$processDelayUpdated}D"));
} else {
+ // Calendar or empty delay
$date->add(new \DateInterval("P{$args['delay']}D"));
}
diff --git a/src/frontend/app/administration/priority/priorities-administration.component.html b/src/frontend/app/administration/priority/priorities-administration.component.html
index 0aa0aed6f32afdbed5be2ab2dd75680edb7a748a..b9c2e3f9b4834250b613460519392cb8fdbff876 100755
--- a/src/frontend/app/administration/priority/priorities-administration.component.html
+++ b/src/frontend/app/administration/priority/priorities-administration.component.html
@@ -47,31 +47,11 @@
<ng-container matColumnDef="delays">
<mat-header-cell *matHeaderCellDef mat-sort-header [class.hide-for-mobile]="appService.getViewMode()" style="flex:2;">{{lang.processDelayDay}}</mat-header-cell>
<mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()" style="flex:2;">
- <span *ngIf="element.delays == null">
- <i style="opacity:0.5">{{lang.processDelayDoctype}}</i>
- </span>
- <span *ngIf="element.delays">
+ <span>
{{element.delays}}
</span>
</mat-cell>
</ng-container>
- <ng-container matColumnDef="working_days" >
- <mat-header-cell *matHeaderCellDef mat-sort-header [class.hide-for-mobile]="appService.getViewMode()" style="flex:3;">{{lang.processType}}</mat-header-cell>
- <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()" style="flex:3;">
- <span *ngIf="element.working_days">
- {{lang.workingDays}}
- </span>
- <span *ngIf="!element.working_days">
- {{lang.calDays}}
- </span>
- </mat-cell>
- </ng-container>
- <ng-container matColumnDef="default_priority" >
- <mat-header-cell *matHeaderCellDef mat-sort-header [class.hide-for-mobile]="appService.getViewMode()" style="flex:1;">{{lang.defaultPriority}}</mat-header-cell>
- <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()" style="flex:1;">
- <span *ngIf="element.default_priority" color="primary" class="fa fa-check fa-2x"></span>
- </mat-cell>
- </ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef></mat-header-cell>
<mat-cell *matCellDef="let element" style="justify-content: flex-end;">
diff --git a/src/frontend/app/administration/priority/priorities-administration.component.ts b/src/frontend/app/administration/priority/priorities-administration.component.ts
index 441c8da95fcfd129b800b1b25efbdacc1588b5e5..786ab3f6e516f173abde835ef7fa01733ab820f8 100755
--- a/src/frontend/app/administration/priority/priorities-administration.component.ts
+++ b/src/frontend/app/administration/priority/priorities-administration.component.ts
@@ -26,7 +26,7 @@ export class PrioritiesAdministrationComponent implements OnInit {
priorities : any[] = [];
prioritiesOrder : any[] = [];
dataSource : any;
- displayedColumns = ['label', 'delays', 'working_days', 'default_priority', 'actions'];
+ displayedColumns = ['label', 'delays', 'actions'];
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
diff --git a/src/frontend/app/administration/priority/priority-administration.component.html b/src/frontend/app/administration/priority/priority-administration.component.html
index abee4023c70a2a174d7d9ee9035611954a3ece81..9aec3a04dd9500d24efb58fb63803d0fe7a2ec36 100755
--- a/src/frontend/app/administration/priority/priority-administration.component.html
+++ b/src/frontend/app/administration/priority/priority-administration.component.html
@@ -30,34 +30,12 @@
<div class="form-group">
<div class="col-md-6">
<mat-form-field>
- <mat-select name="processType" placeholder="{{lang.processType}}" [(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-6">
- <mat-form-field>
- <span matPrefix>
- <mat-checkbox color="primary" name="useDoctypeDelay" [(ngModel)]="priority.useDoctypeDelay"
- matTooltip="{{lang.tooltipPriorityDelay}}"></mat-checkbox>
- </span>
- <input matInput [disabled]="!priority.useDoctypeDelay" type="number" name="delays"
+ <input matInput type="number" name="delays"
placeholder="{{lang.processDelayDay}}" [(ngModel)]="priority.delays" required
pattern="^\d+$">
</mat-form-field>
</div>
</div>
- <div class="form-group">
- <div class="col-md-2 col-xs-1" style="padding-top:10px;">
- <mat-checkbox color="primary" name="default_priority" [(ngModel)]="priority.default_priority"
- matTooltip="{{lang.tooltipPriorityDefault}}">{{lang.defaultPriority}}</mat-checkbox>
- </div>
- </div>
<div class="form-group">
<div class="col-md-12 text-center" style="padding:10px;">
<button mat-raised-button [disabled]="!priorityForm.form.valid"
diff --git a/src/frontend/app/administration/priority/priority-administration.component.ts b/src/frontend/app/administration/priority/priority-administration.component.ts
index 571b5bfc0950688833d89e6fc8ddf800d4b11c84..1277a98d4d45ff56d74f832f89da1e758619ffcd 100755
--- a/src/frontend/app/administration/priority/priority-administration.component.ts
+++ b/src/frontend/app/administration/priority/priority-administration.component.ts
@@ -25,11 +25,8 @@ export class PriorityAdministrationComponent implements OnInit {
loading : boolean = false;
priority : any = {
- useDoctypeDelay : false,
color : "#135f7f",
delays : "0",
- working_days : "false",
- default_priority: false
};
constructor(
@@ -64,12 +61,6 @@ export class PriorityAdministrationComponent implements OnInit {
.subscribe((data: any) => {
this.priority = data.priority;
this.headerService.setHeader(this.lang.priorityModification, this.priority.label);
- this.priority.useDoctypeDelay = this.priority.delays != null;
- if (this.priority.working_days === true) {
- this.priority.working_days = "true";
- } else {
- this.priority.working_days = "false";
- }
this.loading = false;
}, () => {
location.href = "index.php";
@@ -79,10 +70,6 @@ export class PriorityAdministrationComponent implements OnInit {
}
onSubmit() {
- if (this.priority.useDoctypeDelay == false) {
- this.priority.delays = null;
- }
- this.priority.working_days = this.priority.working_days == "true";
if (this.creationMode) {
this.http.post("../../rest/priorities", this.priority)
.subscribe(() => {
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 91d8061899c66cf9b8417228547a7335f5d2fc22..99bc92333d63b326b6083738170a6c29da544da0 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -257,7 +257,6 @@ export const LANG_EN = {
"default" : "default",
"defaultAction" : "Default action",
"defaultOrder" : "Default order",
- "defaultPriority" : "Default priority",
"defaultSort" : "Default sort",
"defaultTemplate" : "Template nature",
"delay1" : "Reminder period 1 before term (in days)",
@@ -719,7 +718,6 @@ export const LANG_EN = {
"processDate" : "Process date",
"processDelay" : "Process delay",
"processDelayDay" : "Process delay (in days)",
- "processDelayDoctype" : "doctype delay is used",
"processLimitDate" : "Processing deadline",
"processMode" : "Process modes",
"processType" : "Process type",
@@ -907,8 +905,6 @@ export const LANG_EN = {
"toolTipDeleteDoctype" : "If mails are attached to this type of document, a reassignment screen will be displayed.",
"tooltipFolderStatus" : "If checked, status can be used for folder baskets",
"tooltipIndexStatus" : "If checked, you can edit metadatas of the mails having this status",
- "tooltipPriorityDefault" : "Set this priority by default when saving a mail",
- "tooltipPriorityDelay" : "Use this processing time instead of the one defined in the document type",
"tooltipSearchStatus" : "If checked, the status will be offered in the search criteria STATUS of the advanced search",
"tooMuchDatas" : "Too much datas to export",
"toRange" : "to",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 3f34b795a3eb5c6d03ac722f347b3ec0cd09b693..45a24ddffe2da8d8a517806ad653c2f8c204c0da 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -269,7 +269,6 @@ export const LANG_FR = {
"default" : "par défaut",
"defaultAction" : "Action par défaut",
"defaultOrder" : "Tri par défaut",
- "defaultPriority" : "Priorité par défaut",
"defaultSort" : "Tri par défaut",
"defaultTemplate" : "Nature du modèle",
"delay1" : "Délai relance 1 avant terme (en jours)",
@@ -751,7 +750,6 @@ export const LANG_FR = {
"processDate" : "Date de traitement",
"processDelay" : "Délai de traitement",
"processDelayDay" : "Délai de traitement (en jours)",
- "processDelayDoctype" : "utilise le délai selon le type de document",
"processLimitDate" : "Date limite de traitement",
"processMode" : "Mode de traitement",
"processType" : "Type de traitement",
@@ -940,8 +938,6 @@ export const LANG_FR = {
"toolTipDeleteDoctype" : "Si des courriers sont rattachés à ce type de document, un écran de réaffectation s'affichera",
"tooltipFolderStatus" : "Si coché, le statut pourra être utilisé pour des bannettes de dossiers",
"tooltipIndexStatus" : "Si coché, vous pourrez modifier les meta-données des documents ayant ce statut",
- "tooltipPriorityDefault" : "Positionner cette priorité par défaut lors de l'enregistrement d'un courrier",
- "tooltipPriorityDelay" : "Utiliser ce délai de traitement au lieu de celui défini dans le type document",
"tooltipSearchStatus" : "Si coché, le statut vous sera proposé dans le critère de recherche STATUTS de la recherche avancée",
"tooMuchDatas" : "Trop de données à exporter",
"toRange" : "Ã ",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index bf4ac346c14fbff2f9cc23ba6668876d092fa3b4..57e33b35d0cae5e4bcee14d510ca60ecd35e9cf9 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -262,7 +262,6 @@ export const LANG_NL = {
"default" : "standaard",
"defaultAction" : "Standaardactie",
"defaultOrder" : "_TO_TRANSLATE",
- "defaultPriority" : "Standaardprioriteit",
"defaultSort" : "Standaard sortering",
"defaultTemplate" : "Aard van het model",
"delay1" : "Termijn herinnering 1 voor einde (in dagen)",
@@ -745,7 +744,6 @@ export const LANG_NL = {
"processDate" : "_TO_TRANSLATE",
"processDelay" : "Verwerkingstermijn",
"processDelayDay" : "Verwerkingstermijn (in dagen)",
- "processDelayDoctype" : "gebruikt de termijn volgens het documenttype",
"processLimitDate" : "Verwerkingsdeadline",
"processMode" : "Verwerkingswijze",
"processType" : "Verwerkingstype",
@@ -935,8 +933,6 @@ export const LANG_NL = {
"toolTipDeleteDoctype" : "Indien er aan dit documenttype brieven zijn gekoppeld zal er een scherm van nieuwe toewijzing weergegeven worden",
"tooltipFolderStatus" : "Indien dit aangevinkt is, zal de status gebruikt kunnen worden voor mapbakjes",
"tooltipIndexStatus" : "Indien dit aangevinkt is, zal u de metagegevens van de brieven met deze status kunnen wijzigen",
- "tooltipPriorityDefault" : "Deze prioriteit standaard plaatsen bij de bewaring van een brief",
- "tooltipPriorityDelay" : "Deze verwerkingstermijn gebruiken in plaats van deze die in het documenttype bepaald is",
"tooltipSearchStatus" : "Indien aangevinkt zal de status u voorgesteld worden in het opzoekcriterium STATUSSEN van de geavanceerde opzoeking",
"tooMuchDatas" : "Too much datas to export", //_TO_TRANSLATE
"toRange" : "naar",