[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9167] Merge 9161:9165 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9167] Merge 9161:9165 from trunk |
|
Date: |
Tue, 17 Apr 2012 10:43:12 +0000 |
Revision: 9167
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9167
Author: sigurdne
Date: 2012-04-17 10:43:12 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Merge 9161:9165 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
branches/Version-1_0-branch/controller/templates/base/control_location/view_locations_for_control.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9165
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-04-17 10:43:00 UTC (rev 9166)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-04-17 10:43:12 UTC (rev 9167)
@@ -299,6 +299,7 @@
// _debug_array($new_orgs);
// _debug_array($orgmappings);
+ $this->db->transaction_begin();
//loop through activities and update organization-connection
foreach($orgmappings as $key => $value)
{
@@ -316,14 +317,24 @@
$this->set_organization_inactive($orgmapping);
//get affected stuff from booking
$alloc =
$this->get_affected_allocations($orgmapping);
- //if($alloc)
- var_dump("allocation: ".
$alloc."</br>");
+ foreach($alloc as $a)
+ {
+ var_dump('Allocation id: '.$a.' flyttes
fra '.$orgmapping.' til '.$key.'</br>');
+ $this->update_affected_allocations($a,
$key);
+ }
+
$res =
$this->get_affected_reservations($orgmapping);
- //if($res)
- var_dump("reservation: ". $res."</br>");
+ foreach($res as $r)
+ {
+ var_dump('Reservation id: '.$r.'
flyttes fra '.$orgmapping.' til '.$key.'</br>');
+ $this->update_affected_reservations($r,
$key);
+ }
$event =
$this->get_affected_events($orgmapping);
- //if($event)
- var_dump("event: ". $event."</br>");
+ foreach($event as $e)
+ {
+ var_dump('Event id: '.$e.' flyttes fra
'.$orgmapping.' til '.$key.'</br>');
+ $this->update_affected_events($e, $key);
+ }
}
}
@@ -335,6 +346,8 @@
var_dump("Oppdaterer organisasjon
".$no['orgid'].','.$no['orgname'].' med ny adresse.<br/>');
$this->update_organization_with_new_info($no);
}
+
+ $this->db->transaction_commit();
}
function get_organization_name_local($org_id)
@@ -818,37 +831,55 @@
function get_affected_allocations($org_id)
{
+ $result = array();
$sql = "select id from bb_allocation where
organization_id={$org_id}";
- $this->db->query($q1, __LINE__, __FILE__);
+ $this->db->query($sql, __LINE__, __FILE__);
while($this->db->next_record()){
- $result = $this->db->f('id');
+ $result[] = $this->db->f('id');
}
return $result;
}
+ function update_affected_allocations($id, $org_id)
+ {
+ $result = $this->db->query("update bb_allocation set
organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
+ }
+
function get_affected_reservations($org_id)
{
+ $result = array();
$sql = "select id from bb_completed_reservation where
organization_id={$org_id}";
- $this->db->query($q1, __LINE__, __FILE__);
+ $this->db->query($sql, __LINE__, __FILE__);
while($this->db->next_record()){
- $result = $this->db->f('id');
+ $result[] = $this->db->f('id');
}
return $result;
}
+ function update_affected_reservations($id, $org_id)
+ {
+ $result = $this->db->query("update bb_completed_reservation set
organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
+ }
+
function get_affected_events($org_id)
{
+ $result = array();
$sql = "select id from bb_event where
customer_organization_id={$org_id}";
- $this->db->query($q1, __LINE__, __FILE__);
+ $this->db->query($sql, __LINE__, __FILE__);
while($this->db->next_record()){
- $result = $this->db->f('id');
+ $result[] = $this->db->f('id');
}
return $result;
}
+ function update_affected_events($id, $org_id)
+ {
+ $result = $this->db->query("update bb_event set
customer_organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
+ }
+
function update($organization)
{
return false;
Modified:
branches/Version-1_0-branch/controller/templates/base/control_location/view_locations_for_control.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_location/view_locations_for_control.xsl
2012-04-17 10:43:00 UTC (rev 9166)
+++
branches/Version-1_0-branch/controller/templates/base/control_location/view_locations_for_control.xsl
2012-04-17 10:43:12 UTC (rev 9167)
@@ -23,7 +23,7 @@
<div class="yui-content">
<div id="control_details">
- <div style="margin: 10px;padding: 10px; width: 25%;">
+ <div id="choose_control">
<!-- When control area is chosen, an ajax
request is executed.
The operation fetches controls from db
and populates the control list.
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-04-17 10:43:00 UTC (rev 9166)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-04-17 10:43:12 UTC (rev 9167)
@@ -1101,12 +1101,16 @@
ul#filters li, ul#search_list li{
float:left;
}
-ul#filters input[type='text'], ul#filters select{
- padding:3px;
+ul#filters input[type="text"], ul#filters select {
+ margin-right: 5px;
+ padding: 3px;
}
+#choose_control select {
+ margin-right: 5px;
+}
ul#search_list input[type="submit"] {
margin: 0;
- padding: 0 10px;
+ padding: 3px 15px;
}
ul#search_list input[type="text"] {
margin: 0 5px 0 0;
@@ -1124,7 +1128,7 @@
width:120px;
}
-/*================================== EXPAND MENU
======================================== */
+/* ================================== EXPAND MENU
======================================== */
.expand_menu div.focus{
background: url('../../../images/bg_expand_active.png') no-repeat;
Modified: branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
2012-04-17 10:43:00 UTC (rev 9166)
+++ branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
2012-04-17 10:43:12 UTC (rev 9167)
@@ -372,6 +372,11 @@
}
+ $_querymethod = array();
+ $__querymethod = array();
+ $_joinmethod_datatype = array();
+ $_joinmethod_datatype_custom = array();
+
$querymethod = '';
if($query)
{
@@ -390,31 +395,93 @@
while ($this->db->next_record())
{
-
if($this->db->f('datatype')=='V' || $this->db->f('datatype')=='email' ||
$this->db->f('datatype')=='CH')
+ switch
($this->db->f('datatype'))
{
- $query_arr[]=
"$entity_table." . $this->db->f('column_name') . " {$this->like} '%{$query}%'";
+ case 'V':
+ case 'email':
+ case 'T':
+
if(!$criteria_id)
+ {
+
$_querymethod[]= "$entity_table." . $this->db->f('column_name') . "
{$this->like} '%{$query}%'";
+
$__querymethod = array(); // remove block
+ }
+ break;
+ case 'CH':
+
if(!$criteria_id)
+ {
+
$_querymethod[]= "$entity_table." . $this->db->f('column_name') . "
{$this->like} '%,{$query},%'";
+
$__querymethod = array(); // remove block
+ }
+ break;
+ case 'R':
+ case 'LB':
+
if(!$criteria_id)
+ {
+
if(!$_joinmethod_datatype_custom)//only join once
+ {
+
$_joinmethod_datatype_custom[] = "{$this->join} phpgw_cust_choice ON
phpgw_cust_choice.location_id =" . (int)$this->db->f('location_id');
+ }
+
+
$_querymethod[]= "(phpgw_cust_choice.location_id =" .
(int)$this->db->f('location_id')
+
." AND phpgw_cust_choice.attrib_id =" . (int)$this->db->f('id')
+
." AND phpgw_cust_choice.value {$this->like} '%{$query}%')";
+
+
$__querymethod = array(); // remove block
+ }
+ break;
+ case 'I':
+
if(ctype_digit($query) && !$criteria_id)
+ {
+
$_querymethod[]= "$entity_table." . $this->db->f('column_name') . " = " .
(int)$query;
+
$__querymethod = array(); // remove block
+ }
+ break;
+ case 'VENDOR':
+ if($criteria_id
== 'vendor')
+ {
+
$_joinmethod_datatype[] = "{$this->join} fm_vendor ON ({$entity_table}." .
$this->db->f('column_name') . " = fm_vendor.id AND fm_vendor.org_name
{$this->like} '%{$query}%') ";
+
$__querymethod = array(); // remove block
+ }
+ break;
+ case 'AB':
+ if($criteria_id
== 'ab')
+ {
+
$_joinmethod_datatype[] = "{$this->join} phpgw_contact_person ON
({$entity_table}." . $this->db->f('column_name') . " =
pphpgw_contact_person.person_id AND (phpgw_contact_person.first_name
{$this->like} '%{$query}%' OR phpgw_contact_person.last_name {$this->like}
'%{$query}%'))";
+
$__querymethod = array(); // remove block
+ }
+ break;
+ case 'ABO':
+ if($criteria_id
== 'abo')
+ {
+
$_joinmethod_datatype[] = "{$this->join} phpgw_contact_org ON
({$entity_table}." . $this->db->f('column_name') . " = phpgw_contact_org.org_id
AND phpgw_contact_org.name {$this->like} '%{$query}%')";
+
$__querymethod = array(); // remove block
+ }
+ break;
+ default:
+
if(!$criteria_id)
+ {
+
$_querymethod[]= "$entity_table." . $this->db->f('column_name') . " =
'{$query}'";
+
$__querymethod = array(); // remove block
+ }
}
- else
if($this->db->f('datatype')=='I')
- {
- $query_arr[]=
"$entity_table." . $this->db->f('column_name') . ' = ' . (int)$query;
- }
- else
- {
- $query_arr[]=
"$entity_table." . $this->db->f('column_name') . " = '{$query}'";
- }
}
+ }
+ }
- $query_arr[]= "location_code
{$this->like} '$query%'";
- $query_arr[]= "org_name {$this->like}
'%$query%'";
- if (isset($query_arr[0]))
- {
- $querymethod = " $where (" .
implode (' OR ',$query_arr) . ')';
- $where = 'AND';
- }
- }
+ $_joinmethod_datatype =
array_merge($_joinmethod_datatype, $_joinmethod_datatype_custom);
+ foreach($_joinmethod_datatype as $_joinmethod)
+ {
+ $sql .= $_joinmethod;
}
+ $_querymethod = array_merge($__querymethod,
$_querymethod);
+ if ($_querymethod)
+ {
+ $querymethod = " $where (" . implode (' OR
',$_querymethod) . ')';
+ unset($_querymethod);
+ }
+
$sql .= " $filtermethod $querymethod";
// echo $sql;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9167] Merge 9161:9165 from trunk,
Sigurd Nes <=