From 34ecd89b94fa10d3b17eb0d71b002bcd81ce8a7e Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 8 Mar 2018 11:56:48 +0100
Subject: [PATCH] FIX rm table res_apa, wording, update material
---
.../js/angular/lang/lang-en.js | 1 +
.../js/angular/lang/lang-en.ts | 55 ++++++-----
package-lock.json | 12 +--
package.json | 4 +-
sql/structure.sql | 99 -------------------
5 files changed, 37 insertions(+), 134 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.js b/apps/maarch_entreprise/js/angular/lang/lang-en.js
index 83942798c3c..5c2a8509b58 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.js
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.js
@@ -318,4 +318,5 @@ exports.LANG_EN = {
"tooltipPriorityDelay": "Use this processing time instead of the one defined in the document type",
"tooltipPriorityDefault": "Set this priority by default when saving a mail",
"defaultPriority": "Default priority",
+ "chooseColor": "Choose a color",
};
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
index d543f9d1006..f943b8a52dd 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
@@ -289,31 +289,32 @@ export const LANG_EN = {
"processMode" : "Process modes",
"loadedFile" : "Loaded file",
"generatedFile" : "Generated file",
- "destruction" : "Destruction",
- "conservation" : "Retention",
- "firstLevelAdded" : "Folder added",
- "firstLevelUpdated" : "Folder updated",
- "firstLevelDeleted" : "Folder deleted",
- "secondLevelAdded" : "Subfolder added",
- "secondLevelUpdated" : "Subfolder updated",
- "secondLevelDeleted" : "Subfolder deleted",
- "documentTypeAdded" : "Document type added",
- "documentTypeUpdated" : "Document type updated",
- "documentTypeDeleted" : "Document type deleted",
- "documentTypeReplacement" : "Document type replacement",
- "transferToDoctype" : "Replace by this document type",
- "complementaryFields" : "Complementary fields",
- "archival" : "Archival",
- "field" : "Field",
- "mandatory" : "Mandatory",
- "fieldType" : "Field type",
- "fieldNature" : "Field nature",
- "databaseColumn" : "DB column",
- "used" : "Utilisé",
- "toolTipDeleteDoctype" : "If mails are attached to this type of document, a reassignment screen will be displayed.",
- "cantMoveDoctype" : "The document type can only be moved in a sub-folder",
- "noDoctypeSelected" : "No document type selected",
- "tooltipPriorityDelay" : "Use this processing time instead of the one defined in the document type",
- "tooltipPriorityDefault" : "Set this priority by default when saving a mail",
- "defaultPriority" : "Default priority",
+ "destruction" : "Destruction",
+ "conservation" : "Retention",
+ "firstLevelAdded" : "Folder added",
+ "firstLevelUpdated" : "Folder updated",
+ "firstLevelDeleted" : "Folder deleted",
+ "secondLevelAdded" : "Subfolder added",
+ "secondLevelUpdated" : "Subfolder updated",
+ "secondLevelDeleted" : "Subfolder deleted",
+ "documentTypeAdded" : "Document type added",
+ "documentTypeUpdated" : "Document type updated",
+ "documentTypeDeleted" : "Document type deleted",
+ "documentTypeReplacement" : "Document type replacement",
+ "transferToDoctype" : "Replace by this document type",
+ "complementaryFields" : "Complementary fields",
+ "archival" : "Archival",
+ "field" : "Field",
+ "mandatory" : "Mandatory",
+ "fieldType" : "Field type",
+ "fieldNature" : "Field nature",
+ "databaseColumn" : "DB column",
+ "used" : "Utilisé",
+ "toolTipDeleteDoctype" : "If mails are attached to this type of document, a reassignment screen will be displayed.",
+ "cantMoveDoctype" : "The document type can only be moved in a sub-folder",
+ "noDoctypeSelected" : "No document type selected",
+ "tooltipPriorityDelay" : "Use this processing time instead of the one defined in the document type",
+ "tooltipPriorityDefault" : "Set this priority by default when saving a mail",
+ "defaultPriority" : "Default priority",
+ "chooseColor" : "Choose a color",
};
diff --git a/package-lock.json b/package-lock.json
index 3c5c0b3cbb1..1c9beaa31ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,9 +13,9 @@
}
},
"@angular/cdk": {
- "version": "5.2.3",
- "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.3.tgz",
- "integrity": "sha512-o95vQCJ1FpHLQj/ZfIrOya/rK0S7VwiY5vjEivpFnH25kHF5LNT4LTj6BOFkPbClMHTIM2wdKwWnuTfK0bg9WA==",
+ "version": "5.2.4",
+ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.4.tgz",
+ "integrity": "sha1-wKQpqHENj+2xV/VG4hy0nUM19/c=",
"dev": true,
"requires": {
"tslib": "1.9.0"
@@ -79,9 +79,9 @@
}
},
"@angular/material": {
- "version": "5.2.3",
- "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.3.tgz",
- "integrity": "sha512-v6IGxGWaeALgBH8+kt2Q9K32zmJQH193bWdCeWmtXk0vJlj3NTiWYy+vLoZQ8aPIAtOqCKCmhf5VrerkS6pgww==",
+ "version": "5.2.4",
+ "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.2.4.tgz",
+ "integrity": "sha1-noI3mDJCg9I+qDkVb6xby3NEPVU=",
"dev": true,
"requires": {
"tslib": "1.9.0"
diff --git a/package.json b/package.json
index 8cc1a31a959..3d67179124d 100755
--- a/package.json
+++ b/package.json
@@ -28,14 +28,14 @@
},
"devDependencies": {
"@angular/animations": "^5.2.7",
- "@angular/cdk": "^5.2.3",
+ "@angular/cdk": "^5.2.4",
"@angular/common": "^5.2.7",
"@angular/compiler": "^5.2.7",
"@angular/compiler-cli": "^5.2.7",
"@angular/core": "^5.2.7",
"@angular/forms": "^5.2.7",
"@angular/http": "^5.2.7",
- "@angular/material": "^5.2.3",
+ "@angular/material": "^5.2.4",
"@angular/platform-browser": "^5.2.7",
"@angular/platform-browser-dynamic": "^5.2.7",
"@angular/platform-server": "^5.2.7",
diff --git a/sql/structure.sql b/sql/structure.sql
index 1724f5b471b..65bbe4f157e 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -277,105 +277,6 @@ CREATE TABLE users
WITH (OIDS=FALSE);
--- modules/advanced_physical_archive/sql/structure/advanced_physical_archive.postgresql.sql
-
- CREATE TABLE res_apa (
- res_id serial NOT NULL ,
- title character varying(255) default NULL ,
- subject text ,
- description text ,
- publisher character varying(255) default NULL ,
- contributor character varying(255) default NULL ,
- type_id integer default NULL ,
- format character varying(50) default NULL ,
- typist character varying(128) default NULL ,
- creation_date timestamp without time zone NOT NULL ,
- author character varying(255) default NULL ,
- author_name text ,
- identifier character varying(255) default NULL ,
- source character varying(255) default NULL ,
- doc_language character varying(50) default NULL ,
- relation integer default NULL ,
- coverage character varying(255) default NULL ,
- doc_date timestamp without time zone default NULL ,
- docserver_id character varying(32) default NULL ,
- folders_system_id integer default NULL ,
- arbox_id character varying(32) default NULL ,
- path character varying(255) default NULL ,
- filename character varying(255) default NULL ,
- offset_doc character varying(255) default NULL ,
- logical_adr character varying(255) default NULL ,
- fingerprint character varying(255) default NULL ,
- filesize integer default NULL ,
- is_paper char(1) default NULL ,
- page_count integer default NULL ,
- scan_date timestamp without time zone default NULL ,
- scan_user character varying(50) default NULL ,
- scan_location character varying(255) default NULL ,
- scan_wkstation character varying(255) default NULL ,
- scan_batch character varying(50) default NULL ,
- burn_batch character varying(50) default NULL ,
- scan_postmark character varying(50) default NULL ,
- envelop_id integer default NULL ,
- status character varying(3) default NULL ,
- destination character varying(50) default NULL ,
- approver character varying(50) default NULL ,
- validation_date timestamp without time zone default NULL ,
- work_batch integer default NULL ,
- origin character varying(50) default NULL ,
- is_ingoing char(1) default NULL ,
- priority smallint default NULL ,
- arbatch_id character varying(32) default NULL ,
- fulltext_result character varying(10) DEFAULT NULL,
- ocr_result character varying(10) DEFAULT NULL,
- converter_result character varying(10) DEFAULT NULL,
- custom_t1 text default NULL,
- custom_n1 integer default NULL ,
- custom_f1 numeric default NULL ,
- custom_d1 timestamp without time zone default NULL ,
- custom_t2 character varying(255) default NULL ,
- custom_n2 integer default NULL ,
- custom_f2 numeric default NULL ,
- custom_d2 timestamp without time zone default NULL ,
- custom_t3 character varying(255) default NULL ,
- custom_n3 integer default NULL ,
- custom_f3 numeric default NULL ,
- custom_d3 timestamp without time zone default NULL ,
- custom_t4 character varying(255) default NULL ,
- custom_n4 integer default NULL ,
- custom_f4 numeric default NULL ,
- custom_d4 timestamp without time zone default NULL ,
- custom_t5 character varying(255) default NULL ,
- custom_n5 integer default NULL ,
- custom_f5 numeric default NULL ,
- custom_d5 timestamp without time zone default NULL ,
- custom_t6 character varying(255) default NULL ,
- custom_d6 timestamp without time zone default NULL ,
- custom_t7 character varying(255) default NULL ,
- custom_d7 timestamp without time zone default NULL ,
- custom_t8 character varying(255) default NULL ,
- custom_d8 timestamp without time zone default NULL ,
- custom_t9 character varying(255) default NULL ,
- custom_d9 timestamp without time zone default NULL ,
- custom_t10 character varying(255) default NULL ,
- custom_d10 timestamp without time zone default NULL ,
- custom_t11 character varying(255) default NULL ,
- custom_t12 character varying(255) default NULL ,
- custom_t13 character varying(255) default NULL ,
- custom_t14 character varying(255) default NULL ,
- custom_t15 character varying(255) default NULL ,
- tablename character varying(32) default 'res_apa',
- initiator character varying(50) default NULL ,
- dest_user character varying(128) default NULL ,
- video_batch integer default NULL ,
- video_time timestamp NULL default NULL ,
- video_user character varying(128) default NULL ,
- video_date timestamp without time zone,
- CONSTRAINT res_apa_pkey PRIMARY KEY (res_id)
-)
-WITH (OIDS=FALSE);
-
-
-- modules/attachments/sql/structure/attachments.postgresql.sql
--
GitLab