X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=5925579be558ed33433bbbf9d50e31d91c864972;hb=37da0ea920fdff712ccef4e1324aa822e981c8fc;hp=3e6d3c4eeb05d2c8c2e18729b1b2c1a6684419df;hpb=72af4496f87c438dc85a0a7573d36b7bd9e49624;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 3e6d3c4e..5925579b 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -271,37 +271,40 @@ function get_trans_view_str($type, $trans_no, $label="")
 }
 
 //--------------------------------------------------------------------------------------
-
-function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=true)
+// Displays currency exchange rate for given date.
+// When there is no exrate for today, 
+// gets it form ECB and stores in local database.
+//
+function exchange_rate_display($from_currency, $to_currency, $date_)
 {
     global $Ajax;
 
 	if ($from_currency != $to_currency)
 	{
-		if ($buttons && isset($_POST['get_rate']))
-		{
-			$comp_currency = get_company_currency();
-			if ($from_currency == $comp_currency)
-				$currency = $to_currency;
-			else
-				$currency = $from_currency;
-			$rate = get_ecb_rate($currency);
-			if (get_date_exchange_rate($currency, $date_))
-				update_exchange_rate($currency, $date_, $rate, $rate);
-			else
-				add_exchange_rate($currency, $date_, $rate, $rate);
-			if ($from_currency == $comp_currency)
-				$rate = 1 / $rate;
-			$Ajax->activate('get_rate');
-		}
+		$comp_currency = get_company_currency();
+		if ($from_currency == $comp_currency)
+			$currency = $to_currency;
 		else
+			$currency = $from_currency;
+		$rate = 0;
+		if ($date_ == Today()) {
+			$rate = get_date_exchange_rate($currency, $date_);
+			if (!$rate) {
+				$rate = get_ecb_rate($currency);
+				if ($rate) 
+					add_exchange_rate($currency, $date_, $rate, $rate);
+			}
+		}
+		if (!$rate)
 			$rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_);
+			
+		if ($from_currency == $comp_currency)
+			$rate = 1 / $rate;
+
 		$rate = number_format2($rate, user_exrate_dec());
-    	label_row(_("Exchange Rate:"),"1 " . $from_currency . " = <span id='_ex_rate'>" . $rate . "</span> " . $to_currency .
-			($buttons?"  " . submit('get_rate',_("Get"), false, true):""));
-	    if($buttons) {
-		  $Ajax->addUpdate('get_rate','_ex_rate', $rate);
-		}
+    	label_row(_("Exchange Rate:"),"1 " . $from_currency 
+			. " = <span id='_ex_rate'>" . $rate . "</span> " . $to_currency );
+		  $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
 	}
 }
 
@@ -536,7 +539,7 @@ function get_js_open_window($width, $height)
 		. "{\n"
 		. " var left = (screen.width - $width) / 2;\n"
 		. " var top = (screen.height - $height) / 2;\n"
-		. " window.open(url, title, 'width=$width,height=$height,left='+left+',top='+top+',screenX='+left+',screenY='+top+',status=no,scrollbars=yes');\n"
+		. " return window.open(url, title, 'width=$width,height=$height,left='+left+',top='+top+',screenX='+left+',screenY='+top+',status=no,scrollbars=yes');\n"
 		. "}\n"
 		. "-->\n"
 		. "</script>\n";
@@ -548,6 +551,8 @@ function get_js_open_window($width, $height)
   If $form<0 $name is element id.
 */
 function set_focus($name, $form_no=0) {
+  global $Ajax;
+	$Ajax->addFocus(true, $name);
     $_POST['_focus'] = $name;
 }
 //
