[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7836] Merge 7813:7835 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7836] Merge 7813:7835 from trunk |
|
Date: |
Thu, 06 Oct 2011 19:30:12 +0000 |
Revision: 7836
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7836
Author: sigurdne
Date: 2011-10-06 19:30:11 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Merge 7813:7835 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.bosystem_message.inc.php
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation.inc.php
branches/Version-1_0-branch/booking/inc/class.uidashboard.inc.php
branches/Version-1_0-branch/booking/inc/class.uisystem_message.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/booking/templates/base/application_new.xsl
branches/Version-1_0-branch/bookingfrontend/inc/class.bosearch.inc.php
branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/rental/inc/class.soparty.inc.php
branches/Version-1_0-branch/rental/inc/class.uiparty.inc.php
branches/Version-1_0-branch/rental/inc/plugins/fellesdata/party.edit.php
branches/Version-1_0-branch/rental/js/rental/common.js
branches/Version-1_0-branch/rental/templates/base/css/base.css
branches/Version-1_0-branch/rental/templates/base/party.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835
Modified: branches/Version-1_0-branch/booking/inc/class.bosystem_message.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.bosystem_message.inc.php
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/booking/inc/class.bosystem_message.inc.php
2011-10-06 19:30:11 UTC (rev 7836)
@@ -8,82 +8,4 @@
parent::__construct();
$this->so = CreateObject('booking.sosystem_message');
}
- /**
- * Returns an array of application ids from applications
assocciated with buildings
- * which the given user has access to
- *
- * @param int $user_id
- */
-
- function read_message_data($for_case_officer_id = null)
- {
- $this->db = & $GLOBALS['phpgw']->db;
- $messages = array();
-
-# if ($type = phpgw::get_var('type', 'string', 'GET',
false) != 'not') {
-# $params['filters']['type'] = phpgw::get_var('type');
-# }
-
-# if ($status = phpgw::get_var('status', 'string', 'GET',
false) != 'not') {
-# $params['filters']['status'] = phpgw::get_var('status');
-# }
-
-# if (is_set($params['filters']['type'])) {
-# $filter = " WHERE type = ".$params['filters']['type']." ";
-# if (is_set($params['filters']['status'])) {
-# $filter = $filter." AND ".$params['filters']['status']."
";
-# }
-# } elseif (is_set($params['filters']['status'])) {
-# if (is_set($params['filters']['status'])) {
-# $filter = " WHERE status = '".$params['filters']['status']."'
";
-# } else {
- $filter = "";
-# }
-
-
- $sql = "SELECT id, type, status, title, name, created,
building_id FROM bb_system_message ".$filter." ORDER BY id DESC";
-
- ob_start();
- $myFile = "/tmp/debug2.txt";
- $fh = fopen($myFile, 'w') or die("can't open file");
- echo "<pre>\ntestdata:\n";print_r($sql);
- $op = ob_get_contents();
- fwrite($fh, $op);
- fclose($fh);
- ob_end_clean();
-
- $external_site_address =
isset($config->config_data['external_site_address']) &&
$config->config_data['external_site_address'] ?
$config->config_data['external_site_address'] :
$GLOBALS['phpgw_info']['server']['webserver_url'];
- $this->db->query($sql);
- $data = $this->db->resultSet;
- while ($messagedata = array_shift($data)) {
- $building_case_officers_data = array();
- $building_case_officers = array();
- $sql = "SELECT account_id, account_lid,
account_firstname, account_lastname FROM phpgw_accounts WHERE account_id IN
(SELECT subject_id FROM bb_permission WHERE
object_id=".$messagedata['building_id']." AND role='case_officer')";
- $this->db->query($sql);
- while ($record =
array_shift($this->db->resultSet)) {
- $building_case_officers_data[] =
array('account_id' => $record['account_id'], 'account_lid' =>
$record['account_lid'],'account_name' => $record['account_firstname']."
".$record['account_lastname']);
- $building_case_officers[] =
$record['account_id'];
- }
-
- if(in_array($for_case_officer_id,
$building_case_officers, true) || is_null($for_case_officer_id)) {
- $message = array('id' =>
$messagedata['id'],
- 'type' =>
lang($messagedata['type']),
- 'status' => lang($messagedata['status']),
- 'created' =>
pretty_timestamp($messagedata['created']),
- 'modified' => '',
- 'activity_name' => '',
- 'contact_name' => $messagedata['name'],
- 'case_officer_name' =>
$for_case_officer_id,
- 'what' => $messagedata['title'],
- 'link' =>
$external_site_address."/index.php?menuaction=booking.uisystem_message.show&id=".$messagedata['id']."&");
-
- while($case_officer =
array_shift($building_case_officers_data)) {
- if
($message['case_officer_name'] = $case_officer['account_id'])
-
$message['case_officer_name'] = $case_officer['account_name'];
- }
- $messages[] = $message;
- }
- }
- return $messages;
- }
}
Modified:
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation.inc.php
2011-10-06 09:44:12 UTC (rev 7835)
+++
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation.inc.php
2011-10-06 19:30:11 UTC (rev 7836)
@@ -165,6 +165,14 @@
'formatter' =>
'YAHOO.booking.formatGenericLink()',
),
array(
+ 'key' => 'event_id',
+ 'label' => lang('Event
id'),
+ ),
+ array(
+ 'key' =>
'event_description',
+ 'label' =>
lang('Description'),
+ ),
+ array(
'key' =>
'building_name',
'label' =>
lang('Building'),
),
@@ -173,6 +181,10 @@
'label' =>
lang('Organization'),
),
array(
+ 'key' => 'contact_name',
+ 'label' =>
lang('Contact'),
+ ),
+ array(
'key' =>
'customer_type',
'label' => lang('Cust.
Type'),
),
@@ -308,7 +320,46 @@
if
(empty($reservation['invoice_file_order_id'])) {
$reservation['invoice_file_order_id'] =
lang("Not Generated");
}
-
+
+ $this->db = & $GLOBALS['phpgw']->db;
+
+ if ($reservation['reservation_type']['label']
== 'Arrangement') {
+ $sql = "select description,contact_name
from bb_event where id=".$reservation['reservation_id'];
+ $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
+ $this->db->next_record();
+ $reservation['event_id'] =
$reservation['reservation_id'];
+ $reservation['event_description'] =
$this->db->f('description', false);
+ $reservation['contact_name'] =
$this->db->f('contact_name', false);
+
+ } elseif
($reservation['reservation_type']['label'] == 'Booking') {
+ $sql = "select application_id from
bb_booking where id=".$reservation['reservation_id'];
+ $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
+ $this->db->next_record();
+ if (!$this->db->f('application_id',
false)) {
+ $reservation['contact_name'] =
'';
+ } else {
+ $sql = "select contact_name
from bb_application where id=".$this->db->f('application_id', false);
+ $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
+ $this->db->next_record();
+ $reservation['contact_name'] =
$this->db->f('contact_name', false);
+ }
+ $reservation['event_id'] = '';
+ $reservation['event_description'] = '';
+ } else {
+ $sql = "select application_id from
bb_allocation where id=".$reservation['reservation_id'];
+ $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
+ $this->db->next_record();
+ if (!$this->db->f('application_id',
false)) {
+ $reservation['contact_name'] =
'';
+ } else {
+ $sql = "select contact_name
from bb_application where id=".$this->db->f('application_id', false);
+ $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
+ $this->db->next_record();
+ $reservation['contact_name'] =
$this->db->f('contact_name', false);
+ }
+ $reservation['event_id'] = '';
+ $reservation['event_description'] = '';
+ }
$reservation['from_'] =
substr($reservation['from_'], 0, -3);
$reservation['to_'] =
substr($reservation['to_'], 0, -3);
$reservation['from_'] =
pretty_timestamp($reservation['from_']);
Modified: branches/Version-1_0-branch/booking/inc/class.uidashboard.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uidashboard.inc.php
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/booking/inc/class.uidashboard.inc.php
2011-10-06 19:30:11 UTC (rev 7836)
@@ -116,11 +116,6 @@
'value' =>
$this->show_all_dashboard_applications() ? lang('Show only applications
assigned to me') : lang('Show all applications'),
'href' =>
self::link(array('menuaction' =>
$this->url_prefix.'.toggle_show_all_dashboard_applications'))
),
- array(
- 'type' =>
'link',
- 'value' =>
lang('Show messages'),
- 'href' =>
self::link(array('menuaction' => 'booking.uisystem_message.index'))
- ),
)
),
),
@@ -205,19 +200,6 @@
}
array_walk($applications["results"], array($this,
"_add_links"), "booking.uiapplication.show");
-# $messages =
$this->system_message_bo->read_message_data($this->show_all_dashboard_messages()
? null : $this->current_account_id());
-
-# if ($this->show_all_dashboard_messages() ||
$this->show_all_dashboard_applications())
-# {
-# if ($this->show_all_dashboard_messages()) {
-# $applications['results'] = $messages;
-# }
-# } else {
-# foreach($messages as $message)
-# {
-# $applications['results'][] = $message;
-# }
-# }
return $this->yui_results($applications);
}
Modified: branches/Version-1_0-branch/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uisystem_message.inc.php
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/booking/inc/class.uisystem_message.inc.php
2011-10-06 19:30:11 UTC (rev 7836)
@@ -8,11 +8,9 @@
'index' => true,
'show' => true,
'edit' => true,
- 'toggle_show_all_dashboard_messages' => true,
'toggle_show_inactive' => true,
);
- const SHOW_ALL_DASHBOARD_MESSAGES_SESSION_KEY =
"show_all_dashboard_messages";
protected $module;
public function __construct()
@@ -25,21 +23,6 @@
$this->module = 'booking';
}
- public function toggle_show_all_dashboard_messages()
- {
- if($this->show_all_dashboard_messages())
- {
-
unset($_SESSION[self::SHOW_ALL_DASHBOARD_MESSAGES_SESSION_KEY]);
- } else {
-
$_SESSION[self::SHOW_ALL_DASHBOARD_MESSAGES_SESSION_KEY] = true;
- }
- $this->redirect(array('menuaction' =>
$this->url_prefix.'.index'));
- }
-
- public function show_all_dashboard_messages() {
- return
array_key_exists(self::SHOW_ALL_DASHBOARD_MESSAGES_SESSION_KEY, $_SESSION);
- }
-
public function index()
{
if(phpgw::get_var('phpgw_return_as') == 'json') {
@@ -54,42 +37,42 @@
'form' => array(
'toolbar' => array(
'item' => array(
-# array('type' =>
'filter',
-# 'name' =>
'status',
-# 'text' => lang('Status').':',
-# 'list' => array(
-# array(
-# 'id' => 'not',
-# 'name' => lang('Not selected')
-# ),
-# array(
-# 'id' => 'NEW',
-# 'name' => lang('NEW')
-# ),
-# array(
-# 'id' => 'CLOSED',
-# 'name' => lang('CLOSED')
-# )
-# )
-# ),
-# array('type' =>
'filter',
-# 'name' =>
'type',
-# 'text' => lang('Type').':',
-# 'list' => array(
-# array(
-# 'id' => 'not',
-# 'name' => lang('Not selected')
-# ),
-# array(
-# 'id' => 'message',
-# 'name' => lang('Message')
-# ),
-# array(
-# 'id' => 'cancelation',
-# 'name' => lang('Cancelation')
-# ),
-# )
-# ),
+ array('type' =>
'filter',
+ 'name' =>
'status',
+ 'text' => lang('Status').':',
+ 'list' => array(
+ array(
+ 'id' => '',
+ 'name' => lang('Not selected')
+ ),
+ array(
+ 'id' => 'NEW',
+ 'name' => lang('NEW')
+ ),
+ array(
+ 'id' => 'CLOSED',
+ 'name' => lang('CLOSED')
+ )
+ )
+ ),
+ array('type' =>
'filter',
+ 'name' =>
'type',
+ 'text' => lang('Type').':',
+ 'list' => array(
+ array(
+ 'id' => '',
+ 'name' => lang('Not selected')
+ ),
+ array(
+ 'id' => 'message',
+ 'name' => lang('Message')
+ ),
+ array(
+ 'id' => 'cancelation',
+ 'name' => lang('Cancelation')
+ ),
+ )
+ ),
array('type' =>
'autocomplete',
'name' =>
'building',
'ui' =>
'building',
@@ -105,14 +88,9 @@
),
array(
'type' =>
'link',
- 'value' =>
lang('Show applications') ,
- 'href' =>
self::link(array('menuaction' => 'booking.uidashboard.index'))
+ 'value' =>
$_SESSION['showall'] ? lang('Show only messages assigned to me') : lang('Show
all messages'),
+ 'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
),
- array(
- 'type' =>
'link',
- 'value' =>
$this->show_all_dashboard_messages() ? lang('Show only messages assigned to
me') : lang('Show all messages'),
- 'href' =>
self::link(array('menuaction' =>
$this->url_prefix.'.toggle_show_all_dashboard_messages'))
- ),
)
),
),
@@ -168,18 +146,45 @@
public function index_json()
{
- $this->db = $GLOBALS['phpgw']->db;
+ $this->db = & $GLOBALS['phpgw']->db;
- if (
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
-
!$this->bo->has_role(booking_sopermission::ROLE_MANAGER) )
- {
- $filters['id'] =
$this->bo->accessable_applications($GLOBALS['phpgw_info']['user']['id']);
+ $current_user = $this->current_account_id();
+ $current_user_building_data = array();
+ $sql = "select object_id from bb_permission where
subject_id=".$current_user." and role='case_officer';";
+ $this->db->query($sql);
+ while ($record = array_shift($this->db->resultSet)) {
+ $current_user_building_data[] =
$record['object_id'];
}
- $filters['status'] = 'NEW';
+ $filters['building_id'] = $current_user_building_data;
+
if(isset($_SESSION['showall']))
{
- $filters['status'] = array('NEW', 'CLOSED');
- }
+ unset($filters['building_id']);
+ unset($filters['building_name']);
+ unset($filters['type']);
+ unset($filters['status']);
+ } else {
+
+ $testdata = phpgw::get_var('filter_building_id', 'int',
'REQUEST', null);
+ if ($testdata != 0) {
+ $filters['building_name'] =
$this->bo->so->get_building(phpgw::get_var('filter_building_id', 'int',
'REQUEST', null));
+ } else {
+ unset($filters['building_name']);
+ }
+ $testdata2 = phpgw::get_var('type', 'str', 'REQUEST');
+ if ($testdata2 != '') {
+ $filters['type'] = phpgw::get_var('type', 'str',
'REQUEST');
+ } else {
+ unset($filters['type']);
+ }
+ $testdata2 = phpgw::get_var('status', 'str', 'REQUEST');
+ if ($testdata2 != '') {
+ $filters['status'] = phpgw::get_var('status', 'str',
'REQUEST');
+ } else {
+ unset($filters['status']);
+ }
+ }
+
$params = array(
'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
'results' => phpgw::get_var('results', 'int',
'REQUEST', null),
@@ -189,22 +194,41 @@
'filters' => $filters
);
- $system_messages = $this->bo->read();
+ $system_messages = $this->bo->so->read($params);
+ array_walk($system_messages["results"], array($this,
"_add_links"), "booking.uisystem_message.show");
- foreach($system_messages["results"] as
&$system_message) {
+
+ foreach($system_messages['results'] as &$system_message)
+ {
+ $building_case_officers_data = array();
+ $building_case_officers = array();
+ $sql = "SELECT account_id, account_lid,
account_firstname, account_lastname FROM phpgw_accounts WHERE account_id IN
(SELECT subject_id FROM bb_permission WHERE
object_id=".$system_message['building_id']." AND role='case_officer')";
+ $this->db->query($sql);
+ while ($record =
array_shift($this->db->resultSet)) {
+ $building_case_officers_data[] =
array('account_id' => $record['account_id'], 'account_lid' =>
$record['account_lid'],'account_name' => $record['account_firstname']."
".$record['account_lastname']);
+ $building_case_officers[] =
$record['account_id'];
+ }
+
$system_message['created'] =
pretty_timestamp($system_message['created']);
$system_message['type'] =
lang($system_message['type']);
$system_message['status'] =
lang($system_message['status']);
+ $system_message['modified'] = '';
+ $system_message['activity_name'] = '';
+ $system_message['contact_name'] =
$system_message['name'];
+ $system_message['case_officer_name'] =
$for_case_officer_id;
+ $system_message['what'] =
$system_message['title'];
+ if (strstr($system_message['what'],"%")){
+ $search = array('%2C','%C3%85',
'%C3%A5', '%C3%98', '%C3%B8', '%C3%86', '%C3%A6');
+ $replace = array
(',','Å','å','Ø','ø','Æ','æ');
+ $system_message['what'] =
str_replace($search, $replace, $system_message['what']);
+ }
+
+ while($case_officer =
array_shift($building_case_officers_data)) {
+ if
($system_message['case_officer_name'] = $case_officer['account_id'])
+
$system_message['case_officer_name'] = $case_officer['account_name'];
+ }
}
- array_walk($system_messages['results'], array($this,
'_add_links'), $this->module.'.uisystem_message.show');
-
- $messages =
$this->bo->read_message_data($this->show_all_dashboard_messages() ? null :
$this->current_account_id());
-
- $system_messages['results'] = $messages;
-
- $results = $this->yui_results($system_messages);
-
- return $results;
+ return $this->yui_results($system_messages);
}
public function edit()
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-10-06
09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-10-06
19:30:11 UTC (rev 7836)
@@ -162,7 +162,7 @@
planning booking no Planlegging
prev booking no Forrige
preview booking no Forhåndsvisning
-previous week booking no Forige uke
+previous week booking no Forrige uke
price list booking no Prisliste
primary admin booking no Kontaktperson 1
primary contact booking no Kontaktperson 1
@@ -418,7 +418,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.
+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
Event type booking no Arrangementstype
Private event booking no Privat arrangement
Public event booking no Offentlig arrangement
@@ -519,3 +519,4 @@
Documentation booking no Dokumentasjon
Upload manual booking no Last opp dokumentasjon
Are you sure you want to delete? booking no Er du sikker på at
søknad skal avvises?
+Event id booking no Arrangement id
Modified: branches/Version-1_0-branch/booking/templates/base/application_new.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/application_new.xsl
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/booking/templates/base/application_new.xsl
2011-10-06 19:30:11 UTC (rev 7836)
@@ -21,7 +21,7 @@
For åpne arrangement, aktiviteter og trening i
regi av
organisasjoner og klubber vises denne
informasjonen på internett.
For faste aktiviteter oppgi intervall og til
dato,
- f.eks. torsdager kl.19-20 frem til 23/6.</p>
+ f.eks. torsdager kl.19-20 frem til 23/6. Oppgi
arrangør og gi en kort beskrivelse av arrangementet. For åpne arrangement,
aktiviteter og trening i regi av organisasjoner og klubber vises denne
informasjonen på internett</p>
</dt>
<dd>
<select name="activity_id" id="field_activity">
Modified: branches/Version-1_0-branch/bookingfrontend/inc/class.bosearch.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.bosearch.inc.php
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.bosearch.inc.php
2011-10-06 19:30:11 UTC (rev 7836)
@@ -17,7 +17,7 @@
$bui_result = $org_result = $res_result = array();
if (!$type || $type == "building") {
- $bui_result =
$this->sobuilding->read(array("query"=>$searchterm, "filters" => array("active"
=> "1")));
+ $bui_result =
$this->sobuilding->read(array("query"=>$searchterm, "sort" => "name", "dir" =>
"asc", "filters" => array("active" => "1")));
foreach($bui_result['results'] as &$bui)
{
$bui['type'] = "building";
@@ -31,7 +31,7 @@
}
}
if (!$type || $type == "organization") {
- $org_result =
$this->soorganization->read(array("query"=>$searchterm, "filters" =>
array("active" => "1")));
+ $org_result =
$this->soorganization->read(array("query"=>$searchterm, "sort" => "name",
"dir" => "asc", "filters" => array("active" => "1")));
foreach($org_result['results'] as &$org)
{
$org['type'] = "organization";
@@ -44,7 +44,7 @@
}
}
if(!$type || $type == "resource") {
- $res_result =
$this->soresource->read(array("query"=>$searchterm, "filters" => array("active"
=> "1")));
+ $res_result =
$this->soresource->read(array("query"=>$searchterm, "sort" => "name", "dir" =>
"asc", "filters" => array("active" => "1")));
foreach($res_result['results'] as &$res)
{
$res['name'] = $res['building_name']. ' / ' . $res['name'];
Modified: branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
2011-10-06 19:30:11 UTC (rev 7836)
@@ -278,7 +278,7 @@
Information about the event bookingfrontend 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 bookingfrontend 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
bookingfrontend 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 bookingfrontend no
For å kunne sende faktura trenger vi opplysninger om organisasjonsnr. eller
fødselsnr.
+In order to send the invoice we need information about either customer
organization number or norwegian social security number bookingfrontend no
For å kunne sende faktura trenger vi opplysninger om organisasjonsnr. eller
fødselsnr. Organisasjonsnr. finner du her: www.brreg.no
Private event bookingfrontend no Privat arrangement
Mass update bookingfrontend no Masseoppdatering
You are now about to update all bookings from this date and to the end of the
season. bookingfrontend no Du er nå i ferd med å oppdatere alle bookinger
fra dagens dato og ut sesongen.
Modified: branches/Version-1_0-branch/rental/inc/class.soparty.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.soparty.inc.php
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/rental/inc/class.soparty.inc.php
2011-10-06 19:30:11 UTC (rev 7836)
@@ -324,7 +324,7 @@
'is_inactive = ' .
$this->marshal(($party->is_inactive() ? 'true' : 'false'), 'bool'),
'comment = ' .
$this->marshal($party->get_comment(), 'string'),
'org_enhet_id = ' .
$this->marshal($party->get_org_enhet_id(), 'int'),
- 'org_unit_leader = ' .
$this->marshal($party->get_org_unit_leader(), 'string'),
+ 'unit_leader = ' .
$this->marshal($party->get_unit_leader(), 'string'),
'location_id = ' . $location_id,
'result_unit_number = ' . $result_unit_number
);
Modified: branches/Version-1_0-branch/rental/inc/class.uiparty.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uiparty.inc.php
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/rental/inc/class.uiparty.inc.php
2011-10-06 19:30:11 UTC (rev 7836)
@@ -515,7 +515,7 @@
$party->set_comment(phpgw::get_var('comment'));
//$party->set_location_id(phpgw::get_var('location_id'));
$party->set_org_enhet_id(phpgw::get_var('org_enhet_id'));
-
$party->set_org_unit_person(phpgw::get_var('org_unit_person'));
+
$party->set_unit_leader(phpgw::get_var('unit_leader'));
if(rental_soparty::get_instance()->store($party)) // ... and then try to store
the object
{
Modified:
branches/Version-1_0-branch/rental/inc/plugins/fellesdata/party.edit.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/plugins/fellesdata/party.edit.php
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/rental/inc/plugins/fellesdata/party.edit.php
2011-10-06 19:30:11 UTC (rev 7836)
@@ -9,9 +9,10 @@
<select name="org_enhet_id" id="org_enhet_id">
<option value=""><?php echo
lang('no_party_location') ?></option>
<?php
-
+ var_dump("SKRIVER UT");
+
$result_units =
rental_bofellesdata::get_instance()->get_result_units();
-
+ print_r($result_units);
$party_org_enhet_id = $party->get_org_enhet_id();
foreach ($result_units as $result_unit)
{
@@ -33,6 +34,8 @@
$party_org_enhet_id = $party->get_org_enhet_id();
if (isset($party_org_enhet_id) &&
is_numeric($party_org_enhet_id))
{
+
+
$result_unit =
rental_bofellesdata::get_instance()->get_result_unit($party_org_enhet_id);
echo $result_unit['ORG_NAME'];
}
Modified: branches/Version-1_0-branch/rental/js/rental/common.js
===================================================================
--- branches/Version-1_0-branch/rental/js/rental/common.js 2011-10-06
09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/rental/js/rental/common.js 2011-10-06
19:30:11 UTC (rev 7836)
@@ -281,7 +281,7 @@
}
);
}else{
-
document.getElementById('unit_errorMsg').style.display = 'block';
+
document.getElementById('unit_errorMsg').style.display = 'block';
}
}
);
@@ -292,7 +292,7 @@
var syncInfo = YAHOO.lang.JSON.parse(o.responseText);
var email = syncInfo.email;
- var department = syncInfo.org_name;
+ var department = syncInfo.department;
var org_name = syncInfo.org_name;
var unit_leader = syncInfo.unit_leader_fullname;
Modified: branches/Version-1_0-branch/rental/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/css/base.css
2011-10-06 09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/rental/templates/base/css/base.css
2011-10-06 19:30:11 UTC (rev 7836)
@@ -46,6 +46,10 @@
margin-top: 0.5em;
}
+input[type="submit"], input[type="button"]{
+ padding:2px 4px;
+}
+
legend {
font-weight: bolder;
margin-bottom: 0.2em;
@@ -167,6 +171,22 @@
float: left;
}
+dl.proplist-col input[type="text"]{
+ width:200px;
+}
+
+dl.proplist-col input.postcode{
+ width:50px;
+}
+
+dl.proplist-col input.medium_number{
+ width:100px;
+}
+
+dl.proplist-col input.address_2{
+ margin-top:4px;
+}
+
div.identifier-header {
padding-left: 2em;
margin-bottom: 1em;
@@ -181,6 +201,10 @@
margin: 0 0 25px 25px;
padding-top: 2em;
}
+.form-buttons input[type="submit"], .form-buttons input[type="button"] {
+ padding: 2px 4px;
+ width: 165px;
+}
.form-buttons button {
margin-right: .5em;
}
@@ -402,13 +426,12 @@
/* Set up common form styles. TODO: needs refinement. */
legend, label, input, select {
margin:0 13px 0px 0px;
+ padding: 1px 2px;
}
label {
line-height:1.5em;
}
-
-
fieldset {
border-bottom:0px solid #ccc;
Modified: branches/Version-1_0-branch/rental/templates/base/party.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/party.php 2011-10-06
09:44:12 UTC (rev 7835)
+++ branches/Version-1_0-branch/rental/templates/base/party.php 2011-10-06
19:30:11 UTC (rev 7836)
@@ -43,7 +43,7 @@
if ($editable)
{
?>
- <input type="text"
name="identifier" id="identifier" value="<?php echo $party->get_identifier()
?>" />
+ <input type="text"
name="identifier" id="identifier" class="medium_number" value="<?php echo
$party->get_identifier() ?>" />
<?php
}
else
@@ -160,7 +160,7 @@
?>
<input type="text"
name="address1" id="address1" value="<?php echo $party->get_address_1() ?>" />
<br/>
- <input type="text"
name="address2" id="address2" value="<?php echo $party->get_address_2() ?>" />
+ <input type="text"
name="address2" id="address2" class="address_2" value="<?php echo
$party->get_address_2() ?>" />
<?php
}
else
@@ -207,7 +207,7 @@
if ($editable)
{
?>
- <input type="text"
name="phone" id="phone" value="<?php echo $party->get_phone() ?>" />
+ <input type="text"
name="phone" id="phone" class="medium_number" value="<?php echo
$party->get_phone() ?>" />
<?php
}
else
@@ -226,7 +226,7 @@
if ($editable)
{
?>
- <input type="text"
name="mobile_phone" id="mobile_phone" value="<?php echo
$party->get_mobile_phone() ?>" />
+ <input type="text"
name="mobile_phone" id="mobile_phone" class="medium_number" value="<?php echo
$party->get_mobile_phone() ?>" />
<?php
}
else
@@ -245,7 +245,7 @@
if ($editable)
{
?>
- <input type="text"
name="fax" id="fax" value="<?php echo $party->get_fax() ?>" />
+ <input type="text"
name="fax" id="fax" class="medium_number" value="<?php echo $party->get_fax()
?>" />
<?php
}
else
@@ -398,44 +398,44 @@
</dl>
<dl class="proplist-col">
<dt>
- <?php if($party->get_comment()
|| $editable) { ?>
- <label for="comment"><?php echo
lang('comment') ?></label>
- <?php } ?>
+ <?php
if($party->get_unit_leader() || $editable) { ?>
+ <label for="unit_leader"><?php
echo lang('unit_leader') ?></label>
+ <?php } ?>
</dt>
<dd>
<?php
if ($editable)
{
- ?>
- <textarea cols="40" rows="7" name="comment"
id="comment"><?php echo $party->get_comment(); ?></textarea>
- <?php
+ ?>
+ <input type="text"
name="unit_leader" id="unit_leader" value="<?php echo $party->get_unit_leader()
?>" />
+ <?php
}
else
{
- echo
$party->get_comment();
+ echo
$party->get_unit_leader();
}
?>
</dd>
<dt>
- <?php
if($party->get_unit_leader() || $editable) { ?>
- <label for="unit_leader"><?php
echo lang('unit_leader') ?></label>
- <?php } ?>
+ <?php if($party->get_comment()
|| $editable) { ?>
+ <label for="comment"><?php echo
lang('comment') ?></label>
+ <?php } ?>
</dt>
<dd>
<?php
if ($editable)
{
- ?>
- <input type="text"
name="unit_leader" id="unit_leader" value="<?php echo $party->get_unit_leader()
?>" />
- <?php
+ ?>
+ <textarea cols="40" rows="7" name="comment"
id="comment"><?php echo $party->get_comment(); ?></textarea>
+ <?php
}
else
{
- echo
$party->get_unit_leader();
+ echo
$party->get_comment();
}
?>
</dd>
- </dl>
+ </dl>
<div class="form-buttons">
<span id="unit_errorMsg">Du må velge
organisasjonsenhet før du kan synkronisere</span>
<?php
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7836] Merge 7813:7835 from trunk,
Sigurd Nes <=