X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=59064f82de031820d3c698b0995031687840cfad;hb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;hp=0831e6103df0fd66369deac64cc2bbc30bfc66d1;hpb=de3a75773afa86df1739d14f24399d6f7a46f809;p=fa-stable.git

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 0831e610..59064f82 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -1,63 +1,165 @@
 <?php
-
-function input_num($postname=null) {
-	if (!isset($_POST[$postname])) 
-	  return null;
-
-    return user_numeric($_POST[$postname]);
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
+
+function get_post($name, $dflt='')
+{
+	return ((!isset($_POST[$name]) || $_POST[$name] === '') ? $dflt : $_POST[$name]);
+}
+//
+// Sets local POST value and adds Value to ajax posting if needed
+//
+/*function set_post($name, $value, $ajax_trigger=true) {
+    global $Ajax;
+
+    $_POST[$name] = $value;
+    if ($ajax_trigger) $Ajax->activate($name);
 }
+*/
+//------------------------------------------------------------------------------
+//    Seek for _POST variable with $prefix.
+//    If var is found returns variable name with prefix stripped,
+//    and null or -1 otherwise.
+//
+function find_submit($prefix, $numeric=true)
+{
 
-//---------------------------------------------------------------------------------
+    foreach($_POST as $postkey=>$postval )
+    {
+		if (strpos($postkey, $prefix) === 0)
+		{
+			$id = substr($postkey, strlen($prefix));
+			return $numeric ? (int)$id : $id;
+		}
+    }
+    return $numeric ? -1 : null;
+}
+//------------------------------------------------------------------------------
+//
+// Helper function for simple db table editor pages
+//
+function simple_page_mode($numeric_id = true)
+{
+	global $Ajax, $Mode, $selected_id;
+
+	$default = $numeric_id ? -1 : '';
+	$selected_id = get_post('selected_id', $default);
+	foreach (array('ADD_ITEM', 'UPDATE_ITEM', 'RESET') as $m) {
+		if (isset($_POST[$m])) {
+			$Ajax->activate('_page_body');
+			if ($m == 'RESET') 
+				$selected_id = $default;
+			$Mode = $m; return;
+		}
+	}
+	foreach (array('Edit', 'Delete') as $m) {
+		foreach ($_POST as $p => $pvar) {
+			if (strpos($p, $m) === 0) {
+//				$selected_id = strtr(substr($p, strlen($m)), array('%2E'=>'.'));
+				unset($_POST['_focus']); // focus on first form entry
+				$selected_id = quoted_printable_decode(substr($p, strlen($m)));
+				$Ajax->activate('_page_body');
+				$Mode = $m;
+				return;
+			}
+		}
+	}
+	$Mode = '';
+}
 
-function hidden($name, $value)
+//------------------------------------------------------------------------------
+//
+//	Read numeric value from user formatted input
+//
+function input_num($postname=null, $dflt=null)
 {
-	echo "<input type=\"hidden\" name=\"$name\" value=\"$value\">\n";
+	if (!isset($_POST[$postname]) || $_POST[$postname] == "")
+	  	return $dflt;
+
+    return user_numeric($_POST[$postname]);
 }
 
 //---------------------------------------------------------------------------------
 
-function submit($name, $value, $echo=true)
+function hidden($name, $value=null, $echo=true)
 {
-	$submit_str = "<input type=\"submit\" class=\"inputsubmit\" name=\"$name\" value=\"$value\">\n";
+  	global $Ajax;
+	
+	if ($value === null) 
+		$value = get_post($name);
+	
+  	$ret = "<input type=\"hidden\" name=\"$name\" value=\"$value\">";
+	$Ajax->addUpdate($name, $name, $value);
+	if ($echo)
+		echo $ret."\n";
+	else
+		return $ret;
+}
+
+function submit($name, $value, $echo=true, $title=false, $async=false, $icon=false)
+{
+	global $path_to_root;
+	
+	default_focus($name);
+	$submit_str = "<button class=\""
+	    .($async ? 'ajaxsubmit' : 'inputsubmit')
+		."\" type=\"submit\""
+		.($async === null ? (fallback_mode() ? ' aspect="fallback"' : " style='display:none;'" ): 
+			($async === 'process' ? 'aspect="process"' : '') )
+	    ." name=\"$name\"  id=\"$name\" value=\"$value\""
+	    .($title ? " title='$title'" : '')
+	    ."><span>$value</span>"
+		.($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon'>" : '')
+		."</button>\n";
 	if ($echo)
 		echo $submit_str;
 	else
 		return $submit_str;
 }
 
-function submit_center($name, $value, $echo=true)
+function submit_center($name, $value, $echo=true, $title=false, $async=false, $icon=false)
 {
 	echo "<center>";
-	submit($name, $value, $echo);
+	submit($name, $value, $echo, $title, $async, $icon);
 	echo "</center>";
 }
 
-function submit_center_first($name, $value)
+function submit_center_first($name, $value, $title=false, $async=false, $icon=false)
 {
 	echo "<center>";
-	submit($name, $value);
+	submit($name, $value, true, $title, $async, $icon);
 	echo "&nbsp;";
 }
 
-function submit_center_last($name, $value)
+function submit_center_last($name, $value, $title=false, $async=false, $icon=false)
 {
 	echo "&nbsp;";
-	submit($name, $value);
+	submit($name, $value, true, $title, $async, $icon);
 	echo "</center>";
 }
 
-function submit_add_or_update($add=true)
+function submit_add_or_update($add=true, $title=false, $async=false)
 {
 	if ($add)
-		submit('ADD_ITEM', _("Save"));
-	else
-		submit('UPDATE_ITEM', _("Update"));
+		submit('ADD_ITEM', _("Add new"), true, $title, $async);
+	else {
+		submit('UPDATE_ITEM', _("Update"), true, $title, $async);
+		submit('RESET', _("Cancel"), true, $title, $async);
+	}
 }
 
-function submit_add_or_update_center($add=true)
+function submit_add_or_update_center($add=true, $title=false, $async=false)
 {
 	echo "<center>";
-	submit_add_or_update($add);
+	submit_add_or_update($add, $title, $async);
 	echo "</center>";
 }
 
@@ -69,45 +171,55 @@ function submit_add_or_update_row($add=true)
 	echo "</td></tr>\n";
 }
 */
-function submit_add_or_update_row($add=true, $right=true, $extra="")
+function submit_add_or_update_row($add=true, $right=true, $extra="", $title=false, $async=false)
 {
 	echo "<tr>";
 	if ($right)
 		echo "<td>&nbsp;</td>\n";
 	echo "<td $extra>";
-	submit_add_or_update($add);
+	submit_add_or_update($add, $title, $async);
 	echo "</td></tr>\n";
 }
 
-function submit_cells($name, $value, $extra="")
+function submit_cells($name, $value, $extra="", $title=false, $async=false)
 {
 	echo "<td $extra>";
-	submit($name, $value);
+	submit($name, $value, true, $title, $async);
 	echo "</td>\n";
 }
 
-function submit_row($name, $value, $right=true, $extra="")
+function submit_row($name, $value, $right=true, $extra="", $title=false, $async=false)
 {
 	echo "<tr>";
 	if ($right)
 		echo "<td>&nbsp;</td>\n";
-	submit_cells($name, $value, $extra);
+	submit_cells($name, $value, $extra, $title, $async);
 	echo "</tr>\n";
 }
-//---------------------------------------------------------------------------------
 
-function button($name, $value, $onclick)
+function submit_return($name, $value, $title=false, $async=false)
 {
-	echo "<input type=\"button\" class=\"inputsubmit\" name=\"$name\" value=\"$value\" onclick=\"$onclick\" />\n";
+	if (count($_SESSION['Context'])) {
+		submit($name, $value, true, $title, $async);
+	}
+}
+//---------------------------------------------------------------------------------
+/*
+function button($name, $value, $onclick, $title=false)
+{
+  	default_focus($name);
+  	echo "<input type=\"button\" class=\"inputsubmit\" name=\"$name\" value=\"$value\" onclick=\"$onclick\""
+	    .($title ? " title='$title'" : '')
+	    ." />\n";
 }
 
-function button_cell($name, $value, $onclick)
+function button_cell($name, $value, $onclick, $title=false)
 {
 	echo "<td>";
-	button($name, $value, $onclick);
+	button($name, $value, $onclick, $title);
 	echo "</td>\n";
 }
-
+*/
 //-----------------------------------------------------------------------------------
 
 function check_value($name)
@@ -117,35 +229,39 @@ function check_value($name)
 	return 1;
 }
 
