X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=9ae512b5910ed2111eef9d4fef0f1fdcecdf99fc;hb=33e8c8d4cc6ace088b9a94a28b5c081e46f2ea81;hp=b2a49e2b90a447cdb5848382d2f922ccd0ac205e;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index b2a49e2b..9ae512b5 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -37,6 +37,7 @@ function find_submit($prefix, $numeric=true)
     }
     return $numeric ? -1 : null;
 }
+
 //------------------------------------------------------------------------------
 //
 // Helper function for simple db table editor pages
@@ -75,7 +76,7 @@ function simple_page_mode($numeric_id = true)
 //
 //	Read numeric value from user formatted input
 //
-function input_num($postname=null, $dflt=null)
+function input_num($postname=null, $dflt=0)
 {
 	if (!isset($_POST[$postname]) || $_POST[$postname] == "")
 	  	return $dflt;
@@ -107,35 +108,46 @@ function hidden($name, $value=null, $echo=true)
 		null  - button visible only in fallback mode; optional icon
 	 Ajax submit:
 		true	  - standard button; optional icon
-		'process' - displays progress bar during call; optional icon
+
 		'default' - default form submit on Ctrl-Enter press; dflt ICON_OK icon
 		'selector' - ditto with closing current popup editor window
 		'cancel'  - cancel form entry on Escape press; dflt ICON_CANCEL
+		'process' - displays progress bar during call; optional icon
+		'nonajax' - ditto, non-ajax submit
+	$atype can contain also multiply type selectors separated by space, 
+	however make sense only combination of 'process' and one of defualt/selector/cancel
 */
 function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=false)
 {
 	global $path_to_root;
 
 	$aspect='';
-	if (!is_bool($atype)) // necessary: switch uses '=='
-	  switch($atype) {
-		case 'process':
-			$aspect = " aspect='process'"; break;
-		case 'selector':
-			$aspect = " aspect='selector' rel = '$value'"; 
-			$value = _("Select");
-			if ($icon===false) $icon=ICON_SUBMIT; break;
-		case 'default':
-			$aspect = " aspect='default'"; 
-			if ($icon===false) $icon=ICON_SUBMIT; break;
-		case 'cancel':
-			$aspect = " aspect='cancel'"; 
-			if ($icon===false) $icon=ICON_ESCAPE; break;
-		case null: 
-			$aspect = fallback_mode() ? 
-				" aspect='fallback'" : " style='display:none;'"; break;
-	 }
+	if ($atype === null) {
+		$aspect = fallback_mode() ? " aspect='fallback'" : " style='display:none;'";
+
+	} elseif (!is_bool($atype)) { // necessary: switch uses '=='
+
+		$aspect = "aspect='$atype' ";
+		$types = explode(' ', $atype);
+
+		foreach ($types as $type) {
+			switch($type) {
+				case 'selector':
+					$aspect = " aspect='selector' rel = '$value'"; 
+					$value = _("Select");
+					if ($icon===false) $icon=ICON_SUBMIT; break;
+
+				case 'default':
+					if ($icon===false) $icon=ICON_SUBMIT; break;
 
+				case 'cancel':
+					if ($icon===false) $icon=ICON_ESCAPE; break;
+
+				case 'nonajax':
+					$atype = false;
+			}
+		}
+	}
 	$submit_str = "<button class=\""
 	    .($atype ? 'ajaxsubmit' : 'inputsubmit')
 		."\" type=\"submit\""
@@ -239,17 +251,24 @@ function submit_return($name, $value, $title=false)
 	}
 }
 
-function submit_js_confirm($name, $msg) {
-	add_js_source(
-		"_validate.$name=function(){ return confirm('"
-			. strtr($msg, array("\n"=>'\\n')) . "');};");
-};
+function submit_js_confirm($name, $msg, $set = true) {
+	global $Ajax;
+	$js = "_validate.$name=".($set ? "function(){ return confirm('"
+				. strtr($msg, array("\n"=>'\\n')) . "');};"
+				: 'null;');
+	if (in_ajax()) {
+		$Ajax->addScript(true, $js);
+	} else
+		add_js_source($js);
+}
 //-----------------------------------------------------------------------------------
 
 function set_icon($icon, $title=false)
 {
 	global $path_to_root;
-	return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." />\n";	
+	if (basename($icon) === $icon) // standard icons does not contain path separator
+		$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
+	return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." />\n";	
 }
 
 function button($name, $value, $title=false, $icon=false,  $aspect='')
