[Fmsystem-commits] [17092] More on helpdesk

[sigurdne]

Revision: 17092
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17092
Author:   sigurdne
Date:     2017-09-18 09:54:30 -0400 (Mon, 18 Sep 2017)
Log Message:
-----------
More on helpdesk

Modified Paths:
--------------
    trunk/helpdesk/inc/class.botts.inc.php
    trunk/helpdesk/inc/class.sotts.inc.php
    trunk/helpdesk/inc/class.uitts.inc.php
    trunk/helpdesk/js/portico/tts.view.js
    trunk/helpdesk/setup/phpgw_no.lang
    trunk/helpdesk/templates/base/tts.xsl

Modified: trunk/helpdesk/inc/class.botts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.botts.inc.php      2017-09-18 08:50:50 UTC (rev 
17091)
+++ trunk/helpdesk/inc/class.botts.inc.php      2017-09-18 13:54:30 UTC (rev 
17092)
@@ -267,6 +267,7 @@
                                'SC' => lang('Status changed'),
                                'M' => lang('Sent by email to'),
                                'AC'=> lang('actual cost changed'),
+                               'FW'=> lang('ticket is forwarded'),
                        );
 
                        $custom_status  = $this->so->get_custom_status();
@@ -600,6 +601,7 @@
                                case 'IF': $type = lang('Initial finnish 
date'); break;
                                case 'L': $type = lang('Location changed'); 
break;
                                case 'AC': $type = lang('actual cost changed'); 
break;
+                               case 'FW': $type = lang('ticket is forwarded'); 
break;
                                case 'M':
                                        $type = lang('Sent by email to');
                                        $this->order_sent_adress = 
$value['new_value']; // in case we want to resend the order as an reminder
@@ -646,6 +648,11 @@
                                        $record_history[$i]['value_new_value']  
= $this->get_category_name($value['new_value']);
                                        $record_history[$i]['value_old_value']  
= $this->get_category_name($value['old_value']);
                                }
+                               else if ($value['status'] == 'FW')
+                               {
+                                       $record_history[$i]['value_new_value']  
= $GLOBALS['phpgw']->accounts->get($value['new_value'])->__toString();
+                                       $record_history[$i]['value_old_value']  
= $GLOBALS['phpgw']->accounts->get($value['old_value'])->__toString();
+                               }
                                else if (($value['status'] == 'F') || 
($value['status'] =='IF'))
                                {
                                        $record_history[$i]['value_new_value']  
= $GLOBALS['phpgw']->common->show_date($value['new_value'],$this->dateformat);

Modified: trunk/helpdesk/inc/class.sotts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.sotts.inc.php      2017-09-18 08:50:50 UTC (rev 
17091)
+++ trunk/helpdesk/inc/class.sotts.inc.php      2017-09-18 13:54:30 UTC (rev 
17092)
@@ -789,8 +789,8 @@
                        $old_order_cat_id = $this->db->f('order_cat_id');
                        $old_building_part = $this->db->f('building_part', 
true);
                        $old_order_dim1 = (int)$this->db->f('order_dim1');
+                       $old_user_id = $this->db->f('user_id');
 
-
                        if ($oldcat_id == 0)
                        {
                                $oldcat_id = '';
@@ -838,6 +838,7 @@
                         * * C% - Status change
                         * * L - Location changed
                         * * M - Mail sent to vendor
+                        * * FW - Forwarded
                         */
 
                        if (!$simple)
@@ -1060,6 +1061,14 @@
                                $receipt['message'][] = array('msg' => 
lang('billable hours has been updated'));
                        }
 
+                       if (!empty($ticket['forward_user_id']) &&  $old_user_id 
!= $ticket['forward_user_id'] && $oldassigned ==  $this->account)
+                       {
+                               $forward_user_id = (int) 
$ticket['forward_user_id'];
+                               $this->db->query("UPDATE phpgw_helpdesk_tickets 
SET user_id = {$forward_user_id}"
+                                       . " WHERE id='{$id}'", __LINE__, 
__FILE__);
+                               $this->historylog->add('FW', $id, 
$forward_user_id, $old_user_id);
+                               $receipt['message'][] = array('msg' => 
lang('ticket is forwarded'));
+                       }
 
                        $value_set = array();
 

Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php      2017-09-18 08:50:50 UTC (rev 
17091)
+++ trunk/helpdesk/inc/class.uitts.inc.php      2017-09-18 13:54:30 UTC (rev 
17092)
@@ -2085,8 +2085,9 @@
                                                'type' => 'tax', 'selected' => 
$ticket['tax_code'], 'order' => 'id',
                                                'id_in_name' => 'num'))),
                                'tabs' => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
