X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=ddd62fef061c4a720122da39805cb9415ebf9c0b;hb=a96e9d18d632cc730a2b4f44d0774a73246915c5;hp=9f0e445092c0f99f8ad9eb1965788eed1fb705f3;hpb=15adf0b69c4d0c07d6dcf07e104a73595bc113b0;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 9f0e4450..ddd62fef 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,6 +1,7 @@
 <?php
 
 include_once($path_to_root . "/admin/db/voiding_db.inc");
+include_once($path_to_root . "/includes/types.inc");
 
 //--------------------------------------------------------------------------------------
 
@@ -553,57 +554,46 @@ function get_js_open_window($width, $height)
 	return $js;
 }
 
-function get_js_form_entry($edit_name, $sel_name, $next_name)
-{
-	$js = "\n<script type=\"text/javascript\">\n"
-		. "<!--\n"
-		. "function recalcAccounts()\n"
-		. "{\n"
-		. "	var myForm = document.forms[0];\n"
-		. "	var len = myForm.$sel_name.length;\n"
-		. "	var txt;\n"
-		. "	var ac = myForm.$edit_name.value;\n"
-		. "	var i;\n"
-		. "	myForm.$sel_name.options[myForm.$sel_name.selectedIndex].selected = false;\n"
-		. "	for (i = 0; i < len; i++)\n"
-		. "	{\n"
-		. "		txt = myForm.$sel_name.options[i].text;\n"
-		. "		if (txt.indexOf(ac) == 0)\n"
-		. "		{\n"
-		. "			myForm.$sel_name.options[i].selected = true;\n"
-		. "			break;\n"
-		. "		}\n"
-		. "	}\n"
-		. "}\n"
-		. "function setAccount(p, s)\n"
-		. "{\n"
-		. "	var myForm = document.forms[0];\n"
-		. " if (p == 0 && myForm.$edit_name.value == \"\")\n"
-		. "		return true;\n"
-		. "	myForm.$edit_name.value = myForm.$sel_name.options[myForm.$sel_name.selectedIndex].value;\n"
-		. " if (s)\n"
-		. "  myForm.submit();\n"
-		. "	myForm.$next_name.focus();\n"
-		. "	return true;\n"
-		. "}\n"
-		. "-->\n"
-		. "</script>\n";
-	return $js;
+//$focus_on = array();
+/*
+  Setting focus on element $name in $form.
+  If $form<0 $name is element id.
+*/
+function set_focus($name, $form_no=0) {
+//  global $focus_on;
+//  $focus_on['name'] = $name;
+//  $focus_on['form'] = $form_no;
+    $_POST['_focus'] = $name;
 }
-
-function get_js_set_focus($name)
-{
-	$js = "\n<script type=\"text/javascript\">\n"
-		. "<!--\n"
-		. "function setFocus()\n"
-		. "{\n"
-		. "	document.forms[0].$name.focus();\n"
-		. "}\n"
-		. "-->\n"
-		. "</script>\n";
-	return $js;
+//
+//	Set default focus on first field $name if not set yet
+//
+function default_focus($name, $form_no=0) {
+//  global $focus_on;
+//    if (!isset($focus_on['name']) && (!isset($_POST['_focus']) || $_POST['_focus']=='') ) {
+//echo "<h2>$name</h2>";
+//	$focus_on['name'] = $name;
+//	$focus_on['form'] = $form_no;
+//    }
+    if (!isset($_POST['_focus'])) {
+	$_POST['_focus'] = $name;
+    }
 }
-
+/*
+function set_js_focus() {
+  global $focus_on;
+  $js = '';
+
+//  if (isset($focus_on['name'])) {
+
+    $js =  "<script type=\"text/javascript\">\n"
+	."Behaviour.addLoadEvent(function(){ setFocus('".$focus_on['name']."'".( $focus_on['form']>=0 ?  (",".$focus_on['form']): '').
+	");});"
+	."</script>";
+//  }
+  return $js;
+}
+*/
 function get_js_png_fix()
 {
 	$js = "<script type=\"text/javascript\">\n"
@@ -633,18 +623,8 @@ function get_js_png_fix()
 
 function get_js_date_picker()
 {
-	global $dateseps, $date_system;
-
-	$how = user_date_format();				// 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
-	$sep = $dateseps[user_date_sep()];		// date separator
-	$wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1));			// weekstart (sun = 0, mon = 1)
-	$months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
-	$wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa"));
-	$back = _("Back");
-	if ($date_system == 1)
-		list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j"));
-	else if ($date_system == 2)
-		list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j"));
+    global $comp_path;
+    $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
 
 	$js = "<style>
 #CCIFrame { display: none; left: 0px; position: absolute; top: 0px; height: 250px; width: 250px; z-index: 99;}
@@ -667,8 +647,25 @@ function get_js_date_picker()
 #CC .empty { background-color: #CCC; border: 1px solid #FFF;}
 </style>
 ";
-	$js .= "<script type=\"text/javascript\">
-<!--\n
+    add_js_source($js);
+    
+    if (!file_exists($fpath)) {
+    
+	global $dateseps, $date_system;
+
+	$how = user_date_format();				// 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
+	$sep = $dateseps[user_date_sep()];		// date separator
+	$wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1));			// weekstart (sun = 0, mon = 1)
+	$months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
+	$wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa"));
+	$back = _("Back");
+	if ($date_system == 1)
+		list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j"));
+	else if ($date_system == 2)
+		list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j"));
+
+
+	$js = "
 function positionInfo(object) {
   var p_elm = object;
   this.getElementLeft = getElementLeft;
@@ -1060,23 +1057,30 @@ function changeCCMonth(change) {
   cC.changeMonth(change);
 }
 document.write(\"<iframe id='CCIframe' src='javascript:false;' frameBorder='0' scrolling='no'></iframe>\");
-document.write(\"<div id='CC'></div>\");
--->
-</script>
-";
-	return $js;
+document.write(\"<div id='CC'></div>\");";
+
+     cache_js_file($fpath, $js);
+    } 
+    add_js_ufile($fpath);
+
+ return '';
 }
+
 //
 //	Javascript conversions to/from user numeric format.
 //
 function add_js_user_num() {
+
+    global $comp_path;
+    $fpath = $comp_path.'/'.user_company().'/js_cache/'.'user_num.js';
+
+    if (!file_exists($fpath)) {
+    
 	global $thoseps, $decseps;
 	$ts = $thoseps[user_tho_sep()];
 	$ds = $decseps[user_dec_sep()];
 
-	$js =
-	"<script language=\"javascript\">
-function price_format(post, num, dec) {
+	$js = "function price_format(post, num, dec, label) {
 	//num = num.toString().replace(/\\$|\\,/g,'');
 	if(isNaN(num))
 		num = \"0\";
@@ -1094,45 +1098,67 @@ function price_format(post, num, dec) {
 			num.substring(num.length-(4*i+3));
 	 num = ((sign)?'':'-') + num;
 	 if(dec!=0) num = num + '".$ds."' + cents;
-	document.getElementsByName(post)[0].value = num;
+	if(label)
+	    document.getElementById(post).innerHTML = num;
+	else
+	    document.getElementsByName(post)[0].value = num;
 	}
-	function get_amount(doc) {
+	function get_amount(doc, label) {
+	    if(label)
+		var val = document.getElementById(doc).innerHTML;
+	    else
 		var val = document.getElementsByName(doc)[0].value;
 		val = val.replace(/\\".$ts."/g,'');
 		val = val.replace(/\\".$ds."/g,'.');
 		return 1*val;
 	}
-	</script>";
-  add_js_source($js);
+	";
+
+     cache_js_file($fpath, $js);
+    } 
+    add_js_ufile($fpath);
 }
 
 function add_js_allocate() {
-	$source =
-	"<script>
-	function allocate_all(doc) {
-	var alloc = get_amount('left_to_allocate');
+    global $comp_path;
+    $fpath = $comp_path.'/'.user_company().'/js_cache/'.'allocate.js';
+
+    if (!file_exists($fpath)) {
+    
+	$js =
+	"function allocate_all(doc) {
 	var amount = get_amount('amount'+doc);
 	var unallocated = get_amount('un_allocated'+doc);
+	var total = get_amount('total_allocated', 1);
+	var left = get_amount('left_to_allocate', 1);
+
 	if(unallocated<amount) amount = unallocated;
-	if((unallocated-amount)<=alloc){
-		alloc-=unallocated-amount;
-	amount=unallocated;
+	if((unallocated-amount)<=left){
+	    left-=unallocated-amount;
+	    total+=unallocated-amount;
+	    amount=unallocated;
 	}else{
-	amount=amount+alloc;
-	alloc=0;
+	total+=left;
+	amount+=left;
+	left=0;
 	}
 	price_format('amount'+doc, amount, ".user_price_dec().");
-	price_format('left_to_allocate', alloc, ".user_price_dec().");
+	price_format('left_to_allocate', left, ".user_price_dec().", 1);
+	price_format('total_allocated', total, ".user_price_dec().", 1);
 	}
 	function allocate_none(doc) {
 	amount = get_amount('amount'+doc);
-	left = get_amount('left_to_allocate');
-	price_format('left_to_allocate',amount+left, ".user_price_dec().");
+	left = get_amount('left_to_allocate', 1);
+	total = get_amount('total_allocated', 1);
+	price_format('left_to_allocate',amount+left, ".user_price_dec().", 1);
 	price_format('amount'+doc, 0, ".user_price_dec().");
-	}
-	</script>";
-	add_js_user_num();
-	add_js_source($source);
+	price_format('total_allocated', total-amount, ".user_price_dec().", 1);
+	}";
+
+     cache_js_file($fpath, $js);
+    } 
+    add_js_ufile($fpath);
+    add_js_user_num();
 }
 
 function alert($msg)