@@ -265,16 +284,18 @@ function button($name, $value, $title=false, $icon=false,  $aspect='')
 	{
 		if ($value == _("Delete")) // Helper during implementation
 			$icon = ICON_DELETE;
-		return "<button type='submit' class='editbutton' name='".
-			htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))).
-			"' value='1'" . ($title ? " title='$title'":" title='$value'")
+		return "<button type='submit' class='editbutton' name='"
+			.htmlentities(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B'
+			)))
+			."' value='1'" . ($title ? " title='$title'":" title='$value'")
 			. ($aspect ? " aspect='$aspect'" : '')
 			. $rel
-			." />".set_icon($icon)."\n";
+			." />".set_icon($icon)."</button>\n";
 	}
 	else
 		return "<input type='submit' class='editbutton' name='"
-			.htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B')))
+			.htmlentities(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B'
+			)))
 			."' value='$value'"
 			.($title ? " title='$title'":'')
 			. ($aspect ? " aspect='$aspect'" : '')
@@ -356,13 +377,27 @@ function check_cells($label, $name, $value=null, $submit_on_change=false, $title
 
 function check_row($label, $name, $value=null, $submit_on_change=false, $title=false)
 {
-	echo "<tr>";
-	echo check_cells($label, $name, $value, $submit_on_change, $title);
+	echo "<tr><td class='label'>$label</td>";
+	echo check_cells(NULL, $name, $value, $submit_on_change, $title);
 	echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------
+function radio($label, $name, $value, $selected=null, $submit_on_change=false)
+{
+	if (!isset($selected))
+		$selected = get_post($name) == $value;
+
+	if ($submit_on_change === true)
+		$submit_on_change = 
+			"JsHttpRequest.request(\"_{$name}_update\", this.form);";
+
+	return "<input type='radio' name=$name value='$value' ".($selected ? "checked":'')
+	    .($submit_on_change ? " onclick='$submit_on_change'" : '')
+		.">".($label ? $label : '');
+}
 
+//-----------------------------------------------------------------------------------
 function labelheader_cell($label, $params="")
 {
 	echo "<td class='tableheader' $params>$label</td>\n";
@@ -439,6 +474,11 @@ function label_cells($label, $value, $params="", $params2="", $id='')
 function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
 {
 	echo "<tr>";
+	if ($params == "")
+	{
+		echo "<td class='label'>$label</td>";
+		$label = null;
+	}	
 	label_cells($label, $value, $params, $params2, $id);
 	if ($leftfill!=0)
 	  	echo "<td colspan=$leftfill></td>";
@@ -503,9 +543,8 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $title=null,
 
 function text_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="")
 {
-	echo "<tr>";
-
-	text_cells($label, $name, $value, $size, $max, $title, $params, $post_label);
+	echo "<tr><td class='label'>$label</td>";
+	text_cells(null, $name, $value, $size, $max, $title, $params, $post_label);
 
 	echo "</tr>\n";
 }
@@ -514,9 +553,8 @@ function text_row($label, $name, $value, $size, $max, $title=null, $params="", $
 
 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, $title, $params, $post_label);
+	echo "<tr><td class='label'>$label</td>";
+	text_cells_ex(null, $name, $size, $max, $value, $title, $params, $post_label);
 
 	echo "</tr>\n";
 }
@@ -586,8 +624,12 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 		}
 	}
 	if ($use_date_picker)