-function check($label, $name, $value, $submit_on_change=false)
+function check($label, $name, $value=null, $submit_on_change=false, $title=false)
 {
+  	global $Ajax;
+
+	default_focus($name);
 	if ($label)
 		echo $label . "  ";
 
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-	if ($value == 1)
-		echo "<input checked type='checkbox' name='$name' value='1' ";
-	else
-		echo "<input type='checkbox' name='$name' value='1'";
-	if ($submit_on_change)
-		echo " onclick='this.form.submit();' ";
-	echo " >\n";
+	if ($value === null)
+		$value = get_post($name,0);
+
+		echo "<input"
+		    .($value == 1 ? ' checked':'')
+		    ." type='checkbox' name='$name' value='1'"
+		    .($submit_on_change ? " onclick='JsHttpRequest.request(\"_{$name}_update\", this.form);'" : '')
+		    .($title ? " title='$title'" : '')
+		    ." >\n";
+	$Ajax->addUpdate($name, $name, $value);
 }
 
-function check_cells($label, $name, $value, $submit_on_change=false)
+function check_cells($label, $name, $value, $submit_on_change=false, $title=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	check(null, $name, $value, $submit_on_change);
+	check(null, $name, $value, $submit_on_change, $title);
 	echo "</td>";
 }
 
