From 417249159dc1d660d9e62e84d674be7151fac838 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 15 Sep 2020 13:06:16 +0200
Subject: [PATCH] FEAT #14537 TIME 1 Add registered mails actions in data_fr +
fix wording
---
sql/data_fr.sql | 37 ++++++++++++++++++-
.../registered-mail-list.component.ts | 6 +--
src/lang/lang-fr.json | 5 +++
3 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 54270453a33..7e578c6b3eb 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1030,7 +1030,6 @@ INSERT INTO difflist_types (difflist_type_id, difflist_type_label, difflist_type
--ACTIONS
------------
TRUNCATE TABLE actions;
-TRUNCATE TABLE actions_categories;
INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (1, 'redirect', 'Rediriger', 'NEW', 'Y', 'redirect', 'Y', 'redirectAction');
--INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (2, '', 'Attribuer au service', 'NEW', 'N', 'confirm_status', 'Y', 'confirmAction');
INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (3, '', 'Retourner au service Courrier', 'RET', 'N', 'confirm_status', 'Y', 'confirmAction');
@@ -1083,7 +1082,32 @@ INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_pag
INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component, parameters) VALUES (530, '', 'Re-Générér les accusés de réception papier si pb impression', '_NOSTATUS_', 'N', 'create_acknowledgement_receipt', 'Y', 'createAcknowledgementReceiptsAction', '{"mode": "both"}');
INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (531, '', 'Envoyer pour annotation sur la tablette (Maarch Parapheur)', 'ATT_MP', 'N', 'sendToExternalSignatureBook', 'Y', 'sendExternalSignatoryBookAction');
--INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component, required_fields) VALUES (532, '', 'Cloturer intervention', 'END', 'N', 'close_mail', 'Y', 'closeMailAction','["indexingCustomField_2"]');
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (532, '', 'Enregistrer et imprimer le recommandé', 'NEW', 'N', 'saveAndPrintRegisteredMail', 'Y', 'saveAndPrintRegisteredMailAction');
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (533, '', 'Enregistrer le recommandé et rester sur la page d''indexation', 'NEW', 'N', 'saveAndIndexRegisteredMail', 'Y', 'saveAndIndexRegisteredMailAction');
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (534, '', 'Imprimer le recommandé', '_NOSTATUS_', 'N', 'printRegisteredMail', 'Y', 'printRegisteredMailAction');
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (535, '', 'Imprimer le descriptif de pli', '_NOSTATUS_', 'N', 'printDepositList', 'Y', 'printDepositListAction');
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, action_page, history, component) VALUES (536, '', 'Enregistrer le recommandé', 'NEW', 'N', 'saveRegisteredMail', 'Y', 'saveRegisteredMailAction');
Select setval('actions_id_seq', (select max(id)+1 from actions), false);
+
+TRUNCATE TABLE actions_categories;
+INSERT INTO actions_categories (action_id, category_id) VALUES (20, 'incoming');
+INSERT INTO actions_categories (action_id, category_id) VALUES (20, 'outgoing');
+INSERT INTO actions_categories (action_id, category_id) VALUES (20, 'internal');
+INSERT INTO actions_categories (action_id, category_id) VALUES (20, 'ged_doc');
+INSERT INTO actions_categories (action_id, category_id) VALUES (22, 'incoming');
+INSERT INTO actions_categories (action_id, category_id) VALUES (22, 'outgoing');
+INSERT INTO actions_categories (action_id, category_id) VALUES (22, 'internal');
+INSERT INTO actions_categories (action_id, category_id) VALUES (22, 'ged_doc');
+INSERT INTO actions_categories (action_id, category_id) VALUES (414, 'incoming');
+INSERT INTO actions_categories (action_id, category_id) VALUES (414, 'outgoing');
+INSERT INTO actions_categories (action_id, category_id) VALUES (414, 'internal');
+INSERT INTO actions_categories (action_id, category_id) VALUES (414, 'ged_doc');
+INSERT INTO actions_categories (action_id, category_id) VALUES (532, 'registeredMail');
+INSERT INTO actions_categories (action_id, category_id) VALUES (533, 'registeredMail');
+INSERT INTO actions_categories (action_id, category_id) VALUES (534, 'registeredMail');
+INSERT INTO actions_categories (action_id, category_id) VALUES (535, 'registeredMail');
+INSERT INTO actions_categories (action_id, category_id) VALUES (536, 'registeredMail');
+
------------
-- BANNETTES SECONDAIRES
TRUNCATE TABLE users_baskets_preferences;
@@ -1728,3 +1752,14 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
--INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (6, 'folders', FALSE, '[33]', 'classifying');
INSERT INTO parameters (id, description, param_value_string) VALUES ('siret', 'Numéro SIRET de l''entreprise', '45239273100025');
+
+/* Recomande*/
+INSERT INTO registered_mail_issuing_sites (id, label, post_office_label, account_number, address_number, address_street, address_additional1, address_additional2, address_postcode, address_town, address_country) VALUES (1, 'MAARCH - Nanterre', 'La poste Nanterre', 1234567, '10', 'AVENUE DE LA GRANDE ARMEE', '', '', '75017', 'PARIS', 'FRANCE');
+SELECT setval('registered_mail_issuing_sites_id_seq', (select max(id)+1 from registered_mail_issuing_sites), false);
+
+INSERT INTO registered_mail_issuing_sites_entities (site_id, entity_id) VALUES (1, 6);
+INSERT INTO registered_mail_issuing_sites_entities (site_id, entity_id) VALUES (1, 13);
+
+INSERT INTO registered_mail_number_range (type, tracking_account_number, range_start, range_end, creator, creation_date, site_id, status) VALUES ('2C', 'SuiviNumber', 1, 10, 23, '2020-09-14 14:38:09.008644', 1, 'OK');
+INSERT INTO registered_mail_number_range (type, tracking_account_number, range_start, range_end, creator, creation_date, site_id, status) VALUES ('RW', 'SuiviNumberInternational', 1, 10, 23, '2020-09-14 14:39:32.972626', 1, 'OK');
+INSERT INTO registered_mail_number_range (type, tracking_account_number, range_start, range_end, creator, creation_date, site_id, status) VALUES ('2D', 'suiviNumber', 1, 10, 23, '2020-09-14 14:39:16.779322', 1, 'OK');
diff --git a/src/frontend/app/administration/registered-mail/registered-mail-list.component.ts b/src/frontend/app/administration/registered-mail/registered-mail-list.component.ts
index 15227453f2f..99fa9fdbe40 100644
--- a/src/frontend/app/administration/registered-mail/registered-mail-list.component.ts
+++ b/src/frontend/app/administration/registered-mail/registered-mail-list.component.ts
@@ -119,7 +119,7 @@ export class RegisteredMailListComponent implements OnInit {
setTimeout(() => {
this.adminService.setDataSource('admin_regitered_mail', this.data, this.sort, this.paginator, this.filterColumns);
}, 0);
- this.notify.success(this.translate.instant('Plage activée'));
+ this.notify.success(this.translate.instant('lang.registeredMailNumberRangesActivated'));
}),
catchError((err: any) => {
this.notify.handleErrors(err);
@@ -143,7 +143,7 @@ export class RegisteredMailListComponent implements OnInit {
setTimeout(() => {
this.adminService.setDataSource('admin_regitered_mail', this.data, this.sort, this.paginator, this.filterColumns);
}, 0);
- this.notify.success(this.translate.instant('Plage cloturée'));
+ this.notify.success(this.translate.instant('lang.registeredMailNumberRangesClosed'));
}),
catchError((err: any) => {
this.notify.handleErrors(err);
@@ -163,7 +163,7 @@ export class RegisteredMailListComponent implements OnInit {
setTimeout(() => {
this.adminService.setDataSource('admin_regitered_mail', this.data, this.sort, this.paginator, this.filterColumns);
}, 0);
- this.notify.success(this.translate.instant('lang.issuingSiteDeleted'));
+ this.notify.success(this.translate.instant('lang.registeredMailNumberRangesRemoved'));
}),
catchError((err: any) => {
this.notify.handleErrors(err);
diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json
index 6ac41a011ee..1d42e965853 100644
--- a/src/lang/lang-fr.json
+++ b/src/lang/lang-fr.json
@@ -1928,6 +1928,11 @@
"warrantyLevel": "Niveau de garantie",
"letter": "Lettre",
"requiredForRegisteredMail": "Champs nécesssaires à la génération de recommandés.",
+ "registeredMailNumberRangesActivated": "Plage activée",
+ "registeredMailNumberRangesClosed": "Plage clôturée",
+ "registeredMailNumberRangesUpdated": "Plage de numéros de recommandés mise à jour",
+ "registeredMailNumberRangesAdded": "Plage de numéros de recommandés créée",
+ "registeredMailNumberRangesRemoved": "Plage de numéros de recommandés supprimée",
"registeredMailNumberRangeCreation": "Création d'une plage de numéros de recommandés",
"registeredMailNumberRangeModification": "Modification d'une plage de numéros de recommandés",
"registeredMailNumberRangeModificationMsg": "La plage est en <b>cours d'utilisation</b> ou <b>clôturée</b>, vous ne pouvez pas la modifier.",
--
GitLab