+	{
+		$calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ? 
+			"$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
 		$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";
+		. "	<img src='$calc_image' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+	}	
 	else
 		$post_label = "";
 
@@ -596,15 +638,15 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 
 	echo "<td>";
 	
-	$class = $submit_on_change ? 'class="searchbox"' : '';
+	$class = $submit_on_change ? 'date active' : 'date';
 
 	$aspect = $check ? 'aspect="cdate"' : '';
 	if ($check && (get_post($name) != Today()))
 		$aspect .= ' style="color:#FF0000"';
 
 	default_focus($name);
-
-	echo "<input type=\"text\" name=\"$name\" $class $aspect size=\"9\" maxlength=\"12\" value=\"" 
+	$size = (user_date_format()>3)?11:10; 
+	echo "<input type=\"text\" name=\"$name\" class=\"$class\" $aspect size=\"$size\" maxlength=\"12\" value=\"" 
 	 . $_POST[$name]. "\""
 	 .($title ? " title='$title'": '')." > $post_label";
 	echo "</td>\n";
@@ -614,12 +656,34 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
 function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_months=0, 
 	$inc_years=0, $params=null, $submit_on_change=false)
 {
-	echo "<tr>";
-	date_cells($label, $name, $title, $check, $inc_days, $inc_months, 
+	echo "<tr><td class='label'>$label</td>";
+	date_cells(null, $name, $title, $check, $inc_days, $inc_months, 
 		$inc_years, $params, $submit_on_change);
 	echo "</tr>\n";
 }
 
+//-----------------------------------------------------------------------------------
+function password_row($label, $name, $value)
+{
+	echo "<tr><td class='label'>$label</td>";
+	label_cell("<input type='password' name='$name' size=20 maxlength=20 value='$value' />");
+	echo "</tr>\n";
+}	
+
+//-----------------------------------------------------------------------------------
+function file_cells($label, $name, $id="")
+{
+	if ($id != "")
+		$id = "id='$id'";
+	label_cells($label, "<input type='file' name='$name' $id />");
+}		
+function file_row($label, $name, $id = "")
+{
+	echo "<tr><td class='label'>$label</td>";
+	file_cells(null, $name, $id);
+	echo "</tr>\n";
+}	
+
 //-----------------------------------------------------------------------------------
 
 function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
@@ -631,8 +695,8 @@ function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit
 
 function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false)
 {
-	echo "<tr>";
-	ref_cells($label, $name, $title, $init, null, $submit_on_change);
+	echo "<tr><td class='label'>$label</td>";
+	ref_cells(null, $name, $title, $init, null, $submit_on_change);
 	echo "</tr>\n";
 }
 
@@ -663,8 +727,11 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu
 			$_POST[$name] = '';
 	}
 	if ($label != null)
+	{
+		if ($params == null)
+			$params = "class='label'";
 		label_cell($label, $params);
-
+	}
 	if (!isset($max))
 		$max = $size;
 
@@ -780,8 +847,8 @@ function textarea_cells($label, $name, $value, $cols, $rows, $title = null, $par
 
 function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params="")
 {
-	echo "<tr>";
-	textarea_cells($label, $name, $value, $cols, $rows, $title, $params);
+	echo "<tr><td class='label'>$label</td>";
+	textarea_cells(null, $name, $value, $cols, $rows, $title, $params);
 	echo "</tr>\n";
 }
 
@@ -850,4 +917,43 @@ function inactive_control_column(&$th) {
 		$Ajax->activate('_page_body');
 	}
 }
+
+function customer_credit_row($customer, $credit, $parms='')
+{
+	global $path_to_root;
+	
+	label_row( _("Current Credit:"),
+		"<a target='_blank' " . ($credit<0 ? 'class="redfg"' : '')
+		."href='$path_to_root/sales/inquiry/customer_inquiry.php?customer_id=".$customer."'"
+		." onclick=\"javascript:openWindow(this.href,this.target); return false;\" >"
+		. price_format($credit)
+		."</a>", $parms);
+}
+
+function supplier_credit_row($supplier, $credit, $parms='')
+{
+	global $path_to_root;
+	
+	label_row( _("Current Credit:"),
+		"<a target='_blank' " . ($credit<0 ? 'class="redfg"' : '')
+		."href='$path_to_root/purchasing/inquiry/supplier_inquiry.php?supplier_id=".$supplier."'"
+		." onclick=\"javascript:openWindow(this.href,this.target); return false;\" >"
+		. price_format($credit)
+		."</a>", $parms);
+}
+
+function bank_balance_row($bank_acc, $parms='')
+{
+	global $path_to_root;
+	
+	$to = add_days(Today(), 1);
+	$bal = get_balance_before_for_bank_account($bank_acc, $to);
+	label_row( _("Bank Balance:"),
+		"<a target='_blank' " . ($bal<0 ? 'class="redfg"' : '')
+		."href='$path_to_root/gl/inquiry/bank_inquiry.php?bank_account=".$bank_acc."'"
+		." onclick=\"javascript:openWindow(this.href,this.target); return false;\" >&nbsp;"
+		. price_format($bal)
+		."</a>", $parms);
+}
+
 ?>
\ No newline at end of file