diff --git a/modules/avis/send_docs_to_recommendation.php b/modules/avis/send_docs_to_recommendation.php
deleted file mode 100755
index 07a17da34b9898f4d76c98f4833eb78a06135268..0000000000000000000000000000000000000000
--- a/modules/avis/send_docs_to_recommendation.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-/**
-* Copyright Maarch since 2008 under licence GPLv3.
-* See LICENCE.txt file at the root folder for more details.
-* This file is part of Maarch software.
-
-* @brief send_docs_to_recommendation
-* @author dev <dev@maarch.org>
-* @ingroup core
-*/
-
-$confirm = false;
-$etapes = array('form');
-$frm_width='355px';
-$frm_height = '90%';
-require "modules/entities/entities_tables.php";
-require_once "modules/entities/class/EntityControler.php";
-require_once "modules/entities/class/class_manage_entities.php";
-require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
- ."class".DIRECTORY_SEPARATOR."class_lists.php";
-
-
-function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode )
-{
- include_once 'apps/' . $_SESSION['config']['app_id'] . '/class/class_chrono.php';
- $cr7 = new chrono();
- $ent = new entity();
- $entity_ctrl = new EntityControler();
- $services = array();
- $servicesCompare = array();
- $db = new Database();
- $sec = new security();
- $labelAction = '';
- if ($id_action <> '') {
- $stmt = $db->query("select label_action from actions where id = ?", array($id_action));
- $resAction = $stmt->fetchObject();
- $labelAction = functions::show_string($resAction->label_action);
- }
-
-
- $frm_str = '<div id="frm_error_'.$id_action.'" class="error"></div>';
- if ($labelAction <> '') {
- $frm_str .= '<h2 class="title">' . $labelAction . ' ' . _NUM;
- } else {
- $frm_str .= '<h2 class="title">'._REDIRECT_MAIL.' '._NUM;
- }
- $values_str = '';
- if (empty($_SESSION['stockCheckbox'])) {
- for ($i=0; $i < count($values);$i++) {
-
- $values_str .= $values[$i].', ';
- }
- } else {
-
- for ($i=0; $i < count($_SESSION['stockCheckbox']);$i++) {
-
- $values_str .= $_SESSION['stockCheckbox'][$i].', ';
- }
- }
- $values_str = preg_replace('/, $/', '', $values_str);
- if (_ID_TO_DISPLAY == 'res_id') {
- $frm_str .= $values_str;
- } else if (_ID_TO_DISPLAY == 'chrono_number') {
- $chrono_number = $cr7->get_chrono_number($values_str, 'res_view_letterbox');
- $frm_str .= $chrono_number;
- }
- $frm_str .= '</h2><br/>';
-
- //Check if role avis is available
- include_once 'modules/entities/class/class_manage_listdiff.php';
-
- $difflist = new diffusion_list();
-
- $roles = array();
- $difflistType = $difflist->get_difflist_type('entity_id');
- $roles = $difflist->get_difflist_type_roles($difflistType);
- if (!in_array('avis', array_keys($roles))) {
- $frm_str .='<p style="color:red;text-align:center;">'._AVIS_ROLE_UNAVAILABLE.'<p>';
- $frm_str .='<center> <input type="button" name="cancel" id="cancel" class="button" value="'._CANCEL.'" onclick="pile_actions.action_pop();actions_status.action_pop();destroyModal(\'modal_'.$id_action.'\');"/></center>';
- return addslashes($frm_str);
- }
-
- include 'modules/templates/class/templates_controler.php';
- $templatesControler = new templates_controler();
- $templates = array();
-
-
- $EntitiesIdExclusion = array();
- $entities = $entity_ctrl->getAllEntities();
- $countEntities = count($entities);
- //var_dump($entities);
- for ($cptAllEnt = 0;$cptAllEnt<$countEntities;$cptAllEnt++) {
- if (!is_integer(array_search($entities[$cptAllEnt]->__get('entity_id'), $servicesCompare))) {
- array_push($EntitiesIdExclusion, $entities[$cptAllEnt]->__get('entity_id'));
- }
- }
-
- $allEntitiesTree= array();
- $allEntitiesTree = $ent->getShortEntityTreeAdvanced(
- $allEntitiesTree, 'all', '', $EntitiesIdExclusion, 'all'
- );
- //Collection
- if (isset($_REQUEST['coll_id']) && ! empty($_REQUEST['coll_id'])) {
- $collId = trim($_REQUEST['coll_id']);
- $parameters .= '&coll_id='.$_REQUEST['coll_id'];
- $view = $sec->retrieve_view_from_coll_id($collId);
- $table = $sec->retrieve_table_from_coll($collId);
- //retrieve the process entity of document
- $stmt = $db->query(
- "SELECT destination FROM " . $table . " WHERE res_id in (?)", array($values_str)
- );
- $resultDest = $stmt->fetchObject();
- $destination = $resultDest->destination;
- }
- if ($destination <> '') {
- $templates = $templatesControler->getAllTemplatesForProcess($destination);
- } else {
- $templates = $templatesControler->getAllTemplatesForSelect();
- }
-
- $_SESSION['redirect']['diff_list']['difflist_type'] = 'entity_id';
-
- $_SESSION['redirect']['diff_list'] = $difflist->get_listinstance($values_str, false);
-
- if ($_SESSION['save_list']['fromProcess'] == 'true') {
- if (!empty($_SESSION['process']['diff_list']['avis'])) {
- $_SESSION['redirect']['diff_list']['avis'] = $_SESSION['process']['diff_list']['avis'];
- }
-
- if (!empty($_SESSION['process']['diff_list']['avis_copy'])) {
- $_SESSION['redirect']['diff_list']['avis_copy'] = $_SESSION['process']['diff_list']['avis_copy'];
- }
-
- if (!empty($_SESSION['process']['diff_list']['avis_info'])) {
- $_SESSION['redirect']['diff_list']['avis_info'] = $_SESSION['process']['diff_list']['avis_info'];
- }
- } else {
- if (!empty($_SESSION['indexing']['diff_list']['avis'])) {
- $_SESSION['redirect']['diff_list']['avis'] = $_SESSION['indexing']['diff_list']['avis'];
- }
-
- if (!empty($_SESSION['indexing']['diff_list']['avis_copy'])) {
- $_SESSION['redirect']['diff_list']['avis_copy'] = $_SESSION['indexing']['diff_list']['avis_copy'];
- }
-
- if (!empty($_SESSION['indexing']['diff_list']['avis_info'])) {
- $_SESSION['redirect']['diff_list']['avis_info'] = $_SESSION['indexing']['diff_list']['avis_info'];
- }
- }
-
- $frm_str .='<b>'._OPINION_LIMIT_DATE.' <span class="red_asterisk"><i class="fa fa-star"></i></span> :</b> <br/>';
- $frm_str .= '<input name="opinion_limit_date_tr" type="text" '
- . 'id="opinion_limit_date_tr" value="" placeholder="JJ-MM-AAAA" onfocus="checkRealDateAvis();" onChange="checkRealDateAvis();" onclick="clear_error(\'frm_error_'
- . $actionId . '\');showCalender(this);" onblur="document.getElementById(\'opinion_limit_date\').value=document.getElementById(\'opinion_limit_date_tr\').value;"/>';
- $frm_str .='<br/>';
- $frm_str .='<br/><b>'._RECOMMENDATION_NOTE.' :</b><br/>';
- $frm_str .= '<select name="templateNotes" id="templateNotes" style="width:98%;margin-bottom: 10px;background-color: White;border: 1px solid #999;color: #666;text-align: left;" '
- . 'onchange="addTemplateToNote($(\'templateNotes\').value, \''
- . $_SESSION['config']['businessappurl'] . 'index.php?display=true'
- . '&module=templates&page=templates_ajax_content_for_notes\');document.getElementById(\'notes\').focus();">';
- $frm_str .= '<option value="">' . _SELECT_NOTE_TEMPLATE . '</option>';
- for ($i=0;$i<count($templates);$i++) {
- if ($templates[$i]['TYPE'] == 'TXT' && ($templates[$i]['TARGET'] == 'notes' || $templates[$i]['TARGET'] == '')) {
- $frm_str .= '<option value="';
- $frm_str .= $templates[$i]['ID'];
- $frm_str .= '">';
- $frm_str .= $templates[$i]['LABEL'];
- }
- $frm_str .= '</option>';
- }
- $frm_str .= '</select><br />';
-
- $frm_str .= '<textarea style="width:98%;height:60px;resize:none;" name="notes" id="notes" onblur="document.getElementById(\'note_content_to_users\').value=document.getElementById(\'notes\').value.replace(/[\n]/gi, \'##\' );"></textarea>';
- //var_dump($allEntitiesTree);
- $frm_str .= '<hr />';
- $frm_str .='<div id="form2" style="border:none;">';
- $frm_str .='<script>change_entity(\''.$_SESSION['destination_entity'].'\', \''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=load_listinstance&specific_role=avis'.'\', \'diff_list_div_redirect\', \'redirect\', \'\', \'false\', \'avis\');</script>';
- $frm_str .= '<form name="frm_redirect_dep" id="frm_redirect_dep" method="post" class="forms" action="#">';
- $frm_str .= '<input type="hidden" name="chosen_action" id="chosen_action" value="end_action" />';
- $frm_str .= '<input type="hidden" name="note_content_to_users" id="note_content_to_users" />';
- $frm_str .= '<input type="hidden" name="opinion_limit_date" id="opinion_limit_date" />';
- $frm_str .='<p>';
- $frm_str .='<div style="clear:both;"></div>';
- $frm_str .= '<div id="diff_list_div_redirect" class="scroll_div" style="height:auto;"></div>';
- $frm_str .='</p>';
- $frm_str .='</form>';
- $frm_str .='</div>';
- $frm_str .='<hr />';
-
- $frm_str .='<div align="center">';
- $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="valid_action_form( \'frm_redirect_dep\', \''.$path_manage_action.'\', \''. $id_action.'\', \''.$values_str.'\', \''.$table.'\', \''.$module.'\', \''.$coll_id.'\', \''.$mode.'\');" />';
- $frm_str .=' <input type="button" name="cancel" id="cancel" class="button" value="'._CANCEL.'" onclick="pile_actions.action_pop();actions_status.action_pop();destroyModal(\'modal_'.$id_action.'\');"/>';
- $frm_str .='</div>';
- return addslashes($frm_str);
-}
-
-function check_form($form_id,$values)
-{
- if (empty($_SESSION['redirect']['diff_list']['avis']['users'][0])) {
- if(empty($_SESSION['redirect']['diff_list']['avis_info']['users'][0])){
- $_SESSION['action_error'] = _RECOMMENDATION_USER. " " . _MANDATORY;
- return false;
- }
- }
- $opinionLimitDate = get_value_fields($values, 'opinion_limit_date');
- if ($opinionLimitDate == null || $opinionLimitDate == '') {
- $_SESSION['action_error'] = _OPINION_LIMIT_DATE. " " . _MANDATORY;
- return false;
- }
-
- $notes_content = get_value_fields($values, 'note_content_to_users');
- if ($notes_content == null || $notes_content == '') {
- $_SESSION['action_error'] = _NOTE. " " . _MANDATORY;
- return false;
- }
-
- $d = DateTime::createFromFormat('d-m-Y', $opinionLimitDate);
-
- if ($d && $d->format('d-m-Y') === $opinionLimitDate) {
- } else {
- $_SESSION['action_error'] = _OPINION_LIMIT_DATE. " " . _WRONG_FORMAT;
- return false;
- }
-
- return true;
- }
-
-function manage_form($arr_id, $history, $id_action, $label_action, $status, $coll_id, $table, $values_form )
-{
- /*
- Redirect to dep:
- $values_form = array (size=3)
- 0 =>
- array (size=2)
- 'ID' => string 'chosen_action' (length=13)
- 'VALUE' => string 'end_action' (length=10)
- 1 =>
- array (size=2)
- 'ID' => string 'department' (length=10)
- 'VALUE' => string 'DGA' (length=3)
- 2 =>
- array (size=2)
- 'ID' => string 'redirect_dep' (length=12)
- 'VALUE' => string 'Rediriger' (length=9)
-
- Redirect to user:
- $values_form = array (size=3)
- 0 =>
- array (size=2)
- 'ID' => string 'chosen_action' (length=13)
- 'VALUE' => string 'end_action' (length=10)
- 1 =>
- array (size=2)
- 'ID' => string 'user' (length=4)
- 'VALUE' => string 'aackermann' (length=10)
- 2 =>
- array (size=2)
- 'ID' => string 'redirect_user' (length=13)
- 'VALUE' => string 'Rediriger' (length=9)
-
- */
-
- if(empty($values_form) || count($arr_id) < 1)
- return false;
-
- $res_id = $arr_id[0];
- include_once 'modules/entities/class/class_manage_listdiff.php';
- include_once 'modules/notes/class/notes_controler.php';
- include_once 'modules/avis/class/avis_controler.php';
- $diffList = new diffusion_list();
- $note = new notes_controler();
- $avis = new avis_controler();
-
- $new_difflist = $diffList->get_listinstance($res_id);
-
- $db = new Database();
-
- $formValues = array();
- for ($i=0; $i<count($values_form); $i++) {
- $formValue = $values_form[$i];
- $id = $formValue['ID'];
- $value = $formValue['VALUE'];
- $formValues[$id] = $value;
- }
-
- //Reset users in specific role
- $new_difflist['avis'] = array();
- $new_difflist['avis_copy'] = array();
- $new_difflist['avis_info'] = array();
-
- $new_difflist['avis']['users'] = array();
- $new_difflist['avis_copy']['users'] = array();
- $new_difflist['avis_info']['users'] = array();
-
- $new_difflist['difflist_type'] = 'entity_id';
-
- if(!empty($_SESSION['redirect']['diff_list']['avis']['users'])){
- foreach ($_SESSION['redirect']['diff_list']['avis']['users'] as $key => $value) {
- //print_r($value);
- array_push(
- $new_difflist['avis']['users'],
- array(
- 'user_id' => $value['user_id'],
- 'firstname' => $value['firstname'],
- 'entity_id' => $value['entity_id'],
- 'entity_label' => $value['entity_label'],
- 'visible' => $value['visible']
- )
- );
- }
- }
-
- if (!empty($_SESSION['redirect']['diff_list']['avis_copy']['users'])) {
- foreach ($_SESSION['redirect']['diff_list']['avis_copy']['users'] as $key => $value) {
- //print_r($value);
- array_push(
- $new_difflist['avis_copy']['users'],
- array(
- 'user_id' => $value['user_id'],
- 'firstname' => $value['firstname'],
- 'entity_id' => $value['entity_id'],
- 'entity_label' => $value['entity_label'],
- 'visible' => $value['visible']
- )
- );
- }
- }
-
- if (!empty($_SESSION['redirect']['diff_list']['avis_info']['users'])) {
- foreach ($_SESSION['redirect']['diff_list']['avis_info']['users'] as $key => $value) {
- //print_r($value);
- array_push(
- $new_difflist['avis_info']['users'],
- array(
- 'user_id' => $value['user_id'],
- 'firstname' => $value['firstname'],
- 'entity_id' => $value['entity_id'],
- 'entity_label' => $value['entity_label'],
- 'visible' => $value['visible']
- )
- );
- }
- }
-
- //save note
- if ($formValues['note_content_to_users'] != '') {
- //Add notes
- $userIdTypist = $_SESSION['user']['UserId'];
- $content_note = $formValues['note_content_to_users'];
- $content_note = str_replace("##", "\n", $content_note);
- $content_note = str_replace(";", ".", $content_note);
- $content_note = str_replace("--", "-", $content_note);
- $content_note = $content_note;
- $content_note = '[' . _TO_AVIS . '] ' . $content_note;
- $note->addNote($res_id, $coll_id, $content_note);
-
- }
- $avis->processAvis($res_id, $formValues['opinion_limit_date']);
- //Save listinstance
- $diffList->save_listinstance(
- $new_difflist,
- $new_difflist['difflist_type'],
- $coll_id,
- $res_id,
- $_SESSION['user']['UserId'],
- $_SESSION['user']['primaryentity']['id']
- );
-
- //Pb with action chain : main action page is saved after this.
- //if process, $_SESSION['process']['diff_list'] will override this one
-
- $_SESSION['process']['diff_list'] = $new_difflist;
- $_SESSION['indexing']['diff_list'] = $new_difflist;
- $_SESSION['action_error'] = $message;
- return array('result' => implode('#', $arr_id), 'history_msg' => $message);
-}
-
- /**
- * Get the value of a given field in the values returned by the form
- *
- * @param $values Array Values of the form to check
- * @param $field String the field
- * @return String the value, false if the field is not found
- **/
-function get_value_fields($values, $field)
-{
- for ($i=0; $i<count($values);$i++) {
-
- if ($values[$i]['ID'] == $field) {
-
- return $values[$i]['VALUE'];
- }
- }
- return false;
-}
-
-?>
diff --git a/rest/index.php b/rest/index.php
index ead633a08ea5e055ce050d58a4d607ce34dc961c..e60097868bec6771ff1fcbd9eea2e0d927cf558a 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -389,6 +389,7 @@ $app->get('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/act
$app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkShippings', \Action\controllers\PreProcessActionController::class . ':checkShippings');
$app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkSignatureBook', \Action\controllers\PreProcessActionController::class . ':checkSignatureBook');
$app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkContinueVisaCircuit', \Action\controllers\PreProcessActionController::class . ':checkContinueVisaCircuit');
+$app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkOpinionInfo', \Action\controllers\PreProcessActionController::class . ':checkOpinionInfo');
$app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkContinueOpinionCircuit', \Action\controllers\PreProcessActionController::class . ':checkContinueOpinionCircuit');
//Search
diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php
index e770ec4c1b2f58a98a5eb9034e094794b98b41c6..33ae8c08382c5493c5fce816705813b28b633ddd 100755
--- a/src/app/action/controllers/PreProcessActionController.php
+++ b/src/app/action/controllers/PreProcessActionController.php
@@ -985,6 +985,53 @@ class PreProcessActionController
return $response->withJson(['resourcesInformations' => $resourcesInformations]);
}
+ public function checkOpinionInfo(Request $request, Response $response, array $args)
+ {
+ $body = $request->getParsedBody();
+
+ if (!Validator::arrayType()->notEmpty()->validate($body['resources'])) {
+ return $response->withStatus(400)->withJson(['errors' => 'Body resources is empty or not an array']);
+ }
+
+ $errors = ResourceListController::listControl(['groupId' => $args['groupId'], 'userId' => $args['userId'], 'basketId' => $args['basketId'], 'currentUserId' => $GLOBALS['id']]);
+ if (!empty($errors['errors'])) {
+ return $response->withStatus($errors['code'])->withJson(['errors' => $errors['errors']]);
+ }
+
+ $body['resources'] = array_slice($body['resources'], 0, 500);
+ if (!ResController::hasRightByResId(['resId' => $body['resources'], 'userId' => $GLOBALS['id']])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
+ }
+
+ $resources = ResModel::get(['select' => ['opinion_limit_date', 'alt_identifier', 'res_id'], 'where' => ['res_id in (?)'], 'data' => [$body['resources']]]);
+
+ $noOpinionLimitDate = [];
+ $noNote = [];
+ $validatedResourcesInfo = [];
+ $validatedResources = [];
+ foreach ($resources as $resource) {
+ if (empty($resource['opinion_limit_date'])) {
+ $noOpinionLimitDate[] = $resources['alt_identifier'] ?? _UNDEFINED;
+ } else {
+ $note = NoteModel::getById([
+ 'select' => ['note_text', 'user_id', 'creation_date'],
+ 'where' => ['identifier in (?)', 'note_text like (?)'],
+ 'data' => [$resource['res_id'], '['._AVIS_USER.']%'],
+ 'order_by' => ['creation_date desc'],
+ 'limit' => 1
+ ]);
+ if (empty($note)) {
+ $noNote[] = $resources['alt_identifier'] ?? _UNDEFINED;
+ } else {
+ $validatedResourcesInfo[] = ['opinionLimitDate' => $resource['opinion_limit_date'], 'note' => $note];
+ $validatedResources[] = $resources['res_id'];
+ }
+ }
+ }
+
+ return $response->withJson(['noOpinionLimitDate' => $noOpinionLimitDate, 'noNote' => $noNote, 'validatedResourcesInfo' => $validatedResourcesInfo, 'validatedResources' => $validatedResources]);
+ }
+
public function checkContinueOpinionCircuit(Request $request, Response $response, array $args)
{
$body = $request->getParsedBody();