|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [16896] More on Eventplanner |
| Date: | Mon, 3 Jul 2017 07:27:07 -0400 (EDT) |
Revision: 16896
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16896
Author: sigurdne
Date: 2017-07-03 07:27:07 -0400 (Mon, 03 Jul 2017)
Log Message:
-----------
More on Eventplanner
Modified Paths:
--------------
trunk/eventplanner/inc/class.uibooking.inc.php
trunk/eventplanner/inc/model/class.booking.inc.php
trunk/eventplanner/setup/phpgw_no.lang
trunk/eventplanner/templates/base/booking.xsl
trunk/eventplanner/templates/base/report.xsl
trunk/eventplannerfrontend/js/portico/application.edit.js
trunk/eventplannerfrontend/templates/base/application.xsl
trunk/eventplannerfrontend/templates/base/booking.xsl
trunk/eventplannerfrontend/templates/base/report.xsl
trunk/phpgwapi/templates/base/attributes_form.xsl
trunk/property/inc/class.soentity.inc.php
Modified: trunk/eventplanner/inc/class.uibooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uibooking.inc.php 2017-07-02 22:25:11 UTC
(rev 16895)
+++ trunk/eventplanner/inc/class.uibooking.inc.php 2017-07-03 11:27:07 UTC
(rev 16896)
@@ -249,7 +249,6 @@
'container' => 'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uivendor_report.query",
'filter_booking_id' => $id,
- 'filter_active' => 1,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $vendor_report_def,
'data' => json_encode($vendor_report),
@@ -278,11 +277,9 @@
);
$datatable_def[] = array(
'container' => 'datatable-container_2',
-// 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uicustomer_report.query",
-// 'filter_booking_id' => $id,
-// 'filter_active' => 1,
-// 'phpgw_return_as' => 'json'))),
- 'requestUrl' => "''",
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uicustomer_report.query",
+ 'filter_booking_id' => $id,
+ 'phpgw_return_as' => 'json'))),
'ColumnDefs' => $customer_report_def,
'data' => json_encode($customer_report),
'tabletools' => $tabletools,
Modified: trunk/eventplanner/inc/model/class.booking.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.booking.inc.php 2017-07-02 22:25:11 UTC
(rev 16895)
+++ trunk/eventplanner/inc/model/class.booking.inc.php 2017-07-03 11:27:07 UTC
(rev 16896)
@@ -129,7 +129,7 @@
'key' => 'id',
'column' => 'to_'
)
- ),
+ ),/*
'active' => array('action' => PHPGW_ACL_READ,
'type' => 'string',
'query' => false,
@@ -141,7 +141,7 @@
'key' => 'id',
'column' => 'active'
)
- ),
+ ),*/
'completed' => array('action' => PHPGW_ACL_EDIT,
'type' => 'int',
'history' => true
Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang 2017-07-02 22:25:11 UTC (rev
16895)
+++ trunk/eventplanner/setup/phpgw_no.lang 2017-07-03 11:27:07 UTC (rev
16896)
@@ -132,4 +132,5 @@
where eventplanner no Hvor
vendor receipt text eventplanner no utøvernotat ved kvittering
customer receipt text eventplanner no Mottakerstednotat ved kvittering
-receipt subject eventplanner no Kvitteringsoverskrift
\ No newline at end of file
+receipt subject eventplanner no Kvitteringsoverskrift
+datetime event eventplanner no Dato/tid for arrangement
\ No newline at end of file
Modified: trunk/eventplanner/templates/base/booking.xsl
===================================================================
--- trunk/eventplanner/templates/base/booking.xsl 2017-07-02 22:25:11 UTC
(rev 16895)
+++ trunk/eventplanner/templates/base/booking.xsl 2017-07-03 11:27:07 UTC
(rev 16896)
@@ -199,7 +199,7 @@
<xsl:value-of select="$lang_customer"/>
</xsl:attribute>
</input>
- <input type="text"
id="customer_name" name="customer_name" value="{booking/customer_name}">
+ <input type="text"
id="customer_name" name="customer_name" value="{booking/customer_name}"
class="pure-input-1-2">
<xsl:attribute
name="placeholder">
<xsl:value-of select="$lang_customer"/>
</xsl:attribute>
@@ -218,7 +218,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact name')"/>
</label>
- <input type="text"
id="customer_contact_name" name="customer_contact_name"
value="{booking/customer_contact_name}">
+ <input type="text"
id="customer_contact_name" name="customer_contact_name"
value="{booking/customer_contact_name}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -231,7 +231,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'email')"/>
</label>
- <input type="text"
id="customer_contact_email" name="customer_contact_email"
value="{booking/customer_contact_email}">
+ <input type="text"
id="customer_contact_email" name="customer_contact_email"
value="{booking/customer_contact_email}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>email</xsl:text>
</xsl:attribute>
@@ -252,7 +252,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact phone')"/>
</label>
- <input type="text"
id="customer_contact_phone" name="customer_contact_phone"
value="{booking/customer_contact_phone}">
+ <input type="text"
id="customer_contact_phone" name="customer_contact_phone"
value="{booking/customer_contact_phone}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -268,7 +268,7 @@
<legend>
<xsl:value-of
select="php:function('lang', 'booking')"/>
</legend>
-
+<!--
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'active')"/>
@@ -289,7 +289,7 @@
</xsl:if>
</input>
</div>
-
+-->
<div class="pure-control-group">
<xsl:variable
name="lang_from">
<xsl:value-of
select="php:function('lang', 'from')"/>
@@ -327,9 +327,9 @@
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'location')"/>
+ <xsl:value-of
select="php:function('lang', 'address')"/>
</label>
- <textarea cols="47"
rows="7" id="location" name="location">
+ <textarea cols="47"
rows="7" id="location" name="location" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -348,7 +348,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'comment')"/>
</label>
- <textarea cols="47"
rows="7" name="comment">
+ <textarea cols="47"
rows="7" name="comment" class="pure-input-1-2">
<xsl:value-of
select="booking/comment"/>
</textarea>
</div>
Modified: trunk/eventplanner/templates/base/report.xsl
===================================================================
--- trunk/eventplanner/templates/base/report.xsl 2017-07-02 22:25:11 UTC
(rev 16895)
+++ trunk/eventplanner/templates/base/report.xsl 2017-07-03 11:27:07 UTC
(rev 16896)
@@ -60,7 +60,7 @@
</xsl:call-template>
<div class="pure-control-group">
<xsl:variable name="lang_from">
- <xsl:value-of
select="php:function('lang', 'from')"/>
+ <xsl:value-of
select="php:function('lang', 'datetime event')"/>
</xsl:variable>
<label>
<xsl:value-of
select="$lang_from"/>
@@ -68,12 +68,12 @@
<xsl:value-of
select="php:function('show_date', number(booking/from_), $date_format)"/>
</div>
- <div class="pure-control-group">
+ <!--div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'to')"/>
</label>
<xsl:value-of
select="php:function('show_date', number(booking/to_), $date_format)"/>
- </div>
+ </div-->
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'customer')"/>
Modified: trunk/eventplannerfrontend/js/portico/application.edit.js
===================================================================
--- trunk/eventplannerfrontend/js/portico/application.edit.js 2017-07-02
22:25:11 UTC (rev 16895)
+++ trunk/eventplannerfrontend/js/portico/application.edit.js 2017-07-03
11:27:07 UTC (rev 16896)
@@ -66,7 +66,6 @@
return;
}
var id = $("#application_id").val();
- document.getElementById('summary').value =
CKEDITOR.instances['summary'].getData();
if (id > 0)
{
Modified: trunk/eventplannerfrontend/templates/base/application.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/application.xsl 2017-07-02
22:25:11 UTC (rev 16895)
+++ trunk/eventplannerfrontend/templates/base/application.xsl 2017-07-03
11:27:07 UTC (rev 16896)
@@ -376,14 +376,6 @@
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'summary')"/>
- </label>
- <textarea
cols="47" rows="7" id="summary" name="summary" class="pure-input-1-2" >
-
<xsl:value-of disable-output-escaping="yes" select="application/summary"/>
- </textarea>
- </div>
- <div
class="pure-control-group">
- <label>
<xsl:value-of select="php:function('lang', 'remark')"/>
</label>
<textarea
cols="47" rows="7" name="remark" class="pure-input-1-2" >
Modified: trunk/eventplannerfrontend/templates/base/booking.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/booking.xsl 2017-07-02
22:25:11 UTC (rev 16895)
+++ trunk/eventplannerfrontend/templates/base/booking.xsl 2017-07-03
11:27:07 UTC (rev 16896)
@@ -199,7 +199,7 @@
<xsl:value-of select="$lang_customer"/>
</xsl:attribute>
</input>
- <input type="text"
id="customer_name" name="customer_name" value="{booking/customer_name}">
+ <input type="text"
id="customer_name" name="customer_name" value="{booking/customer_name}"
class="pure-input-1-2">
<xsl:attribute
name="placeholder">
<xsl:value-of select="$lang_customer"/>
</xsl:attribute>
@@ -218,7 +218,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact name')"/>
</label>
- <input type="text"
id="customer_contact_name" name="customer_contact_name"
value="{booking/customer_contact_name}">
+ <input type="text"
id="customer_contact_name" name="customer_contact_name"
value="{booking/customer_contact_name}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -231,7 +231,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'email')"/>
</label>
- <input type="text"
id="customer_contact_email" name="customer_contact_email"
value="{booking/customer_contact_email}">
+ <input type="text"
id="customer_contact_email" name="customer_contact_email"
value="{booking/customer_contact_email}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>email</xsl:text>
</xsl:attribute>
@@ -239,20 +239,12 @@
<xsl:value-of select="php:function('lang', 'email')"/>
</xsl:attribute>
</input>
- <xsl:choose>
- <xsl:when
test="valid_email = 1">
-
<xsl:text> </xsl:text>
- <a
href="{link_create_user}">
-
<xsl:value-of select="php:function('lang', 'create_user_based_on_email_link')"/>
- </a>
- </xsl:when>
- </xsl:choose>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'contact phone')"/>
</label>
- <input type="text"
id="customer_contact_phone" name="customer_contact_phone"
value="{booking/customer_contact_phone}">
+ <input type="text"
id="customer_contact_phone" name="customer_contact_phone"
value="{booking/customer_contact_phone}" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -270,27 +262,6 @@
</legend>
<div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'active')"/>
- </label>
- <input type="checkbox"
name="active" id="active" value="1" readonly="readonly">
- <xsl:if
test="calendar/active = 1">
-
<xsl:attribute name="checked" value="checked"/>
- </xsl:if>
- </input>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'completed')"/>
- </label>
- <input type="checkbox"
name="completed" id="completed" value="1">
- <xsl:if
test="calendar/completed = 1">
-
<xsl:attribute name="checked" value="checked"/>
- </xsl:if>
- </input>
- </div>
-
- <div class="pure-control-group">
<xsl:variable
name="lang_from">
<xsl:value-of
select="php:function('lang', 'from')"/>
</xsl:variable>
@@ -297,19 +268,7 @@
<label>
<xsl:value-of
select="$lang_from"/>
</label>
- <input type="text"
id="from_" name="from_" size="16" readonly="readonly">
- <xsl:if
test="calendar/from_ != 0 and calendar/from_ != ''">
-
<xsl:attribute name="value">
-
<xsl:value-of select="php:function('show_date', number(calendar/from_),
$date_format)"/>
-
</xsl:attribute>
- </xsl:if>
- <xsl:attribute
name="data-validation">
-
<xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute
name="data-validation-error-msg">
-
<xsl:value-of select="$lang_from"/>
- </xsl:attribute>
- </input>
+ <xsl:value-of
select="php:function('show_date', number(calendar/from_), $date_format)"/>
</div>
<div class="pure-control-group">
<label>
@@ -317,19 +276,12 @@
</label>
<xsl:value-of
select="application/timespan"/>
</div>
-
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'to')"/>
- </label>
- <xsl:value-of
select="php:function('show_date', number(calendar/to_), $date_format)"/>
- </div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'location')"/>
+ <xsl:value-of
select="php:function('lang', 'address')"/>
</label>
- <textarea cols="47"
rows="7" id="location" name="location">
+ <textarea cols="47"
rows="7" id="location" name="location" class="pure-input-1-2">
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -336,40 +288,6 @@
<xsl:value-of
select="booking/location"/>
</textarea>
</div>
- <!--div
class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'remark')"/>
- </label>
- <textarea cols="47"
rows="7" name="remark">
- <xsl:value-of
select="booking/remark"/>
- </textarea>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'comment')"/>
- </label>
- <textarea cols="47"
rows="7" name="comment">
- <xsl:value-of
select="booking/comment"/>
- </textarea>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'history')"/>
- </label>
- <div
class="pure-custom">
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl'/>
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
-
<xsl:with-param name="data" select ='data'/>
-
<xsl:with-param name="config" select ='config'/>
-
</xsl:call-template>
-
</xsl:if>
- </xsl:for-each>
- </div>
- </div-->
</fieldset>
</div>
<div id="reports">
Modified: trunk/eventplannerfrontend/templates/base/report.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/report.xsl 2017-07-02
22:25:11 UTC (rev 16895)
+++ trunk/eventplannerfrontend/templates/base/report.xsl 2017-07-03
11:27:07 UTC (rev 16896)
@@ -60,7 +60,7 @@
</xsl:call-template>
<div class="pure-control-group">
<xsl:variable name="lang_from">
- <xsl:value-of
select="php:function('lang', 'from')"/>
+ <xsl:value-of
select="php:function('lang', 'datetime event')"/>
</xsl:variable>
<label>
<xsl:value-of
select="$lang_from"/>
@@ -68,12 +68,12 @@
<xsl:value-of
select="php:function('show_date', number(booking/from_), $date_format)"/>
</div>
- <div class="pure-control-group">
+ <!--div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'to')"/>
</label>
<xsl:value-of
select="php:function('show_date', number(booking/to_), $date_format)"/>
- </div>
+ </div-->
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'customer')"/>
Modified: trunk/phpgwapi/templates/base/attributes_form.xsl
===================================================================
--- trunk/phpgwapi/templates/base/attributes_form.xsl 2017-07-02 22:25:11 UTC
(rev 16895)
+++ trunk/phpgwapi/templates/base/attributes_form.xsl 2017-07-03 11:27:07 UTC
(rev 16896)
@@ -773,14 +773,18 @@
</xsl:variable>
<div class="pure-custom">
<xsl:for-each select="choice">
- <xsl:choose>
- <xsl:when test="selected='1'">
- <input id="id_{$name}_{id}"
type="{$input_type}" name="values_attribute[{$attrib_id}][value][]"
value="{id}" checked="checked"/>
- </xsl:when>
- <xsl:otherwise>
- <input id="id_{$name}_{id}"
type="{$input_type}" name="values_attribute[{$attrib_id}][value][]"
value="{id}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <input id="id_{$name}_{id}"
type="{$input_type}" name="values_attribute[{$attrib_id}][value][]"
value="{id}">
+ <xsl:if test="selected='1'">
+ <xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//nullable!='1' and
$input_type = 'radio'">
+ <xsl:attribute name="required">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
<xsl:value-of select="value"/>
<br></br>
</xsl:for-each>
Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php 2017-07-02 22:25:11 UTC (rev
16895)
+++ trunk/property/inc/class.soentity.inc.php 2017-07-03 11:27:07 UTC (rev
16896)
@@ -2144,7 +2144,6 @@
{
foreach ($values['attributes'] as
&$attr)
{
-// $attr['value'] =
$xml->getElementsByTagName($attr['column_name'])->item(0)->nodeValue;
$attr['value'] =
$this->db->stripslashes($jsondata[$attr['column_name']]);
}
}
| [Prev in Thread] | Current Thread | [Next in Thread] |