[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9860] Fixed errors after testing.
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [9860] Fixed errors after testing. |
|
Date: |
Wed, 15 Aug 2012 12:00:38 +0000 |
Revision: 9860
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9860
Author: erikhl
Date: 2012-08-15 12:00:33 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
Fixed errors after testing.
Javascript errors in frontend
Error when approving activity
Error when transferring activities to portal
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendar/inc/class.sogroup.inc.php
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
trunk/activitycalendarfrontend/templates/base/activity_edit.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-08-15 10:32:33 UTC
(rev 9859)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-08-15 12:00:33 UTC
(rev 9860)
@@ -1422,8 +1422,40 @@
$id = intval($activity_id);
$org_id = intval($organization_id);
- $result = $this->db->query("UPDATE activity_activity SET
organization_id={$org_id} WHERE id={$id}", __LINE__,__FILE__);
+ $result = $this->db->query("UPDATE activity_activity SET
organization_id={$org_id} WHERE id={$id}", __LINE__,__FILE__);
return isset($result);
}
+
+ function get_activities_without_groups()
+ {
+ $activities = array();
+ $sql_activities = "select a.*, o.description as org_desc from
activity_activity a, bb_organization o where (a.group_id is null or a.group_id
= 0) and o.id = a.organization_id";
+ $this->db->query($sql_activities, __LINE__, __FILE__);
+ while($this->db->next_record())
+ {
+ $activity_id = $this->db->f('id');
+ $activity_title = $this->db->f('title');
+ $activity_organization = $this->db->f('organization_id');
+ $description = $this->db->f('org_desc');
+
+ $activities[] = array(
+ 'id'=>$activity_id,
+ 'title'=>$activity_title,
+ 'organization'=>$activity_organization,
+ 'description'=>$description
+ );
+ }
+ return $activities;
+ }
+
+ /*
+ * Function to be run once.
+ * Generates new groups based on activity where group is not
registered.
+ * Adds new group to booking
+ */
+ function generate_groups()
+ {
+ //TODO
+ }
}
Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php 2012-08-15 10:32:33 UTC
(rev 9859)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php 2012-08-15 12:00:33 UTC
(rev 9860)
@@ -181,8 +181,8 @@
function update_group_description($group_id, $desc)
{
- $sql = "UPDATE bb_group SET description={$desc} WHERE
ID={$group_id}";
- $result = $this->db->query($sql, __LINE__, __FILE__);
+ $sql = "UPDATE bb_group SET description='{$desc}' WHERE
ID={$group_id}";
+ $result = $this->db->query($sql, __LINE__, __FILE__);
if(isset($result))
{
return true;
@@ -200,7 +200,7 @@
$phone=$contact['phone'];
$mail=$contact['mail'];
- $sql = "UPDATE bb_group_contact SET NAME='{$name},
PHONE='{$phone}', EMAIL='{$mail}' WHERE id={$id}";
+ $sql = "UPDATE bb_group_contact SET NAME='{$name}',
PHONE='{$phone}', EMAIL='{$mail}' WHERE id={$id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if(isset($result))
{
Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php 2012-08-15
10:32:33 UTC (rev 9859)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2012-08-15
12:00:33 UTC (rev 9860)
@@ -25,7 +25,8 @@
'edit' => true,
'download' => true,
'send_mail' => true,
- 'get_organization_groups' => true
+ 'get_organization_groups' => true,
+ 'create_groups' => true
);
public function __construct()
@@ -307,12 +308,12 @@
if(isset($g_id) && $g_id > 0)
{
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
true));
-
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),$subject,$body);
+
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),$subject,$body);
}
else if (isset($o_id) && $o_id
> 0)
{
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
-
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),$subject,$body);
+
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),$subject,$body);
}
}
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'activitycalendar.uiactivities.view', 'id' => $activity->get_id(), 'saved_ok'
=> 'yes'));
@@ -742,5 +743,25 @@
return $returnHTML;
}
+
+ public function create_groups()
+ {
+ //var_dump('Vi skal lage grupper!');
+ $activities = $this->so_activity->get_activities_without_groups();
+ //_debug_array($activities);
+
+ foreach ($activities as $a)
+ {
+ $group_info = array();
+ $group_info['name'] = $a['title'];
+ $group_info['organization_id'] = $a['organization'];
+ $group_info['description'] = $a['description'];
+
+ $cp =
$this->so_contact->get_booking_contact_persons($a['organization']);
+
+ _debug_array($group_info);
+ _debug_array($cp);
+ }
+ }
}
?>
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-15
10:32:33 UTC (rev 9859)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-15
12:00:33 UTC (rev 9860)
@@ -544,8 +544,16 @@
$new_state =
phpgw::get_var('state');
// ... set all
parameters
$activity->set_title(phpgw::get_var('title'));
-
$activity->set_arena(phpgw::get_var('arena_id'));
-
$activity->set_internal_arena(phpgw::get_var('internal_arena_id'));
+ $arena_id =
phpgw::get_var('internal_arena_id');
+ $arena_arr =
explode($arena_id,"_");
+ if($arena_arr[0] ==
'i')
+ {
+
$activity->set_internal_arena($arena_arr[1]);
+ }
+ else
+ {
+
$activity->set_arena($arena_arr[1]);
+ }
//$district_array =
phpgw::get_var('district');
$activity->set_district(phpgw::get_var('district'));
$activity->set_office(phpgw::get_var('office'));
Modified: trunk/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit.php
2012-08-15 10:32:33 UTC (rev 9859)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit.php
2012-08-15 12:00:33 UTC (rev 9860)
@@ -161,7 +161,7 @@
alert("Kategori må fylles ut!");
return false;
}
- if((document.getElementById('internal_arena_id').value == null ||
document.getElementById('internal_arena_id').value == 0) &&
(document.getElementById('new_arena_hidden').value==null ||
document.getElementById('new_arena_hidden').value==''))
+ if((document.getElementById('internal_arena_id').value == null ||
document.getElementById('internal_arena_id').value == 0))
{
alert("Lokale må fylles ut!");
return false;
@@ -326,7 +326,7 @@
}
?>
</optgroup>
- <optgroup label="<?php
echo lang('building') ?>">
+ <optgroup label="<?php
echo lang('external_arena') ?>">
<?php
foreach($arenas as
$arena)
{
@@ -409,9 +409,9 @@
</FIELDSET>
<div class="form-buttons">
<?php
- if ($editable) {
- echo '<input type="submit"
name="save_activity" value="' . lang('save') . '" onclick="return allOK();"/>';
- }
+ if ($editable) {?>
+ <input type="submit"
name="save_activity" value="<?php echo lang('save')?>" onclick="return
allOK();"/>
+ <?php }
?>
</div>
</dl>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9860] Fixed errors after testing.,
Erik Holm-Larsen <=