" ;
@@ -1918,37 +2055,36 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
//}
}
-
/**
- * Summary of post_show_item_processmakerticket
- * @param $parm
+ * Summary of pre_show_tab_arbehaviours
+ * @param array $params info about tab to be shown
+ * @return void
*/
- public static function post_show_item_processmakerticket($parm) {
- global $LANG, $pmHideSolution;
- if( ($plug = new Plugin) && !$plug->isActivated('arbehaviours') ) {
- if ($parm->getID() && in_array($parm->getType(), array('Ticket'))) {
- // then we are in a ticket
- if (isset($_REQUEST['glpi_tab']) && $_SESSION['glpiactiveprofile']['interface'] != "helpdesk" ) {
- $data = explode('$', $_REQUEST['glpi_tab']);
- $itemtype = $data[0];
- // Default set
- $tabnum = 1;
- if (isset($data[1])) {
- $tabnum = $data[1];
- }
- elseif ($itemtype == -1 )
- $tabnum = -1 ;
+ static function pre_show_tab_processmaker($params) {
+ global $LANG, $pmHideSolution;
+ $plugin = new Plugin();
+ $itemtype = $params['item']->getType();
+ switch ($itemtype) {
+ case 'Ticket':
+ case 'Problem':
+ case 'Change':
+ if ($params['options']['id']) {
+ // then we are in an ITIL Object
+ if (isset($_SESSION['glpiactiveprofile']['interface']) && $_SESSION['glpiactiveprofile']['interface'] != "helpdesk") {
+ $tabnum = $params['options']['tabnum'];
+ // tabnum 1 : Processing Ticket, tabnum 2 : Solution
- if( $tabnum == 2 || $tabnum == -1 ) {
- // then we are showing the Solution tab
- // if a case is running
- // then we must prevent solution to be input
- if( $pmHideSolution ) { //isset($pmVar['GLPI_ITEM_CAN_BE_SOLVED']) && $pmVar['GLPI_ITEM_CAN_BE_SOLVED'] != 1 ) { //if( $pmInfo !== null && ( $pmInfo->caseStatus != 'COMPLETED' && $pmInfo->caseStatus != 'CANCELLED' )) {
+ if ($tabnum == 2 or $tabnum == 1) {
+ // we must check if we can solve item even if PM case is still running (ex: PIR tasks for Change Management)
+ $pmCanSolve = PluginProcessmakerCase::canSolve( $params );
+ if (!$pmCanSolve) {
+ // don't display message if arbehaviours is install
+ if (!($plugin->isInstalled('arbehaviours') && $plugin->isActivated('arbehaviours'))) {
+ $messageOne = $LANG['processmaker']['item']['preventsolution'][1];
+ $messageTwo = $LANG['processmaker']['item']['preventsolution'][2];
+ // output explicit message to explain why it's not possible to add solution
- echo "
";
- if( $tabnum == -1 )
- echo "";
- echo "
+ $message = "
@@ -1959,12 +2095,12 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
- ".$LANG['processmaker']['item']['preventsolution'][1]."
+ ".$messageOne."
- ".$LANG['processmaker']['item']['preventsolution'][2]."
+ ".$messageTwo."
@@ -1977,13 +2113,139 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
";
- }
+ }
+
+ $pmHideSolution = true ;
+ $itemtype = strtolower($itemtype);
+ if ($tabnum == 1 && isset($_SESSION['glpiactiveprofile'][$itemtype.'_status'])) {
+ // don't display message if arbehaviours is install
+ if (!($plugin->isInstalled('arbehaviours') && $plugin->isActivated('arbehaviours'))) {
+ self::displayMessage($message, '', WARNING);
+
+ //save current $_SESSION['glpiactiveprofile'][$itemtype.'_status'']
+ $_SESSION['glpiactiveprofile'][$itemtype.'_status_save'] = $_SESSION['glpiactiveprofile'][$itemtype.'_status'];
+ // for all $params['options']['itemtype']. status, disable solved ( life cycles )
+ foreach ($_SESSION['glpiactiveprofile'][$itemtype.'_status'] as $key => $value) {
+ $_SESSION['glpiactiveprofile'][$itemtype.'_status'][$key][CommonITILObject::SOLVED] = 0;
+ }
+ }
+ } else {
+ // then output a new div and hide solution for content
+ echo $message;
+ echo "
";
+ }
+ }
}
}
- }
- }
+ }
+
+ }
}
+
+ public static function post_show_tab_processmaker($params) {
+ global $pmHideSolution;
+
+ $itemtype = $params['item']->getType();
+ switch ($itemtype) {
+
+ case 'Ticket':
+ case 'Problem':
+ case 'Change':
+ if ($params['options']['id']) {
+ // then we are in an itil object
+ if (isset($_SESSION['glpiactiveprofile']['interface']) && $_SESSION['glpiactiveprofile']['interface'] != "helpdesk") {
+ $tabnum = $params['options']['tabnum'];
+
+ if ($tabnum == 2 or $tabnum == 1) {
+ // then we are showing the Solution tab or Processing Ticket tab
+
+ if ($pmHideSolution) {
+ echo "
";
+
+ }
+ $itemtype = strtolower($itemtype);
+ // replace $_SESSION['glpiactiveprofile'][$itemtype.'_status'] with saved value
+ if ($tabnum == 1 && isset($_SESSION['glpiactiveprofile'][$itemtype.'_status_save'])) {
+ $_SESSION['glpiactiveprofile'][$itemtype.'_status'] = $_SESSION['glpiactiveprofile'][$itemtype.'_status_save'];
+ }
+
+ }
+ }
+
+ }
+ break;
+
+ }
+
+ }
+
+
+ ///**
+ // * Summary of post_show_item_processmakerticket
+ // * @param $parm
+ // */
+ //public static function post_show_item_processmakerticket($parm) {
+ // global $LANG, $pmHideSolution;
+ // if( ($plug = new Plugin) && !$plug->isActivated('arbehaviours') ) {
+ // if ($parm->getID() && in_array($parm->getType(), array('Ticket'))) {
+ // // then we are in a ticket
+ // if (isset($_REQUEST['glpi_tab']) && $_SESSION['glpiactiveprofile']['interface'] != "helpdesk" ) {
+ // $data = explode('$', $_REQUEST['glpi_tab']);
+ // $itemtype = $data[0];
+ // // Default set
+ // $tabnum = 1;
+ // if (isset($data[1])) {
+ // $tabnum = $data[1];
+ // }
+ // elseif ($itemtype == -1 )
+ // $tabnum = -1 ;
+
+ // if( $tabnum == 2 || $tabnum == -1 ) {
+ // // then we are showing the Solution tab
+ // // if a case is running
+ // // then we must prevent solution to be input
+ // if( $pmHideSolution ) { //isset($pmVar['GLPI_ITEM_CAN_BE_SOLVED']) && $pmVar['GLPI_ITEM_CAN_BE_SOLVED'] != 1 ) { //if( $pmInfo !== null && ( $pmInfo->caseStatus != 'COMPLETED' && $pmInfo->caseStatus != 'CANCELLED' )) {
+
+ // echo "
";
+ // if( $tabnum == -1 )
+ // echo "
";
+ // echo "
+ //
+ //
+ //
+ //
+ //
+ // ".$LANG['processmaker']['item']['preventsolution'][1]."
+ //
+ //
+ //
+ //
+ // ".$LANG['processmaker']['item']['preventsolution'][2]."
+ //
+ //
+ //
+ //
+ //
+ //
+ //
";
+ // }
+ // }
+ // }
+ // }
+ // }
+ //}
+
///**
// * Summary of canedit_item_processmakertickettask
// * @param $parm
@@ -2046,28 +2308,31 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
* Summary of saveForm
* This function posts dynaform variables to PM, using the CURL module.
* @param mixed $request: is the $_REQUEST server array
- * @param string $cookie: is the $_SERVER['HTTP_COOKIE'] string
+ * //@param string $cookie: is the $_SERVER['HTTP_COOKIE'] string
* @return mixed: returns false if request failed, otherwise, returns true
*/
- public function saveForm( $request, $cookie ) {
+ public function saveForm( $request ) { //, $cookie ) {
- function HandleHeaderLine( $curl, $header_line ) {
- global $cookies;
- $temp = explode( ": ", $header_line ) ;
- if( is_array( $temp ) && $temp[0] == 'Set-Cookie' ) {
- $temp2 = explode( "; ", $temp[1]) ;
- //$cookies .= $temp2[0].'; ' ;
- curl_setopt($curl, CURLOPT_COOKIE, $temp2[0]."; " ) ;
- }
- return strlen($header_line);
- }
+ if( !function_exists( 'HandleHeaderLine' ) ) {
+ function HandleHeaderLine( $curl, $header_line ) {
+ //global $cookies;
+ $temp = explode( ": ", $header_line ) ;
+ if( is_array( $temp ) && $temp[0] == 'Set-Cookie' ) {
+ $temp2 = explode( "; ", $temp[1]) ;
+ //$cookies .= $temp2[0].'; ' ;
+ curl_setopt($curl, CURLOPT_COOKIE, $temp2[0]."; " ) ;
+ }
+ return strlen($header_line);
+ }
+ }
$data = http_formdata_flat_hierarchy( $request ) ;
$ch = curl_init();
+ //to be able to trace network traffic with a local proxy
// curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1 ) ;
- // curl_setopt($ch, CURLOPT_PROXY, "localhost:10000");
+ //curl_setopt($ch, CURLOPT_PROXY, "localhost:8888");
curl_setopt($ch, CURLOPT_HEADER, 1);
// curl_setopt($ch, CURLOPT_VERBOSE, 1);
// curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
@@ -2107,34 +2372,46 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
foreach( $item->datas['tasks'] as &$task ) { // we must check if task category is PM task category or not, if yes then we add task category comment to datas
$task['##task.description##'] = str_replace( '##processmaker.taskcomment##', $task['##task.categorycomment##'], $task['##task.description##'] ) ;
}
- //$config = PluginProcessmakerConfig::getInstance() ;
- //$taskCat = new TaskCategory ;
- //$target = reset( $item->target ) ; // to get first target in target array without knowing the key for this value
- //// save current translations
- //if( isset( $_SESSION['glpi_dropdowntranslations'] ) )
- // $trans = $_SESSION['glpi_dropdowntranslations'] ;
- //// load available translations for this user
- //$_SESSION['glpi_dropdowntranslations'] = DropdownTranslation::getAvailableTranslations($target['language']);
- //foreach( $item->datas['tasks'] as &$task ) { // we must check if task category is PM task category or not, if yes then we add task category comment to datas
- // $taskCat->getFromDB( $task['##task.category_id##'] ) ;
- // $ancestors = getAncestorsOf( 'glpi_taskcategories', $task['##task.category_id##'] ) ; //$ancestors = json_decode($taskCat->fields['ancestors_cache'], true) ;
- // if( in_array( $config->fields['taskcategories_id'], $ancestors) ) {
- // $loc = DropdownTranslation::getTranslatedValue( $taskCat->getID(), 'TaskCategory', 'comment', $target['language'], $taskCat->fields['comment'] ) ;
- // //$task['##processmaker.taskcomment##'] = $loc; //['comment'] ;
- // $task['##task.description##'] = str_replace( '##processmaker.taskcomment##', $loc, $task['##task.description##'] ) ;
- // }
- //}
- //// restore default translations
- //if( isset( $trans ) )
- // $_SESSION['glpi_dropdowntranslations'] = $trans ;
- //else
- // unset( $_SESSION['glpi_dropdowntranslations'] ) ;
}
}
- /**
+ /**
+ * Summary of plugin_item_get_pdfdatas_processmaker
+ * @param mixed $item
+ */
+ public static function plugin_item_get_pdfdatas_processmaker($item){
+ if( isset( $item->datas ) ){
+ $config = PluginProcessmakerConfig::getInstance() ;
+ $taskCat = new TaskCategory ;
+
+ // save current translations
+ if( isset( $_SESSION['glpi_dropdowntranslations'] ) ) {
+ $trans = $_SESSION['glpi_dropdowntranslations'] ;
+ }
+ // load available translations for this user
+ $_SESSION['glpi_dropdowntranslations'] = DropdownTranslation::getAvailableTranslations($_SESSION['glpilanguage']);
+
+ $taskCat->getFromDB( $item->datas['taskcategories_id'] ) ;
+ $ancestors = getAncestorsOf( 'glpi_taskcategories', $item->datas['taskcategories_id']) ;
+ if( in_array( $config->fields['taskcategories_id'], $ancestors) ) {
+ $loc_completename = DropdownTranslation::getTranslatedValue( $taskCat->getID(), 'TaskCategory', 'completename', $_SESSION['glpilanguage'], $taskCat->fields['completename'] ) ;
+ $loc_comment = DropdownTranslation::getTranslatedValue( $taskCat->getID(), 'TaskCategory', 'comment', $_SESSION['glpilanguage'], $taskCat->fields['comment'] ) ;
+ $item->datas['content'] = $loc_completename."\n\n".str_replace( "##processmaker.taskcomment##\n##ticket.url##_PluginProcessmakerCase\$processmakercases", $loc_comment, $item->datas['content']) ;
+ }
+ // restore default translations
+ if( isset( $trans ) ) {
+ $_SESSION['glpi_dropdowntranslations'] = $trans ;
+ } else {
+ unset( $_SESSION['glpi_dropdowntranslations'] ) ;
+ }
+ }
+
+ }
+
+
+ /**
* Summary of getProcessesWithCategoryAndProfile
* @param mixed $category
* @param mixed $type
@@ -2146,7 +2423,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
$processList = array( ) ;
$entityAncestors = implode( ", ", getAncestorsOf( getTableForItemType( 'Entity' ), $entity ) ) ;
- if( strlen( $entityAncestors ) != 0 ) {
+ if( strlen( $entityAncestors ) > 0 ) {
$entityAncestors = " OR (entities_id IN ($entityAncestors) AND is_recursive = 1) " ;
}
@@ -2163,7 +2440,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
}
public function startNewCase( $processId, $itemType, $itemId, $userId=null ) {
- global $DB;
+ global $DB, $CFG_GLPI;
$requesters = PluginProcessmakerProcessmaker::getItemUsers( $itemType, $itemId, CommonITILActor::REQUESTER) ; // 1 for requesters
if( !key_exists( 0, $requesters ) ) {
@@ -2206,10 +2483,11 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
'GLPI_ITEM_PRIORITY' => $locItem->fields['priority'],
'GLPI_TICKET_GLOBAL_VALIDATION' => $locItem->fields['global_validation'] ,
'GLPI_TICKET_TECHNICIAN_GLPI_ID' => $userId, //$technicians[0]['glpi_id'],
+ 'GLPI_URL' => $CFG_GLPI['url_base'].$CFG_GLPI['root_doc'],
'GLPI_TICKET_TECHNICIAN_PM_ID' => PluginProcessmakerUser::getPMUserId( $userId ) //$technicians[0]['pm_id']
) ) ;
- if ($resultCase->status_code == 0){
+ if ($resultCase->status_code === 0){
$caseInfo = $this->getCaseInfo( $resultCase->caseId );
//$query = "UPDATE APPLICATION SET APP_STATUS='TO_DO' WHERE APP_UID='".$resultCase->caseId."' AND APP_STATUS='DRAFT'" ;
@@ -2226,9 +2504,249 @@ class PluginProcessmakerProcessmaker extends CommonDBTM {
//$query = "INSERT INTO glpi_plugin_processmaker_cases (items_id, itemtype, id, case_num, case_status, processes_id) VALUES ($itemId, '$itemType', '".$resultCase->caseId."', ".$resultCase->caseNumber.", '".$caseInfo->caseStatus."', '".$caseInfo->processId."');" ;
//$res = $DB->query($query) ;
- $this->add1stTask($itemType, $itemId, $caseInfo, '', $userId ) ;
-}
+ $this->add1stTask($itemType, $itemId, $caseInfo, array( 'userId' => $userId ) ) ;
+ }
return $resultCase;
}
+
+
+ /**
+ * Summary of derivateCase
+ * in $request must be present
+ * 'UID', 'APP_UID' and DEL_INDEX'
+ *
+ * @param mixed $myCase
+ * @param mixed $request
+ * @param mixed $users_id
+ */
+ public function derivateCase( $myCase, $request, $users_id=null ) { //$cookies,
+ global $PM_DB;
+
+ // save the case variables
+ $resultSave = $this->saveForm( $request ) ;//, $_SERVER['HTTP_COOKIE'] ) ;
+
+ // now derivate the case !!!
+ $pmRouteCaseResponse = $this->routeCase( $myCase->getID(), $request['DEL_INDEX']) ;
+
+ // now tries to get some variables to setup content for new task and to append text to solved task
+ $infoForTasks = $this->getVariables( $myCase->getID(), array( "GLPI_ITEM_TASK_CONTENT",
+ "GLPI_ITEM_APPEND_TO_TASK",
+ "GLPI_NEXT_GROUP_TO_BE_ASSIGNED",
+ "GLPI_ITEM_TITLE",
+ "GLPI_TICKET_FOLLOWUP_CONTENT",
+ "GLPI_TICKET_FOLLOWUP_IS_PRIVATE",
+ "GLPI_TICKET_FOLLOWUP_REQUESTTYPES_ID",
+ "GLPI_ITEM_TASK_ENDDATE",
+ "GLPI_ITEM_TASK_STARTDATE",
+ "GLPI_ITEM_SET_STATUS"
+ ) );
+ $itemSetStatus = '';
+ if( array_key_exists( 'GLPI_ITEM_SET_STATUS', $infoForTasks ) ) {
+ $itemSetStatus = $infoForTasks[ 'GLPI_ITEM_SET_STATUS' ] ;
+ }
+
+ $txtItemTitle = '' ;
+ if( array_key_exists( 'GLPI_ITEM_TITLE', $infoForTasks ) ) {
+ $txtItemTitle = $infoForTasks[ 'GLPI_ITEM_TITLE' ] ;
+ }
+
+ $txtToAppendToTask = '' ;
+ if( array_key_exists( 'GLPI_ITEM_APPEND_TO_TASK', $infoForTasks ) ) {
+ $txtToAppendToTask = $infoForTasks[ 'GLPI_ITEM_APPEND_TO_TASK' ] ;
+ }
+
+ $txtTaskContent = '' ;
+ if( array_key_exists( 'GLPI_ITEM_TASK_CONTENT', $infoForTasks ) ) {
+ $txtTaskContent = $infoForTasks[ 'GLPI_ITEM_TASK_CONTENT' ] ;
+ }
+
+ $groupId = 0 ;
+ if( array_key_exists( 'GLPI_NEXT_GROUP_TO_BE_ASSIGNED', $infoForTasks ) ) {
+ $groupId = $infoForTasks[ 'GLPI_NEXT_GROUP_TO_BE_ASSIGNED' ] ;
+ }
+
+ $taskStartDate = '' ;
+ $taskEndDate = '' ;
+ if( array_key_exists( 'GLPI_ITEM_TASK_ENDDATE', $infoForTasks ) ) {
+ $taskEndDate = $infoForTasks[ 'GLPI_ITEM_TASK_ENDDATE' ] ;
+ }
+ if( array_key_exists( 'GLPI_ITEM_TASK_STARTDATE', $infoForTasks ) ) {
+ $taskStartDate = $infoForTasks[ 'GLPI_ITEM_TASK_STARTDATE' ] ;
+ if( $taskEndDate == '' ) {
+ // at least
+ $taskEndDate = $taskStartDate ;
+ }
+ }
+
+ $createFollowup = false ; // by default
+ if( array_key_exists( 'GLPI_TICKET_FOLLOWUP_CONTENT', $infoForTasks ) && $infoForTasks[ 'GLPI_TICKET_FOLLOWUP_CONTENT' ] != '') {
+ //&& array_key_exists( 'GLPI_TICKET_FOLLOWUP_IS_PRIVATE', $infoForTasks )
+ //&& array_key_exists( 'GLPI_TICKET_FOLLOWUP_REQUESTTYPES_ID', $infoForTasks )
+ $createFollowup = true ;
+ }
+
+ // reset those variables
+ $resultSave = $this->sendVariables( $myCase->getID() , array( "GLPI_ITEM_APPEND_TO_TASK" => '',
+ "GLPI_ITEM_TASK_CONTENT" => '',
+ "GLPI_NEXT_GROUP_TO_BE_ASSIGNED" => '',
+ "GLPI_ITEM_TITLE" => '',
+ "GLPI_TICKET_FOLLOWUP_CONTENT" => '',
+ "GLPI_TICKET_FOLLOWUP_IS_PRIVATE" => '',
+ "GLPI_TICKET_FOLLOWUP_REQUESTTYPES_ID" => '',
+ "GLPI_ITEM_TASK_ENDDATE" => '',
+ "GLPI_ITEM_TASK_STARTDATE" => '',
+ "GLPI_ITEM_SET_STATUS" => '') ) ;
+
+ // print_r( $pmRouteCaseResponse ) ;
+ // die() ;
+
+ // now manage tasks associated with item
+ $itemType = $myCase->getField('itemtype');
+ $itemId = $myCase->getField('items_id');
+
+ // switch own task to 'done' and create a new one
+ $this->solveTask( $myCase->getID(), $request['DEL_INDEX'], array( 'txtToAppend' => $txtToAppendToTask, 'users_id_tech' => $users_id ) ) ;
+
+ // create a followup if requested
+ if( $createFollowup && $itemType == 'Ticket' ) {
+ $this->addTicketFollowup( $itemId, $infoForTasks ) ;
+ }
+ $caseInfo = $this->getCaseInfo( $myCase->getID(), $request['DEL_INDEX']) ;
+ if( property_exists( $pmRouteCaseResponse, 'routing' ) ) {
+ foreach( $pmRouteCaseResponse->routing as $route ) {
+ $this->addTask( $itemType,
+ $itemId,
+ $caseInfo,
+ $route->delIndex,
+ PluginProcessmakerUser::getGLPIUserId( $route->userId ),
+ $groupId,
+ $route->taskId,
+ array( 'txtTaskContent' => $txtTaskContent,
+ 'start_date' => $taskStartDate,
+ 'end_date' => $taskEndDate)
+ ) ;
+
+ // if end date was specicied, then must change due date of the PM task
+ if( $taskEndDate != '' ) {
+ $PM_DB->query( "UPDATE APP_DELEGATION SET DEL_TASK_DUE_DATE='$taskEndDate' WHERE APP_UID='".$caseInfo->caseId."' AND DEL_INDEX=".$route->delIndex);
+ }
+ }
+ }
+
+ if( $txtItemTitle != '') {
+ // we are going to change the title of current GLPI Item
+ $item = new $itemType ;
+ $item->getFromDB( $itemId ) ;
+ $item->update( array('id' => $itemId, 'name' => $txtItemTitle) ) ;
+ }
+
+ if( $itemSetStatus != '' ) {
+ $this->setItemStatus($itemType, $itemId, $itemSetStatus ) ;
+ }
+
+ // evolution of case status: DRAFT, TO_DO, COMPLETED, CANCELLED
+ $myCase->update( array( 'id' => $myCase->getID(), 'case_status' => $caseInfo->caseStatus ) ) ;
+ }
+
+
+ /**
+ * Summary of getPMGroups
+ * @return array
+ */
+ public static function getPMGroups( ) {
+ global $PM_DB;
+ $pmGroupList = array();
+ foreach($PM_DB->request("SELECT * FROM content WHERE content.CON_CATEGORY='GRP_TITLE' AND content.CON_LANG='en'") as $dbgroup){
+ $pmGroupList[$dbgroup['CON_VALUE']] = $dbgroup;
+ }
+ return $pmGroupList;
+ }
+
+
+ /**
+ * Summary of displayMessage
+ * Show a html message bottom-right of screen
+ * @param string $html_message message to be shown
+ * @param string $title if '' then title bar is not shown (default '')
+ * @param string $msgtype the type of the message (ERROR | WARNING | INFO)
+ * @return void
+ **/
+ static private function displayMessage($html_message, $title='',$msgtype='info_msg') {
+
+ //set title and css class
+ switch ($msgtype) {
+ case ERROR:
+ $title = __('Error');
+ $class = 'err_msg';
+ break;
+ case WARNING:
+ $title = __('Warning');
+ $class = 'warn_msg';
+ break;
+ case INFO:
+ $title = __('Information');
+ $class = 'info_msg';
+ break;
+ }
+
+ echo "
";
+ echo $html_message;
+ echo "
";
+
+ $scriptblock = "
+ $(document).ready(function() {
+ var _of = window;
+ var _at = 'right-20 bottom-20';
+ //calculate relative dialog position
+ $('.message_after_redirect').each(function() {
+ var _this = $(this);
+ if (_this.attr('aria-describedby') != 'message_after_redirect_$msgtype') {
+ _of = _this;
+ _at = 'right top-' + (10 + _this.outerHeight());
+ }
+ });
+
+ $('#message_after_redirect_$msgtype').dialog({
+ dialogClass: 'message_after_redirect $class',
+ minHeight: 40,
+ minWidth: 200,
+ position: {
+ my: 'right bottom',
+ at: _at,
+ of: _of,
+ collision: 'none'
+ },
+ autoOpen: false,
+ show: {
+ effect: 'slide',
+ direction: 'down',
+ 'duration': 800
+ }
+ })
+ .dialog('open');";
+
+ //do not autoclose errors
+ if ($msgtype != ERROR) {
+ $scriptblock .= "
+
+ // close dialog on outside click
+ $(document.body).on('click', function(e){
+ if ($('#message_after_redirect_$msgtype').dialog('isOpen')
+ && !$(e.target).is('.ui-dialog, a')
+ && !$(e.target).closest('.ui-dialog').length) {
+ $('#message_after_redirect_$msgtype').dialog('close');
+ // redo focus on initial element
+ e.target.focus();
+ }
+ });";
+ }
+
+ $scriptblock .= "
+
+ });
+ ";
+
+ echo Html::scriptBlock($scriptblock);
+ }
}
\ No newline at end of file
diff --git a/inc/task.class.php b/inc/task.class.php
index 2fb02b0..925ad76 100644
--- a/inc/task.class.php
+++ b/inc/task.class.php
@@ -89,34 +89,36 @@ class PluginProcessmakerTask extends CommonITILTask
static function populatePlanning($params) {
global $CFG_GLPI;
- //echo 'Test' ;
+
$ret = array();
$events = array() ;
- $params['begin'] = '2000-01-01 00:00:00';
- $ret = CommonITILTask::genericPopulatePlanning( 'TicketTask', $params ) ;
+ if( isset($params['start']) ) {
+ $params['begin'] = '2000-01-01 00:00:00';
+ $ret = CommonITILTask::genericPopulatePlanning( 'TicketTask', $params ) ;
- foreach( $ret as $key => $event ) {
- if( $event['state'] == 1 || ($params['display_done_events'] == 1 && $event['state'] == 2)) { // if todo or done but need to show them (=planning)
- // check if task is one within a case
- $pmTask = new self('TicketTask');
- if( $pmTask->getFromDB( $event['tickettasks_id'] ) ) { // $pmTask->getFromDBByQuery( " WHERE itemtype = 'TicketTask' AND items_id = ". $event['tickettasks_id'] ) ) {
- $event['editable'] = false;
- $event['url'] .= '&forcetab=PluginProcessmakerCase$processmakercases' ;
+ foreach( $ret as $key => $event ) {
+ if( $event['state'] == 1 || ($params['display_done_events'] == 1 && $event['state'] == 2)) { // if todo or done but need to show them (=planning)
+ // check if task is one within a case
+ $pmTask = new self('TicketTask');
+ if( $pmTask->getFromDB( $event['tickettasks_id'] ) ) { // $pmTask->getFromDBByQuery( " WHERE itemtype = 'TicketTask' AND items_id = ". $event['tickettasks_id'] ) ) {
+ $event['editable'] = false;
+ $event['url'] .= '&forcetab=PluginProcessmakerCase$processmakercases' ;
- $taskCat = new TaskCategory ;
- $taskCat->getFromDB( $pmTask->fields['taskcategories_id'] ) ;
- $taskComment = isset($taskCat->fields['comment']) ? $taskCat->fields['comment'] : '' ;
- if( Session::haveTranslations('TaskCategory', 'comment') ) {
- $taskComment = DropdownTranslation::getTranslatedValue( $taskCat->getID(), 'TaskCategory', 'comment', $_SESSION['glpilanguage'], $taskComment ) ;
+ $taskCat = new TaskCategory ;
+ $taskCat->getFromDB( $pmTask->fields['taskcategories_id'] ) ;
+ $taskComment = isset($taskCat->fields['comment']) ? $taskCat->fields['comment'] : '' ;
+ if( Session::haveTranslations('TaskCategory', 'comment') ) {
+ $taskComment = DropdownTranslation::getTranslatedValue( $taskCat->getID(), 'TaskCategory', 'comment', $_SESSION['glpilanguage'], $taskComment ) ;
+ }
+
+ $event['content'] = str_replace( '##processmaker.taskcomment##', $taskComment, $event['content'] ) ;
+ $event['content'] = str_replace( '##ticket.url##_PluginProcessmakerCase$processmakercases', "", $event['content'] ) ; //
"."Click to manage task"."
+ //if( $event['state'] == 1 && $event['end'] < $params['start'] ) { // if todo and late
+ // $event['name'] = $event['end'].' '.$event['name'] ; //$event['begin'].' to '.$event['end'].' '.$event['name'] ;
+ // $event['end'] = $params['start'].' 24:00:00'; //.$CFG_GLPI['planning_end'];
+ //}
+ $events[$key] = $event ;
}
-
- $event['content'] = str_replace( '##processmaker.taskcomment##', $taskComment, $event['content'] ) ;
- $event['content'] = str_replace( '##ticket.url##_PluginProcessmakerCase$processmakercases', "", $event['content'] ) ; //
"."Click to manage task"."
- if( $event['state'] == 1 && $event['end'] < $params['start'] ) { // if todo and late
- $event['name'] = $event['end'].' '.$event['name'] ; //$event['begin'].' to '.$event['end'].' '.$event['name'] ;
- $event['end'] = $params['start'].' 24:00:00'; //.$CFG_GLPI['planning_end'];
- }
- $events[$key] = $event ;
}
}
}
diff --git a/inc/user.class.php b/inc/user.class.php
index 92c6647..36bc520 100644
--- a/inc/user.class.php
+++ b/inc/user.class.php
@@ -178,7 +178,7 @@ class PluginProcessmakerUser extends CommonDBTM {
* Summary of getGLPIUserId
* returns GLPI user ID from a Processmaker user ID
* @param string $pmUserId
- * @return int, GLPI user id, or 0 if not found
+ * @return int GLPI user id, or 0 if not found
*/
public static function getGLPIUserId( $pmUserId ){
$obj = new self ;
diff --git a/js/cases.helpdesk.js b/js/cases.helpdesk.js
index 39cb362..1bbb9ea 100644
--- a/js/cases.helpdesk.js
+++ b/js/cases.helpdesk.js
@@ -41,8 +41,13 @@ function onLoadFrame( evt, caseId, delIndex, caseNumber, processName ) {
caseIFrame = document.getElementById('caseiframe');
- if (caseIFrame != undefined && caseIFrame.contentDocument != undefined) {
- var contentDocument = caseIFrame.contentDocument;
+ var contentDocument;
+ try {
+ contentDocument = caseIFrame.contentDocument;
+ } catch (ex) {
+ contentDocument = false;
+ }
+ if (caseIFrame != undefined && contentDocument) {
var buttonContinue = contentDocument.getElementById('form[btnGLPISendRequest]');
var txtAreaUseRequestSumUp = contentDocument.getElementById('form[UserRequestSumUp]');
var linkList = contentDocument.getElementsByTagName('a');
diff --git a/js/cases.js b/js/cases.js
index 47c5055..9d10837 100644
--- a/js/cases.js
+++ b/js/cases.js
@@ -20,13 +20,25 @@ function bGLPIHideElement(eltList, attribute, value) {
return ret;
}
-function showMask(elt) {
- if( !elt.defaultPrevented ) {
- Ext.getBody().moveTo(0, 0);
- var myMask = new Ext.LoadMask(Ext.getBody(), { removeMask: false });
- myMask.show();
- }
-};
+
+function displayOverlay() {
+ //debugger;
+ // don't use displayOverlay when submit input open new tab or update parent ( example: pdf generation )
+ if (!($(this).is('input[type=submit]')
+ && $(this).parents('form').length > 0
+ && ($(this).parents('form').first().attr('target') == '_blank' || $(this).parents('form').first().attr('target') == '_parent'))) {
+ $("
").appendTo("body");
+
+ var timer = window.setInterval(function () {
+ var count = $('.ui-widget-overlay.ui-front').length;
+ if (count == 2) {
+ $($('.ui-widget-overlay.ui-front')[1]).remove();
+ window.clearInterval(timer);
+ }
+
+ }, 10);
+ }
+}
function onTaskFrameLoad(event, delIndex, hideClaimButton, csrf) {
@@ -41,12 +53,22 @@ function onTaskFrameLoad(event, delIndex, hideClaimButton, csrf) {
try {
var locContentDocument;
var taskFrame = document.getElementById(taskFrameId);
-
- if (taskFrame != undefined && taskFrame.contentDocument != undefined) {
+ try {
+ locContentDocument = taskFrame.contentDocument;
+ } catch (ex) {
+ locContentDocument = false;
+ }
+ if (taskFrame != undefined && locContentDocument != undefined) {
// here we've caught the content of the iframe
+ // if task resumé, then hide the form part
+ //debugger;
+ var form_resume = locContentDocument.getElementsByName('cases_Resume');
+ if (form_resume.length > 0 && form_resume[0].style.display != 'none') {
+ form_resume[0].style.display = 'none';
+ }
+
// then look if btnGLPISendRequest exists,
- locContentDocument = taskFrame.contentDocument;
var locElt = locContentDocument.getElementById('form[btnGLPISendRequest]');
if (!bShowHideNextStep && locElt != undefined ) {
var linkList = locContentDocument.getElementsByTagName('a');
@@ -60,6 +82,7 @@ function onTaskFrameLoad(event, delIndex, hideClaimButton, csrf) {
// if yes then change the action of the form POST
var node = formList[0]; // must have one element in list: in a dynaform there is one and only one HTML form
+ node.setAttribute('actionBackup', node.action);
var action = node.action.split('?');
node.action = GLPI_HTTP_CASE_FORM + '?' + action[1] + '&DEL_INDEX=' + delIndex;
@@ -71,9 +94,8 @@ function onTaskFrameLoad(event, delIndex, hideClaimButton, csrf) {
csrfElt.setAttribute("value", csrf) ;
node.appendChild(csrfElt);
- // try to add showMask function to submit event
- // TODO
- //node.addEventListener('submit', showMask, true);
+ // add showMask function to submit event
+ //node.addEventListener('submit', displayOverlay, true);
} else {
// then hide the button itself
locElt.style.display = 'none';
@@ -94,8 +116,11 @@ function onTaskFrameLoad(event, delIndex, hideClaimButton, csrf) {
// to manage Claim
var formList = locContentDocument.getElementsByTagName('form');
var node = formList[0]; // must have one element in list: in a dynaform there is one and only one HTML form
+ node.setAttribute('actionBackup', node.action);
+
var action = node.action.split('?');
node.action = GLPI_HTTP_CASE_FORM + '?' + action[1] + '&DEL_INDEX=' + delIndex;
+
bHideClaimCancelButton = true;
// TODO
//node.addEventListener('submit', showMask);
@@ -110,24 +135,15 @@ function onTaskFrameLoad(event, delIndex, hideClaimButton, csrf) {
GLPI_RELOAD_PARENT.location.reload();
}
- // try to redim caseIFrame
- if (!redimIFrame) {
- var newHeight;
- //var locElt = locContentDocument.getElementsByTagName("table")[0];
- var locElt = locContentDocument.getElementsByTagName("body")[0];
- newHeight = parseInt(getComputedStyle(locElt, null).getPropertyValue('height'), 10) + 60;
- //if (locElt)
- // newHeight = (locElt.clientHeight < 400 ? 400 : locElt.clientHeight) + locElt.offsetParent.offsetTop ;
- //else {
- // locElt = locContentDocument.getElementsByTagName("form")[0];
- // newHeight = (locElt.clientHeight < 400 ? 400 : locElt.clientHeight) + locElt.offsetTop ;
- //}
- //locElt.clientHeight = newHeight; // don't know if this is neccessary!!! --> bugs on IE8
- //NOT NEEDED WITH jQuery: var elts = $('#processmakertabpanel').tabs();//.getItem('task-' + delIndex).setHeight(newHeight);
- //debugger;
- taskFrame.height = newHeight ;
- redimIFrame = true;
- }
+ // try to redim caseIFrame
+ if (!redimIFrame) {
+ redimTaskFrame(taskFrame, delIndex);
+ var redimFrameTimer = window.setInterval(function () {
+ redimTaskFrame(taskFrame, delIndex);
+ }, 1000);
+
+ redimIFrame = true;
+ }
}
taskFrameTimerCounter = taskFrameTimerCounter + 1;
@@ -143,6 +159,21 @@ function onTaskFrameLoad(event, delIndex, hideClaimButton, csrf) {
}
+function redimTaskFrame(taskFrame, delIndex) {
+ var newHeight;
+ try{
+ //var locElt = locContentDocument.getElementsByTagName("table")[0];
+ var locElt = taskFrame.contentDocument.getElementsByTagName("body")[0];
+ newHeight = parseInt(getComputedStyle(locElt, null).getPropertyValue('height'), 10) ;
+ if (newHeight < 500) {
+ newHeight = 500;
+ }
+
+ taskFrame.height = newHeight;
+ } catch (e) {
+ }
+}
+
function onTaskFrameActivation(delIndex) {
var taskFrameId = "caseiframe-" + delIndex;
var taskFrameTimerCounter = 0;
@@ -182,23 +213,16 @@ function onTaskFrameActivation(delIndex) {
}
function clearClass(lociFrame) {
- //var otherFrameTimerCounter = 0;
- //var otherFrameTimer = window.setInterval(function () {
- try {
- var locElt = lociFrame.contentDocument.getElementsByTagName('body')[0];
- if (locElt != undefined && locElt.className != '') {
- //debugger;
- locElt.className = '';
- // window.clearInterval(otherFrameTimer);
- //} else {
- // otherFrameTimerCounter = otherFrameTimerCounter + 1;
- // if (otherFrameTimerCounter > 3000 )
- // window.clearInterval(otherFrameTimer);
- }
- } catch (ev) {
+ try {
+ var locElt = lociFrame.contentDocument.getElementsByTagName('body')[0];
+ if (locElt != undefined && locElt.className != '') {
+ //debugger;
+ locElt.className = '';
+
+ }
+ } catch (ev) {
- }
- //}, 10);
+ }
}
function onOtherFrameLoad(tabPanelName, frameName, eltTagName, isMap3) {
diff --git a/locales/en_GB.php b/locales/en_GB.php
index 7344176..e17fbe6 100644
--- a/locales/en_GB.php
+++ b/locales/en_GB.php
@@ -12,8 +12,8 @@ $LANG['processmaker']['profile']['case_delete']="Delete cases";
$LANG['processmaker']['process']['process_guid']="Process GUID";
$LANG['processmaker']['process']['project_type_short']="Project type" ;
$LANG['processmaker']['process']['project_type']="Project type (to be changed if not up-to-date)" ;
-$LANG['processmaker']['process']['project_type_bpmn']='BPMN';
-$LANG['processmaker']['process']['project_type_classic']='Classic' ;
+$LANG['processmaker']['process']['project_type_bpmn']='bpmn';
+$LANG['processmaker']['process']['project_type_classic']='classic' ;
$LANG['processmaker']['process']['hide_case_num_title_short']="Hide case number and title";
$LANG['processmaker']['process']['hide_case_num_title']="Hide case number and title in task descriptions";
$LANG['processmaker']['process']['insert_task_comment_short']="Insert Task Category";
@@ -112,8 +112,8 @@ $LANG['processmaker']['search']['processtitle']="Process Title";
$LANG['processmaker']['search']['casetitle']="Case Title";
$LANG['processmaker']['search']['hascase']="Running Case?";
-$LANG['processmaker']['cron']['pmusers']="Syncs GLPI users and pseudo-groups into ProcessMaker." ;
-$LANG['processmaker']['cron']['pmnotifications']="Notifications for GLPI Tasks bound to ProcessMaker Tasks." ;
+$LANG['processmaker']['cron']['pmusers']="Syncs GLPI users and groups into ProcessMaker." ;
+$LANG['processmaker']['cron']['pmtaskactions']="To apply task actions between cases." ;
$LANG['processmaker']['cron']['pmorphancases']['description']="Cleaning of orphan cases." ;
$LANG['processmaker']['cron']['pmorphancases']['parameter']="Number of days to keep orphan cases";
diff --git a/locales/fr_FR.php b/locales/fr_FR.php
index 6b582c6..b81600a 100644
--- a/locales/fr_FR.php
+++ b/locales/fr_FR.php
@@ -112,7 +112,8 @@ $LANG['processmaker']['search']['processtitle']="Nom du processus";
$LANG['processmaker']['search']['casetitle']="Titre du cas";
$LANG['processmaker']['search']['hascase']="Cas en cours ?";
-$LANG['processmaker']['cron']['pmusers']="Synchro des utilisateurs GLPI et des pseudo-groups avec ProcessMaker." ;
-$LANG['processmaker']['cron']['pmnotifications']="Notifications des tâches GLPI liées à des tâches de ProcessMaker." ;
+$LANG['processmaker']['cron']['pmusers']="Synchro des utilisateurs GLPI et des groups avec ProcessMaker." ;
+//$LANG['processmaker']['cron']['pmnotifications']="Notifications des tâches GLPI liées à des tâches de ProcessMaker." ;
+$LANG['processmaker']['cron']['pmtaskactions']="Pour appliquer les actions de tâches entre cas." ;
$LANG['processmaker']['cron']['pmorphancases']['description']="Nettoyage des cas orphelins." ;
$LANG['processmaker']['cron']['pmorphancases']['parameter']="Nombre de jours avant nettoyage des cas orphelins.";
diff --git a/processmaker.xml b/processmaker.xml
index 213d66a..8f6a603 100644
--- a/processmaker.xml
+++ b/processmaker.xml
@@ -23,7 +23,7 @@
- 3.0.0
+ 3.1.0
9.1
diff --git a/setup.php b/setup.php
index 3b1ebe6..a8c1458 100644
--- a/setup.php
+++ b/setup.php
@@ -48,9 +48,14 @@ function plugin_init_processmaker() {
$PLUGIN_HOOKS['pre_show_item']['processmaker']
= array('PluginProcessmakerProcessmaker', 'pre_show_item_processmakerticket');
- $PLUGIN_HOOKS['post_show_item']['processmaker']
- = array('Ticket' => array('PluginProcessmakerProcessmaker',
- 'post_show_item_processmakerticket'));
+ $PLUGIN_HOOKS['pre_show_tab']['processmaker']
+ = array('PluginProcessmakerProcessmaker', 'pre_show_tab_processmaker');
+ $PLUGIN_HOOKS['post_show_tab']['processmaker']
+ = array('PluginProcessmakerProcessmaker', 'post_show_tab_processmaker');
+
+ //$PLUGIN_HOOKS['post_show_item']['processmaker']
+ // = array('Ticket' => array('PluginProcessmakerProcessmaker',
+ // 'post_show_item_processmakerticket'));
// Display a menu entry ?
if (Session::haveRight('config', READ) ) {
@@ -70,7 +75,8 @@ function plugin_init_processmaker() {
// , 'TicketFollowup' => 'plugin_pre_item_update_processmaker_followup'
$PLUGIN_HOOKS['item_update']['processmaker'] = array(
- 'TicketSatisfaction' => 'plugin_item_update_processmaker_satisfaction'
+ 'TicketSatisfaction' => 'plugin_item_update_processmaker_satisfaction',
+ 'TicketTask' => 'plugin_item_update_processmaker_tasks'
);
$PLUGIN_HOOKS['item_add']['processmaker'] = array(
@@ -81,6 +87,9 @@ function plugin_init_processmaker() {
'NotificationTargetTicket' => array('PluginProcessmakerProcessmaker', 'plugin_item_get_datas_processmaker')
);
+ $PLUGIN_HOOKS['item_get_pdfdatas']['processmaker'] = array(
+ 'PluginPdfTicketTask' => array('PluginProcessmakerProcessmaker', 'plugin_item_get_pdfdatas_processmaker')
+ );
$PLUGIN_HOOKS['pre_item_purge']['processmaker'] = array(
@@ -115,16 +124,16 @@ function plugin_version_processmaker(){
global $LANG;
return array ('name' => 'Process Maker',
- 'version' => '3.0.0',
+ 'version' => '3.1.0',
'author' => 'Olivier Moron',
'homepage' => '',
- 'minGlpiVersion' => '0.85.0');
+ 'minGlpiVersion' => '9.1');
}
// Optional : check prerequisites before install : may print errors or add to message after redirect
function plugin_processmaker_check_prerequisites(){
- if (version_compare(GLPI_VERSION,'0.85','lt') || version_compare(GLPI_VERSION,'9.2','ge')) {
- echo "This plugin requires GLPI 0.85.0 or higher";
+ if (version_compare(GLPI_VERSION,'9.1','lt') || version_compare(GLPI_VERSION,'9.2','ge')) {
+ echo "This plugin requires GLPI 9.1 or higher";
return false;
}
//$plug = new Plugin ;