X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=5925579be558ed33433bbbf9d50e31d91c864972;hb=361aac31df66f513fc014aee6adc9f1e30dd18a7;hp=3a47f128f7937b9590b2c6c67cdc69dff3358ba9;hpb=f63c58475b057c9f4a05894a6935ea351b6d7af3;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 3a47f128..5925579b 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,6 +1,7 @@
" . $rate . " " . $to_currency );
+ $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
}
}
@@ -312,7 +322,7 @@ function is_voided_display($type, $id, $label)
echo "
$label ";
echo "" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . " ";
if (strlen($void_entry["memo_"]) > 0)
- echo "" . _("Memo:") . " " . $void_entry["memo_"] . " ";
+ echo "" . _("Memo:") . " " . $void_entry["memo_"] . " ";
echo " |
";
end_table(1);
@@ -453,7 +463,6 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
function display_footer_exit()
{
- global $path_to_root;
br(2);
end_page();
exit;
@@ -522,22 +531,6 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
}
}
-function get_js_go_back()
-{
- $js = "\n\n";
- return $js;
-}
-
function get_js_open_window($width, $height)
{
$js = "\n\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;
+ global $Ajax;
+ $Ajax->addFocus(true, $name);
+ $_POST['_focus'] = $name;
}
-
-function set_js_focus() {
- global $focus_on;
- $js = '';
- if (isset($focus_on['name'])) {
- $js = "";
- }
- return $js;
+//
+// Set default focus on first field $name if not set yet
+//
+function default_focus($name, $form_no=0) {
+ if (!isset($_POST['_focus'])) {
+ set_focus($name);
+ }
}
function get_js_png_fix()
@@ -605,19 +593,20 @@ 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 = "
";
add_js_source($js);
-
- if (!file_exists($fpath)) {
-
+
+ if (!file_exists($fpath) || $go_debug) {
+
global $dateseps, $date_system;
$how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
@@ -640,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"));
@@ -818,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) {
@@ -838,6 +843,9 @@ function CC() {
";
$js .= "
dateField.value = dateString;
+ setFocus(dateField.name);
+ if (dateField.className=='searchbox')
+ dateField.onblur();
hide();
}
return;
@@ -877,6 +885,7 @@ function CC() {
function calendarDrawTable() {
var dayOfMonth = 1;
var wstart = $wstart;
+ var wno = ' $wno ';
var validDay = 0;
var startDayOfWeek = getDayOfWeek(currentYear, currentMonth, dayOfMonth);
var daysInMonth = getDaysInMonth(currentYear, currentMonth);
@@ -884,10 +893,11 @@ function CC() {
var table = \"\";
table += \"\";
table += \"\";
+ table += \"\"+wno+\" | \";
for (var n=0; n<7; n++)
table += \"\" + wdays[(wstart+n)%7]+\" | \";
table += \"
\";
@@ -900,6 +910,13 @@ function CC() {
} else if (validDay == 1 && dayOfMonth > daysInMonth) {
validDay = 0;
}
+ if (n==0)
+ {
+ if (dayOfMonth > daysInMonth)
+ table += \" | \";
+ else
+ table += \"\"+getWeek(currentYear, currentMonth, dayOfMonth)+\" | \";
+ }
if(validDay) {
if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) {
css_class = 'current';
@@ -925,7 +942,7 @@ function CC() {
}
table += \"\";
}
- table += \"\";
+ table += \"\";
table += \"
\";
return table;
}
@@ -989,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');
}
}
}
@@ -1042,107 +1059,12 @@ document.write(\"