Skip to content

MaarchCourrier
MaarchCourrier
Verified Commit dcc58c40 authored by Damien's avatar Damien
Browse files
Options

FEAT #11422 TIME 0:40 Clean cases

parent bc8c8b99
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6417 deletions
apps/maarch_entreprise/actions/process.php
View file @ dcc58c40
......@@ -729,24 +729,6 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$toolbarBagde_script = $_SESSION['config']['businessappurl'].'index.php?display=true&module=attachments&page=load_toolbar_attachments&resId='.$res_id.'&collId='.$coll_id;
$frm_str .= '<script>loadToolbarBadge(\'attachments_tab\',\''.$toolbarBagde_script.'\');</script>';
}
//CASES
if ($core_tools->is_module_loaded('cases')) {
$frm_str .= '<td>';
$pathScriptTab = $_SESSION['config']['businessappurl']
.'index.php?display=true&page=show_case_tab&module=cases&resId='.$res_id.'&collId='.$coll_id;
$frm_str .= '<span onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''.urlencode(_CASE).'\',\''.$pathScriptTab.'\',\'cases\');return false;" '
.'onmouseover="this.style.cursor=\'pointer\';" class="categorie" style="width:90%;">';
$frm_str .= '<span id="cases_tab" class="tab_module" style="color:#1C99C5;"><i class="fa fa-plus-square"></i></span><b>&nbsp;'
.'<i id="cases_tab_img" class="fa fa-suitcase fa-2x" title="'._CASE.'"></i><span id="cases_tab_badge"></span>';
$frm_str .= '</span>';
$frm_str .= '</td>';
//LOAD TOOLBAR BADGE
$toolbarBagde_script = $_SESSION['config']['businessappurl'].'index.php?display=true&module=cases&page=load_toolbar_cases&resId='.$res_id.'&collId='.$coll_id;
$frm_str .= '<script>loadToolbarBadge(\'cases_tab\',\''.$toolbarBagde_script.'\');</script>';
}
//PRINT FOLDER
if ($core_tools->test_service('print_folder_doc', 'visa', false)) {
......
apps/maarch_entreprise/actions/validate_mail.php
View file @ dcc58c40
......@@ -1343,25 +1343,6 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$frm_str .= '<script>loadToolbarBadge(\'links_tab\',\''.$toolbarBagde_script.'\');</script>';
$frm_str .= '</td>';
//CASES
if ($core_tools->is_module_loaded('cases')) {
$frm_str .= '<td>';
$pathScriptTab = $_SESSION['config']['businessappurl']
.'index.php?display=true&page=show_case_tab&module=cases&resId='.$res_id.'&collId='.$coll_id;
$frm_str .= '<span onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''.urlencode(_CASE).'\',\''.$pathScriptTab.'\',\'cases\');return false;" '
.'onmouseover="this.style.cursor=\'pointer\';" class="categorie" style="width:90%;">';
$frm_str .= '<span id="cases_tab" class="tab_module" style="color:#1C99C5;"><i class="fa fa-plus-square"></i></span><b>&nbsp;'
.'<i id="cases_tab_img" class="fa fa-suitcase fa-2x" title="'._CASE.'"></i><span id="cases_tab_badge"></span>';
$frm_str .= '</span>';
$frm_str .= '</td>';
//LOAD TOOLBAR BADGE
$toolbarBagde_script = $_SESSION['config']['businessappurl'].'index.php?display=true&module=cases&page=load_toolbar_cases&resId='.$res_id.'&collId='.$coll_id;
$frm_str .= '<script>loadToolbarBadge(\'cases_tab\',\''.$toolbarBagde_script.'\');</script>';
}
//END TOOLBAR
$frm_str .= '</table>';
$frm_str .= '</div>';
......
apps/maarch_entreprise/actions/view.php
View file @ dcc58c40
......@@ -35,11 +35,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$frm_str = '';
$_SESSION['doc_id'] = $res_id;
$frm_str .= '<div>';
if ($_POST['module'] == 'cases') {
$frm_str .= ' <center><input name="close" style="padding:5px;font-weight:600;" id="close" type="button" value="'._CLOSE.'" class="button" onClick="javascript:$(\'baskets\').style.visibility=\'visible\';destroyModal(\'modal_'.$id_action.'\');reinit();"/></center>';
} else {
$frm_str .= ' <center><input name="close" style="padding:5px;font-weight:600;" id="close" type="button" value="'._CLOSE.'" class="button" onClick="javascript:$(\'baskets\').style.visibility=\'visible\';destroyModal(\'modal_'.$id_action.'\');reinit();window.location.reload();"/></center>';
}
$frm_str .= ' <center><input name="close" style="padding:5px;font-weight:600;" id="close" type="button" value="'._CLOSE.'" class="button" onClick="javascript:$(\'baskets\').style.visibility=\'visible\';destroyModal(\'modal_'.$id_action.'\');reinit();window.location.reload();"/></center>';
$frm_str .= ' </br>';
$frm_str .= ' <iframe src="../../rest/res/'.$res_id.'/content" name="viewframe" id="viewframe" scrolling="auto" frameborder="0" ></iframe>';
$frm_str .= '</div>';
......
apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php
View file @ dcc58c40
......@@ -163,7 +163,7 @@ abstract class indexing_searching_app_Abstract extends Database
$cat_id = 'empty';
}
$checkEmptyMultiContact = false;
// Simple cases
// Simple case
foreach (array_keys($post) as $key) {
//save_contact
if (isset($_SESSION['adresses']) && !empty($_SESSION['adresses']['contactid'])) {
......@@ -247,7 +247,7 @@ abstract class indexing_searching_app_Abstract extends Database
$data_res = $type->fill_data_array($type_id, $coll_id, $val_indexes, $data_res);
}
///////////////////////// Other cases
///////////////////////// Other case
//process date
if (
isset($_ENV['categories'][$cat_id]['other_cases']['process_limit_date'])
......
apps/maarch_entreprise/class/class_list_show_with_template_Abstract.php
View file @ dcc58c40
......@@ -255,17 +255,6 @@ abstract class list_show_with_template_Abstract extends list_show
return $return;
}
//Load view_doc if this parameters is loaded in list_show and list_show_with_template
public function tmplt_func_bool_detail_cases($actual_string, $theline, $result, $key)
{
if ($this->bool_detail == true) {
$return = "<a href='".$_SESSION['config']['businessappurl'].'index.php?page=details_cases&module=cases&amp;id='.$result[$theline][0]['case_id']."' title='"._DETAILS_CASES."'>
<i class='fa fa-info-circle fa-2x' title='"._DETAILS."'></i></a>";
return $return;
}
}
//Load check form if this parameters is loaded in list_show and list_show_with_template
public function tmplt_func_bool_view_doc($actual_string, $theline, $result, $key)
{
......@@ -422,8 +411,6 @@ abstract class list_show_with_template_Abstract extends list_show
$my_var = $this->tmplt_include_by_module($actual_string, $theline, $result, $key, $include_by_module);
} elseif (preg_match("/^func_load_external_script\|/", $actual_string)) {
$my_var = $this->tmplt_load_external_script($actual_string, $theline, $result, $key, $include_by_module);
} elseif (preg_match('/^func_bool_detail_case$/', $actual_string)) {
$my_var = $this->tmplt_func_bool_detail_cases($actual_string, $theline, $result, $key, $include_by_module);
} elseif (preg_match('/^func_bool_see_attachments$/', $actual_string)) {
$my_var = $this->tmplt_func_bool_see_attachments($actual_string, $theline, $result, $key, $include_by_module);
} elseif (preg_match('/^func_bool_see_items$/', $actual_string)) {
......@@ -550,29 +537,6 @@ abstract class list_show_with_template_Abstract extends list_show
$file = 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.$actual_template.'.html';
}
//To load including values template Use for case by exemple
//##############################################################
if ($core_tools->is_module_loaded('cases') == true) {
$case_file = 'modules'.DIRECTORY_SEPARATOR.'cases'.DIRECTORY_SEPARATOR.'template_addon'.DIRECTORY_SEPARATOR.$actual_template.'.html';
if (file_exists($case_file)) {
$addon_list_trait = $this->get_template($case_file);
$addon_tmp = explode('#!#', $addon_list_trait);
foreach ($addon_tmp as $including_file) {
if (substr($including_file, 0, 5) == 'TABLE') {
$including_table = substr($including_file, 5);
}
if (substr($including_file, 0, 4) == 'HEAD') {
$including_head = substr($including_file, 4);
}
if (substr($including_file, 0, 6) == 'RESULT') {
$including_result = substr($including_file, 6);
}
if (substr($including_file, 0, 6) == 'FOOTER') {
$including_footer = substr($including_file, 6);
}
}
}
}
//##############################################################
$list_trait = $this->get_template($file);
$tmp = explode('#!#', $list_trait);
......
apps/maarch_entreprise/class/class_lists_Abstract.php
View file @ dcc58c40
......@@ -1384,20 +1384,6 @@ abstract class lists_Abstract extends Database
}
}
protected function _tmplt_func_load_case_status($resultTheLine)
{
$db = new Database();
$stmt = $db->query('SELECT count(*) as total FROM cases WHERE case_closing_date is not NULL and case_id = ?',
[$resultTheLine[0]['case_id']]);
$result = $stmt->fetchObject();
if ($result->total > 0) {
return '<i class="fa fa-briefcase fa-2x" title="'._CLOSED.'"><sup> <i class="fa fa-lock" aria-hidden="true" style="color:red;font-size:10px;"></i></sup></i>';
} else {
return '<i class="fa fa-briefcase fa-2x"></i>';
}
var_dump($resultTheLine[0]);
}
protected function _tmplt_showActionAdvResultFA($parameter, $resultTheLine)
{
$my_explode = explode('|', $parameter);
......@@ -1883,8 +1869,6 @@ abstract class lists_Abstract extends Database
} elseif (preg_match('/^func_isConfidential$/', $parameter)) {
$var = $this->_tmplt_func_isConfidential($resultTheLine);
//#showActionIcon## : show action icon
} elseif (preg_match('/^func_load_case_status$/', $parameter)) {
$var = $this->_tmplt_func_load_case_status($resultTheLine);
} else {
$var = _WRONG_FUNCTION_OR_WRONG_PARAMETERS;
}
......
apps/maarch_entreprise/indexing_searching/details.php
View file @ dcc58c40
......@@ -240,15 +240,11 @@ if ($stmt->rowCount() > 0) {
}
}
}
$case_sql_complementary = '';
if ($core->is_module_loaded('cases') == true) {
$case_sql_complementary = ' , case_id';
}
$stmt = $db->query(
'SELECT status, format, typist, creation_date, fingerprint, filesize, '
.'res_id, destination, source, '
.'description, closing_date, alt_identifier, initiator, entity_label '.$comp_fields
.$case_sql_complementary.' FROM '.$table.' WHERE res_id = ?',
.' FROM '.$table.' WHERE res_id = ?',
array($s_id)
);
$res = $stmt->fetchObject();
......@@ -313,14 +309,6 @@ if ($stmt->rowCount() == 0) {
$typistLabel = $typist;
}
if ($core->is_module_loaded('cases') == true) {
require_once 'modules/cases/class/class_modules_tools.php';
$case = new cases();
if ($res->case_id != '') {
$case_properties = $case->get_case_info($res->case_id);
}
}
foreach (array_keys($indexes) as $key) {
if (preg_match('/^custom/', $key)) {
$tmp = 'doc_'.$key;
......@@ -436,21 +424,6 @@ if ($stmt->rowCount() == 0) {
echo $sendmail;
}
//CASES TAB
if ($core->is_module_loaded('cases') == true) {
$case_frame = '';
$pathScriptTab = $_SESSION['config']['businessappurl']
.'index.php?display=true&page=show_case_tab&module=cases&collId='.$coll_id.'&resId='.$s_id;
$case_frame .= '<div id="cases_tab" class="fa fa-suitcase DetailsTabFunc" title="'._CASE.'" onclick="loadSpecificTab(\'uniqueDetailsIframe\',\''.$pathScriptTab.'\');tabClicked(\'cases_tab\',true);"> <sup id="cases_tab_badge"></sup>';
$case_frame .= '</div>';
//LOAD TOOLBAR BADGE
$toolbarBagde_script = $_SESSION['config']['businessappurl'].'index.php?display=true&module=cases&page=load_toolbar_cases&resId='.$s_id.'&collId='.$coll_id;
$case_frame .= '<script>loadToolbarBadge(\'cases_tab\',\''.$toolbarBagde_script.'\');</script>';
echo $case_frame;
}
//NOTES TAB
if ($core->is_module_loaded('notes')) {
$note = '';
......
apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
View file @ dcc58c40
......@@ -101,9 +101,6 @@ if ($mode == 'normal') {
}
$template_list = array();
array_push($template_list, 'documents_list_search_adv');
if ($core_tools->is_module_loaded('cases')) {
array_push($template_list, 'cases_list_search_adv');
}
//For status icon
$extension_icon = '';
......@@ -261,10 +258,6 @@ if ($mode == 'normal') {
'filename',
'res_id as real_dest'
);
//Cases
if ($core_tools->is_module_loaded('cases') == true) {
array_push($select[$view], 'case_id', 'case_label', 'case_description');
}
//Folder
if ($core_tools->is_module_loaded('folder')) {
array_push($select[$view], 'folders_system_id', 'folder_name');
......@@ -758,27 +751,6 @@ if ($mode == 'normal') {
}
}
if ($tab[$i][$j][$value] == 'case_id' && $core_tools->is_module_loaded('cases') == true) {
$tab[$i][$j]['label'] = _CASE_NUM;
$tab[$i][$j]['size'] = '10';
$tab[$i][$j]['label_align'] = 'left';
$tab[$i][$j]['align'] = 'left';
$tab[$i][$j]['valign'] = 'bottom';
$tab[$i][$j]['show'] = false;
$tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
$tab[$i][$j]['value'] = "<a href='".$_SESSION['config']['businessappurl'].'index.php?page=details_cases&module=cases&id='.$tab[$i][$j]['value']."'>".$tab[$i][$j]['value'].'</a>';
$tab[$i][$j]['order'] = 'case_id';
}
if ($tab[$i][$j][$value] == 'case_label' && $core_tools->is_module_loaded('cases') == true) {
$tab[$i][$j]['label'] = _CASE_LABEL;
$tab[$i][$j]['size'] = '10';
$tab[$i][$j]['label_align'] = 'left';
$tab[$i][$j]['align'] = 'left';
$tab[$i][$j]['valign'] = 'bottom';
$tab[$i][$j]['show'] = true;
$tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
$tab[$i][$j]['order'] = 'case_id';
}
if ($tab[$i][$j][$value] == 'folder_name') {
$tab[$i][$j]['label'] = _FOLDER;
$tab[$i][$j]['size'] = '10';
......
apps/maarch_entreprise/indexing_searching/search_adv_result.php
View file @ dcc58c40
......@@ -72,7 +72,6 @@ if (isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'frame') {
}
$where_request = "";
$arrayPDO = array();
$case_view = false;
$_ENV['date_pattern'] = "/^[0-3][0-9]-[0-1][0-9]-[1-2][0-9][0-9][0-9]$/";
$json_txt = '{';
......@@ -156,31 +155,6 @@ if (count($_REQUEST['meta']) > 0) {
$arrayPDO = array_merge($arrayPDO, array(":multifield" => "%".$multifield."%"));
$where_request .=" and ";
} elseif ($tab_id_fields[$j] == 'numcase' && !empty($_REQUEST['numcase'])) {
// CASE_NUMBER
$json_txt .= "'numcase' : ['".addslashes(trim($_REQUEST['numcase']))."'],";
//$where_request .= "res_view_letterbox.case_id = ".$func->wash($_REQUEST['numcase'], "num", _N_CASE,"no")." and ";
$where_request .= " ".$_SESSION['collections'][0]['view'].".case_id = :numCase and ";
$arrayPDO = array_merge($arrayPDO, array(":numCase" => $_REQUEST['numcase']));
$case_view=true;
if (!is_numeric($_REQUEST['numcase'])) {
$_SESSION['error_search'] = _CASE_NUMBER_ERROR;
}
} elseif ($tab_id_fields[$j] == 'labelcase' && !empty($_REQUEST['labelcase'])) {
// CASE_LABEL
$json_txt .= "'labelcase' : ['".addslashes(trim($_REQUEST['labelcase']))."'],";
//$where_request .= "res_view_letterbox.case_id = ".$func->wash($_REQUEST['numcase'], "num", _N_CASE,"no")." and ";
$where_request .= " lower(translate(".$_SESSION['collections'][0]['view'].".case_label,'ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûýýþÿŔŕ','aaaaaaaceeeeiiiidnoooooouuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr')) like lower(:labelCase) and ";
$arrayPDO = array_merge($arrayPDO, array(":labelCase" => "%".$func->wash($_REQUEST['labelcase'], "no", _CASE_LABEL, "no")."%"));
$case_view=true;
} elseif ($tab_id_fields[$j] == 'descriptioncase' && !empty($_REQUEST['descriptioncase'])) {
// CASE_DESCRIPTION
$json_txt .= "'descriptioncase' : ['".addslashes(trim($_REQUEST['descriptioncase']))."'],";
//$where_request .= "res_view_letterbox.case_id = ".$func->wash($_REQUEST['numcase'], "num", _N_CASE,"no")." and ";
$where_request .= " lower(translate(".$_SESSION['collections'][0]['view'].".case_description,'ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûýýþÿŔŕ','aaaaaaaceeeeiiiidnoooooouuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr')) like lower(:descriptionCase) and ";
$arrayPDO = array_merge($arrayPDO, array(":descriptionCase" => "%".$func->wash($_REQUEST['descriptioncase'], "no", _CASE_DESCRIPTION, "no")."%"));
$case_view=true;
} elseif ($tab_id_fields[$j] == 'chrono' && !empty($_REQUEST['chrono'])) {
$json_txt .= " 'chrono' : ['".addslashes(trim($_REQUEST['chrono']))."'],";
$chrono = $func->wash($_REQUEST['chrono'], "no", _CHRONO_NUMBER, "no");
......@@ -879,27 +853,12 @@ if (!empty($_SESSION['error_search'])) {
$_SESSION['searching']['where_request'] = $where_request;
$_SESSION['searching']['where_request_parameters'] = $arrayPDO;
}
if (isset($_REQUEST['specific_case'])
&& $_REQUEST['specific_case'] == "attach_to_case"
) {
$page = 'list_results_mlb_frame'; ?>
<script type="text/javascript">
window.top.location.href = '<?php echo $_SESSION['config']['businessappurl'].'index.php?display=true&module=cases&page='.$page.'&load&searched_item='. $_REQUEST['searched_item'] .'&searched_value='.$_REQUEST['searched_value'].'&template='.$_REQUEST['template']; ?>';
</script>
<?php
exit();
}
if (empty($_SESSION['error_search'])) {
//specific string for search_adv cases
$extend_link_case = "";
if ($case_view == true) {
$extend_link_case = "&template=group_case";
}
//##################
$page = 'list_results_mlb'; ?>
<script type="text/javascript">
window.top.location.href = '<?php if ($mode == 'normal') {
echo $_SESSION['config']['businessappurl'].'index.php?page='.$page.'&dir=indexing_searching&load'.$extend_link_case;
echo $_SESSION['config']['businessappurl'].'index.php?page='.$page.'&dir=indexing_searching&load';
} elseif ($mode=='frame' || $mode == 'popup') {
echo $_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page='.$page.'&mode='.$mode.'&action_form='.$_REQUEST['action_form'].'&modulename='.$_REQUEST['modulename'];
}
......
apps/maarch_entreprise/lang/en.php
View file @ dcc58c40
......@@ -3853,9 +3853,6 @@ if (!defined('_DOCUMENTS_LIST_EXTEND')) {
if (!defined('_DOCUMENTS_LIST')) {
define('_DOCUMENTS_LIST', 'Simple list');
} //template
if (!defined('_CASES_LIST')) {
define('_CASES_LIST', 'Cases list');
} //template
if (!defined('_DOCUMENTS_LIST_SEARCH')) {
define('_DOCUMENTS_LIST_SEARCH', 'Expanded list');
} //template
......
apps/maarch_entreprise/lang/fr.php
View file @ dcc58c40
......@@ -3891,9 +3891,6 @@ if (!defined('_DOCUMENTS_LIST_EXTEND')) {
if (!defined('_DOCUMENTS_LIST')) {
define('_DOCUMENTS_LIST', 'Liste simple');
} //template
if (!defined('_CASES_LIST')) {
define('_CASES_LIST', 'Liste des affaires');
} //template
if (!defined('_DOCUMENTS_LIST_SEARCH')) {
define('_DOCUMENTS_LIST_SEARCH', 'Liste étendue');
} //template
......
apps/maarch_entreprise/lang/nl.php
View file @ dcc58c40
......@@ -1261,7 +1261,6 @@ if (!defined('_DOCUMENTS_LIST_WITH_ATTACHMENTS')) { define('_DOCUMENTS_LIST_WITH
if (!defined('_DOCUMENTS_LIST_COPIES')) { define('_DOCUMENTS_LIST_COPIES', 'Lijst van de kopieën');}
if (!defined('_DOCUMENTS_LIST_EXTEND')) { define('_DOCUMENTS_LIST_EXTEND', 'Uitgebreide lijst');}
if (!defined('_DOCUMENTS_LIST')) { define('_DOCUMENTS_LIST', 'Eenvoudige lijst');}
if (!defined('_CASES_LIST')) { define('_CASES_LIST', 'Lijst van de zaken');}
if (!defined('_DOCUMENTS_LIST_SEARCH')) { define('_DOCUMENTS_LIST_SEARCH', 'Uitgebreide lijst');}
if (!defined('_CLICK_ICON_TO_TOGGLE')) { define('_CLICK_ICON_TO_TOGGLE', 'Klik op de icoon voor Weergeven / Verbergen');}
if (!defined('_SHOW')) { define('_SHOW', 'Weergeven');}
......
apps/maarch_entreprise/template/group_case.html deleted 100755 → 0
View file @ bc8c8b99
<!--
* basket_list and search_adv_list template
*
*
* @package Maarch LetterBox 3.0
* @version 3.0
* @since 10/2005
* @license GPL
* @author Loïc Vinet <dev@maarch.org>
*
Parts :
##HEAD< : Begining of the head part
##HEAD> : End of the head part
##RESULT< : Begining of result list
##RESULT> : End fo result list
Functions :
##load_css|arg1## : load css style - arg1= name of this class
##css_line|coll|nonecoll## : load css style for line arg1,arg2 : switch beetwin style on line one or line two
##css_line_reload## : reload last css style loaded by css_line
##order_link|arg1|arg2## : reload list and change order; arg1=type; arg2=sort
##url_docview## : open view of document;
##url_docdetail## : open detail of document;
##url_download## : download document;
##load_img|arg1## : show loaded image; arg1= name of img file
##load_value|arg|##: load value in the db; arg1= column's value identifier
Mods :
##func_bool_radio_form## : Activate bool_radio_form in class_list_show.php
##func_bool_check_form## : Activate bool_check_form in class_list_show.php
##func_bool_view_doc## : Activate func to view documents
##func_bool_detail_doc## : Activate func to view documents detail's page
##func_include_by_module|arg1## : Include template from specific module (arg1 : module id)
##func_load_external_script## : Load an external script in this template (arg1: module_id, arg2: php file)
Defines :
_NAME_OF_LANG_INSTANCE : u se constant define in lang.php
-->
#!#TABLE
<table border="0" cellspacing="0" class="##load_css|listing spec zero_padding ##" id='search_cases' style = "width: 100%; min-width: 900px; margin: 0;">
#!#HEAD
<thead border ="1">
<tr>
<th width="100%" colspan="3">
<div align="center" style="border:1px solid; height:20px;margin-bottom:10px;padding-top:10px;vertical-align:middle;">
##define_lang|_SORT_BY## :
##define_lang|_NUM_CASE##
<a href="##order_link|cases.case_id|desc##" title="##define_lang|_DESC_SORT##"><i class="fa fa-angle-down fa-2x" title="##define_lang|_DESC_SORT##"></i> </a> <a href="##order_link|cases.case_id|asc##" title="##define_lang|_ASC_SORT##"> <i class="fa fa-angle-up fa-2x" title="##define_lang|_ASC_SORT##"></i></a>
&nbsp;
##define_lang|_CASE_LABEL##
<a href="##order_link|cases.case_label|desc##" title="##define_lang|_DESC_SORT##"><i class="fa fa-angle-down fa-2x" title="##define_lang|_DESC_SORT##"></i> </a> <a href="##order_link|cases.case_label|asc##" title="##define_lang|_ASC_SORT##"> <i class="fa fa-angle-up fa-2x" title="##define_lang|_ASC_SORT##"></i></a>
&nbsp;
##define_lang|_CASE_DESCRIPTION##
<a href="##order_link|cases.case_description|desc##" title="##define_lang|_DESC_SORT##"><i class="fa fa-angle-down fa-2x" title="##define_lang|_DESC_SORT##"></i> </a> <a href="##order_link|cases.case_description|asc##" title="##define_lang|_ASC_SORT##"> <i class="fa fa-angle-up fa-2x" title="##define_lang|_ASC_SORT##"></i></a>
&nbsp;
##define_lang|_CASE_CREATION_DATE##
<a href="##order_link|cases.case_creation_date|desc##" title="##define_lang|_DESC_SORT##"><i class="fa fa-angle-down fa-2x" title="##define_lang|_DESC_SORT##"></i> </a> <a href="##order_link|cases.case_creation_date|asc##" title="##define_lang|_ASC_SORT##"> <i class="fa fa-angle-up fa-2x" title="##define_lang|_ASC_SORT##"></i></a>
&nbsp;
##define_lang|_CASE_TYPIST##
<a href="##order_link|cases.case_typist|desc##" title="##define_lang|_DESC_SORT##"><i class="fa fa-angle-down fa-2x" title="##define_lang|_DESC_SORT##"></i> </a> <a href="##order_link|cases.case_typist|asc##" title="##define_lang|_ASC_SORT##"> <i class="fa fa-angle-up fa-2x" title="##define_lang|_ASC_SORT##"></i></a>
</div>
</th>
</tr>
</thead>
<tbody>
#!#RESULT
<!-- ------------------------------------------------------------------------->
<tr class="##css_line|col| ##" >
<td width="10%" align="center"style="text-align:center" >
<h2>##func_bool_radio_form## ##load_value|case_id##</h2>
<!--<div align="center">##load_value|status##</div>-->
</td>
<td width="70%" style="font-size:12px;"><b><!--##define_lang|_SUBJECT## :--></b><b>##load_value|case_label##</b> </td>
<td width="20%" style="text-align:right">
##load_value|case_closing_date## ##define_lang|_CASE_CREATION_DATE## : ##load_value|case_creation_date##
</td>
</tr>
<tr class="##css_line_reload##">
<td style="text-align:center" style="font-size:13px;">
<div align="center">
<i class="fa fa-briefcase fa-2x" title="##loadValue|status##" ></i>
</div>
</td>
<td style="text-align:left">
<em>##load_value|case_description##</em>
</td>
<td><p align="right">
<i class="fa fa-angle-down fa-2x case_img" onclick="new Effect.toggle('info##load_value|case_id##', 'blind');" onmouseover="document.body.style.cursor='pointer';" onmouseout="document.body.style.cursor='auto';" id="h23"></i>
&nbsp;&nbsp;&nbsp;##func_include_by_module|cases##
</p>
</td>
</tr >
<tr class="##css_line_reload##" >
<td colspan="3" class="white">
<div class="more_ressources" id="info##load_value|case_id##" style="display:none">
##func_load_external_script|cases|case_extend_list.php##
</div>
</td>
</tr>
<tr><td colspan="6" style="background-color: white;">&nbsp;</td></tr>
#!#FOOTER
<!-- ------------------------------------------------------------------------->
</tbody>
</table>
<script type="text/javascript">
/*$$('.case_img').filter(function(el){
return !($(el).up('tr').next().down('.more_ressources').immediateDescendants().length);
}).each(function(el1){
el1.setStyle({display:'none'});
});*/
</script>
apps/maarch_entreprise/xml/IVS/requests_definitions.xml
View file @ dcc58c40
......@@ -315,13 +315,6 @@
<parameter name="size"/>
</requestDefinition>
<requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="little_details" >
<parameter name="dir" value="indexing_searching"/>
<parameter name="page" value="little_details_invoices"/>
<parameter name="display" value="true"/>
<parameter name="value"/>
</requestDefinition>
<requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="multiLink" >
<parameter name="dir" value="indexing_searching"/>
<parameter name="page" value="multiLink"/>
......@@ -560,7 +553,6 @@
<!-- MODULES PART -->
<xi:include href="../../../../modules/attachments/xml/IVS/requests_definitions.xml"/>
<xi:include href="../../../../modules/basket/xml/IVS/requests_definitions.xml"/>
<xi:include href="../../../../modules/cases/xml/IVS/requests_definitions.xml"/>
<xi:include href="../../../../modules/content_management/xml/IVS/requests_definitions.xml"/>
<xi:include href="../../../../modules/entities/xml/IVS/requests_definitions.xml"/>
<xi:include href="../../../../modules/folder/xml/IVS/requests_definitions.xml"/>
......@@ -589,7 +581,6 @@
<!-- MODULES PART -->
<xi:include href="../../../../modules/attachments/xml/IVS/validation_rules.xml"/>
<xi:include href="../../../../modules/basket/xml/IVS/validation_rules.xml"/>
<xi:include href="../../../../modules/cases/xml/IVS/validation_rules.xml"/>
<xi:include href="../../../../modules/content_management/xml/IVS/validation_rules.xml"/>
<xi:include href="../../../../modules/entities/xml/IVS/validation_rules.xml"/>
<xi:include href="../../../../modules/folder/xml/IVS/validation_rules.xml"/>
......@@ -618,7 +609,6 @@
<!-- MODULES PART -->
<xi:include href="../../../../modules/attachments/xml/IVS/data_types.xml"/>
<xi:include href="../../../../modules/basket/xml/IVS/data_types.xml"/>
<xi:include href="../../../../modules/cases/xml/IVS/data_types.xml"/>
<xi:include href="../../../../modules/content_management/xml/IVS/data_types.xml"/>
<xi:include href="../../../../modules/entities/xml/IVS/data_types.xml"/>
<xi:include href="../../../../modules/folder/xml/IVS/data_types.xml"/>
......
apps/maarch_entreprise/xml/config.xml.default
View file @ dcc58c40
......@@ -238,10 +238,6 @@
<comment>_BASKETS_COMMENT</comment>
</MODULES>
<MODULES>
<moduleid>cases</moduleid>
<comment>_CASES_COMMENT</comment>
</MODULES>
<MODULES>
<moduleid>entities</moduleid>
<comment>_ENTITIES_COMMENT</comment>
</MODULES>
......
apps/maarch_entreprise/xml/lists_parameters.xml
View file @ dcc58c40
......@@ -174,38 +174,6 @@
<GOTOLIST></GOTOLIST>
</TEMPLATE>
<TEMPLATE>
<ID>cases_list</ID>
<LABEL>_CASES_LIST</LABEL>
<IMG>fa fa-briefcase fa-2x</IMG>
<NAME>group_cases_for_basket</NAME>
<ORIGIN>module</ORIGIN>
<MODULE>cases</MODULE>
<GOTOLIST>
<ID>list_cases</ID>
<LABEL>_CASES_LIST</LABEL>
<NAME>cases_list</NAME>
<ORIGIN>module</ORIGIN>
<MODULE>cases</MODULE>
</GOTOLIST>
<ENABLED>true</ENABLED>
</TEMPLATE>
<TEMPLATE>
<ID>cases_list_search_adv</ID>
<LABEL>_CASES_LIST</LABEL>
<IMG>fa fa-briefcase fa-2x</IMG>
<NAME>group_cases</NAME>
<ORIGIN>module</ORIGIN>
<MODULE>cases</MODULE>
<GOTOLIST>
<ID>list_cases</ID>
<LABEL>_CASES_LIST</LABEL>
<NAME>cases_list_search_adv</NAME>
<ORIGIN>module</ORIGIN>
<MODULE>cases</MODULE>
</GOTOLIST>
<ENABLED>true</ENABLED>
</TEMPLATE>
<TEMPLATE>
<ID>folder_documents_list</ID>
<LABEL>_FOLDER_DOCUMENTS_LIST</LABEL>
<IMG>fa fa-list-ul fa-2x</IMG>
......
modules/basket/class/class_modules_tools_Abstract.php
View file @ dcc58c40
......@@ -102,7 +102,6 @@ abstract class basket_Abstract extends Database
{
$_SESSION['user']['baskets'] = [];
$this->_loadBasketsPages();
$user = \User\models\UserModel::getByLogin(['login' => $userData['UserId'], 'select' => ['id']]);
if (isset($userData['primarygroup']) && isset($userData['UserId'])) {
......@@ -124,142 +123,6 @@ abstract class basket_Abstract extends Database
}
}
/**
* Return the url of the basket result page given an basket identifier.
*
* @param $basketIdPage string Basket results page identifier
* @param $mode_page string "frame" or "no_frame"
* @return string url of the basket results page or empty string in error
* case
*/
public function retrieve_path_page($basketIdPage, $mode)
{
// Gets the indice of the $basketIdPage in the
// $_SESSION['basket_page'] to access all the informations on this page
$path = '';
$ind = -1;
for ($i = 0; $i < count($_SESSION['basket_page']); $i ++) {
if (trim($_SESSION['basket_page'][$i]['ID']) == trim(
$basketIdPage
)
) {
$ind = $i;
break;
}
}
// If the page identifier is not found return an empty string
if ($ind == -1) {
return '';
} else {// building the url
// The page is in the apps
if (strtoupper($_SESSION['basket_page'][$ind]['ORIGIN']) == 'APPS'
) {
if (strtoupper($mode) == 'NO_FRAME') {
$path = $_SESSION['config']['businessappurl']
. 'index.php?page='