From 93f6ec1a7733e6636052882692f5cac429059777 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 12 Feb 2019 12:04:11 +0100
Subject: [PATCH] FEAT #9156 Opinions + category_id
---
.../controllers/ResourceListController.php | 21 +++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php
index 83cc55e005a..7c1d8b8db64 100644
--- a/src/app/resource/controllers/ResourceListController.php
+++ b/src/app/resource/controllers/ResourceListController.php
@@ -120,6 +120,8 @@ class ResourceListController
$select[] = 'mlb_coll_ext.process_limit_date AS "mlb_coll_ext.process_limit_date"';
} elseif ($value['value'] == 'getModificationDate') {
$select[] = 'res_letterbox.modification_date';
+ } elseif ($value['value'] == 'getOpinionLimitDate') {
+ $select[] = 'res_letterbox.opinion_limit_date';
}
}
@@ -162,7 +164,7 @@ class ResourceListController
$value['displayValue'] = $resource['priorities.label'];
$display[] = $value;
} elseif ($value['value'] == 'getCategory') {
- $value['displayValue'] = ResModel::getCategoryLabel(['categoryId' => $resource['category_id']]);
+ $value['displayValue'] = $resource['category_id'];
$display[] = $value;
} elseif ($value['value'] == 'getDoctype') {
$value['displayValue'] = $resource['doctypes.description'];
@@ -179,13 +181,18 @@ class ResourceListController
} elseif ($value['value'] == 'getVisaWorkflow') {
$value['displayValue'] = ResourceListController::getVisaWorkflow(['resId' => $resource['res_id']]);
$display[] = $value;
- } elseif ($value['value'] == 'getOpinionWorkflow') {
+ } elseif ($value['value'] == 'getParallelOpinionNumber') {
+ $value['displayValue'] = ResourceListController::getParallelOpinionNumber(['resId' => $resource['res_id']]);
+ $display[] = $value;
} elseif ($value['value'] == 'getCreationAndProcessLimitDates') {
$value['displayValue'] = ['creationDate' => $resource['creation_date'], 'processLimitDate' => $resource['process_limit_date']];
$display[] = $value;
} elseif ($value['value'] == 'getModificationDate') {
$value['displayValue'] = $resource['modification_date'];
$display[] = $value;
+ } elseif ($value['value'] == 'getOpinionLimitDate') {
+ $value['displayValue'] = $resource['opinion_limit_date'];
+ $display[] = $value;
}
}
$formattedResources[$key]['display'] = $display;
@@ -727,4 +734,14 @@ class ResourceListController
return $recipients;
}
+
+ private static function getParallelOpinionNumber(array $args)
+ {
+ ValidatorModel::notEmpty($args, ['resId']);
+ ValidatorModel::intVal($args, ['resId']);
+
+ $notes = NoteModel::get(['select' => ['count(1)'], 'where' => ['identifier = ?', 'note_text like ?'], 'data' => [$args['resId'], '[avis%']]);
+
+ return $notes[0]['count'];
+ }
}
--
GitLab