[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11207] bkbooking: stavanger update
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [11207] bkbooking: stavanger update |
|
Date: |
Thu, 27 Jun 2013 07:41:27 +0000 |
Revision: 11207
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11207
Author: kjell
Date: 2013-06-27 07:41:05 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
bkbooking: stavanger update
Modified Paths:
--------------
branches/stavangerkommune/booking/inc/class.soevent.inc.php
branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
branches/stavangerkommune/booking/inc/class.uievent.inc.php
branches/stavangerkommune/booking/js/booking/common.js
branches/stavangerkommune/booking/templates/base/application.xsl
Modified: branches/stavangerkommune/booking/inc/class.soevent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.soevent.inc.php 2013-06-26
12:21:20 UTC (rev 11206)
+++ branches/stavangerkommune/booking/inc/class.soevent.inc.php 2013-06-27
07:41:05 UTC (rev 11207)
@@ -249,6 +249,30 @@
$db->query($sql, __LINE__, __FILE__);
}
+ public function delete_event($id)
+ {
+ $db = $this->db;
+ $table_name = $this->table_name.'_comment';
+ $sql = "DELETE FROM $table_name WHERE event_id = ($id)";
+ $db->query($sql, __LINE__, __FILE__);
+ $table_name = $this->table_name.'_agegroup';
+ $sql = "DELETE FROM $table_name WHERE event_id = ($id)";
+ $db->query($sql, __LINE__, __FILE__);
+ $table_name = $this->table_name.'_targetaudience';
+ $sql = "DELETE FROM $table_name WHERE event_id = ($id)";
+ $db->query($sql, __LINE__, __FILE__);
+ $table_name = $this->table_name.'_date';
+ $sql = "DELETE FROM $table_name WHERE event_id = ($id)";
+ $db->query($sql, __LINE__, __FILE__);
+ $table_name = $this->table_name.'_resource';
+ $sql = "DELETE FROM $table_name WHERE event_id = ($id)";
+ $db->query($sql, __LINE__, __FILE__);
+ $table_name = $this->table_name;
+ $sql = "DELETE FROM $table_name WHERE id = ($id)";
+ $db->query($sql, __LINE__, __FILE__);
+ return True;
+ }
+
public function update_id_string() {
$table_name = $this->table_name;
$db = $this->db;
Modified: branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2013-06-26 12:21:20 UTC (rev 11206)
+++ branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2013-06-27 07:41:05 UTC (rev 11207)
@@ -363,6 +363,7 @@
$association['from_'] =
pretty_timestamp($association['from_']);
$association['to_'] =
pretty_timestamp($association['to_']);
$association['link'] =
self::link(array('menuaction' => 'booking.ui'.$association['type'].'.edit',
'id'=>$association['id']));
+ $association['dellink'] =
self::link(array('menuaction' => 'booking.ui'.$association['type'].'.delete',
'event_id'=>$association['id'],
'application_id'=>$association['application_id']));
$association['type'] =
lang($association['type']);
}
@@ -753,7 +754,6 @@
$this->redirect(array('menuaction' =>
$this->url_prefix . '.show', 'id'=>$application['id']));
}
-
$application['dashboard_link'] =
self::link(array('menuaction' => 'booking.uidashboard.index'));
$application['applications_link'] =
self::link(array('menuaction' => 'booking.uiapplication.index'));
$application['edit_link'] =
self::link(array('menuaction' => 'booking.uiapplication.edit', 'id' =>
$application['id']));
@@ -798,6 +798,10 @@
}
$from = array("data" => implode(',',$from));
$num_associations = $associations['total_records'];
+ if ($this->is_assigned_to_current_user($application) &&
$GLOBALS['phpgw']->acl->check('admin', phpgwapi_acl::ADD, 'booking'))
+ $application['currentuser'] = true;
+ else
+ $application['currentuser'] = false;
self::check_date_availability($application);
self::render_template('application',
array('application' => $application,
'audience' =>
$audience, 'agegroups' => $agegroups,
Modified: branches/stavangerkommune/booking/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-06-26
12:21:20 UTC (rev 11206)
+++ branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-06-27
07:41:05 UTC (rev 11207)
@@ -9,6 +9,7 @@
'index' => true,
'add' => true,
'edit' => true,
+ 'delete' => true,
'info' => true,
'toggle_show_inactive' => true,
);
@@ -725,7 +726,17 @@
$this->add_template_helpers();
self::render_template('event_edit', array('event' =>
$event, 'activities' => $activities, 'agegroups' => $agegroups, 'audience' =>
$audience, 'comments' => $comments));
}
-
+ public function delete()
+ {
+ $event_id = phpgw::get_var('event_id', 'GET');
+ $application_id = phpgw::get_var('application_id',
'GET');
+
+ $this->bo->so->delete_event($event_id);
+ if (isset($application_id))
+ $this->redirect(array('menuaction' =>
'booking.uiapplication.show', 'id'=>$application_id));
+ else
+ $this->redirect(array('menuaction' =>
'booking.uievent.index'));
+ }
public function info()
{
$event =
$this->bo->read_single(intval(phpgw::get_var('id', 'GET')));
Modified: branches/stavangerkommune/booking/js/booking/common.js
===================================================================
--- branches/stavangerkommune/booking/js/booking/common.js 2013-06-26
12:21:20 UTC (rev 11206)
+++ branches/stavangerkommune/booking/js/booking/common.js 2013-06-27
07:41:05 UTC (rev 11207)
@@ -118,6 +118,13 @@
elCell.innerHTML = '<a href="' + link + '">' + name + '</a>';
};
+YAHOO.booking.formatLink2 = function(elCell, oRecord, oColumn, oData) {
+ var name = 'slett';
+ var text = "'Er du sikker på at du vil slette denne?'";
+ var link = oRecord.getData('dellink');
+ elCell.innerHTML = '<a onclick="return confirm('+ text +');" href="' +
link + '">' + name + '</a>';
+};
+
YAHOO.booking.formatGenericLink = function() {
var links = [];
var nOfLinks = arguments.length;
Modified: branches/stavangerkommune/booking/templates/base/application.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/application.xsl
2013-06-26 12:21:20 UTC (rev 11206)
+++ branches/stavangerkommune/booking/templates/base/application.xsl
2013-06-27 07:41:05 UTC (rev 11207)
@@ -322,10 +322,11 @@
<script type="text/javascript">
var resourceIds = '<xsl:value-of select="application/resource_ids"/>';
+ var currentuser = '<xsl:value-of select="application/currentuser"/>';
if (!resourceIds || resourceIds == "") {
resourceIds = false;
}
- var lang = <xsl:value-of select="php:function('js_lang', 'Resources',
'Resource Type', 'ID', 'Type', 'From', 'To', 'Document')"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resources',
'Resource Type', 'ID', 'Type', 'From', 'To', 'Document', 'Active' ,'Delete',
'del')"/>;
var app_id = <xsl:value-of select="application/id"/>;
var building_id = <xsl:value-of select="application/building_id"/>;
var resources = <xsl:value-of select="application/resources"/>;
@@ -345,12 +346,22 @@
]]>
var colDefs = [{key: 'name', label: lang['Resources'], formatter:
YAHOO.booking.formatLink}, {key: 'type', label: lang['Resource Type']}];
YAHOO.booking.inlineTableHelper('resources_container', url,
colDefs);
- var colDefs = [
- {key: 'id', label: lang['ID'], formatter:
YAHOO.booking.formatLink},
- {key: 'type', label: lang['Type']},
- {key: 'from_', label: lang['From']},
- {key: 'to_', label: lang['To']},
- {key: 'active', label: lang['active']}];
+ if (currentuser == 1) {
+ var colDefs = [
+ {key: 'id', label: lang['ID'], formatter:
YAHOO.booking.formatLink},
+ {key: 'type', label: lang['Type']},
+ {key: 'from_', label: lang['From']},
+ {key: 'to_', label: lang['To']},
+ {key: 'active', label: lang['Active']},
+ {key: 'dellink', label: lang['Delete'],
formatter: YAHOO.booking.formatLink2}];
+ } else {
+ var colDefs = [
+ {key: 'id', label: lang['ID'], formatter:
YAHOO.booking.formatLink},
+ {key: 'type', label: lang['Type']},
+ {key: 'from_', label: lang['From']},
+ {key: 'to_', label: lang['To']},
+ {key: 'active', label: lang['Active']}];
+ }
YAHOO.booking.inlineTableHelper('associated_container', url2,
colDefs);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11207] bkbooking: stavanger update,
Kjell Arne Espedal <=