extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-12 05:58:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix to use internaly the iCal conform stati for phonecalls to, externaly for the user there is no change, they still see call or will-call as status

Browse Source
This commit is contained in:
Ralf Becker 2006-03-20 19:43:33 +00:00
parent 11ce7b455d
commit 125214e0d2
5 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infolog/inc/class.boinfolog.inc.php
View File

@ -103,7 +103,7 @@
); );
$this->status = $this->stock_status = array( $this->status = $this->stock_status = array(
'defaults' => array( 'defaults' => array(
'task' => 'ongoing', 'phone' => 'call', 'note' => 'done'), 'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done'),
'task' => array( 'task' => array(
'offer' => 'offer', // --> NEEDS-ACTION 'offer' => 'offer', // --> NEEDS-ACTION
'not-started' => 'not-started', // iCal NEEDS-ACTION 'not-started' => 'not-started', // iCal NEEDS-ACTION
@ -112,8 +112,8 @@
'cancelled' => 'cancelled', // iCal CANCELLED 'cancelled' => 'cancelled', // iCal CANCELLED
'billed' => 'billed' ), // --> DONE 'billed' => 'billed' ), // --> DONE
'phone' => array( 'phone' => array(
'call' => 'call', // --> NEEDS-ACTION 'not-started' => 'call', // iCal NEEDS-ACTION
'will-call' => 'will-call', // --> IN-PROCESS 'ongoing' => 'will-call', // iCal IN-PROCESS
'done' => 'done', // iCal COMPLETED 'done' => 'done', // iCal COMPLETED
'billed' => 'billed' ), // --> DONE 'billed' => 'billed' ), // --> DONE
'note' => array( 'note' => array(

6
infolog/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

2
infolog/setup/setup.inc.php
View File

@ -12,7 +12,7 @@
/* $Id$ */ /* $Id$ */
$setup_info['infolog']['name'] = 'infolog'; $setup_info['infolog']['name'] = 'infolog';
$setup_info['infolog']['version'] = '1.2.002'; $setup_info['infolog']['version'] = '1.2.003';
$setup_info['infolog']['app_order'] = 5; $setup_info['infolog']['app_order'] = 5;
$setup_info['infolog']['tables'] = array('egw_infolog','egw_infolog_extra'); $setup_info['infolog']['tables'] = array('egw_infolog','egw_infolog_extra');
$setup_info['infolog']['enable'] = 1; $setup_info['infolog']['enable'] = 1;

21
infolog/setup/tables_update.inc.php
View File

@ -525,4 +525,25 @@
} }
return $GLOBALS['setup_info']['infolog']['currentver'] = '1.2.002'; return $GLOBALS['setup_info']['infolog']['currentver'] = '1.2.002';
} }
$test[] = '1.2.002';
function infolog_upgrade1_2_002()
{
// change the phone-status: call --> not-started, will-call --> ongoing to be able to sync them
$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='not-started' WHERE info_status='call'",__LINE__,__FILE__);
$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='ongoing' WHERE info_status='will-call'",__LINE__,__FILE__);
// remove the call and will-call from the custom stati, if they exist
$config =& CreateObject('phpgwapi.config','infolog');
$config->read_repository();
if (is_array($config->config_data['status']['phone']))
{
unset($config->config_data['status']['phone']['call']);
unset($config->config_data['status']['phone']['will-call']);
$config->save_repository();
}
return $GLOBALS['setup_info']['infolog']['currentver'] = '1.2.003';
}
?> ?>

4
infolog/templates/default/index.xet
View File

@ -56,7 +56,7 @@
<row class="row" valign="top"> <row class="row" valign="top">
<hbox align="center" orient=",5"> <hbox align="center" orient=",5">
<image label="$row_cont[info_type]" src="${row}[info_type]"/> <image label="$row_cont[info_type]" src="${row}[info_type]"/>
<button image="$row_cont[info_status]" ro_image="$row_cont[info_status]" label="$row_cont[info_status]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/> <button image="$row_cont[info_status_label]" ro_image="$row_cont[info_status_label]" label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
<button image="$row_cont[info_percent]" ro_image="$row_cont[info_percent]" label="$row_cont[info_percent]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/> <button image="$row_cont[info_percent]" ro_image="$row_cont[info_percent]" label="$row_cont[info_percent]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
</hbox> </hbox>
<vbox orient="0,0"> <vbox orient="0,0">
@ -155,7 +155,7 @@
<row class="row" valign="top"> <row class="row" valign="top">
<hbox align="center" orient=",5"> <hbox align="center" orient=",5">
<image label="$row_cont[info_type]" src="${row}[info_type]"/> <image label="$row_cont[info_type]" src="${row}[info_type]"/>
<button image="$row_cont[info_status]" ro_image="$row_cont[info_status]" label="$row_cont[info_status]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/> <button image="$row_cont[info_status_label]" ro_image="$row_cont[info_status_label]" label="$row_cont[info_status_label]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
<button image="$row_cont[info_percent]" ro_image="$row_cont[info_percent]" label="$row_cont[info_percent]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/> <button image="$row_cont[info_percent]" ro_image="$row_cont[info_percent]" label="$row_cont[info_percent]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
</hbox> </hbox>
<vbox orient="0,0"> <vbox orient="0,0">