diff --git a/CHANGELOG.md b/CHANGELOG.md index 08fb4602d7989fb8cca6b840182a145ded8ae832..e3070547ca110f9b751009411e403b5127fa833c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## Version 2.7.4 + - `Fixed` Mauvaise ventilation par profil d'archive et service producteur dans l'onglet statistique + - `Fixed` Impossibilité de sauvegarder des métadonnées de type datetime via l'écran + - `Fixed` Champs obligatoires n'apparaissent plus lors de l'ajout/modification des métadonnées + - `Fixed` Mauvais retour lors de la recherche sur les champs description + - `Changed` Modification de l'utilisateur attribué lors de la création du schéma medona + ## Version 2.7.3 - `Fixed` Actualisation lors du changement d'organisation après connexion. - `Added` Prise en compte de l'ajout d'une référence à une archive parente lors du versement d'un bordereau MADES. @@ -25,7 +32,7 @@ - `Fixed` Calcul de la prochaine exécution mêmeen cas d'erreur dans le planificateur de tâches. - `Fixed` Affichage du compte de service en charge d'exécuter la tâche dans le planificateur de tâches. - `Fixed` Restauration du fichier permettant la génération de la doc OPENAPI. -- `Fixed` Correction du bug de déconnexion intempestive lors du changement d'organisation d'appartenance. +- `Fixed` Correction du bug de déconnexion intempestive lors du changement d'organisation d'appartenance. - `Fixed` Amélioration de la détection de l'algorithme de hash sur les bordereaux externes. - `Fixed` Correction du bug lors de la modification des paramètres d'un cluster de stockage. - `Fixed` Correction de l'affichage de la prévisualisation de certains PDF. diff --git a/VERSION.md b/VERSION.md index e2bdf6e45aabad2aa4ab05536fdbeac70558cca7..a4dd9dba4fbfc56b9de647bc31ed848d9f65885f 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.7.3 \ No newline at end of file +2.7.4 diff --git a/dependency/html/Document.php b/dependency/html/Document.php index c33e3454320a49fa917b041193cb030999448df0..9d8e1c2eaaf3cb4618becdc8307dcd9f58101b9d 100755 --- a/dependency/html/Document.php +++ b/dependency/html/Document.php @@ -280,11 +280,11 @@ class Document extends \dependency\xml\Document $this->addScript("/public/js/datePicker/bootstrap-datepicker.js"); //min version does not exists // monment - // $this->addScript("/public/js/moment_2.14.1/moment.js"); - $this->addScript("/public/js/moment_2.14.1/moment.min.js"); + $this->addScript("/public/js/moment_2.14.1/moment.js"); + //$this->addScript("/public/js/moment_2.14.1/moment.min.js"); - // $this->addScript("/public/js/dateTimePicker/bootstrap-datetimepicker.js"); - $this->addScript("/public/js/dateTimePicker/bootstrap-datetimepicker.min.js"); + $this->addScript("/public/js/dateTimePicker/bootstrap-datetimepicker.js"); + // $this->addScript("/public/js/dateTimePicker/bootstrap-datetimepicker.min.js"); $this->addScript("/public/js/csrf/csrfprotector.js");//min version does not exists @@ -346,7 +346,7 @@ class Document extends \dependency\xml\Document public function addContent($content, $container = false) { $contentFragment = $this->addFragment($content); - + if (!$container) { $container = $this->getContainer(); } diff --git a/src/bundle/Statistics/Controller/Statistics.php b/src/bundle/Statistics/Controller/Statistics.php index e1233e8591c582afa70e6f23958ec512c3f2cb05..fd9b91c511f18a9ed8ba527895894293bf0f2e94 100644 --- a/src/bundle/Statistics/Controller/Statistics.php +++ b/src/bundle/Statistics/Controller/Statistics.php @@ -196,7 +196,7 @@ class Statistics foreach ($directStats as $groupBy => $result) { $groupByFound = false; for ($i = 0; $i < count($stats); $i++) { - if ($stats[$i][$filter] == $groupby) { + if ($stats[$i][$filter] == $groupBy) { if ($resultType == 'sum') { $result1 = floatval(str_replace(" ", "", $stats[$i][$resultType])); $result2 = floatval(str_replace(" ", "", $result)); @@ -716,7 +716,7 @@ EOT; ? ' LEFT JOIN "recordsManagement"."archivalProfile" "archivalProfile" ON "archivalProfile"."reference" = "event"."eventInfo"::json->>10' : ' INNER JOIN "organization"."organization" "organization" - ON "organization"."registrationNumber" = "event"."eventInfo"::json->>6'; + ON "organization"."registrationNumber" = "event"."eventInfo"::json->>4'; } $query = 'SELECT '.($groupBy ? $selectCondition . ' AS "'.$groupBy.'", ' : '').'SUM(CAST(COALESCE(NULLIF("event"."eventInfo"::json->>'.$jsonSizeColumnNumber.', \'\'), \'0\') AS INTEGER)) @@ -766,7 +766,7 @@ EOT; ? ' LEFT JOIN "recordsManagement"."archivalProfile" "archivalProfile" ON "archivalProfile"."reference" = "event"."eventInfo"::json->>10' : ' INNER JOIN "organization"."organization" "organization" - ON "organization"."registrationNumber" = "event"."eventInfo"::json->>6'; + ON "organization"."registrationNumber" = "event"."eventInfo"::json->>4'; } $query = 'SELECT '.($groupBy ? $selectCondition . ' AS "'.$groupBy.'", ' : '').'COUNT("event"."eventId") diff --git a/src/bundle/medona/Resources/sql/schema.pgsql.sql b/src/bundle/medona/Resources/sql/schema.pgsql.sql index f48e1690b3341bcaed1accf63bce42f5c8d83ff7..cc6a32b84eb5ef7303240e642af268b29a4d02ac 100644 --- a/src/bundle/medona/Resources/sql/schema.pgsql.sql +++ b/src/bundle/medona/Resources/sql/schema.pgsql.sql @@ -1,7 +1,6 @@ DROP SCHEMA IF EXISTS "medona" CASCADE; -CREATE SCHEMA "medona" - AUTHORIZATION postgres; +CREATE SCHEMA "medona"; -- Table: "medona"."archivalAgreement" diff --git a/src/bundle/recordsManagement/Controller/log.php b/src/bundle/recordsManagement/Controller/log.php index a75ef70d6d67b27473429df0e3de3fd37f6574e1..ac5cb3f4f105406530aca12c515f6df631d4b01b 100755 --- a/src/bundle/recordsManagement/Controller/log.php +++ b/src/bundle/recordsManagement/Controller/log.php @@ -222,12 +222,21 @@ class log implements archiveDescriptionInterface } } + if (!is_null($description)) { + $queryString .= $description; + } + $archiveController = \laabs::newController('recordsManagement/archive'); $archives = []; $sortBy = ">fromDate"; - $logs = $this->sdoFactory->find("recordsManagement/log", $queryString, [], $sortBy, 0, $maxResults); + try { + $logs = $this->sdoFactory->find("recordsManagement/log", $queryString, [], $sortBy, 0, $maxResults); + } catch (\Exception $e) { + return []; + } + foreach ($logs as $log) { try { diff --git a/src/presentation/maarchRM/Presenter/recordsManagement/welcome.php b/src/presentation/maarchRM/Presenter/recordsManagement/welcome.php index 66b0e034b01397c4e92e5996904ee79941179379..254f072d3215494a5a6b9a12c425c3d089791b50 100755 --- a/src/presentation/maarchRM/Presenter/recordsManagement/welcome.php +++ b/src/presentation/maarchRM/Presenter/recordsManagement/welcome.php @@ -115,7 +115,8 @@ class welcome $archiveDescriptions = \laabs::callService('recordsManagement/archivalProfile/readByreference_reference_', $archivalProfile->reference)->archiveDescription; $archivalProfiles[$key]->archiveDescription = $archiveDescriptions; $archivalProfiles[$key]->searchFields = []; - foreach ($archivalProfile->archiveDescription as $archiveDescription) { + foreach ($archivalProfile->archiveDescription as $k => $archiveDescription) { + $archivalProfiles[$key]->archiveDescription[$k]->readonly = $archiveDescription->isImmutable; switch ($archiveDescription->descriptionField->type) { case 'text': case 'name': diff --git a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html index 498e58dbac6dacc5c8b376be5c0a15734432fbce..9ffffe856da20a8c203fd53a57b973a843df7126 100755 --- a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html +++ b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/descriptionForm.html @@ -238,6 +238,8 @@ input:invalid { addArchiveDescription : function(archiveDescription) { var descriptionField = archiveDescription.descriptionField; + descriptionField.required = archiveDescription.required; + descriptionField.readonly = archiveDescription.readonly; var target = $("#archivalProfileFields"); var formGroup = Metadata.getFormGroup(descriptionField); target.append(formGroup); @@ -370,7 +372,6 @@ input:invalid { field.attr('placeholder', $('#date_text').text()); parent.append(field); - if (descriptionField.format == 'datetime') { field.data('format', 'datetime'); field.datetimepicker(dateTimePickerParams); @@ -932,8 +933,8 @@ input:invalid { field = target.find("input"); if (field.data('format') == 'datetime') { data = data.replace('T', ' '); - field.data('DateTimePicker').format('YYYY-MM-DD HH:mm:ss'); field.data('DateTimePicker').date(data) + field.data('DateTimePicker').format('YYYY-MM-DD HH:mm:ss'); } else { data = new Date(data).toLocaleDateString("[?merge locale ?]").replace(/\//g, "-"); field.datepicker('setDate', data); diff --git a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html index 8670613f6173d786f2b23e17d4022e83354af50c..7bd52d9329d84657f6dbd38e10ae16eb46d10445 100755 --- a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html +++ b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/folder.html @@ -452,7 +452,6 @@ NewArchive = { loadImportForm: function(e, profileMetadata) { - console.trace(); $('#folderContents').addClass('hide'); trigger('newArchiveForm.recordsManagement', [profileMetadata, ArchiveFolderList.orgRegNumber, ArchiveFolderList.folderId, e.data('parent-archive-id'), e.data('parent-archive-name')]); } diff --git a/web/public/js/dateTimePicker/bootstrap-datetimepicker.js b/web/public/js/dateTimePicker/bootstrap-datetimepicker.js index 8838cbcd2454fb51173de6602a4cc64c861eea5f..753e437c0fe6d4b39204e343b019cc58ee681d55 100644 --- a/web/public/js/dateTimePicker/bootstrap-datetimepicker.js +++ b/web/public/js/dateTimePicker/bootstrap-datetimepicker.js @@ -328,7 +328,7 @@ getTemplate = function () { var template = $('