[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17377] controller: FDV-288
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17377] controller: FDV-288 |
|
Date: |
Thu, 30 Nov 2017 10:07:42 -0500 (EST) |
Revision: 17377
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17377
Author: sigurdne
Date: 2017-11-30 10:07:41 -0500 (Thu, 30 Nov 2017)
Log Message:
-----------
controller: FDV-288
Modified Paths:
--------------
trunk/controller/inc/class.soprocedure.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/inc/model/class.procedure.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/setup/setup.inc.php
trunk/controller/setup/tables_current.inc.php
trunk/controller/setup/tables_update.inc.php
trunk/controller/templates/base/procedure/procedure_item.xsl
Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php 2017-11-29 21:26:26 UTC
(rev 17376)
+++ trunk/controller/inc/class.soprocedure.inc.php 2017-11-30 15:07:41 UTC
(rev 17377)
@@ -73,7 +73,9 @@
'procedure_id',
'revision_no',
'revision_date',
- 'control_area_id'
+ 'control_area_id',
+ 'modified_date',
+ 'modified_by'
);
$values = array(
@@ -88,7 +90,9 @@
$this->marshal($procedure->get_procedure_id(),
'int'),
$this->marshal($procedure->get_revision_no(),
'int'),
$this->marshal($procedure->get_revision_date(),
'int'),
-
$this->marshal($procedure->get_control_area_id(), 'int')
+
$this->marshal($procedure->get_control_area_id(), 'int'),
+ $this->marshal($procedure->get_modified_date(),
'int'),
+ $this->marshal($procedure->get_modified_by(),
'int'),
);
$result = $this->db->query('INSERT INTO
controller_procedure (' . join(',', $cols) . ') VALUES (' . join(',', $values)
. ')', __LINE__, __FILE__);
@@ -126,7 +130,9 @@
'procedure_id = ' .
$this->marshal($procedure->get_procedure_id(), 'int'),
'revision_no = ' .
$this->marshal($procedure->get_revision_no(), 'int'),
'revision_date = ' .
$this->marshal($procedure->get_revision_date(), 'int'),
- 'control_area_id = ' .
$this->marshal($procedure->get_control_area_id(), 'int')
+ 'control_area_id = ' .
$this->marshal($procedure->get_control_area_id(), 'int'),
+ 'modified_date = ' .
$this->marshal($procedure->get_modified_date(), 'int'),
+ 'modified_by = ' .
$this->marshal($procedure->get_modified_by(), 'int'),
);
$result = $this->db->query('UPDATE controller_procedure
SET ' . join(',', $values) . " WHERE id=$id", __LINE__, __FILE__);
@@ -168,6 +174,8 @@
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$procedure->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$procedure->set_modified_by($this->unmarshal($this->db->f('modified_by'),
'int'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$procedure->set_control_area_name($category[0]['name']);
@@ -434,6 +442,8 @@
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
+
$procedure->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$procedure->set_modified_by($this->unmarshal($this->db->f('modified_by'),
'int'));
$values[] = $procedure;
}
@@ -467,9 +477,10 @@
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
+
$procedure->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$procedure->set_modified_by($this->unmarshal($this->db->f('modified_by'),
'int'));
$results[] = $procedure->toArray();
- ;
}
return $results;
@@ -538,9 +549,10 @@
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$procedure->set_control_area_name($category_name = $category[0]['name']);
+
$procedure->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$procedure->set_modified_by($this->unmarshal($this->db->f('modified_by'),
'int'));
$results[] = $procedure->toArray();
- ;
}
return $results;
@@ -636,7 +648,11 @@
}
else
{
- $cols .= "procedure.id, procedure.title,
procedure.purpose, procedure.responsibility, procedure.description,
procedure.reference, procedure.attachment, procedure.start_date,
procedure.end_date, procedure.procedure_id, procedure.revision_no,
procedure.revision_date, procedure.control_area_id ";
+ $cols .= "procedure.id, procedure.title,
procedure.purpose, procedure.responsibility,"
+ . " procedure.description,
procedure.reference, procedure.attachment,"
+ . " procedure.start_date,
procedure.end_date, procedure.procedure_id,"
+ . " procedure.revision_no,
procedure.revision_date, procedure.control_area_id,"
+ . " procedure.modified_date,
procedure.modified_by";
}
//var_dump($sort_field);
$dir = $ascending ? 'ASC' : 'DESC';
@@ -666,6 +682,8 @@
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$procedure->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$procedure->set_modified_by($this->unmarshal($this->db->f('modified_by'),
'int'));
//$procedure->set_control_area_name($this->unmarshal($this->db->f('control_area_name'),
'string'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$procedure->set_control_area_name($category[0]['name']);
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2017-11-29 21:26:26 UTC
(rev 17376)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2017-11-30 15:07:41 UTC
(rev 17377)
@@ -248,6 +248,8 @@
$procedure->set_end_date(phpgw::get_var('end_date', 'date'));
$procedure->set_revision_date(phpgw::get_var('revision_date', 'date'));
$procedure->set_control_area_id(phpgw::get_var('control_area'));
+ $procedure->set_modified_date(time());
+
$procedure->set_modified_by($GLOBALS['phpgw_info']['user']['account_id']);
$revision =
(int)$procedure->get_revision_no();
if ($revision && is_numeric($revision)
&& $revision > 0)
@@ -349,6 +351,8 @@
$new_procedure->set_revision_date($revision_date);
$new_procedure->set_control_area_id(phpgw::get_var('control_area'));
+
$new_procedure->set_modified_date(time());
+
$new_procedure->set_modified_by($GLOBALS['phpgw_info']['user']['account_id']);
if (isset($procedure_id) &&
$procedure_id > 0)
{
@@ -614,11 +618,18 @@
$table_header[] = array('header' =>
lang('Procedure title'));
$table_header[] = array('header' =>
lang('Procedure start date'));
$table_header[] = array('header' =>
lang('Procedure end date'));
+ $table_header[] = array('header' =>
lang('Modified date'));
+ $table_header[] = array('header' =>
lang('Modified by'));
$revised_procedures =
$this->so->get_other_revisions($procedure->get_id());
$table_values = array();
- foreach ($revised_procedures as $rev)
+ foreach ($revised_procedures as &$rev)
{
+ if($rev['modified_by'])
+ {
+
$rev['modified_by_name'] =
$GLOBALS['phpgw']->accounts->id2name($rev['modified_by']);
+ }
+ $rev['modified_date'] =
$GLOBALS['phpgw']->common->show_date($rev['modified_date'],
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$rev['link'] =
self::link(array('menuaction' => 'controller.uiprocedure.view',
'id' =>
$rev['id'], 'view_revision' => 'yes'));
$table_values[] = array('row'
=> $rev);
Modified: trunk/controller/inc/model/class.procedure.inc.php
===================================================================
--- trunk/controller/inc/model/class.procedure.inc.php 2017-11-29 21:26:26 UTC
(rev 17376)
+++ trunk/controller/inc/model/class.procedure.inc.php 2017-11-30 15:07:41 UTC
(rev 17377)
@@ -49,6 +49,8 @@
protected $control_area_id;
protected $control_area_name;
protected $documents;
+ protected $modified_date;
+ protected $modified_by;
/**
* Constructor. Takes an optional ID. If a procedure is
created from outside
@@ -201,7 +203,26 @@
{
return $this->control_area_name;
}
+ public function get_modified_date()
+ {
+ return (int)$this->modified_date;
+ }
+ public function set_modified_date( $modified_date )
+ {
+ $this->modified_date = $modified_date;
+ }
+
+ public function get_modified_by()
+ {
+ return (int)$this->modified_by;
+ }
+
+ public function set_modified_by( $modified_by )
+ {
+ $this->modified_by = $modified_by;
+ }
+
/**
* Get a static reference to the storage object associated with
this model object
*
@@ -232,7 +253,9 @@
'procedure_id' => $this->get_procedure_id(),
'revision_no' => $this->get_revision_no(),
'revision_date' => ($this->get_revision_date())
? date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->get_revision_date()) : '',
- 'control_area' => $this->get_control_area_name()
+ 'control_area' =>
$this->get_control_area_name(),
+ 'modified_date' => $this->get_modified_date(),
+ 'modified_by' => $this->get_modified_by()
);
}
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2017-11-29 21:26:26 UTC (rev
17376)
+++ trunk/controller/setup/phpgw_no.lang 2017-11-30 15:07:41 UTC (rev
17377)
@@ -412,4 +412,6 @@
new revision controller no Ny revisjon
deviation controller no Avvik
save check list controller no Lagre verdier
-plan controller no Planlegg
\ No newline at end of file
+plan controller no Planlegg
+modified date controller no Dato siste endring
+modified by controller no Endret av
\ No newline at end of file
Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php 2017-11-29 21:26:26 UTC (rev
17376)
+++ trunk/controller/setup/setup.inc.php 2017-11-30 15:07:41 UTC (rev
17377)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.54';
+ $setup_info['controller']['version'] = '0.1.55';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php 2017-11-29 21:26:26 UTC
(rev 17376)
+++ trunk/controller/setup/tables_current.inc.php 2017-11-30 15:07:41 UTC
(rev 17377)
@@ -98,7 +98,9 @@
'procedure_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'revision_no' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'revision_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
- 'control_area_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True)
+ 'control_area_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
+ 'modified_date' => array('type' => 'int',
'precision' => 8,'nullable' => True),
+ 'modified_by' => array('type' => 'int',
'precision' => 4,'nullable' => True),
),
'pk' => array('id'),
'fk' => array(),
Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php 2017-11-29 21:26:26 UTC
(rev 17376)
+++ trunk/controller/setup/tables_update.inc.php 2017-11-30 15:07:41 UTC
(rev 17377)
@@ -1155,4 +1155,29 @@
$GLOBALS['setup_info']['controller']['currentver'] = '0.1.54';
return $GLOBALS['setup_info']['controller']['currentver'];
+ }
+
+ $test[] = '0.1.54';
+ function controller_upgrade0_1_54()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_procedure','modified_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => true
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_procedure','modified_by',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => true
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['controller']['currentver'] =
'0.1.55';
+ return
$GLOBALS['setup_info']['controller']['currentver'];
+ }
}
\ No newline at end of file
Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl
2017-11-29 21:26:26 UTC (rev 17376)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl
2017-11-30 15:07:41 UTC (rev 17377)
@@ -266,6 +266,12 @@
<td>
<xsl:value-of select="end_date"/>
</td>
+ <td>
+ <xsl:value-of select="modified_date"/>
+ </td>
+ <td>
+ <xsl:value-of
select="modified_by_name"/>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17377] controller: FDV-288,
sigurdne <=