[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7125] Merge 7121:7124 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7125] Merge 7121:7124 from trunk |
|
Date: |
Tue, 15 Mar 2011 10:30:56 +0000 |
Revision: 7125
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7125
Author: sigurdne
Date: 2011-03-15 10:30:56 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
Merge 7121:7124 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/filemanager/inc/class.uiaction_base.inc.php
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
branches/Version-1_0-branch/rental/inc/class.socomposite.inc.php
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.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
+
/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
Modified:
branches/Version-1_0-branch/filemanager/inc/class.uiaction_base.inc.php
===================================================================
--- branches/Version-1_0-branch/filemanager/inc/class.uiaction_base.inc.php
2011-03-15 10:30:00 UTC (rev 7124)
+++ branches/Version-1_0-branch/filemanager/inc/class.uiaction_base.inc.php
2011-03-15 10:30:56 UTC (rev 7125)
@@ -41,7 +41,9 @@
//_debug_array($this->bofilemanager->help_info);
- $key = $this->bofilemanager->help_name;
+ //$key = $this->bofilemanager->help_name;
+ $key = urldecode(phpgw::get_var('help_name', 'string'));
+
if($this->bofilemanager->help_info[$key])
{
$msg = $this->bofilemanager->help_info[$key];
Modified: branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2011-03-15 10:30:00 UTC (rev 7124)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2011-03-15 10:30:56 UTC (rev 7125)
@@ -1180,11 +1180,16 @@
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=>1, 'acl_location'=> $this->acl_location));
}
+ $workorder_id = phpgw::get_var('workorder_id'); // in
case of bigint
+ if( phpgw::get_var('done', 'bool') )
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiwo_hour.index', 'workorder_id'=> $workorder_id));
+ }
+
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'files'));
$show_cost = phpgw::get_var('show_cost',
'bool');
$show_details = true;//phpgw::get_var('show_details',
'bool');
- $workorder_id = phpgw::get_var('workorder_id'); // in
case of bigint
$to_email = phpgw::get_var('to_email',
'email');
$update_email = phpgw::get_var('update_email',
'bool');
$send_order = phpgw::get_var('send_order',
'bool');
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-03-15
10:30:00 UTC (rev 7124)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-03-15
10:30:56 UTC (rev 7125)
@@ -204,13 +204,13 @@
auto tax property no Auto MVA
b_account property no Budsjett konto
back to admin property no Tilbake til Admin
-back to calculation property no Tilbake til kalkulsajon
+back to calculation property no Tilbake til kalkulasjon
back to entity property no Returner til entitet
back to investment list property no Tilbake til liste over
investeringer
back to list property no Tilbake til liste
back to the list property no Tilbake til liste
-back to the ticket list property no Tilbake til meldings
liste uten å lagre
-back to the workorder list property no Tilbake til bestilling
liste
+back to the ticket list property no Tilbake til
meldingsliste uten å lagre
+back to the workorder list property no Tilbake til
bestillingsliste
base property no Grunnlag
base description property no Beskrivelse av grunnlag
basis property no Basis
Modified: branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2011-03-15 10:30:00 UTC (rev 7124)
+++ branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2011-03-15 10:30:56 UTC (rev 7125)
@@ -382,7 +382,20 @@
</tr>
<xsl:choose>
<xsl:when test="table_send !=''">
-
<tr><td><xsl:apply-templates select="table_send"/></td></tr>
+
<tr>
+
<td colspan='2'>
+
<input type="submit" name="send_order"
value="{table_send/lang_send_order}">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="table_send/lang_send_order_statustext"/>
+
</xsl:attribute>
+
</input>
+
<input type="submit" name="done"
value="{table_done/lang_done}">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="table_done/lang_done_statustext"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
</tr>
</xsl:when>
</xsl:choose>
@@ -545,16 +558,24 @@
</tr>
<xsl:choose>
<xsl:when test="table_send !=''">
- <tr><td><xsl:apply-templates
select="table_send"/></td></tr>
+ <tr>
+ <td colspan='2'>
+ <input type="submit" name="send_order"
value="{table_send/lang_send_order}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="table_send/lang_send_order_statustext"/>
+ </xsl:attribute>
+ </input>
+ <input type="submit" name="done"
value="{table_done/lang_done}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="table_done/lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
</xsl:when>
</xsl:choose>
</form>
-<xsl:choose>
- <xsl:when test="table_send !=''">
- <tr><td><xsl:apply-templates select="table_done"/></td></tr>
- </xsl:when>
-</xsl:choose>
- </table>
+</table>
<script type="text/javascript">
var property_js = <xsl:value-of select="property_js" />;
@@ -1913,11 +1934,9 @@
<xsl:variable
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
<xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
<form method="post"
action="{$done_action}">
- <input type="submit"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
name="done" value="{$lang_done}">
+ <xsl:attribute
name="title">
<xsl:value-of
select="lang_done_statustext"/>
- <xsl:text>';
return true;</xsl:text>
</xsl:attribute>
</input>
</form>
Modified: branches/Version-1_0-branch/rental/inc/class.socomposite.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.socomposite.inc.php
2011-03-15 10:30:00 UTC (rev 7124)
+++ branches/Version-1_0-branch/rental/inc/class.socomposite.inc.php
2011-03-15 10:30:56 UTC (rev 7125)
@@ -68,32 +68,49 @@
}
$special_query = false; //specify if the query should use
distinct on rental_composite.id (used for selecting composites that has an
active or inactive contract)
$ts_query = strtotime(date('Y-m-d')); // timestamp for query
(today)
+ $availability_date_from = $ts_query;
+ $availability_date_to = $ts_query;
+
if(isset($filters['availability_date_from']) &&
$filters['availability_date_from'] != ''){
$availability_date_from =
strtotime($filters['availability_date_from']);
}
- else{
- $availability_date_from = $ts_query;
- }
+
if(isset($filters['availability_date_to']) &&
$filters['availability_date_to'] != ''){
$availability_date_to =
strtotime($filters['availability_date_to']);
}
- else{
- $availability_date_to = $ts_query;
- }
+
switch($filters['has_contract']){
case "has_contract":
- $filter_clauses[] = "(NOT
rental_contract_composite.contract_id IS NULL AND NOT((NOT
rental_contract.date_start IS NULL AND ( rental_contract.date_start <
$availability_date_from AND rental_contract.date_end < $availability_date_from)
OR (rental_contract.date_end IS NULL OR ( rental_contract.date_start >
$availability_date_to AND rental_contract.date_end >
$availability_date_to)))))";
- //$filter_clauses[] = "(NOT
rental_contract_composite.contract_id IS NULL AND (NOT
rental_contract.date_start IS NULL AND (NOT rental_contract.date_start <
$availability_date_from AND NOT rental_contract.date_end <
$availability_date_from) OR (rental_contract.date_end IS NULL OR (NOT
rental_contract.date_start > $availability_date_to AND NOT
rental_contract.date_end > $availability_date_to))))";
- //$filter_clauses[] = "(NOT
rental_contract_composite.contract_id IS NULL AND (NOT
rental_contract.date_start IS NULL AND rental_contract.date_start <
$availability_date_from OR rental_contract.date_end < $availability_date_from
AND (rental_contract.date_end IS NULL OR (rental_contract.date_start >
$availability_date_to AND rental_contract.date_end > $availability_date_to))))";
- //$filter_clauses[] = "(NOT
rental_contract_composite.contract_id IS NULL AND (NOT
rental_contract.date_start IS NULL AND rental_contract.date_start <
$availability_date_from AND ((rental_contract.date_end IS NULL OR (NOT
rental_contract.date_end IS NULL AND rental_contract.date_end >
$availability_date_from)) OR (rental_contract.date_start >
$availability_date_to AND (rental_contract.date_end IS NULL OR (NOT
rental_contract.date_end IS NULL AND rental_contract.date_end <
$availability_date_to))))))";
- //$filter_clauses[] = "(NOT
rental_contract_composite.contract_id IS NULL AND (NOT
rental_contract.date_start IS NULL AND rental_contract.date_start <
$availability_date_from AND (rental_contract.date_end IS NULL OR (NOT
rental_contract.date_end IS NULL AND rental_contract.date_end >
$availability_date_from))))";
+ $filter_clauses[] = "NOT
rental_contract_composite.contract_id IS NULL"; // Composite must have a
contract
+ $filter_clauses[] = "NOT
rental_contract.date_start IS NULL"; // The contract must have start date
+
+ /* The contract's start date not after the end
of the period if there is no end date */
+ $filter_clauses[] = "
+ ((NOT rental_contract.date_start >
$availability_date_to AND rental_contract.date_end IS NULL)
+ OR
+ (NOT rental_contract.date_start >
$availability_date_to AND NOT rental_contract.date_end IS NULL AND NOT
rental_contract.date_end < $availability_date_from))";
$special_query=true;
break;
case "has_no_contract":
- //$filter_clauses[] =
"(rental_contract_composite.contract_id IS NULL OR NOT rental_composite.id IN
(SELECT rental_composite.id FROM rental_composite LEFT JOIN
rental_contract_composite ON (rental_contract_composite.composite_id =
rental_composite.id) LEFT JOIN rental_contract ON (rental_contract.id =
rental_contract_composite.contract_id) WHERE 1=1 AND rental_composite.is_active
= TRUE AND (NOT rental_contract_composite.contract_id IS NULL AND (NOT
rental_contract.date_start IS NULL AND rental_contract.date_start <
$availability_date_from AND (rental_contract.date_end IS NULL OR (NOT
rental_contract.date_end IS NULL AND rental_contract.date_end >
$availability_date_from))))))";
- //$filter_clauses[] =
"(rental_contract_composite.contract_id IS NULL OR NOT rental_composite.id IN
(SELECT rental_composite.id FROM rental_composite LEFT JOIN
rental_contract_composite ON (rental_contract_composite.composite_id =
rental_composite.id) LEFT JOIN rental_contract ON (rental_contract.id =
rental_contract_composite.contract_id) WHERE 1=1 AND rental_composite.is_active
= TRUE AND (NOT rental_contract_composite.contract_id IS NULL OR (NOT
rental_contract.date_start IS NULL OR (((rental_contract.date_start <
$availability_date_from AND rental_contract.date_end < $availability_date_from)
OR (NOT rental_contract.date_end IS NULL OR (rental_contract.date_start >
$availability_date_to AND rental_contract.date_end >
$availability_date_to))))))))";
- $filter_clauses[] =
"(rental_contract_composite.contract_id IS NULL OR NOT rental_composite.id IN
(SELECT rental_composite.id FROM rental_composite LEFT JOIN
rental_contract_composite ON (rental_contract_composite.composite_id =
rental_composite.id) LEFT JOIN rental_contract ON (rental_contract.id =
rental_contract_composite.contract_id) WHERE NOT
(((((rental_contract.date_start < $availability_date_from AND
rental_contract.date_end < $availability_date_from) OR (
(rental_contract.date_start > $availability_date_to AND
rental_contract.date_end > $availability_date_to))))))))";
-
+ $filter_clauses[] = "
+ (
+ rental_contract_composite.contract_id
IS NULL OR
+ NOT rental_composite.id IN
+ (
+ SELECT rental_composite.id FROM
rental_composite
+ LEFT JOIN
rental_contract_composite ON (rental_contract_composite.composite_id =
rental_composite.id)
+ LEFT JOIN rental_contract ON
(rental_contract.id = rental_contract_composite.contract_id)
+ WHERE
+ (
+ NOT
rental_contract_composite.contract_id IS NULL AND
+ NOT
rental_contract.date_start IS NULL AND
+ ((NOT
rental_contract.date_start > $availability_date_to AND rental_contract.date_end
IS NULL)
+ OR
+ (NOT
rental_contract.date_start > $availability_date_to AND NOT
rental_contract.date_end IS NULL AND NOT rental_contract.date_end <
$availability_date_from))
+ )
+ )
+ )
+ ";
$special_query=true;
break;
case "both":
@@ -130,27 +147,6 @@
$joins .= " {$this->left_join} rental_contract_composite ON
(rental_contract_composite.composite_id = rental_composite.id)";
$joins .= " {$this->left_join} rental_contract ON
(rental_contract.id = rental_contract_composite.contract_id)";
- if(isset($filters['availability_date_from']) &&
$filters['availability_date_from'] != ''){
- $availability_date_from =
strtotime($filters['availability_date_from']);
- }
- else
- {
- $availability_date_from = strtotime(date('Y-m-d'));
- }
- if(isset($filters['availability_date_to']) &&
$filters['availability_date_to'] != ''){
- $availability_date_to =
strtotime($filters['availability_date_to']);
- }
- else
- {
- if(isset($filters['availability_date_from']) &&
$filters['availability_date_from'] != ''){
- $availability_date_to =
strtotime($filters['availability_date_from']);
- }
- else{
- $availability_date_to =
strtotime(date('Y-m-d'));
- }
- }
-
-
if($return_count) // We should only return a count
{
$cols = 'COUNT(DISTINCT(rental_composite.id)) AS count';
@@ -159,17 +155,28 @@
{
if($special_query)
{
- $cols = "DISTINCT(rental_composite.id) AS
composite_id, rental_unit.id AS unit_id, rental_unit.location_code,
rental_composite.name, rental_composite.has_custom_address,
rental_composite.address_1, rental_composite.house_number,
rental_composite.address_2, rental_composite.postcode, rental_composite.place,
rental_composite.is_active, rental_composite.area, CASE WHEN (NOT
rental_contract_composite.contract_id IS NULL AND (NOT
rental_contract.date_start IS NULL AND (NOT (rental_contract.date_start <
$availability_date_from AND rental_contract.date_end <
$availability_date_from)) AND (rental_contract.date_end IS NULL OR NOT
(rental_contract.date_start > $availability_date_to AND
rental_contract.date_end > $availability_date_to)))) THEN 'Ikke ledig' ELSE
'Ledig' END as status";
+ $cols = "DISTINCT(rental_composite.id) AS
composite_id,";
}
else
{
- $cols = "rental_composite.id AS composite_id,
rental_unit.id AS unit_id, rental_unit.location_code, rental_composite.name,
rental_composite.has_custom_address, rental_composite.address_1,
rental_composite.house_number, rental_composite.address_2,
rental_composite.postcode, rental_composite.place, rental_composite.is_active,
rental_composite.area, CASE WHEN (NOT rental_contract_composite.contract_id IS
NULL AND (NOT rental_contract.date_start IS NULL AND (NOT
(rental_contract.date_start < $availability_date_from AND
rental_contract.date_end < $availability_date_from)) AND
(rental_contract.date_end IS NULL OR NOT (rental_contract.date_start >
$availability_date_to AND rental_contract.date_end > $availability_date_to))))
THEN 'Ikke ledig' ELSE 'Ledig' END as status";
+ $cols = "rental_composite.id AS composite_id,";
}
+ $cols .= "rental_unit.id AS unit_id,
rental_unit.location_code, rental_composite.name,
rental_composite.has_custom_address, rental_composite.address_1,
rental_composite.house_number, rental_composite.address_2,
rental_composite.postcode, rental_composite.place, rental_composite.is_active,
rental_composite.area, ";
+ $cols .= "
+ CASE WHEN
+ (
+ NOT rental_contract_composite.contract_id IS
NULL AND
+ NOT rental_contract.date_start IS NULL AND
+ ((NOT rental_contract.date_start >
$availability_date_to AND rental_contract.date_end IS NULL)
+ OR
+ (NOT rental_contract.date_start >
$availability_date_to AND NOT rental_contract.date_end IS NULL AND NOT
rental_contract.date_end < $availability_date_from))
+ )
+ THEN 'Ikke ledig' ELSE 'Ledig' END as status";
}
$dir = $ascending ? 'ASC' : 'DESC';
$order = $sort_field ? "ORDER BY {$this->marshal($sort_field,
'field')} $dir ": '';
- //var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}");
+ //var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}");
return "SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}";
}
Modified:
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.php
===================================================================
---
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.php
2011-03-15 10:30:00 UTC (rev 7124)
+++
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.php
2011-03-15 10:30:56 UTC (rev 7125)
@@ -5,7 +5,7 @@
if(document.forms[0].availability_date_to.value == '')
{
document.forms[0].availability_date_to.value =
document.forms[0].availability_date_from.value;
- document.forms[0].availability_date_to.value_hidden =
document.forms[0].availability_date_from_hidden.value
+ document.forms[0].availability_date_to_hidden.value =
document.forms[0].availability_date_from_hidden.value
}
return true;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7125] Merge 7121:7124 from trunk,
Sigurd Nes <=