Merge branch 'release/2.2' into 'master'

Release/2.2

See merge request !86

data/maarchRM/sql/pgsql/demo.sql

@@ -49,10 +49,6 @@ INSERT INTO "auth"."privilege"("roleId", "userStory") VALUES
 INSERT INTO "auth"."roleMember"("roleId", "userAccountId") VALUES
 ('ADMIN', 'superadmin');
 
-
--- publicUserStory
-INSERT INTO "auth"."publicUserStory"("userStory") VALUES 
-('app/*');
     
 -- LIFECYCLE
 INSERT INTO "lifeCycle"."eventFormat" ("type", "format", "notification", "message") VALUES
@@ -81,15 +77,6 @@ INSERT INTO "lifeCycle"."eventFormat" ("type", "format", "notification", "messag
 INSERT INTO "recordsManagement"."serviceLevel" ("serviceLevelId", "reference", "digitalResourceClusterId", "control", "default", "samplingFrequency","samplingRate") VALUES
     ('ServiceLevel_001', 'serviceLevel_001', 'archives', 'formatDetection formatValidation virusCheck convertOnDeposit', false, 2, 50),
     ('ServiceLevel_002', 'serviceLevel_002', 'archives', '', true,2 ,50);
-    
-INSERT INTO "batchProcessing"."task"
-("taskId", "route", "description") VALUES
-('01', 'audit/event/createChainjournal', 'Chainer le journal de l''application'),
-('02', 'lifeCycle/journal/createChainjournal', 'Chainer le journal du cyle de vie'),
-('03', 'recordsManagement/archiveCompliance/readPeriodic', 'Valider l''intégrité des archives'),
-('04', 'recordsManagement/archives/deleteDisposablearchives', 'Détruire les archives'),
-('05', 'batchProcessing/notification/updateProcess', 'Envoyer notification'),
-('06', 'recordsManagement/archives/updateIndexfulltext', 'Extraction plein texte');
 
 
 INSERT INTO "batchProcessing"."scheduling"
@@ -98,7 +85,7 @@ INSERT INTO "batchProcessing"."scheduling"
 ('chainJournalLifeCycle', 'Chaînage du journal du cycle de vie', 'System', '02', '00;01;;;;;;;', null,null,null,'paused'),
 ('integrity', 'Intégrité', 'System','03', '00;02;;;;;;;',null,null,null,'paused'),
 ('deleteArchive', 'Destruction', 'System', '04', '00;03;;;;;;;', null,null,null,'paused'),
-('sendNotification', 'Envoie des notifications', 'System', '05', '00;04;;;;;;;', null,null,null,'paused');
+('sendNotification', 'Envoi des notifications', 'System', '05', '00;04;;;;;;;', null,null,null,'paused');
 
 
 INSERT INTO "recordsManagement"."retentionRule" ("code", "label", "description", "duration", "finalDisposition") VALUES ('BULPAI', 'Bulletins de paie', 'Code du Travail, art. L3243-4 - Code de la Sécurité Sociale, art. L243-12', 'P5Y', 'destruction');
@@ -346,6 +333,7 @@ INSERT INTO "auth"."account" ("accountType", "accountId", "lastName", "firstName
 INSERT INTO "auth"."account" ("accountType", "accountId", "lastName", "firstName", "title", "displayName", "accountName", "emailAddress", "password","enabled","passwordChangeRequired","passwordLastChange", "locked", "badPasswordCount","lastLogin","lastIp","replacingUserAccountId") VALUES ('user', 'ddur', 'DUR', 'Dominique', 'Mme', 'Dominique DUR', 'ddur', 'info@maarch.org', 'fffd2272074225feae229658e248b81529639e6199051abdeb49b6ed60adf13d',true,false,null,false,0,null,null,null);
 INSERT INTO "auth"."account" ("accountType", "accountId", "lastName", "firstName", "title", "displayName", "accountName", "emailAddress", "password","enabled","passwordChangeRequired","passwordLastChange", "locked", "badPasswordCount","lastLogin","lastIp","replacingUserAccountId") VALUES ('user', 'ssissoko', 'SISSOKO', 'Sylvain', 'M.', 'Sylvain SISSOKO', 'ssissoko', 'info@maarch.org', 'fffd2272074225feae229658e248b81529639e6199051abdeb49b6ed60adf13d',true,false,null,false,0,null,null,null);
 
+INSERT INTO "auth"."account" ("accountType", "accountId", "displayName", "accountName", "emailAddress", "enabled") VALUES ('service', 'System', 'Système', 'Systeme', 'info@maarch.org', true);
 
 INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function", "default") VALUES ('ppetit', 'ACME', '', true);
 INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function", "default") VALUES ('aadams', 'DESR', '', true);
@@ -364,7 +352,9 @@ INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function",
 INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function", "default") VALUES ('ttong', 'CC', '', true);
 INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function", "default") VALUES ('ddur', 'CC', '', true);
 INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function", "default") VALUES ('ssissoko', 'CC', '', true);
+INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function", "default") VALUES ('superadmin', 'SAM', '', true);
 
+INSERT INTO "organization"."servicePosition" ("serviceAccountId", "orgId") VALUES ('System', 'ARC');
 
 INSERT INTO "auth"."roleMember"("roleId", "userAccountId") VALUES ( 'UTILISATEUR', 'ppetit');
 INSERT INTO "auth"."roleMember"("roleId", "userAccountId") VALUES ( 'UTILISATEUR', 'aadams');
@@ -383,8 +373,6 @@ INSERT INTO "auth"."roleMember"("roleId", "userAccountId") VALUES ( 'UTILISATEUR
 INSERT INTO "auth"."roleMember"("roleId", "userAccountId") VALUES ( 'CORRESPONDANT_ARCHIVES', 'bblier');
 INSERT INTO "auth"."roleMember"("roleId", "userAccountId") VALUES ( 'CORRESPONDANT_ARCHIVES', 'kmama');
 INSERT INTO "auth"."roleMember"("roleId", "userAccountId") VALUES ( 'CORRESPONDANT_ARCHIVES', 'ccharles');
--- Insert postprocess SQL queries here
-INSERT INTO "auth"."account" ("accountType", "accountId", "displayName", "accountName", "emailAddress", "enabled") VALUES ('service', 'System', 'Système', 'Systeme', 'info@maarch.org', true); 
 
 INSERT INTO "auth"."servicePrivilege"("accountId", "serviceURI") VALUES  ('System', '*');
 

src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php

@@ -158,14 +158,14 @@ trait archiveCommunicationTrait
                 if ($originatingStartDate && $originatingEndDate) {
                     $queryParams['originatingStartDate'] = $originatingStartDate;
                     $queryParams['originatingEndDate'] = $originatingEndDate;
-                    $queryParts['depositDate'] = "originatingDate >= :originatingStartDate AND originatingDate <= :originatingEndDate";
+                    $queryParts['originatingDate'] = "originatingDate >= :originatingStartDate AND originatingDate <= :originatingEndDate";
                 } elseif ($originatingStartDate) {
                     $queryParams['originatingStartDate'] = $originatingStartDate;
-                    $queryParts['depositDate'] = "originatingDate >= :depositStartDate";
+                    $queryParts['originatingDate'] = "originatingDate >= :originatingStartDate";
 
                 } elseif ($originatingEndDate) {
                     $queryParams['originatingEndDate'] = $originatingEndDate;
-                    $queryParts['date'] = "originatingDate <= :originatingEndDate";
+                    $queryParts['originatingDate'] = "originatingDate <= :originatingEndDate";
                 }
 
                 if ($depositStartDate && $depositEndDate) {
@@ -178,7 +178,7 @@ trait archiveCommunicationTrait
 
                 } elseif ($depositEndDate) {
                     $queryParams['depositEndDate'] = $depositEndDate;
-                    $queryParts['date'] = "depositDate <= :depositEndDate";
+                    $queryParts['depositDate'] = "depositDate <= :depositEndDate";
                 }
                 if($archiveExpired){
                     $currentDate = \laabs::newDate();
@@ -211,10 +211,6 @@ trait archiveCommunicationTrait
             if (!empty($archive->disposalDate) && $archive->disposalDate <= \laabs::newDate()) {
                 $archive->disposable = true;
             }
-
-            if (isset($originators[$archive->originatorOrgRegNumber])) {
-                $archive->originator = $originators[$archive->originatorOrgRegNumber];
-            }
         }
 
         return $archives;

src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html

@@ -260,6 +260,12 @@
         $('#archive_searchForm').find("input[name='archiveExpired'][value='']").parent().click();
         $('#archive_searchForm').find('input[type="checkbox"]').bootstrapToggle('off');
         $('#originatorOrgInfo').hide();
+
+        delete $("#archive_searchForm [name=depositStartDate]").data('datepicker').setDates();
+        delete $("#archive_searchForm [name=depositEndDate]").data('datepicker').setDates();
+        delete $("#archive_searchForm [name=originatingStartDate]").data('datepicker').setDates();
+        delete $("#archive_searchForm [name=originatingEndDate]").data('datepicker').setDates();
+
         $('#archive_searchResult').empty();
     });