-function check_row($label, $name, $value, $submit_on_change=false)
+function check_row($label, $name, $value, $submit_on_change=false, $title=false)
 {
 	echo "<tr>";
-	check_cells($label, $name, $value, $submit_on_change);
+	check_cells($label, $name, $value, $submit_on_change, $title);
 	echo "</tr>\n";
 }
 
@@ -156,71 +272,91 @@ function labelheader_cell($label, $params="")
 	echo "<td class='tableheader' $params>$label</td>\n";
 }
 
-function label_cell($label, $params="")
+function label_cell($label, $params="", $id=null)
 {
+    global $Ajax;
+
+	if(isset($id))
+	{
+	    $params .= " id='$id'";
+	    $Ajax->addUpdate($id, $id, $label);
+	}
 	echo "<td $params>$label</td>\n";
+
+	return $label;
 }
 
-function amount_cell($label, $bold=false)
+function amount_cell($label, $bold=false, $params="", $id=null)
 {
 	if ($bold)
-		label_cell("<b>".price_format($label)."</b>", "nowrap align=right");
+		label_cell("<b>".price_format($label)."</b>", "nowrap align=right ".$params, $id);
 	else
-		label_cell(price_format($label), "nowrap align=right");
+		label_cell(price_format($label), "nowrap align=right ".$params, $id);
 }
 
-function percent_cell($label, $bold=false)
+function percent_cell($label, $bold=false, $id=null)
 {
 	if ($bold)
-		label_cell("<b>".percent_format($label)."</b>", "nowrap align=right");
+		label_cell("<b>".percent_format($label)."</b>", "nowrap align=right", $id);
 	else
-		label_cell(percent_format($label), "nowrap align=right");
+		label_cell(percent_format($label), "nowrap align=right", $id);
 }
-
-function qty_cell($label, $bold=false, $dec=null)
+// 2008-06-15. Changed
+function qty_cell($label, $bold=false, $dec=null, $id=null)
 {
+	if (!isset($dec))
+		$dec = get_qty_dec();
 	if ($bold)
-		label_cell("<b>".qty_format($label, $dec)."</b>", "nowrap align=right");
+		label_cell("<b>".number_format2($label, $dec)."</b>", "nowrap align=right", $id);
 	else
-		label_cell(qty_format($label, $dec), "nowrap align=right");
+		label_cell(number_format2($label, $dec), "nowrap align=right", $id);
 }
 
-function label_cells($label, $value, $params="", $params2="")
+function label_cells($label, $value, $params="", $params2="", $id='')
 {
 	if ($label != null)
 		echo "<td $params>$label</td>\n";
-	echo "<td $params2>$value</td>\n";
+	label_cell($value, $params2, $id);
 }
 
