[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7919] bkbooking: update on dashboard and application
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [7919] bkbooking: update on dashboard and application |
Date: |
Fri, 21 Oct 2011 13:54:03 +0000 |
Revision: 7919
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7919
Author: kjell
Date: 2011-10-21 13:54:02 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
bkbooking: update on dashboard and application
Modified Paths:
--------------
trunk/booking/inc/class.boapplication.inc.php
trunk/booking/inc/class.uidashboard.inc.php
trunk/booking/setup/phpgw_no.lang
trunk/booking/templates/base/application.xsl
Modified: trunk/booking/inc/class.boapplication.inc.php
===================================================================
--- trunk/booking/inc/class.boapplication.inc.php 2011-10-21 13:01:33 UTC
(rev 7918)
+++ trunk/booking/inc/class.boapplication.inc.php 2011-10-21 13:54:02 UTC
(rev 7919)
@@ -88,26 +88,26 @@
return $applications;
}
- public function read_dashboard_data($for_case_officer_id =
null) {
+ public function read_dashboard_data($for_case_officer_id =
array(null,null)) {
$params = $this->build_default_read_params();
-
+
if (!isset($params['filters'])) $params['filters'] =
array();
$where_clauses = !isset($params['filters']['where']) ?
array() : (array)$params['filters']['where'];
- if (!is_null($for_case_officer_id)) {
- $where_clauses[] =
"(%%table%%.display_in_dashboard = 1 AND %%table%%.case_officer_id =
".intval($for_case_officer_id).')';
+ if (!is_null($for_case_officer_id[0])) {
+ $where_clauses[] =
"(%%table%%.display_in_dashboard = 1 AND %%table%%.case_officer_id =
".intval($for_case_officer_id[1]).')';
+ } else {
+ $where_clauses[] = "(%%table%%.case_officer_id
= ".intval($for_case_officer_id[1]).')';
}
+
if ($building_id = phpgw::get_var('filter_building_id',
'int', 'GET', false)) {
$where_clauses[] = "(%%table%%.id IN (SELECT
DISTINCT a.id FROM bb_application a, bb_application_resource ar, bb_resource r
WHERE ar.application_id = a.id AND ar.resource_id = r.id AND r.building_id =
".intval($building_id)."))";
}
-# if ($type = phpgw::get_var('type') != 'not') {
-# $params['filters']['type'] = phpgw::get_var('type');
-# }
-
- if ($status = phpgw::get_var('status') != 'not') {
+
+ if ( $status = phpgw::get_var('status') != '') {
$params['filters']['status'] = phpgw::get_var('status');
- }
+ }
$params['filters']['where'] = $where_clauses;
Modified: trunk/booking/inc/class.uidashboard.inc.php
===================================================================
--- trunk/booking/inc/class.uidashboard.inc.php 2011-10-21 13:01:33 UTC (rev
7918)
+++ trunk/booking/inc/class.uidashboard.inc.php 2011-10-21 13:54:02 UTC (rev
7919)
@@ -73,8 +73,8 @@
'text' => lang('Status').':',
'list' => array(
array(
- 'id' => 'not',
- 'name' => lang('Not selected')
+ 'id' => '',
+ 'name' => lang('All')
),
array(
'id' => 'NEW',
@@ -92,10 +92,6 @@
'id' => 'ACCEPTED',
'name' => lang('ACCEPTED')
),
- array(
- 'id' => 'CLOSED',
- 'name' => lang('CLOSED')
- )
)
),
array('type' =>
'autocomplete',
@@ -132,10 +128,6 @@
'label' =>
lang('Status')
),
array(
- 'key' => 'type',
- 'label' => lang('Type')
- ),
- array(
'key' => 'created',
'label' =>
lang('Created')
),
@@ -172,7 +164,7 @@
public function index_json()
{
$this->db = $GLOBALS['phpgw']->db;
- $applications =
$this->bo->read_dashboard_data($this->show_all_dashboard_applications() ? null
: $this->current_account_id());
+ $applications =
$this->bo->read_dashboard_data($this->show_all_dashboard_applications() ?
array(null,$this->current_account_id()) : array(1,$this->current_account_id()));
foreach($applications['results'] as &$application)
{
$application['status'] =
lang($application['status']);
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2011-10-21 13:01:33 UTC (rev 7918)
+++ trunk/booking/setup/phpgw_no.lang 2011-10-21 13:54:02 UTC (rev 7919)
@@ -420,7 +420,7 @@
Information about the event booking no Informasjon om arrangementet
Short description. For public events, activities and training under the
direction of organizations and clubs, this information will be displayed on the
internet booking no Gi en kort beskrivelse av arrangementet. For
åpne arrangement, aktiviteter og trening i regi av organisasjoner og klubber
vises denne informasjonen på internett
To borrow premises you must verify that you have read terms and conditions
booking no For å låne lokaler må du bekrefte at du har lest juridiske
betingelser
-In order to send the invoice we need information about either customer
organization number or norwegian social security number booking no For å
kunne sende faktura trenger vi opplysninger om organisasjonsnr. eller
fødselsnr. Organisasjonsnr. finner du her: www.brreg.no
+In order to send the invoice we need information about either customer
organization number or norwegian social security number booking no For å
kunne sende faktura trenger vi opplysninger om organisasjonsnr. eller
fødselsnr. Interne fra BK oppgir ressursnr. Organisasjonsnr. finner du her:
www.brreg.no
Event type booking no Arrangementstype
Private event booking no Privat arrangement
Public event booking no Offentlig arrangement
@@ -534,3 +534,5 @@
Cancelation of bookings from booking no Avbestilling av bookinger fra
Booking system settings booking no Bookingmodul systeminnstillinger
Frontend users can delete bookings and allocations booking no Brukere
av frontend kan slette bookinger og tildelinger direkte
+All that borrow premises from Bergen Kommune must verify that they have read
the terms and conditions, this is usually fire regulations and house rules.
booking no Alle som leier lokaler hos Bergen kommune må bekrefte at de
har lest betingelsene, dette gjelder som regel brannforskrifter og husreglement.
+
Modified: trunk/booking/templates/base/application.xsl
===================================================================
--- trunk/booking/templates/base/application.xsl 2011-10-21 13:01:33 UTC
(rev 7918)
+++ trunk/booking/templates/base/application.xsl 2011-10-21 13:54:02 UTC
(rev 7919)
@@ -212,7 +212,7 @@
</dl>
<dl class="form-col">
<div class="heading"><br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
- <p>Alle som leier lokaler hos Bergen kommune må
bekrefte at de har lest betingelsene, dette gjelder som regel brannforskrifter
og husreglement.</p>
+ <p><xsl:value-of select="php:function('lang', 'All that
borrow premises from Bergen Kommune must verify that they have read the terms
and conditions, this is usually fire regulations and house rules.')" /></p>
<br />
<div id='regulation_documents'> </div>
<br />
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7919] bkbooking: update on dashboard and application,
Kjell Arne Espedal <=