[Fmsystem-commits] [6821] bkbooking: bugfix allocation + updated translations

[Kjell Arne Espedal]

Revision: 6821
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6821
Author:   kjell
Date:     2011-01-21 10:08:27 +0000 (Fri, 21 Jan 2011)
Log Message:
-----------
bkbooking: bugfix allocation + updated translations

Modified Paths:
--------------
    trunk/booking/inc/class.uiallocation.inc.php
    trunk/booking/js/booking/schedule.js
    trunk/booking/setup/phpgw_no.lang

Modified: trunk/booking/inc/class.uiallocation.inc.php
===================================================================
--- trunk/booking/inc/class.uiallocation.inc.php        2011-01-21 08:58:46 UTC 
(rev 6820)
+++ trunk/booking/inc/class.uiallocation.inc.php        2011-01-21 10:08:27 UTC 
(rev 6821)
@@ -146,7 +146,6 @@
                                        $allocation['from_'] = 
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday']." 
".$_POST['from_'])-60*60*24*7);
                                        $allocation['to_'] = strftime("%Y-%m-%d 
%H:%M", strtotime($_POST['weekday']." ".$_POST['to_'])-60*60*24*7);
                                } 
-
                                $_POST['from_'] = $allocation['from_'];
                                $_POST['to_'] = $allocation['to_'];
 
@@ -156,7 +155,6 @@
                                {
                                        $step++;
                                }
-
                                if (!$errors && $_POST['outseason'] != 'on' )
                                {
                                        try {
@@ -222,7 +220,7 @@
                                array_set_default($allocation, 'building_name', 
phpgw::get_var('building_name', 'GET'));
                                array_set_default($allocation, 'from_', 
phpgw::get_var('from_', 'GET'));
                                array_set_default($allocation, 'to_', 
phpgw::get_var('to_', 'GET'));
-                               $weekday =  
strtolower(strftime("%A",strtotime($allocation['from_'][0])));
+                               $weekday =  phpgw::get_var('weekday', 'GET');
                        }
 
                        $this->flash_form_errors($errors);

Modified: trunk/booking/js/booking/schedule.js
===================================================================
--- trunk/booking/js/booking/schedule.js        2011-01-21 08:58:46 UTC (rev 
6820)
+++ trunk/booking/js/booking/schedule.js        2011-01-21 10:08:27 UTC (rev 
6821)
@@ -201,7 +201,16 @@
        _to = _to ? '%20' + _to: '';
        var url = YAHOO.booking.newApplicationUrl;
        var state = date.getFullYear() + '-' + (date.getMonth()+1) + '-' + 
date.getDate();
-       url += '&from_[]=' + state + _from + '&to_[]=' + state + _to + 
'&resource=' + resource;
+    var day = date.getDay();
+    var weekday=new Array(7);
+    weekday[0]="sunday";
+    weekday[1]="monday";
+    weekday[2]="tuesday";
+    weekday[3]="wednesday";
+    weekday[4]="thursday";
+    weekday[5]="friday";
+    weekday[6]="saturday";
+       url += '&from_[]=' + state + _from + '&to_[]=' + state + _to + 
'&resource=' + resource + '&weekday=' + weekday[day];
        window.location.href = url;
 }
 

Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang   2011-01-21 08:58:46 UTC (rev 6820)
+++ trunk/booking/setup/phpgw_no.lang   2011-01-21 10:08:27 UTC (rev 6821)
@@ -464,7 +464,7 @@
 Confirm e-mail address booking no      Bekreft e-postadressen
 The e-mail addresses you entered do not match  booking no      E-postadressene 
er ikke like
 Lengt of shortname is to long, max 11 characters long  booking no      
Kortnavn er for langt, maks 11 tegn
-The organization number is wrong or not present        booking no      Det er 
ikke registrert et organisjonsnummer på denne organisasjonen
+The organization number is wrong or not present        booking no      Det er 
ikke registrert fakturainformasjon på denne organisasjonen
 The resource number is wrong or not present    booking no      Det er ikke 
registert et ressursnummer på denne organisasjonen
 Recurring allocation   booking no      Gjenta tildelingen
 weekday        booking no      Ukedag