+                               'forward_user' => ($ticket['user_id'] != 
$ticket['reverse_id'] && $ticket['assignedto'] ==  $this->account) ? true : 
false
                        );
-
+ 
                        phpgwapi_jquery::load_widget('numberformat');
                        phpgwapi_jquery::load_widget('autocomplete');
                        self::add_javascript('helpdesk', 'portico', 
'tts.view.js');

Modified: trunk/helpdesk/js/portico/tts.view.js
===================================================================
--- trunk/helpdesk/js/portico/tts.view.js       2017-09-18 08:50:50 UTC (rev 
17091)
+++ trunk/helpdesk/js/portico/tts.view.js       2017-09-18 13:54:30 UTC (rev 
17092)
@@ -327,3 +327,7 @@
        }
 
 });
+
+var oArgs = {menuaction: 'helpdesk.uitts.get_reverse_assignee'};
+var strURL = phpGWLink('index.php', oArgs, true);
+JqueryPortico.autocompleteHelper(strURL, 'forward_user_name', 
'forward_user_id', 'forward_user_container');

Modified: trunk/helpdesk/setup/phpgw_no.lang
===================================================================
--- trunk/helpdesk/setup/phpgw_no.lang  2017-09-18 08:50:50 UTC (rev 17091)
+++ trunk/helpdesk/setup/phpgw_no.lang  2017-09-18 13:54:30 UTC (rev 17092)
@@ -215,3 +215,5 @@
 ticket categories      helpdesk        no      Meldingskategorier
 ticket status  helpdesk        no      Meldingsstatus
 url    helpdesk        no      Url
+forward        helpdesk        no      Videresend
+ticket is forwarded    helpdesk        no      Melding er videresendt
\ No newline at end of file

Modified: trunk/helpdesk/templates/base/tts.xsl
===================================================================
--- trunk/helpdesk/templates/base/tts.xsl       2017-09-18 08:50:50 UTC (rev 
17091)
+++ trunk/helpdesk/templates/base/tts.xsl       2017-09-18 13:54:30 UTC (rev 
17092)
@@ -23,8 +23,8 @@
 
                function response_lookup()
                {
-                       var oArgs = 
{menuaction:'helpdesk.uilookup.response_template',type:'response_template'};
-                       var strURL = phpGWLink('index.php', oArgs);
+               var oArgs = 
{menuaction:'helpdesk.uilookup.response_template',type:'response_template'};
+               var strURL = phpGWLink('index.php', oArgs);
                TINY.box.show({iframe:strURL, 
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
 mask:true, animate:true, close: true});
                }
        </script>
@@ -343,6 +343,20 @@
                                                </label>
                                                <xsl:value-of 
select="value_owned_by"/>
                                        </div>
+                                       <xsl:if test="forward_user ='1'">
+                                               <div class="pure-control-group">
+                                                       <xsl:variable 
name="lang_forward">
+                                                               <xsl:value-of 
select="php:function('lang', 'forward')"/>
+                                                       </xsl:variable>
+                                                       <label>
+                                                               <xsl:value-of 
select="$lang_forward"/>
+                                                       </label>
+                                                       <input type="hidden" 
id="forward_user_id" name="values[forward_user_id]"  
value="{value_forward_user}"/>
+                                                       <input type="text" 
id="forward_user_name" name="values[forward_user_name]" 
value="{value_forward_user_name}" class="pure-input-1-2">
+                                                       </input>
+                                                       <div 
id="forward_user_container"/>
+                                               </div>
+                                       </xsl:if>
                                        <xsl:for-each select="value_origin">
                                                <div class="pure-control-group">
                                                        <label>