Skip to content
Snippets Groups Projects
Verified Commit b84a3958 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

fix array type order by

parent 0f45a0cc
No related branches found
No related tags found
No related merge requests found
<?php <?php
/** /**
* Copyright Maarch since 2008 under licence GPLv3. * Copyright Maarch since 2008 under licence GPLv3.
* See LICENCE.txt file at the root folder for more details. * See LICENCE.txt file at the root folder for more details.
* This file is part of Maarch software. * This file is part of Maarch software.
* */
*/
/** /**
* @brief Message Exchange Review Controller * @brief Message Exchange Review Controller
* @author dev@maarch.org *
* @ingroup core * @author dev@maarch.org
*/ * @ingroup core
*/
namespace Sendmail\Controllers; namespace Sendmail\Controllers;
...@@ -20,7 +20,7 @@ use Slim\Http\Response; ...@@ -20,7 +20,7 @@ use Slim\Http\Response;
use Resource\models\ResModel; use Resource\models\ResModel;
use Action\models\ActionModel; use Action\models\ActionModel;
require_once __DIR__. '/../../export_seda/Controllers/ReceiveMessage.php'; require_once __DIR__.'/../../export_seda/Controllers/ReceiveMessage.php';
require_once 'modules/export_seda/RequestSeda.php'; require_once 'modules/export_seda/RequestSeda.php';
class MessageExchangeReviewController class MessageExchangeReviewController
...@@ -32,10 +32,10 @@ class MessageExchangeReviewController ...@@ -32,10 +32,10 @@ class MessageExchangeReviewController
} }
$resLetterboxData = ResModel::getOnView([ $resLetterboxData = ResModel::getOnView([
'select' => ['nature_id, reference_number', 'entity_label', 'res_id', 'identifier'], 'select' => ['nature_id, reference_number', 'entity_label', 'res_id', 'identifier'],
'where' => ['res_id = ?'], 'where' => ['res_id = ?'],
'data' => [$aArgs['res_id']], 'data' => [$aArgs['res_id']],
'orderBy' => 'res_id']); 'orderBy' => ['res_id'], ]);
if ($resLetterboxData[0]['nature_id'] == 'message_exchange' && substr($resLetterboxData[0]['reference_number'], 0, 16) == 'ArchiveTransfer_') { if ($resLetterboxData[0]['nature_id'] == 'message_exchange' && substr($resLetterboxData[0]['reference_number'], 0, 16) == 'ArchiveTransfer_') {
return $resLetterboxData[0]; return $resLetterboxData[0];
...@@ -52,13 +52,13 @@ class MessageExchangeReviewController ...@@ -52,13 +52,13 @@ class MessageExchangeReviewController
$reviewObject = new \stdClass(); $reviewObject = new \stdClass();
$reviewObject->Comment = array(); $reviewObject->Comment = array();
$reviewObject->Comment[0] = new \stdClass(); $reviewObject->Comment[0] = new \stdClass();
$reviewObject->Comment[0]->value = '[' . date("d/m/Y H:i:s") . '] "' . $actionInfo['label_action'] . '" ' . _M2M_ACTION_DONE . ' ' . $_SESSION['user']['entities'][0]['ENTITY_LABEL'] . '. '. _M2M_ENTITY_DESTINATION.' : ' . $messageExchangeData['entity_label']; $reviewObject->Comment[0]->value = '['.date('d/m/Y H:i:s').'] "'.$actionInfo['label_action'].'" '._M2M_ACTION_DONE.' '.$_SESSION['user']['entities'][0]['ENTITY_LABEL'].'. '._M2M_ENTITY_DESTINATION.' : '.$messageExchangeData['entity_label'];
$date = new \DateTime; $date = new \DateTime();
$reviewObject->Date = $date->format(\DateTime::ATOM); $reviewObject->Date = $date->format(\DateTime::ATOM);
$reviewObject->MessageIdentifier = new \stdClass(); $reviewObject->MessageIdentifier = new \stdClass();
$reviewObject->MessageIdentifier->value = $messageExchangeData['reference_number'] . '_NotificationSent'; $reviewObject->MessageIdentifier->value = $messageExchangeData['reference_number'].'_NotificationSent';
$reviewObject->CodeListVersions = new \stdClass(); $reviewObject->CodeListVersions = new \stdClass();
$reviewObject->CodeListVersions->value = ''; $reviewObject->CodeListVersions->value = '';
...@@ -67,27 +67,27 @@ class MessageExchangeReviewController ...@@ -67,27 +67,27 @@ class MessageExchangeReviewController
$reviewObject->UnitIdentifier->value = $messageExchangeData['reference_number']; $reviewObject->UnitIdentifier->value = $messageExchangeData['reference_number'];
$RequestSeda = new \RequestSeda(); $RequestSeda = new \RequestSeda();
$messageExchangeReply = $RequestSeda->getMessageByReference($messageExchangeData['reference_number'] . '_ReplySent'); $messageExchangeReply = $RequestSeda->getMessageByReference($messageExchangeData['reference_number'].'_ReplySent');
$dataObject = json_decode($messageExchangeReply->data); $dataObject = json_decode($messageExchangeReply->data);
$reviewObject->OriginatingAgency = $dataObject->TransferringAgency; $reviewObject->OriginatingAgency = $dataObject->TransferringAgency;
$reviewObject->ArchivalAgency = $dataObject->ArchivalAgency; $reviewObject->ArchivalAgency = $dataObject->ArchivalAgency;
if ($reviewObject->ArchivalAgency->OrganizationDescriptiveMetadata->Communication[0]->Channel == 'url') { if ($reviewObject->ArchivalAgency->OrganizationDescriptiveMetadata->Communication[0]->Channel == 'url') {
$tab = explode('saveMessageExchangeReturn', $reviewObject->ArchivalAgency->OrganizationDescriptiveMetadata->Communication[0]->value); $tab = explode('saveMessageExchangeReturn', $reviewObject->ArchivalAgency->OrganizationDescriptiveMetadata->Communication[0]->value);
$reviewObject->ArchivalAgency->OrganizationDescriptiveMetadata->Communication[0]->value = $tab[0] . 'saveMessageExchangeReview'; $reviewObject->ArchivalAgency->OrganizationDescriptiveMetadata->Communication[0]->value = $tab[0].'saveMessageExchangeReview';
} }
$sendMessage = new \SendMessage(); $sendMessage = new \SendMessage();
$reviewObject->MessageIdentifier->value = $messageExchangeData['reference_number'] . '_Notification'; $reviewObject->MessageIdentifier->value = $messageExchangeData['reference_number'].'_Notification';
$filePath = $sendMessage->generateMessageFile($reviewObject, "ArchiveModificationNotification", $_SESSION['config']['tmppath']); $filePath = $sendMessage->generateMessageFile($reviewObject, 'ArchiveModificationNotification', $_SESSION['config']['tmppath']);
$reviewObject->MessageIdentifier->value = $messageExchangeData['reference_number'] . '_NotificationSent'; $reviewObject->MessageIdentifier->value = $messageExchangeData['reference_number'].'_NotificationSent';
$reviewObject->TransferringAgency = $reviewObject->OriginatingAgency; $reviewObject->TransferringAgency = $reviewObject->OriginatingAgency;
$messageId = SendMessageExchangeController::saveMessageExchange(['dataObject' => $reviewObject, 'res_id_master' => $aArgs['res_id_master'], 'type' => 'ArchiveModificationNotification', 'file_path' => $filePath]); $messageId = SendMessageExchangeController::saveMessageExchange(['dataObject' => $reviewObject, 'res_id_master' => $aArgs['res_id_master'], 'type' => 'ArchiveModificationNotification', 'file_path' => $filePath]);
$reviewObject->MessageIdentifier->value = $messageExchangeData['reference_number'] . '_Notification'; $reviewObject->MessageIdentifier->value = $messageExchangeData['reference_number'].'_Notification';
$reviewObject->DataObjectPackage = new \stdClass(); $reviewObject->DataObjectPackage = new \stdClass();
$reviewObject->DataObjectPackage->DescriptiveMetadata = new \stdClass(); $reviewObject->DataObjectPackage->DescriptiveMetadata = new \stdClass();
...@@ -95,7 +95,7 @@ class MessageExchangeReviewController ...@@ -95,7 +95,7 @@ class MessageExchangeReviewController
$reviewObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0] = new \stdClass(); $reviewObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0] = new \stdClass();
$reviewObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0]->Content = new \stdClass(); $reviewObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0]->Content = new \stdClass();
$reviewObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0]->Content->OriginatingSystemId = $aArgs['res_id_master']; $reviewObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0]->Content->OriginatingSystemId = $aArgs['res_id_master'];
$reviewObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0]->Content->Title[0] = '[CAPTUREM2M_NOTIFICATION]'.date("Ymd_his"); $reviewObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0]->Content->Title[0] = '[CAPTUREM2M_NOTIFICATION]'.date('Ymd_his');
$reviewObject->TransferringAgency->OrganizationDescriptiveMetadata = new \stdClass(); $reviewObject->TransferringAgency->OrganizationDescriptiveMetadata = new \stdClass();
$reviewObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier = $_SESSION['user']['UserId']; $reviewObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier = $_SESSION['user']['UserId'];
...@@ -136,8 +136,9 @@ class MessageExchangeReviewController ...@@ -136,8 +136,9 @@ class MessageExchangeReviewController
} }
$messageId = SendMessageExchangeController::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $messageExchange->res_id_master, 'type' => 'ArchiveModificationNotification']); $messageId = SendMessageExchangeController::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $messageExchange->res_id_master, 'type' => 'ArchiveModificationNotification']);
return $response->withJson([ return $response->withJson([
"messageId" => $messageId 'messageId' => $messageId,
]); ]);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment