[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16871] eventplanner: report
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16871] eventplanner: report |
|
Date: |
Thu, 15 Jun 2017 08:10:03 -0400 (EDT) |
Revision: 16871
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16871
Author: sigurdne
Date: 2017-06-15 08:10:02 -0400 (Thu, 15 Jun 2017)
Log Message:
-----------
eventplanner: report
Modified Paths:
--------------
trunk/eventplanner/inc/class.uicustomer_report.inc.php
trunk/eventplanner/inc/class.uivendor_report.inc.php
trunk/eventplanner/templates/base/application_info.xsl
trunk/eventplannerfrontend/templates/base/application_info.xsl
Modified: trunk/eventplanner/inc/class.uicustomer_report.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uicustomer_report.inc.php 2017-06-15
09:08:00 UTC (rev 16870)
+++ trunk/eventplanner/inc/class.uicustomer_report.inc.php 2017-06-15
12:10:02 UTC (rev 16871)
@@ -184,8 +184,12 @@
$booking_id = $customer_report->booking_id ?
$customer_report->booking_id : phpgw::get_var('booking_id', 'int');
$booking =
createObject('eventplanner.bobooking')->read_single($booking_id);
+ $calendar_id = $booking->calendar_id;
+ $calendar =
createObject('eventplanner.bocalendar')->read_single($calendar_id, true,
$relaxe_acl = true);
- $application =
createObject('eventplanner.boapplication')->read_single($booking->application_id);
+ $application =
createObject('eventplanner.boapplication')->read_single($calendar->application_id,
true, $relaxe_acl = true);
+ $application->summary = '';
+ $application->remark = '';
$application_type_list =
execMethod('eventplanner.bogeneric.get_list', array('type' =>
'application_type'));
$types = (array)$application->types;
if($types)
Modified: trunk/eventplanner/inc/class.uivendor_report.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uivendor_report.inc.php 2017-06-15
09:08:00 UTC (rev 16870)
+++ trunk/eventplanner/inc/class.uivendor_report.inc.php 2017-06-15
12:10:02 UTC (rev 16871)
@@ -184,8 +184,13 @@
$booking_id = $vendor_report->booking_id ?
$vendor_report->booking_id : phpgw::get_var('booking_id', 'int');
$booking =
createObject('eventplanner.bobooking')->read_single($booking_id);
+ $calendar_id = $booking->calendar_id;
+ $calendar =
createObject('eventplanner.bocalendar')->read_single($calendar_id, true,
$relaxe_acl = true);
- $application =
createObject('eventplanner.boapplication')->read_single($booking->application_id);
+ $application =
createObject('eventplanner.boapplication')->read_single($calendar->application_id,
true, $relaxe_acl = true);
+ $application->summary = '';
+ $application->remark = '';
+
$application_type_list =
execMethod('eventplanner.bogeneric.get_list', array('type' =>
'application_type'));
$types = (array)$application->types;
if($types)
Modified: trunk/eventplanner/templates/base/application_info.xsl
===================================================================
--- trunk/eventplanner/templates/base/application_info.xsl 2017-06-15
09:08:00 UTC (rev 16870)
+++ trunk/eventplanner/templates/base/application_info.xsl 2017-06-15
12:10:02 UTC (rev 16871)
@@ -16,20 +16,25 @@
<xsl:value-of select="application/title"/>
</div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'program
description')"/>
- </label>
- <div class="pure-custom">
- <xsl:value-of disable-output-escaping="yes"
select="application/summary"/>
+ <xsl:if test="application/summary != ''">
+
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'program description')"/>
+ </label>
+ <div class="pure-custom">
+ <xsl:value-of disable-output-escaping="yes"
select="application/summary"/>
+ </div>
</div>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'remark')"/>
- </label>
- <xsl:value-of select="application/remark"/>
- </div>
+ </xsl:if>
+ <xsl:if test="application/remark != ''">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'remark')"/>
+ </label>
+ <xsl:value-of select="application/remark"/>
+ </div>
+ </xsl:if>
<div class="pure-control-group">
<label>
Modified: trunk/eventplannerfrontend/templates/base/application_info.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/application_info.xsl
2017-06-15 09:08:00 UTC (rev 16870)
+++ trunk/eventplannerfrontend/templates/base/application_info.xsl
2017-06-15 12:10:02 UTC (rev 16871)
@@ -15,24 +15,26 @@
</label>
<xsl:value-of select="application/title"/>
</div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'program
description')"/>
- </label>
- <div class="pure-custom">
- <xsl:value-of disable-output-escaping="yes"
select="application/summary"/>
+ <xsl:if test="application/summary != ''">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'program description')"/>
+ </label>
+ <div class="pure-custom">
+ <xsl:value-of disable-output-escaping="yes"
select="application/summary"/>
+ </div>
</div>
- </div>
-
+ </xsl:if>
+ <xsl:if test="application/remark != ''">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'remark')"/>
+ </label>
+ <xsl:value-of select="application/remark"/>
+ </div>
+ </xsl:if>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang', 'remark')"/>
- </label>
- <xsl:value-of select="application/remark"/>
- </div>
-
- <div class="pure-control-group">
- <label>
<xsl:value-of select="php:function('lang', 'contact
name')"/>
</label>
<xsl:value-of select="application/contact_name"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16871] eventplanner: report,
sigurdne <=