[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9378] property: disable/activate categories
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9378] property: disable/activate categories |
|
Date: |
Sat, 12 May 2012 18:10:55 +0000 |
Revision: 9378
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9378
Author: sigurdne
Date: 2012-05-12 18:10:54 +0000 (Sat, 12 May 2012)
Log Message:
-----------
property: disable/activate categories
Modified Paths:
--------------
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/js/portico/ajax_workorder_edit.js
trunk/property/setup/default_records.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/cat_sub_select.xsl
Added Paths:
-----------
trunk/property/js/portico/ajax_project_edit.js
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2012-05-12 18:10:27 UTC
(rev 9377)
+++ trunk/property/inc/class.boworkorder.inc.php 2012-05-12 18:10:54 UTC
(rev 9378)
@@ -48,7 +48,8 @@
'read_single' => true,
'save' => true,
'delete' => true,
- 'check_perms' => true
+ 'check_perms' => true,
+ 'get_category' => true
);
function property_boworkorder($session=false)
@@ -167,6 +168,13 @@
}
}
+ public function get_category()
+ {
+ $cat_id = phpgw::get_var('cat_id', 'int');
+ $category = $this->cats->return_single($cat_id);
+ return $category[0];
+ }
+
function column_list($selected = array())
{
if(!$selected)
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2012-05-12 18:10:27 UTC (rev
9377)
+++ trunk/property/inc/class.uiproject.inc.php 2012-05-12 18:10:54 UTC (rev
9378)
@@ -30,6 +30,11 @@
phpgw::import_class('phpgwapi.yui');
/**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
+ /**
* Description
* @package property
*/
@@ -2035,7 +2040,9 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'project.edit', 'property' );
- // $GLOBALS['phpgw']->xslttpl->pp();
+
+ phpgwapi_jquery::load_widget('core');
+ $GLOBALS['phpgw']->js->validate_file( 'portico',
'ajax_project_edit', 'property' );
}
function delete()
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2012-05-12 18:10:27 UTC
(rev 9377)
+++ trunk/property/inc/class.uiworkorder.inc.php 2012-05-12 18:10:54 UTC
(rev 9378)
@@ -1985,7 +1985,7 @@
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'workorder.edit', 'property' );
- $GLOBALS['phpgw']->js->validate_file( 'portico',
'ajax_workorder_edit', 'property' );
+ $GLOBALS['phpgw']->js->validate_file( 'portico',
'ajax_workorder_edit', 'property' );
}
function add()
Added: trunk/property/js/portico/ajax_project_edit.js
===================================================================
--- trunk/property/js/portico/ajax_project_edit.js
(rev 0)
+++ trunk/property/js/portico/ajax_project_edit.js 2012-05-12 18:10:54 UTC
(rev 9378)
@@ -0,0 +1,25 @@
+$(document).ready(function(){
+
+ $("#global_category_id").change(function(){
+ var oArgs = {menuaction:'property.boworkorder.get_category',
cat_id:$(this).val()};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function(data) {
+ if( data != null)
+ {
+ if(data.active !=1)
+ {
+ alert('Denne kan ikke velges');
+ }
+ }
+ }
+ });
+ });
+});
+
Modified: trunk/property/js/portico/ajax_workorder_edit.js
===================================================================
--- trunk/property/js/portico/ajax_workorder_edit.js 2012-05-12 18:10:27 UTC
(rev 9377)
+++ trunk/property/js/portico/ajax_workorder_edit.js 2012-05-12 18:10:54 UTC
(rev 9378)
@@ -1,5 +1,28 @@
$(document).ready(function(){
+ $("#global_category_id").change(function(){
+ var oArgs = {menuaction:'property.boworkorder.get_category',
cat_id:$(this).val()};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function(data) {
+ if( data != null)
+ {
+ if(data.active !=1)
+ {
+ alert('Denne kan ikke velges');
+ }
+ }
+ }
+ });
+ });
+
+
$("#workorder_edit").live("submit", function(e){
if($("#lean").val() == 0)
Modified: trunk/property/setup/default_records.inc.php
===================================================================
--- trunk/property/setup/default_records.inc.php 2012-05-12 18:10:27 UTC
(rev 9377)
+++ trunk/property/setup/default_records.inc.php 2012-05-12 18:10:54 UTC
(rev 9378)
@@ -880,5 +880,17 @@
$sql = 'CREATE OR REPLACE VIEW fm_open_workorder_view AS'
. ' SELECT fm_workorder.id, fm_workorder.project_id,
fm_workorder_status.descr FROM fm_workorder'
. ' JOIN fm_workorder_status ON fm_workorder.status =
fm_workorder_status.id WHERE fm_workorder_status.delivered IS NULL AND
fm_workorder_status.closed IS NULL';
+ $GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+ $sql = 'CREATE OR REPLACE VIEW fm_orders_actual_cost_view AS'
+ . ' SELECT fm_orders.id as order_id, sum(godkjentbelop)
AS actual_cost FROM fm_ecobilagoverf join fm_orders ON
fm_ecobilagoverf.pmwrkord_code = fm_orders.id GROUP BY fm_orders.id';
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+
+ $sql = 'CREATE OR REPLACE VIEW fm_ecobilag_sum_view AS'
+ . ' SELECT DISTINCT bilagsnr, sum(godkjentbelop) AS
approved_amount, sum(belop) AS amount FROM fm_ecobilag GROUP BY bilagsnr ORDER
BY bilagsnr ASC';
+ $GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_ecodimb_role (id, name) VALUES (1, 'Bestiller')",__LINE__,__FILE__);
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_ecodimb_role (id, name) VALUES (2, 'Attestant')",__LINE__,__FILE__);
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_ecodimb_role (id, name) VALUES (3, 'Anviser')",__LINE__,__FILE__);
+
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2012-05-12 18:10:27 UTC (rev
9377)
+++ trunk/property/setup/tables_update.inc.php 2012-05-12 18:10:54 UTC (rev
9378)
@@ -4159,7 +4159,7 @@
foreach($categories as $category)
{
$location = $locations[$category['appname']];
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property', $location);
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('property', $location);
$GLOBALS['phpgw_setup']->oProc->query("UPDATE
phpgw_categories SET cat_appname = 'property', location_id = {$location_id}
WHERE cat_id = {$category['id']}",__LINE__,__FILE__);
$GLOBALS['phpgw']->locations->add("{$location}.category.{$category['id']}",
$category['name'], 'property');
@@ -4299,7 +4299,7 @@
$db =& $GLOBALS['phpgw_setup']->oProc->m_odb;
$tables = array('fm_ecobilag', 'fm_ecobilagoverf');
-
+
foreach($tables as $table)
{
//Backup
@@ -4862,9 +4862,9 @@
$sql = "SELECT c_attrib_table, column_name FROM
phpgw_cust_attribute JOIN phpgw_locations ON phpgw_cust_attribute.location_id =
phpgw_locations.location_id WHERE datatype = 'CH' GROUP BY c_attrib_table,
column_name";
$GLOBALS['phpgw_setup']->oProc->query($sql);
-
+
$attribs = array();
-
+
while ($GLOBALS['phpgw_setup']->oProc->next_record())
{
$attribs[$GLOBALS['phpgw_setup']->oProc->f('c_attrib_table')][] =
$GLOBALS['phpgw_setup']->oProc->f('column_name');
@@ -4968,15 +4968,15 @@
'uc' => array()
)
);
-
+
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
{
$GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.606';
return $GLOBALS['setup_info']['property']['currentver'];
}
}
-
+
/**
* Update property version from 0.9.17.606 to 0.9.17.607
* Add authorities demands type to request
@@ -4988,8 +4988,8 @@
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
-
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_b_account_category','active',
array('type' => 'int','precision' => '2','nullable' => True,'default' => '0'));
-
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_b_account_category','project_group',
array('type' => 'int','precision' => '2','nullable' => True,'default' =>
'0'));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_b_account_category','active',
array('type' => 'int','precision' => '2','nullable' => True,'default' => '0'));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_b_account_category','project_group',
array('type' => 'int','precision' => '2','nullable' => True,'default' => '0'));
$GLOBALS['phpgw_setup']->oProc->query('UPDATE
fm_b_account_category SET active = 1',__LINE__,__FILE__);
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
@@ -5010,7 +5010,7 @@
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
-
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_entity_category','location_link_level',
array('type' => 'int','precision' => '4','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_entity_category','location_link_level',
array('type' => 'int','precision' => '4','nullable' => True));
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
{
@@ -5735,7 +5735,7 @@
'input_type' => 'text',
'name' => 'pre_path',
'descr' => 'path on local sever
to store exported files for pre approved vouchers',
- 'value' =>
$config->config_data['export_pre_path'],
+ 'value' =>
$config->config_data['export_pre_path'],
)
);
@@ -5889,7 +5889,7 @@
{
$orders[] =
$GLOBALS['phpgw_setup']->oProc->f('pmwrkord_code');
}
-
+
foreach($orders as $order)
{
$sql = "SELECT loc1 FROM fm_project JOIN fm_workorder
ON fm_project.id = fm_workorder.project_id WHERE fm_workorder.id = '{$order}'";
@@ -5900,7 +5900,7 @@
$GLOBALS['phpgw_setup']->oProc->query("UPDATE
fm_ecobilagoverf SET loc1 = '{$loc1}' WHERE pmwrkord_code =
'{$order}'",__LINE__,__FILE__);
}
}
-
+
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
{
$GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.634';
@@ -5974,7 +5974,7 @@
$GLOBALS['phpgw_setup']->oProc->DropColumn('fm_responsibility',array(),'active');
-
$GLOBALS['phpgw_setup']->oProc->RenameColumn('fm_responsibility_role','location','location_level');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('fm_responsibility_role','location','location_level');
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_responsibility_role','location_level',array('type'
=> 'varchar','precision' => '200','nullable' => True));
$sql = 'SELECT * FROM fm_responsibility_role';
@@ -5991,8 +5991,8 @@
foreach ($roles as $role)
{
- $sql = 'UPDATE fm_responsibility_role SET
location_level = ' . implode(',', $role['location_level']) . " WHERE id =
{$role['id']}";
-
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+ $sql = 'UPDATE fm_responsibility_role SET
location_level = ' . implode(',', $role['location_level']) . " WHERE id =
{$role['id']}";
+
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
}
@@ -6057,7 +6057,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_tts_tickets','modified_date',array('type'
=> 'int','precision' => 4, 'nullable' => True));
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_tts_tickets','address',array('type'
=> 'varchar','precision' => '255','nullable' => True));
-
+
$sql = 'SELECT id, entry_date FROM fm_tts_tickets';
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
@@ -6204,7 +6204,7 @@
}
}
-
+
$test[] = '0.9.17.640';
function property_upgrade0_9_17_640()
{
@@ -6228,8 +6228,8 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
-
+
$test[] = '0.9.17.641';
function property_upgrade0_9_17_641()
{
Modified: trunk/property/templates/base/cat_sub_select.xsl
===================================================================
--- trunk/property/templates/base/cat_sub_select.xsl 2012-05-12 18:10:27 UTC
(rev 9377)
+++ trunk/property/templates/base/cat_sub_select.xsl 2012-05-12 18:10:54 UTC
(rev 9378)
@@ -6,7 +6,7 @@
<xsl:variable name="cat_sub_name">
<xsl:value-of select="cat_sub_name"/>
</xsl:variable>
- <select name="{$cat_sub_name}" class="forms"
title="{$lang_cat_sub_statustext}">
+ <select id = "global_category_id" name="{$cat_sub_name}"
class="forms" title="{$lang_cat_sub_statustext}">
<xsl:apply-templates select="cat_sub_list"/>
</select>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9378] property: disable/activate categories,
Sigurd Nes <=