[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9873] Fixes after testing 16/08
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [9873] Fixes after testing 16/08 |
|
Date: |
Fri, 17 Aug 2012 08:53:18 +0000 |
Revision: 9873
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9873
Author: erikhl
Date: 2012-08-17 08:53:17 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
Fixes after testing 16/08
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendar/inc/class.sogroup.inc.php
trunk/activitycalendar/inc/class.soorganization.inc.php
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/activitycalendar/inc/class.uiorganization.inc.php
trunk/activitycalendar/inc/model/class.organization.inc.php
trunk/activitycalendar/setup/phpgw_no.lang
trunk/activitycalendar/templates/base/organization.php
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
trunk/activitycalendarfrontend/setup/phpgw_no.lang
trunk/activitycalendarfrontend/templates/base/activity.php
trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-08-17 08:15:49 UTC
(rev 9872)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-08-17 08:53:17 UTC
(rev 9873)
@@ -620,6 +620,20 @@
return $result;
}
+ function get_office_description($office_id)
+ {
+ $result = "Ingen";
+ if($office_id != null)
+ {
+ $sql = "SELECT description FROM bb_office where id=$office_id";
+ var_dump($sql);
+ $this->db->query($sql, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('description');
+ }
+ }
+ return $result;
+ }
function get_target_name($target_id)
{
Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php 2012-08-17 08:15:49 UTC
(rev 9872)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php 2012-08-17 08:53:17 UTC
(rev 9873)
@@ -195,7 +195,7 @@
function update_group_contact($contact)
{
- $id=intval($contact['id']);
+ $id=intval($contact['original_id']);
$name=$contact['name'];
$phone=$contact['phone'];
$mail=$contact['mail'];
Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php 2012-08-17
08:15:49 UTC (rev 9872)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php 2012-08-17
08:53:17 UTC (rev 9873)
@@ -147,6 +147,7 @@
$columns[] = 'org.email';
$columns[] = 'org.description';
$columns[] = 'org.address';
+ $columns[] = 'org.addressnumber';
$columns[] = 'org.zip_code';
$columns[] = 'org.city';
$columns[] = 'org.district';
@@ -499,7 +500,7 @@
$description = $organization->get_description();
$street = $organization->get_address();
$streetnumber = $organization->get_addressnumber();
- $zip_code = $organization->set_zip_code();
+ $zip_code = $organization->get_zip_code();
$city = $organization->get_city();
$district = $organization->get_district();
$change_type = $organization->get_change_type();
Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php 2012-08-17
08:15:49 UTC (rev 9872)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2012-08-17
08:53:17 UTC (rev 9873)
@@ -521,14 +521,15 @@
//$link_text = "<a
href='http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
//$link_text = "<a
href='{$mailBaseURL}?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
$link_text = "<a
href='http://www.bergen.kommune.no/aktivitetsoversikt/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
- $office_name =
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
+ $office_name =
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
+ //$office_footer =
activitycalendar_soactivity::get_instance()->get_office_description($activity->get_office());
if($activity->get_state() == 2)
{
- $body = lang('mail_body_update_frontend',
$activity->get_title(), $link_text, $office_name);
+ $body = lang('mail_body_update_frontend',
$activity->get_title(), $link_text, $office_name);// .
'<br/><br/>'.$office_footer;
}
else
{
- $body = lang('mail_body_update',
$activity->get_title(), $link_text, $office_name);
+ $body = lang('mail_body_update',
$activity->get_title(), $link_text, $office_name);// .
'<br/><br/>'.$office_footer;
}
//var_dump($subject);
Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-08-17
08:15:49 UTC (rev 9872)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-08-17
08:53:17 UTC (rev 9873)
@@ -81,143 +81,6 @@
unset($org_info);
unset($contact1);
unset($contact2);
-/* if($type)
- {
- $sogroup = activitycalendar_sogroup::get_instance();
- $soactivity =
activitycalendar_soactivity::get_instance();
- $socontact =
activitycalendar_socontactperson::get_instance();
- $group_array = $sogroup->get(null, null, null, null,
null, null, array('id' => $id, 'changed_groups' => 'true'));
- if(count($group_array) > 0){
- $keys = array_keys($group_array);
- $group = $group_array[$keys[0]];
- }
- if(isset($_POST['save_group'])) // The user has pressed
the save button
- {
- $desc = phpgw::get_var('group_description');
- $group->set_description($desc);
-
- $contact1 = array();
- $contact1['id'] = phpgw::get_var('contact1_id');
- $contact1['name'] =
phpgw::get_var('contact1_name');
- $contact1['phone'] =
phpgw::get_var('contact1_phone');
- $contact1['mail'] =
phpgw::get_var('contact1_email');
- $contact1['org_id'] = 0;
- $contact1['group_id'] = $group->get_id();
-
- $contact2 = array();
- $contact2['id'] = phpgw::get_var('contact2_id');
- $contact2['name'] =
phpgw::get_var('contact2_name');
- $contact2['phone'] =
phpgw::get_var('contact2_phone');
- $contact2['mail'] =
phpgw::get_var('contact2_email');
- $contact2['org_id'] = 0;
- $contact2['group_id'] = $group->get_id();
-
- if($sogroup->update_local($group))
- {
-
$socontact->update_local_contact_person($contact1);
-
$socontact->update_local_contact_person($contact2);
- $message = lang('messages_saved_form');
- }
- else
- {
- $error = lang('messages_form_error');
- }
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiorganization.show', 'id' =>
$group->get_id(), 'type' => 'group', 'saved_ok' => 'yes'));
- }
- else if(isset($_POST['store_group'])) // The user has
pressed the store button
- {
- $desc = phpgw::get_var('group_description');
- $orgid = $group->get_organization_id();
-
- $group_info = array();
- $group_info['name'] = $group->get_name(); //new
- $group_info['organization_id'] = $orgid;
- $group_info['description'] = $desc;
-
- $contact1_id = phpgw::get_var('contact1_id');
- $contact2_id = phpgw::get_var('contact2_id');
-
- $contact1_name =
phpgw::get_var('contact1_name');
- $contact1_phone =
phpgw::get_var('contact1_phone');
- $contact1_email =
phpgw::get_var('contact1_email');
-
- $contact2_name =
phpgw::get_var('contact2_name');
- $contact2_phone =
phpgw::get_var('contact2_phone');
- $contact2_email =
phpgw::get_var('contact2_email');
-
-
- $new_group_id =
$sogroup->transfer_group($group_info);
- if($new_group_id)
- {
- //update activity with new org id
- //add contact persons to booking
- $contact1 = array();
- $contact1['name'] = $contact1_name;
- $contact1['phone'] = $contact1_phone;
- $contact1['mail'] = $contact1_email;
- $contact1['group_id'] = $new_group_id;
-
$soactivity->add_contact_person_group($contact1);
-
- $contact2 = array();
- $contact2['name'] = $contact2_name;
- $contact2['phone'] = $contact2_phone;
- $contact2['mail'] = $contact2_email;
- $contact2['group_id'] = $new_group_id;
-
$soactivity->add_contact_person_group($contact2);
-
- $message = lang('messages_saved_form');
-
- //get organization_id for the group:
- $group_org_id =
$sogroup->get_orgid_from_group($new_group_id);
-
- //get affected activities and update
with new org id
- $update_activities =
$soactivity->get_activities_for_update($id, true);
- foreach($update_activities as $act)
- {
-
$act->set_organization_id($group_org_id);
-
$act->set_group_id($new_group_id);
- $act->set_new_org(false);
- $soactivity->store($act);
- var_dump($act);
- }
-
- //set local group as stored
- $group->set_change_type('added');
- $group->set_transferred(true);
- $sogroup->update_local($group);
- $message = lang('messages_saved_form');
-
- $contact_persons =
$socontact->get_booking_contact_persons($group->get_id(), true);
- $cp1 = $contact_persons[0];
- $cp2 = $contact_persons[1];
- }
- else
- {
- $error = lang('messages_form_error');
- }
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiorganization.show', 'id' =>
$group->get_id(), 'type' => 'group', 'saved_ok' => 'yes'));
- }
-
- $contact_persons =
$socontact->get_local_contact_persons($group->get_id(), true);
- $cp1 = $contact_persons[0];
- $cp2 = $contact_persons[1];
-
- $data = array
- (
- 'group' => $group,
- 'contactperson1' => $cp1,
- 'contactperson2' => $cp2,
- 'editable' => true,
- 'cancel_link' => $cancel_link,
- 'errorMsgs' => $errorMsgs,
- 'infoMsgs' => $infoMsgs
- );
- return $this->render('group.php', $data);
-
- }
- else
- {*/
- //var_dump('org');
$so_org =
activitycalendar_soorganization::get_instance();
$so_activity =
activitycalendar_soactivity::get_instance();
$so_contact =
activitycalendar_socontactperson::get_instance();
@@ -229,45 +92,6 @@
//var_dump($org);
$districts = $so_activity->get_districts();
-/* if(isset($_POST['save_organization'])) // The user has
pressed the save button
- {
-
$org->set_organization_number(phpgw::get_var('orgno'));
-
$org->set_district(phpgw::get_var('org_district'));
- $org->set_homepage(phpgw::get_var('homepage'));
- $org->set_email(phpgw::get_var('email'));
- $org->set_phone(phpgw::get_var('phone'));
- $org->set_address(phpgw::get_var('address'));
-
$org->set_description(phpgw::get_var('org_description'));
-
- $contact1 = array();
- $contact1['id'] = phpgw::get_var('contact1_id');
- $contact1['name'] =
phpgw::get_var('contact1_name');
- $contact1['phone'] =
phpgw::get_var('contact1_phone');
- $contact1['mail'] =
phpgw::get_var('contact1_email');
- $contact1['org_id'] = $org->get_id();
- $contact1['group_id'] = 0;
-
- $contact2 = array();
- $contact2['id'] = phpgw::get_var('contact2_id');
- $contact2['name'] =
phpgw::get_var('contact2_name');
- $contact2['phone'] =
phpgw::get_var('contact2_phone');
- $contact2['mail'] =
phpgw::get_var('contact2_email');
- $contact2['org_id'] = $org->get_id();
- $contact2['group_id'] = 0;
-
- if($so_org->update_local($org))
- {
-
$so_contact->update_local_contact_person($contact1);
-
$so_contact->update_local_contact_person($contact2);
- $message = lang('messages_saved_form');
- }
- else
- {
- $error = lang('messages_form_error');
- }
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiorganization.show', 'id' =>
$org->get_id(), 'saved_ok' => 'yes'));
- }
- else*/
if(isset($_POST['store_organization'])) // The user has
pressed the store button
{
$orgno = phpgw::get_var('orgno');
@@ -275,9 +99,11 @@
$homepage = phpgw::get_var('homepage');
$email = phpgw::get_var('email');
$phone = phpgw::get_var('phone');
- $address_tmp = phpgw::get_var('address');
+ $address = phpgw::get_var('address');
+ $zip = phpgw::get_var('zip_code');
+ $city = phpgw::get_var('city');
//phpgw::get_var('address') . ' ' .
phpgw::get_var('number') . ', ' . phpgw::get_var('postaddress');
- $address_array = explode(",",$address_tmp);
+ //$address_array = explode(",",$address_tmp);
$desc = phpgw::get_var('org_description');
$org_info = array();
@@ -293,8 +119,9 @@
$org_info['phone'] = $phone;
$org_info['email'] = $email;
$org_info['description'] = $desc;
- $org_info['street'] = $address_array[0];
- $org_info['zip'] = $address_array[1];
+ $org_info['street'] = $address;
+ $org_info['zip'] = $zip;
+ $org_info['postaddress'] = $city;
$org_info['activity_id'] = '';
$org_info['district'] = $district;
@@ -355,9 +182,11 @@
$homepage = phpgw::get_var('homepage');
$email = phpgw::get_var('email');
$phone = phpgw::get_var('phone');
- $address_tmp = phpgw::get_var('address');
+ $address = phpgw::get_var('address');
+ $zip = phpgw::get_var('zip_code');
+ $city = phpgw::get_var('city');
//phpgw::get_var('address') . ' ' .
phpgw::get_var('number') . ', ' . phpgw::get_var('postaddress');
- $address_array = explode(",",$address_tmp);
+ //$address_array = explode(",",$address_tmp);
$desc = phpgw::get_var('org_description');
$org_info = array();
@@ -373,8 +202,9 @@
$org_info['phone'] = $phone;
$org_info['email'] = $email;
$org_info['description'] = $desc;
- $org_info['street'] = $address_array[0];
- $org_info['zip'] = $address_array[1];
+ $org_info['street'] = $address;
+ $org_info['zip_code'] = $zip;
+ $org_info['city'] = $city;
$org_info['activity_id'] = '';
$org_info['district'] = $district;
@@ -435,7 +265,6 @@
);
return $this->render('organization.php', $data);
-// }
}
public function show()
Modified: trunk/activitycalendar/inc/model/class.organization.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.organization.inc.php 2012-08-17
08:15:49 UTC (rev 9872)
+++ trunk/activitycalendar/inc/model/class.organization.inc.php 2012-08-17
08:53:17 UTC (rev 9873)
@@ -18,6 +18,9 @@
protected $change_type;
protected $transferred;
protected $original_org_id;
+ protected $addressnumber;
+ protected $zip_code;
+ protected $city;
/**
* Constructor. Takes an optional ID. If a organization is
created from outside
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2012-08-17 08:15:49 UTC (rev
9872)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2012-08-17 08:53:17 UTC (rev
9873)
@@ -406,7 +406,7 @@
group_saved_form activitycalendar no Gruppen ble lagret
published activitycalendar no Publisert
contactperson_not_set activitycalendar no Kontaktpersoner hentes
fra valgt organisasjon/gruppe ved lagring.
-description_helptext activitycalendar no Hentes fra
booking/organisasjonsregister ved lagring/oppdatering.
+description_helptext activitycalendar no Hentes fra
booking/grupperegister ved lagring/oppdatering.
back_to_list activitycalendar no Tilbake til oversikt
target_not_selected activitycalendar no Målgruppe må velges!
district_not_selected activitycalendar no Distrikt må velges!
Modified: trunk/activitycalendar/templates/base/organization.php
===================================================================
--- trunk/activitycalendar/templates/base/organization.php 2012-08-17
08:15:49 UTC (rev 9872)
+++ trunk/activitycalendar/templates/base/organization.php 2012-08-17
08:53:17 UTC (rev 9873)
@@ -83,11 +83,19 @@
<dt><label for="street">Adresse</label></dt>
<dd>
<?php if($editable){?>
- <input type="text" name="address"
value="<?php echo $organization->get_address();?>"/>
+ <input type="text" name="address"
value="<?php echo $organization->get_address();?> <?php echo
$organization->get_addressnumber();?>"/>
<?php }else{?>
- <?php echo
$organization->get_address();?>
+ <?php echo $organization->get_address()
. ' ' . $organization->get_addressnumber();;?>
<?php }?>
</dd>
+ <dt><label
for="street">Postnummer/Sted</label></dt>
+ <dd>
+ <?php if($editable){?>
+ <input type="text" name="zip_code"
value="<?php echo $organization->get_zip_code();?>"
size="6"/> <input type="text" name="city" value="<?php echo
$organization->get_city();?>"/>
+ <?php }else{?>
+ <?php echo
$organization->get_zip_code() . ' ' . $organization->get_city();?>
+ <?php }?>
+ </dd>
<dt><label
for="org_description">Beskrivelse</label></dt>
<dd>
<?php if($editable){?>
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-17
08:15:49 UTC (rev 9872)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-17
08:53:17 UTC (rev 9873)
@@ -600,6 +600,12 @@
{
$this->so_group->update_group_description($activity->get_group_id(),
$act_description);
$this->so_group->update_group_contact($contact_person);
+
+
$person_arr_tmp =
$this->so_contact->get_booking_contact_persons($activity->get_group_id(), true);
+
foreach($person_arr_tmp as $p_t)
+ {
+
$persons_array_tmp[] = $p_t;
+ }
}
}
else
@@ -614,7 +620,7 @@
'activity' => $activity,
'organization' => $organization,
'group' => $group,
-
'contact1' => $persons_array[0],
+
'contact1' => $persons_array_tmp[0],
'arenas' => $arenas,
'buildings' => $buildings,
'categories' => $categories,
Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang 2012-08-17 08:15:49 UTC
(rev 9872)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang 2012-08-17 08:53:17 UTC
(rev 9873)
@@ -57,7 +57,7 @@
title_helptext activitycalendarfrontend no Skriv inn tittel på
aktiviteten slik du vil den skal vises i kommuneportalen
int_arena_helptext activitycalendarfrontend no Dersom
aktiviteten skal finne sted i et kommunalt bygg velges dette fra listen her.
arena_helptext activitycalendarfrontend no Dersom aktiviteten skal
finne sted på en ikke-kommunal arena, velges dette her.<br/>Dersom aktiviteten
finner sted på flere arenaer, velg hovedarena her.
-messages_saved_form activitycalendarfrontend no Aktiviteten ble
lagret.<br/>Når aktiviteten er godkjent av kulturkontoret vil den vises i
kommuneportalen.
+messages_saved_form activitycalendarfrontend no Aktiviteten ble
lagret.<br/>Når aktiviteten er godkjent av kulturkontoret vil den vises på
kommunens nettsider.
messages_form_error activitycalendarfrontend no Det oppstod et
problem under lagring
change_request_ok activitycalendarfrontend no Endringsønske
for organisasjon er sendt inn for organisasjon %1
target_not_selected activitycalendarfrontend no Målgruppe må
velges!
Modified: trunk/activitycalendarfrontend/templates/base/activity.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity.php 2012-08-17
08:15:49 UTC (rev 9872)
+++ trunk/activitycalendarfrontend/templates/base/activity.php 2012-08-17
08:53:17 UTC (rev 9873)
@@ -123,7 +123,7 @@
<?php if(!$change_request)
{
if(!$activity->get_new_org()){?>
- <a
href="index.php?menuaction=activitycalendarfrontend.uiactivity.edit_organization_values&organization_id=<?php
echo $organization->get_id();?>"><?php echo lang('edit_organization');?></a>
+ <a
href="index.php?menuaction=activitycalendarfrontend.uiactivity.edit_organization_values&organization_id=<?php
echo $organization->get_id();?>" target="_blank"><?php echo
lang('edit_organization');?></a>
<?php }
}?>
</dd>
Modified: trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-08-17 08:15:49 UTC (rev 9872)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-08-17 08:53:17 UTC (rev 9873)
@@ -63,10 +63,9 @@
}
?>
</select>
- <br/><br/>
</dd>
<dt>
- <?php echo
lang('activity_edit_helptext');?><br/><br/>
+
</dt>
<dd>
<div id="activity_select">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9873] Fixes after testing 16/08,
Erik Holm-Larsen <=