@@ -555,7 +560,7 @@ function set_focus($name, $form_no=0) {
 //
 function default_focus($name, $form_no=0) {
     if (!isset($_POST['_focus'])) {
-	$_POST['_focus'] = $name;
+	  set_focus($name);
     }
 }
 
@@ -588,11 +593,11 @@ function get_js_png_fix()
 
 function get_js_date_picker()
 {
-    global $comp_path;
+    global $comp_path, $go_debug;
     $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;}
+#CCIframe { display: none; left: 0px; position: absolute; top: 0px; height: 250px; width: 270px; z-index: 99;}
 #CC { position:absolute; background-color:#FFF; margin:0; padding:0; display:none; z-index: 100;}
 #CC table { font-family: arial, verdana, helvetica, sans-serif;font-size: 8pt; border-left: 1px solid #336; border-right: 1px solid #336;}
 #CC th { font-weight: normal; text-align: center;}
@@ -601,6 +606,7 @@ function get_js_date_picker()
 #CC .header { background-color: #336;}
 #CC .weekday { background-color: #DDD; color: #000;}
 #CC .weekend { background-color: #FFC; color: #000;}
+#CC .weekno { background-color: #c0daf8; color: #555;}
 #CC .current { border: 1px solid #339; background-color: #336; color: #FFF;}
 #CC .weekday,#CC .weekend,#CC .current { display: block; text-decoration: none; border: 1px solid #FFF; width: 2em;}
 #CC .weekday:hover,#CC .weekend:hover,#CC .current:hover { color: #FFF; background-color: #336; border: 1px solid #999;}
@@ -614,7 +620,7 @@ function get_js_date_picker()
 ";
     add_js_source($js);
 
-    if (!file_exists($fpath)) {
+    if (!file_exists($fpath) || $go_debug) {
 
 	global $dateseps, $date_system;
 
@@ -623,6 +629,7 @@ function get_js_date_picker()
 	$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"));
+	$wno = _("W"); // week no
 	$back = _("Back");
 	if ($date_system == 1)
 		list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j"));
@@ -801,6 +808,21 @@ function CC() {
     dateField.value = '';
     hide();
   }
+  this.getWeek = getWeek;
+  function getWeek(year, month, day) {
+";
+	if ($how == 0)
+		$js .= "  day++;";
+	$js .= "
+    var date = new Date(year,month-1,day);
+    var D = date.getDay();
+    if(D == 0) D = 7;
+    date.setDate(date.getDate() + (4 - D));
+    var YN = date.getFullYear();
+    var ZBDoCY = Math.floor((date.getTime() - new Date(YN, 0, 1, -6)) / 86400000);
+    var WN = 1 + Math.floor(ZBDoCY / 7);
+    return WN;
+  }
   this.setDate = setDate;
   function setDate(year, month, day) {
     if (dateField) {
@@ -821,6 +843,9 @@ function CC() {
 ";
 	$js .= "
       dateField.value = dateString;
+	  setFocus(dateField.name);
+	  if (dateField.className=='searchbox')
+	  	dateField.onblur();
       hide();
     }
     return;
@@ -860,6 +885,7 @@ function CC() {
   function calendarDrawTable() {
     var dayOfMonth = 1;
     var wstart = $wstart;
+    var wno = '&nbsp;$wno&nbsp;';
     var validDay = 0;
     var startDayOfWeek = getDayOfWeek(currentYear, currentMonth, dayOfMonth);
     var daysInMonth = getDaysInMonth(currentYear, currentMonth);
@@ -867,10 +893,11 @@ function CC() {
     var table = \"<table cellspacing='0' cellpadding='0' border='0'>\";
     table += \"<tr class='header'>\";
     table += \"  <td colspan='2' class='previous'><a href='javascript:changeCCMonth(-1);'>&lt;</a><br><a href='javascript:changeCCYear(-1);'>&laquo;</a></td>\";
-    table += \"  <td colspan='3' class='title'>\" + months[currentMonth-1] + \"<br>\" + currentYear + \"</td>\";
+    table += \"  <td colspan='4' class='title'>\" + months[currentMonth-1] + \"<br>\" + currentYear + \"</td>\";
     table += \"  <td colspan='2' class='next'><a href='javascript:changeCCMonth(1);'>&gt;</a><br><a href='javascript:changeCCYear(1);'>&raquo;</a></td>\";
     table += \"</tr>\";
     table += \"<tr>\";
+    table += \"<th class='weekno'>\"+wno+\"</th>\";
     for (var n=0; n<7; n++)
     	table += \"<th>\" + wdays[(wstart+n)%7]+\"</th>\";
     table += \"</tr>\";
@@ -883,6 +910,13 @@ function CC() {
         } else if (validDay == 1 && dayOfMonth > daysInMonth) {
           validDay = 0;
         }
+        if (n==0)
+        {
+        	if (dayOfMonth > daysInMonth)
+          		table += \"<td class='empty'>&nbsp;</td>\";
+       		else
+       			table += \"<td class='weekno'>\"+getWeek(currentYear, currentMonth, dayOfMonth)+\"</td>\";
+        }
         if(validDay) {
           if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) {
             css_class = 'current';
@@ -908,7 +942,7 @@ function CC() {
       }
       table += \"</tr>\";
     }
-    table += \"<tr class='header'><th colspan='7' style='padding: 3px;text-align:center;'><a href='javascript:hideCC();'>$back</a></td></tr>\";
+    table += \"<tr class='header'><th colspan='8' style='padding: 3px;text-align:center;'><a href='javascript:hideCC();'>$back</a></td></tr>\";
     table += \"</table>\";
     return table;
   }
@@ -972,19 +1006,19 @@ function CC() {
     if(document.getElementById){
       calendar = document.getElementById(calendarId);
       calendar.innerHTML = calendarDrawTable(currentYear, currentMonth);
-      setProperty('display', 'block');
       var fieldPos = new positionInfo(dateField);
       var calendarPos = new positionInfo(calendarId);
       var x = fieldPos.getElementLeft();
       var y = fieldPos.getElementBottom();
       setProperty('left', x + 'px');
       setProperty('top', y + 'px');
+      setProperty('display', 'block');
       if (document.all) {
-        setElementProperty('display', 'block', 'CCIframe');
         setElementProperty('left', x + 'px', 'CCIframe');
         setElementProperty('top', y + 'px', 'CCIframe');
         setElementProperty('width', calendarPos.getElementWidth() + 'px', 'CCIframe');
         setElementProperty('height', calendarPos.getElementHeight() + 'px', 'CCIframe');
+        setElementProperty('display', 'block', 'CCIframe');
       }
     }
   }