[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17076] property: more on order layout
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17076] property: more on order layout |
|
Date: |
Thu, 14 Sep 2017 10:01:56 -0400 (EDT) |
Revision: 17076
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17076
Author: sigurdne
Date: 2017-09-14 10:01:55 -0400 (Thu, 14 Sep 2017)
Log Message:
-----------
property: more on order layout
Modified Paths:
--------------
trunk/property/inc/class.botts.inc.php
trunk/property/inc/class.sotts.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php 2017-09-14 12:25:07 UTC (rev
17075)
+++ trunk/property/inc/class.botts.inc.php 2017-09-14 14:01:55 UTC (rev
17076)
@@ -706,6 +706,7 @@
}
$ticket['finnish_date'] =
!empty($ticket['finnish_date']) ?
$GLOBALS['phpgw']->common->show_date($ticket['finnish_date'],
$this->dateformat) : '';
$ticket['order_deadline'] =
!empty($ticket['order_deadline']) ?
$GLOBALS['phpgw']->common->show_date($ticket['order_deadline'],
$this->dateformat) : '';
+ $ticket['order_deadline2'] =
!empty($ticket['order_deadline2']) ?
$GLOBALS['phpgw']->common->show_date($ticket['order_deadline2'],
$this->dateformat) : '';
/*
if ($ticket['status'] == 'X')
@@ -787,6 +788,10 @@
{
$ticket['order_deadline'] =
$GLOBALS['phpgw']->common->show_date($ticket['order_deadline'],
$this->dateformat);
}
+ if ($ticket['order_deadline2'])
+ {
+ $ticket['order_deadline2'] =
$GLOBALS['phpgw']->common->show_date($ticket['order_deadline2'],
$this->dateformat);
+ }
if ($ticket['location_code'])
{
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2017-09-14 12:25:07 UTC (rev
17075)
+++ trunk/property/inc/class.sotts.inc.php 2017-09-14 14:01:55 UTC (rev
17076)
@@ -590,6 +590,7 @@
'b_account_id' => 'fm_tts_tickets.b_account_id',
'continuous' => 'fm_tts_tickets.continuous',
'order_deadline' =>
'fm_tts_tickets.order_deadline',
+ 'order_deadline2' =>
'fm_tts_tickets.order_deadline2',
);
$custom_cols = $this->custom->find('property',
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
@@ -785,6 +786,7 @@
'b_account_id' =>
$this->db->f('b_account_id'),
'continuous' =>
$this->db->f('continuous'),
'order_deadline' =>
$this->db->f('order_deadline'),
+ 'order_deadline2' =>
$this->db->f('order_deadline2'),
);
foreach ($custom_cols as $custom_col)
@@ -874,6 +876,7 @@
$ticket['order_id'] = $this->db->f('order_id');
$ticket['continuous'] =
$this->db->f('continuous');
$ticket['order_deadline'] =
$this->db->f('order_deadline');
+ $ticket['order_deadline2'] =
$this->db->f('order_deadline2');
$ticket['vendor_id'] =
$this->db->f('vendor_id');
$ticket['contract_id'] =
$this->db->f('contract_id',true);
$ticket['service_id'] =
$this->db->f('service_id',true);
@@ -1747,6 +1750,10 @@
{
$value_set['order_deadline'] =
phpgwapi_datetime::date_to_timestamp($ticket['order_deadline']);
}
+ if(!empty($ticket['order_deadline2']))
+ {
+ $value_set['order_deadline2'] =
phpgwapi_datetime::date_to_timestamp($ticket['order_deadline2']);
+ }
if(isset($ticket['vendor_email']) &&
is_array($ticket['vendor_email']))
{
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2017-09-14 12:25:07 UTC (rev
17075)
+++ trunk/property/inc/class.uitts.inc.php 2017-09-14 14:01:55 UTC (rev
17076)
@@ -2183,6 +2183,7 @@
if ($access_order)
{
$GLOBALS['phpgw']->jqcal->add_listener('order_deadline');
+
$GLOBALS['phpgw']->jqcal->add_listener('order_deadline2');
$b_account_data =
$this->bocommon->initiate_ui_budget_account_lookup(array
(
@@ -3019,6 +3020,7 @@
'value_target' => $ticket['target'],
'value_finnish_date' => $ticket['finnish_date'],
'value_order_deadline' =>
$ticket['order_deadline'],
+ 'value_order_deadline2' =>
$ticket['order_deadline2'],
'link_entity' => $link_entity,
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'location_data2' => $location_data,
@@ -3389,8 +3391,12 @@
if($ticket['order_deadline'])
{
- $data[] = array('col1' => lang('deadline'),
'col2' =>"<b>{$ticket['order_deadline']}</b>");
+ $data[] = array('col1' => lang('deadline for
start'), 'col2' =>"<b>{$ticket['order_deadline']}</b>");
}
+ if($ticket['order_deadline2'])
+ {
+ $data[] = array('col1' => lang('deadline for
execution'), 'col2' =>"<b>{$ticket['order_deadline2']}</b>");
+ }
$pdf->ezTable($data, array('col1' => '', 'col2' => ''),
'', array('showHeadings' => 0,
'shaded' => 0, 'xPos' => 0,
@@ -3721,9 +3727,14 @@
}
}
+ $user_phone = str_replace(' ', '', $user_phone);
$contact_phone = str_replace(' ', '', $contact_phone);
$contact_phone2 = str_replace(' ', '', $contact_phone2);
+ if( preg_match( '/^(\d{2})(\d{2})(\d{2})(\d{2})$/',
$user_phone, $matches ) )
+ {
+ $user_phone = "{$matches[1]} $matches[2]
$matches[2] $matches[4]";
+ }
if( preg_match( '/^(\d{2})(\d{2})(\d{2})(\d{2})$/',
$contact_phone, $matches ) )
{
$contact_phone = "{$matches[1]} $matches[2]
$matches[2] $matches[4]";
@@ -3810,9 +3821,18 @@
if($ticket['order_deadline'])
{
- $deadline_block .= "<br/><b>" .
lang('deadline') . '</b>';
+ $deadline_block .= "<br/><b>" . lang('deadline
for start') . '</b>';
$deadline_block .= "<br/>" .
$ticket['order_deadline'];
}
+ if($ticket['order_deadline2'])
+ {
+ if($ticket['order_deadline'])
+ {
+ $deadline_block .= "<br/>";
+ }
+ $deadline_block .= "<br/><b>" . lang('deadline
for execution') . '</b>';
+ $deadline_block .= "<br/>" .
$ticket['order_deadline2'];
+ }
$body .= '<br/>'. nl2br(str_replace(array
(
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2017-09-14 12:25:07 UTC (rev 17075)
+++ trunk/property/setup/phpgw_no.lang 2017-09-14 14:01:55 UTC (rev 17076)
@@ -2238,4 +2238,6 @@
category content property no Tekster for kategori
order deadline property no Frist for utførelse
please update <a href="%1">your email address here</a> property no
Venligst oppdatert din <a href="%1">epost-adresse her</a>
-clear contact property no Fjern kontakperson
\ No newline at end of file
+clear contact property no Fjern kontakperson
+deadline for start property no Frist for oppstart
+deadline for execution property no Frist for ferdigstillelse
\ No newline at end of file
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2017-09-14 12:25:07 UTC (rev 17075)
+++ trunk/property/setup/setup.inc.php 2017-09-14 14:01:55 UTC (rev 17076)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.719';
+ $setup_info['property']['version'] = '0.9.17.720';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2017-09-14 12:25:07 UTC (rev
17075)
+++ trunk/property/setup/tables_current.inc.php 2017-09-14 14:01:55 UTC (rev
17076)
@@ -1181,6 +1181,7 @@
'delivery_address' => array('type' => 'text',
'nullable' => True),
'continuous' => array('type' => 'int',
'precision' => 2, 'nullable' => True),
'order_deadline' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
+ 'order_deadline2' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
),
'pk' => array('id'),
'ix' => array(),
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2017-09-14 12:25:07 UTC (rev
17075)
+++ trunk/property/setup/tables_update.inc.php 2017-09-14 14:01:55 UTC (rev
17076)
@@ -9806,4 +9806,24 @@
$GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.719';
return $GLOBALS['setup_info']['property']['currentver'];
}
+ }
+
+ /**
+ * Update property version from 0.9.17.719 to 0.9.17.720
+ *
+ */
+ $test[] = '0.9.17.719';
+
+ function property_upgrade0_9_17_719()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->AddColumn('fm_tts_tickets',
'order_deadline2', array(
+ 'type' => 'int', 'precision' => 8, 'nullable' => true));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.720';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
}
\ No newline at end of file
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2017-09-14 12:25:07 UTC (rev
17075)
+++ trunk/property/templates/base/tts.xsl 2017-09-14 14:01:55 UTC (rev
17076)
@@ -987,12 +987,40 @@
<label>
<xsl:value-of select="php:function('lang', 'deadline')"/>
</label>
+
<table class="pure-table pure-u-md-1-2">
+
<thead>
+
<tr>
+
<th>
+
<xsl:value-of select="php:function('lang',
'deadline for start')"/>
+
</th>
+
<th>
+
<xsl:value-of select="php:function('lang',
'deadline for execution')"/>
+
</th>
+
</tr>
+
</thead>
+
<tbody>
+
<tr>
+
<td>
-
<input type="text" id="order_deadline" name="values[order_deadline]" size="10"
value="{value_order_deadline}" readonly="readonly">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'order deadline')"/>
-
</xsl:attribute>
-
</input>
+
<input type="text" id="order_deadline"
name="values[order_deadline]" size="10" value="{value_order_deadline}"
readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'deadline for start')"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
<td>
+
+
<input type="text" id="order_deadline2"
name="values[order_deadline2]" size="10" value="{value_order_deadline2}"
readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'deadline for execution')"/>
+
</xsl:attribute>
+
</input>
+
+
</td>
+
</tr>
+
</tbody>
+
</table>
+
</div>
<div
class="pure-control-group">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17076] property: more on order layout,
sigurdne <=