[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15613]
|
From: |
saul . huanay |
|
Subject: |
[Fmsystem-commits] [15613] |
|
Date: |
Thu, 8 Sep 2016 00:52:28 +0000 (UTC) |
Revision: 15613
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15613
Author: psaul
Date: 2016-09-08 00:52:28 +0000 (Thu, 08 Sep 2016)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind-2/phpgwapi/js/jquery/common.js
branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
branches/dev-syncromind-2/rental/inc/class.uicontract.inc.php
branches/dev-syncromind-2/rental/js/rental/schedule.js
branches/dev-syncromind-2/rental/templates/base/schedule.xsl
Modified: branches/dev-syncromind-2/phpgwapi/js/jquery/common.js
===================================================================
--- branches/dev-syncromind-2/phpgwapi/js/jquery/common.js 2016-09-07
18:54:03 UTC (rev 15612)
+++ branches/dev-syncromind-2/phpgwapi/js/jquery/common.js 2016-09-08
00:52:28 UTC (rev 15613)
@@ -1782,9 +1782,14 @@
var k = col.key;
+ var is_create = true;
if (data[k])
{
text = data[k]['status'];
+ if (text == "Ikke ledig")
+ {
+ is_create = false;
+ }
}
else
{
@@ -1800,6 +1805,13 @@
$(this).parent().parent().find('tr').removeClass("trselected")
$(this).parent().addClass("trselected");
$('#schedule_toolbar button').attr('disabled',
false);
+ var b_is_create = eval(is_create);
+ if (!b_is_create)
+ {
+ $('#schedule_toolbar
button.create_type').attr('disabled', true);
+ }
+ schedule.rental.data = data;
+ schedule.rental.col = col;
}
}
);
Modified: branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
2016-09-07 18:54:03 UTC (rev 15612)
+++ branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
2016-09-08 00:52:28 UTC (rev 15613)
@@ -1138,12 +1138,17 @@
'phpgw_return_as' => 'json'
));
- $parameters = array();
-
- $parameters[] = array(
- 'name' => 'id',
- 'source' => 'id'
- );
+ $parameters = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' => 'id',
+ 'source' => 'id'
+ )
+ )
+ );
$toolbar = array();
@@ -1154,7 +1159,7 @@
'menuaction' => 'rental.uicomposite.add'
))
);
-
+
$toolbar[] = array(
'name' => 'download',
'text' => lang('download'),
@@ -1165,7 +1170,7 @@
'allrows' => true
))
);
-
+
$toolbar[] = array(
'name' => 'edit',
'text' => lang('edit'),
@@ -1175,7 +1180,7 @@
)),
'parameters' => $parameters
);
-
+
$toolbar[] = array(
'name' => 'view',
'text' => lang('show'),
@@ -1185,7 +1190,7 @@
)),
'parameters' => $parameters
);
-
+
$contract_types =
rental_socontract::get_instance()->get_fields_of_responsibility();
$valid_contract_types = array();
@@ -1229,6 +1234,9 @@
'menuaction' =>
'rental.uicontract.add_from_composite',
'responsibility_id' =>
$create_type[0]
)),
+ 'attributes' => array(
+ 'class' => 'create_type'
+ ),
'parameters' => $parameters
);
}
Modified: branches/dev-syncromind-2/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.uicontract.inc.php
2016-09-07 18:54:03 UTC (rev 15612)
+++ branches/dev-syncromind-2/rental/inc/class.uicontract.inc.php
2016-09-08 00:52:28 UTC (rev 15613)
@@ -1917,6 +1917,13 @@
$end_date = ($contract->get_contract_date() &&
$contract->get_contract_date()->has_end_date()) ? date($this->dateFormat,
$contract->get_contract_date()->get_end_date()) : '';
$due_date = ($contract->get_due_date()) ?
date($this->dateFormat, $contract->get_due_date()) : '';
+ if ($start_date == "") {
+ $date = phpgw::get_var('start_date');
+ $date = str_replace("-", "/", $date);
+
+ $start_date = ($date) ? ($date) : '';
+ }
+
$_contract_id = $contract->get_id();
if (empty($_contract_id))
{
@@ -2316,12 +2323,22 @@
$success =
$so_contract->add_composite($contract->get_id(), phpgw::get_var('id'));
if ($success)
{
+ $parameters = array(
+ 'menuaction' =>
'rental.uicontract.edit',
+ 'id' =>
$contract->get_id()
+ );
+
+ $date =
(phpgw::get_var('date')) ? phpgw::get_var('date') : '';
+ if ($date != "")
+ {
+
$parameters['start_date'] = $date;
+ }
+
$db_contract->transaction_commit();
$comp_name =
rental_socomposite::get_instance()->get_single(phpgw::get_var('id'))->get_name();
$message =
lang('messages_new_contract_from_composite') . ' ' . $comp_name;
phpgwapi_cache::message_set($message, 'message');
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit',
- 'id' =>
$contract->get_id()));
+
$GLOBALS['phpgw']->redirect_link('/index.php', $parameters);
}
else
{
Modified: branches/dev-syncromind-2/rental/js/rental/schedule.js
===================================================================
--- branches/dev-syncromind-2/rental/js/rental/schedule.js 2016-09-07
18:54:03 UTC (rev 15612)
+++ branches/dev-syncromind-2/rental/js/rental/schedule.js 2016-09-08
00:52:28 UTC (rev 15613)
@@ -216,14 +216,31 @@
var text = v['text'];
var action = v['action'];
- var parameters = (v['parameters']) ? v['parameters'] : "";
+ var parameters = (v['parameters']) ? v['parameters'] : "";
+ var attributes = (v['attributes']) ? v['attributes'] : "";
var button = document.createElement('button');
button.innerHTML = text;
+
if (parameters)
{
button.disabled = true;
}
+
+ if (attributes)
+ {
+ $.each(v['attributes'], function(i, v){
+ if (i == 'class')
+ {
+ button.classList.add(v);
+ }
+ else
+ {
+ button.setAttribute(i, v);
+ }
+ });
+ }
+
if (name == 'download')
{
button.addEventListener('click', function()
@@ -258,13 +275,19 @@
var new_action = action;
if (parameters)
{
- for (var i = 0; i < parameters.length;
i++)
+ for (var i = 0; i <
parameters.parameter.length; i++)
{
- var val =
eval(parameters[i]['source']);
- new_action += '&' +
parameters[i]['name'] + '=' + eval(val);
+ var val =
eval(parameters.parameter[i]['source']);
+ new_action += '&' +
parameters.parameter[i]['name'] + '=' + eval(val);
}
}
- window.open(new_action);
+ if (button.classList.contains('create_type'))
+ {
+ var date =
schedule.rental['col']['date'];
+ date = date.getDate() + '-' +
(date.getMonth() + 1) + '-' + date.getFullYear();
+ new_action += '&date=' + date;
+ }
+ window.open(new_action);
}, false);
}
Modified: branches/dev-syncromind-2/rental/templates/base/schedule.xsl
===================================================================
--- branches/dev-syncromind-2/rental/templates/base/schedule.xsl
2016-09-07 18:54:03 UTC (rev 15612)
+++ branches/dev-syncromind-2/rental/templates/base/schedule.xsl
2016-09-08 00:52:28 UTC (rev 15613)
@@ -164,6 +164,7 @@
</div>
<script type="text/javascript">
var composite_id = '<xsl:value-of select="composite_id"/>';
+ schedule.rental = {};
$(window).load(function() {
schedule.params.length = $('#cboNObjects').val();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15613],
saul . huanay <=