-function label_row($label, $value, $params="", $params2="", $leftfill=0)
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
 {
 	echo "<tr>";
-	label_cells($label, $value, $params, $params2);
-	if($leftfill!=0)
-	  echo "<td colspan=$leftfill></td>";
+	label_cells($label, $value, $params, $params2, $id);
+	if ($leftfill!=0)
+	  	echo "<td colspan=$leftfill></td>";
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------
 
-function text_cells($label, $name, $value, $size="", $max="", $params="", $post_label="", $disabled="")
+function text_cells($label, $name, $value=null, $size="", $max="", $title=false, $params="", $post_label="", $disabled="")
 {
+  	global $Ajax;
+
+	default_focus($name);
 	if ($label != null)
 		label_cell($label, $params);
 	echo "<td>";
 
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	echo "<input $disabled type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" value=\"$value\">";
+	if ($value === null)
+		$value = get_post($name);
+	echo "<input $disabled type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" value=\"$value\""
+	    .($title ? " title='$title'" : '')
+	    .">";
 
 	if ($post_label != "")
 		echo " " . $post_label;
 
 	echo "</td>\n";
+	$Ajax->addUpdate($name, $name, $value);
 }
 
-function text_cells_ex($label, $name, $size, $max=null, $init=null, $params=null, $post_label=null)
+function text_cells_ex($label, $name, $size, $max=null, $init=null, $title=null, $params=null, $post_label=null, $submit_on_change=false)
 {
+  	global $Ajax;
+
+	default_focus($name);
 	if (!isset($_POST[$name]) || $_POST[$name] == "")
 	{
 		if ($init)
@@ -235,38 +371,41 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $params=null
 		$max = $size;
 
 	echo "<td>";
-
-	echo "<input type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" value=\"" . $_POST[$name]. "\">";
+	$class = $submit_on_change ? 'class="searchbox"' : '';
+	echo "<input $class type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" value=\"" . $_POST[$name]. "\""
+	 .($title ? " title='$title'": '')." >";
 
 	if ($post_label)
 		echo " " . $post_label;
 
 	echo "</td>\n";
+	$Ajax->addUpdate($name, $name, $_POST[$name]);
 }
 
-function text_row($label, $name, $value, $size, $max, $params="", $post_label="")
+function text_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="")
 {
 	echo "<tr>";
 
-	text_cells($label, $name, $value, $size, $max, $params, $post_label);
+	text_cells($label, $name, $value, $size, $max, $title, $params, $post_label);
 
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------
 
-function text_row_ex($label, $name, $size, $max=null, $value=null, $params=null, $post_label=null)
+function text_row_ex($label, $name, $size, $max=null, $title=null, $value=null, $params=null, $post_label=null)
 {
 	echo "<tr>";
 
-	text_cells_ex($label, $name, $size, $max, $value, $params, $post_label);
+	text_cells_ex($label, $name, $size, $max, $value, $title, $params, $post_label);
 
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------
 
-function date_cells($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
+function date_cells($label, $name, $title = null, $init=null, $inc_days=0, 
+	$inc_months=0, $inc_years=0, $params=null, $submit_on_change=false)
 {
 	global $use_date_picker, $path_to_root;
 	if (!isset($_POST[$name]) || $_POST[$name] == "")
@@ -291,33 +430,35 @@ function date_cells($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_
 			$_POST[$name] = $init;
 	}
 	if ($use_date_picker)
-		$post_label = "<a href=\"javascript:date_picker(document.forms[0].$name);\">"
+		$post_label = "<a tabindex='-1' href=\"javascript:date_picker(document.getElementsByName('$name')[0]);\">"
 		. "	<img src='$path_to_root/themes/default/images/cal.gif' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
 	else
 		$post_label = "";
-	text_cells_ex($label, $name, 9, 12, $_POST[$name], $params, $post_label);
+	text_cells_ex($label, $name, 9, 12, $_POST[$name], $title, $params, $post_label, $submit_on_change);
 }
 
-function date_row($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null)
+function date_row($label, $name, $title=null, $init=null, $inc_days=0, $inc_months=0, 
+	$inc_years=0, $params=null, $submit_on_change=false)
 {
 	echo "<tr>";
-	date_cells($label, $name, $init, $inc_days, $inc_months, $inc_years, $params);
+	date_cells($label, $name, $title, $init, $inc_days, $inc_months, 
+		$inc_years, $params, $submit_on_change);
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------
 
-function ref_cells($label, $name, $init=null, $params=null)
+function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
 {
-	text_cells_ex($label, $name, 16, 18, $init, $params);
+	text_cells_ex($label, $name, 16, 18, $init, $title, $params, null, $submit_on_change);
 }
 
 //-----------------------------------------------------------------------------------
 
-function ref_row($label, $name, $init=null)
+function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false)
 {
 	echo "<tr>";
-	ref_cells($label, $name, $init);
+	ref_cells($label, $name, $title, $init, null, $submit_on_change);
 	echo "</tr>\n";
 }
 
@@ -328,7 +469,7 @@ function percent_row($label, $name, $init=null)
 
 	if (!isset($_POST[$name]) || $_POST[$name]=="")
 	{
-			$_POST[$name] = $init== null ? '' : $init;
+		$_POST[$name] = $init == null ? '' : $init;
 	}
 
 	small_amount_row($label, $name, $_POST[$name], null, "%", user_percent_dec());
@@ -336,11 +477,13 @@ function percent_row($label, $name, $init=null)
 
 function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=null, $post_label=null, $dec=null)
 {
+	global $Ajax;
+
 	if (!isset($dec))
-	  $dec = user_price_dec();
+	  	$dec = user_price_dec();
 	if (!isset($_POST[$name]) || $_POST[$name] == "")
 	{
-		if ($init)
+		if ($init !== null)
 			$_POST[$name] = $init;
 		else
 			$_POST[$name] = '';
@@ -355,10 +498,13 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu
 
 	echo "<input class='amount' type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" dec=\"$dec\" value=\"" . $_POST[$name]. "\">";
 
-	if ($post_label)
-		echo " " . $post_label;
-
+	if ($post_label) {
+		echo "<span id='_{$name}_label'> $post_label</span>";
+		$Ajax->addUpdate($name, '_'.$name.'_label', $post_label);
+	}
 	echo "</td>\n";
+	$Ajax->addUpdate($name, $name, $_POST[$name]);
+	$Ajax->addAssign($name, $name, 'dec', $dec);
 }
 
 
@@ -387,16 +533,16 @@ function small_amount_row($label, $name, $init=null, $params=null, $post_label=n
 
 function qty_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
 {
-	if(!isset($dec))
-	  $dec = user_qty_dec();
+	if (!isset($dec))
+	  	$dec = user_qty_dec();
 
 	amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec);
 }
 
 function qty_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
 {
-	if(!isset($dec))
-	  $dec = user_qty_dec();
+	if (!isset($dec))
+	  	$dec = user_qty_dec();
 
 	echo "<tr>";
 	amount_cells($label, $name, $init, $params, $post_label, $dec);
@@ -405,8 +551,8 @@ function qty_row($label, $name, $init=null, $params=null, $post_label=null, $dec
 
 function small_qty_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
 {
-	if(!isset($dec))
-	  $dec = user_qty_dec();
+	if (!isset($dec))
+	  	$dec = user_qty_dec();
 
 	echo "<tr>";
 	small_amount_cells($label, $name, $init, $params, $post_label, $dec);
@@ -424,33 +570,42 @@ function small_amount_cells($label, $name, $init=null, $params=null, $post_label
 
 function small_qty_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
 {
-  if (!isset($dec))
-	  $dec = user_qty_dec();
+  	if (!isset($dec))
+	  	$dec = user_qty_dec();
 	amount_cells_ex($label, $name, 7, 12, $init, $params, $post_label, $dec);
 }
 
 //-----------------------------------------------------------------------------------
 
-function textarea_cells($label, $name, $value, $cols, $rows, $params="")
+function textarea_cells($label, $name, $value, $cols, $rows, $title = null, $params="")
 {
+  	global $Ajax;
+
+	default_focus($name);
 	if ($label != null)
 		echo "<td $params>$label</td>\n";
 	if ($value == null)
 		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	echo "<td><textarea name='$name' cols='$cols' rows='$rows'>$value</textarea></td>\n";
+	echo "<td><textarea name='$name' cols='$cols' rows='$rows'"
+	.($title ? " title='$title'" : '')
+	.">$value</textarea></td>\n";
+	$Ajax->addUpdate($name, $name, $value);
 }
 
-function textarea_row($label, $name, $value, $cols, $rows, $params="")
+function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params="")
 {
 	echo "<tr>";
-	textarea_cells($label, $name, $value, $cols, $rows, $params);
+	textarea_cells($label, $name, $value, $cols, $rows, $title, $params);
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------
-
+/*
 function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $input_value)
 {
+  	global $Ajax;
+
+	default_focus($name);
 	echo "<tr><td>$label</td>\n";
 	echo "<td>";
 
@@ -461,8 +616,9 @@ function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $
 	submit($input_name, $input_value);
 
 	echo "</td></tr>\n";
+	$Ajax->addUpdate($name, $name, $value);
 }
-
+*/
 //-----------------------------------------------------------------------------------