fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [7974]


From: Erik Holm-Larsen
Subject: [Fmsystem-commits] [7974]
Date: Tue, 01 Nov 2011 09:04:10 +0000

Revision: 7974
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7974
Author:   erikhl
Date:     2011-11-01 09:04:09 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.socontactperson.inc.php
    trunk/activitycalendar/inc/class.sogroup.inc.php
    trunk/activitycalendar/inc/class.soorganization.inc.php
    trunk/activitycalendar/inc/class.uiorganization.inc.php
    trunk/activitycalendar/inc/model/class.group.inc.php
    trunk/activitycalendar/setup/phpgw_no.lang
    trunk/activitycalendar/templates/base/group.php
    trunk/activitycalendar/templates/base/organization.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-10-31 09:32:52 UTC 
(rev 7973)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-01 09:04:09 UTC 
(rev 7974)
@@ -1163,10 +1163,17 @@
                return isset($result);
        }
        
-       function get_activities_for_update($org_id)
+       function get_activities_for_update($org_id, $group = false)
        {
                $activities = array();
-               $sql = "SELECT * FROM activity_activity WHERE new_org AND 
organization_id={$org_id}";
+               if($group)
+               {
+                       $sql = "SELECT * FROM activity_activity WHERE new_org 
AND group_id={$org_id}";
+               }
+               else
+               {
+                       $sql = "SELECT * FROM activity_activity WHERE new_org 
AND organization_id={$org_id}";
+               }
                $this->db->query($sql, __LINE__, __FILE__);
                while ($this->db->next_record())
                {                       

Modified: trunk/activitycalendar/inc/class.socontactperson.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.socontactperson.inc.php    2011-10-31 
09:32:52 UTC (rev 7973)
+++ trunk/activitycalendar/inc/class.socontactperson.inc.php    2011-11-01 
09:04:09 UTC (rev 7974)
@@ -302,4 +302,54 @@
                }
                return $contact_person;
        }
+       
+       function get_local_contact_persons($id, $group=false)
+       {
+               $result = array();
+       if(isset($id)){
+               if($group)
+               {
+                       $q1="SELECT id, organization_id, group_id, name, phone, 
email FROM activity_contact_person WHERE group_id='{$id}'";
+               }
+               else
+               {
+                       $q1="SELECT id, organization_id, group_id, name, phone, 
email FROM activity_contact_person WHERE organization_id='{$id}'";
+               }
+                       $this->db->query($q1, __LINE__, __FILE__);
+                       while($this->db->next_record()){
+                               $contact_person = new 
activitycalendar_contact_person($this->db->f('id'), 'int');
+                               
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
+                               
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'), 
'int'));
+                               
$contact_person->set_name($this->unmarshal($this->db->f('name'), 'string'));
+                               
$contact_person->set_phone($this->unmarshal($this->db->f('phone'), 'string'));
+                               
$contact_person->set_email($this->unmarshal($this->db->f('email'), 'string'));
+                               $result[] = $contact_person;
+                       }
+       }
+               return $result;
+       }
+       
+       function update_local_contact_person($contact)
+       {
+               $id = $contact['id'];
+               $name = $contact['name'];
+               $phone = $contact['phone'];
+               $mail = $contact['mail'];
+               $org_id = $contact['org_id'];
+               $group_id = $contact['group_id'];
+               
+               $columns[] = "name='{$name}'";
+               $columns[] = "phone='{$phone}'";
+               $columns[] = "email='{$mail}'";
+               $columns[] = "organization_id={$org_id}";
+               $columns[] = "group_id={$group_id}";
+               $columns[] = "address=''";
+               $columns[] = "zipcode=''"; 
+               $columns[] = "city=''";
+               $cols = implode(',',$columns);
+
+               $sql = "UPDATE activity_contact_person SET {$cols} WHERE 
id={$id}";
+       $result = $this->db->query($sql, __LINE__, __FILE__);
+               return isset($result);
+       }
 }
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php    2011-10-31 09:32:52 UTC 
(rev 7973)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php    2011-11-01 09:04:09 UTC 
(rev 7974)
@@ -104,6 +104,8 @@
                                $columns[] = 'activity_group.name';
                                $columns[] = 'activity_group.description';
                                $columns[] = 'activity_group.organization_id';
+                               $columns[] = 'activity_group.change_type';
+                               $columns[] = 'activity_group.transferred';
                                
                                $dir = $ascending ? 'ASC' : 'DESC';
                                $order = "ORDER BY activity_group.id $dir";
@@ -266,8 +268,71 @@
                        
$group->set_shortname($this->unmarshal($this->db->f('shortname'), 'string'));
                        
$group->set_description($this->unmarshal($this->db->f('description'), 
'string'));
                        
$group->set_show_in_portal($this->unmarshal($this->db->f('show_in_portal'), 
'int'));
+                       
$group->set_change_type($this->unmarshal($this->db->f('change_type'), 
'string'));
+                       
$group->set_transferred($this->unmarshal($this->db->f('transferred')));
                }
                return $group;
        }
+       
+       function update_local($group)
+       {
+               $name = $group->get_name();
+               $orgid = $group->get_organization_id();
+               $description = $group->get_description();
+               $change_type = $group->get_change_type();
+               $transferred = ($group->get_transferred() == 1 || 
$group->get_transferred() == true)?'true':'false';
+               
+               $values[] = "NAME='{$name}'";
+               $values[] = "DESCRIPTION='{$description}'";
+               $values[] = "ORGANIZATION_ID='{$orgid}'";
+               $values[] = "CHANGE_TYPE='{$change_type}'";
+               $values[] = "TRANSFERRED={$transferred}";
+               $vals = implode(',',$values);
+               
+               $sql = "UPDATE activity_group SET {$vals} WHERE 
ID={$group->get_id()}";
+       $result = $this->db->query($sql, __LINE__, __FILE__);
+               if(isset($result))
+               {
+                       return true;
+               }
+               else
+               {
+                       return false;
+               }
+       }
+       
+       function transfer_group($group_info)
+       {
+               $name = $group_info['name'];
+               $orgid = $group_info['organization_id'];
+               $description = $group_info['description'];
+               $activity_id = 0;
+               $show_in_portal = 1; 
+               
+               $columns[] = 'name';
+               $columns[] = 'description';
+               $columns[] = 'organization_id';
+               $columns[] = 'activity_id';
+               $columns[] = 'show_in_portal';
+               $cols = implode(',',$columns);
+               
+               $values[] = "'{$name}'";
+               $values[] = "'{$description}'";
+               $values[] = "'{$orgid}'";
+               $values[] = $this->marshal($activity_id, 'int');
+               $values[] = $show_in_portal;
+               $vals = implode(',',$values);
+               
+               $sql = "INSERT INTO bb_group ({$cols}) VALUES ({$vals})";
+       $result = $this->db->query($sql, __LINE__, __FILE__);
+               if(isset($result))
+               {
+                       return $this->db->get_last_insert_id('bb_group', 'id');
+               }
+               else
+               {
+                       return 0;
+               }
+       }
 }
 ?>

Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php     2011-10-31 
09:32:52 UTC (rev 7973)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php     2011-11-01 
09:04:09 UTC (rev 7974)
@@ -325,7 +325,7 @@
                $street = $organization->get_address();
                $district = $organization->get_district();
                $change_type = $organization->get_change_type();
-               $transferred = $organization->get_transferred()?true:false;
+               $transferred = ($organization->get_transferred() == 1 || 
$organization->get_transferred() == true)?'true':'false';
                
                $values[] = "NAME='{$name}'";
                $values[] = "HOMEPAGE='{$homepage}'";
@@ -336,7 +336,7 @@
                $values[] = "ORGNO='{$orgnr}'";
                $values[] = "DISTRICT='{$district}'";
                $values[] = "CHANGE_TYPE='{$change_type}'";
-               $values[] = "TRANSFERRED='{$transferred}'";
+               $values[] = "TRANSFERRED={$transferred}";
                $vals = implode(',',$values);
                
                $sql = "UPDATE activity_organization SET {$vals} WHERE 
ID={$organization->get_id()}";
@@ -384,7 +384,7 @@
                        
$organization->set_district($this->unmarshal($this->db->f('district'), 
'string'));
                        
$organization->set_description($this->unmarshal($this->db->f('description'), 
'string'));
                        
$organization->set_change_type($this->unmarshal($this->db->f('change_type'), 
'string'));
-                       
$organization->set_transferred($this->unmarshal($this->db->f('trnasferred'), 
'bool'));
+                       
$organization->set_transferred($this->unmarshal($this->db->f('transferred'), 
'bool'));
                        
$organization->set_show_in_portal($this->unmarshal($this->db->f('show_in_portal'),
 'int'));
                }
                return $organization;

Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-10-31 
09:32:52 UTC (rev 7973)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-11-01 
09:04:09 UTC (rev 7974)
@@ -75,35 +75,118 @@
                {
                        //var_dump($type);
                        $so = activitycalendar_sogroup::get_instance();
-                       $group = $so->get(null, null, null, null, null, null, 
array('id' => $id, 'changed_groups' => 'true'));
+                       $so_contact = 
activitycalendar_socontactperson::get_instance();
+                       $so_activity = 
activitycalendar_soactivity::get_instance();
+                       $group_array = $so->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
                        {
-                               $orgno = phpgw::get_var('orgno');
-                               $district = phpgw::get_var('org_district');
-                               $homepage = phpgw::get_var('homepage');
-                               $email = phpgw::get_var('email');
-                               $phone = phpgw::get_var('phone');
-                               $address = phpgw::get_var('address');
-                               $desc = phpgw::get_var('org_description');
+                               $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($so->update_local($group))
+                               {
+                                       
$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');
+                               }
+                               
                        }
                        else if(isset($_POST['store_group'])) // The user has 
pressed the store button
                        {
-                               $orgno = phpgw::get_var('orgno');
-                               $district = phpgw::get_var('org_district');
-                               $homepage = phpgw::get_var('homepage');
-                               $email = phpgw::get_var('email');
-                               $phone = phpgw::get_var('phone');
-                               $address = phpgw::get_var('address');
-                               $desc = phpgw::get_var('org_description');
+                               $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 = 
$so->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;
+                                       
$so_activity->add_contact_person_group($contact1);
+                                       
+                                       $contact2 = array();
+                                       $contact2['name'] = $contact2_name;
+                                       $contact2['phone'] = $contact2_phone;
+                                       $contact2['mail'] = $contact_mail_2;
+                                       $contact2['group_id'] = $new_group_id;
+                                       
$so_activity->add_contact_person_group($contact2);
+                                       
+                                       $message = lang('messages_saved_form'); 
+                                       
+                                       //get affected activities and update 
with new org id
+                                       $update_activities = 
$so_activity->get_activities_for_update($new_group_id, true);
+                                       foreach($update_activities as $act)
+                                       {
+                                               
$act->set_group_id($new_group_id);
+                                               $act->set_new_org(false);
+                                               $so_activity->store($act);
+                                       }
+                                       
+                                       //set local group as stored
+                                       $group->set_change_type('added');
+                                       $group->set_transferred(true);
+                                       $so->update_local($group);
+                               }
+                               else
+                               {
+                                       $error = lang('messages_form_error');
+                               }
                        }
                        
+                       $contact_persons = 
$so_contact->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,
                                'errorMsgs' => $errorMsgs,
                                'infoMsgs' => $infoMsgs
@@ -134,8 +217,26 @@
                                $org->set_address(phpgw::get_var('address'));
                                
$org->set_description(phpgw::get_var('org_description'));
                                
-                               if($so->update_local_org($org))
+                               $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->update_local($org))
                                {
+                                       
$so_contact->update_local_contact_person($contact1);
+                                       
$so_contact->update_local_contact_person($contact2);
                                        $message = lang('messages_saved_form'); 
                                }
                                else
@@ -173,6 +274,18 @@
                                $org_info['activity_id'] = '';
                                $org_info['district'] = $district;
                                
+                               $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_org_id = 
$so->transfer_organization($org_info);
                                if($new_org_id)
                                {
@@ -191,6 +304,7 @@
                                        $contact2['mail'] = $contact_mail_2;
                                        $contact2['org_id'] = $new_org_id;
                                        
$so_activity->add_contact_person_org($contact2);
+                                       
                                        $message = lang('messages_saved_form'); 
                                        
                                        //get affected activities and update 
with new org id
@@ -214,10 +328,16 @@
                                
                        }
                        
+                       $contact_persons = 
$so_contact->get_local_contact_persons($org->get_id());
+                       $cp1 = $contact_persons[0];
+                       $cp2 = $contact_persons[1];
+                       
                        $data = array
                        (
                                'organization'  => $org,
                                'districts'     =>      $districts,
+                               'contactperson1' => $cp1,
+                               'contactperson2' => $cp2,
                                'editable' => true,
                                'errorMsgs' => $errorMsgs,
                                'infoMsgs' => $infoMsgs
@@ -511,6 +631,26 @@
                                }
                                $value['labels'][] = lang('edit');
                                break;
+                       case 'changed_groups':
+                               $value['ajax'][] = false;
+                               if($value['organization_id'] != '' && 
$value['organization_id'] != null){
+                                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.show', 'id' => $value['id'], 'type' => 
'group')));
+                               }
+                               else
+                               {
+                                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.show', 'id' => $value['id'])));
+                               }
+                               $value['labels'][] = lang('show');
+                               $value['ajax'][] = false;
+                               if($value['organization_id'] != '' && 
$value['organization_id'] != null){
+                                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.edit', 'id' => $value['id'], 'type' => 
'group')));
+                               }
+                               else
+                               {
+                                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.edit', 'id' => $value['id'])));
+                               }
+                               $value['labels'][] = lang('edit');
+                               break;
                }
     }
 }

Modified: trunk/activitycalendar/inc/model/class.group.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.group.inc.php        2011-10-31 
09:32:52 UTC (rev 7973)
+++ trunk/activitycalendar/inc/model/class.group.inc.php        2011-11-01 
09:04:09 UTC (rev 7974)
@@ -12,6 +12,7 @@
                protected $show_in_portal;
                protected $shortname;
                protected $change_type;
+               protected $transferred;
                
                /**
                 * Constructor.  Takes an optional ID.  If a organization is 
created from outside
@@ -73,6 +74,13 @@
                
                public function get_shortname() { return $this->shortname; }
                
+               public function set_transferred($transferred)
+               {
+                       $this->transferred = $transferred;
+               }
+               
+               public function get_transferred() { return $this->transferred; }
+               
                public function serialize()
                {
                        return array(
@@ -82,7 +90,8 @@
                                'shortname' => $this->get_shortname(),
                                'description' => $this->get_description(),
                                'show_in_portal' => $this->get_show_in_portal(),
-                               'change_type' => $this->get_change_type()
+                               'change_type' => $this->get_change_type(),
+                               'transferred' => $this->get_transferred()
                        );
                }
                

Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang  2011-10-31 09:32:52 UTC (rev 
7973)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2011-11-01 09:04:09 UTC (rev 
7974)
@@ -392,4 +392,5 @@
 active_arena   activitycalendar        no      Aktiv
 inactive_arena activitycalendar        no      Inaktiv
 change_type    activitycalendar        no      Endringstype
-added  activitycalendar        no      Lagt til i organisasjonsregisteret
\ No newline at end of file
+added  activitycalendar        no      Lagt til i organisasjonsregisteret
+store  activitycalendar        no      Overfør til organisasjonsregister
\ No newline at end of file

Modified: trunk/activitycalendar/templates/base/group.php
===================================================================
--- trunk/activitycalendar/templates/base/group.php     2011-10-31 09:32:52 UTC 
(rev 7973)
+++ trunk/activitycalendar/templates/base/group.php     2011-11-01 09:04:09 UTC 
(rev 7974)
@@ -1 +1,63 @@
 <?php
+       //include common logic for all templates
+       include("common.php");
+?>
+<div class="identifier-header">
+       <h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH 
?>images/32x32/custom/contact.png" /><?php echo lang('group') ?></h1>
+</div>
+<div class="yui-content">
+       <div id="details">
+               <form action="#" method="post">
+                       <input type="hidden" name="id" value="<?php 
if($group->get_id()){ echo $group->get_id(); } else { echo '0'; }  ?>"/>
+                       <dl class="proplist-col">
+                               <dt><label for="orgname">Gruppenavn</label></dt>
+                               <dd><?php echo $group->get_name();?></dd>
+                               <dt><label 
for="group_description">Beskrivelse</label></dt>
+                               <dd>
+                               <?php if($editable){?>
+                                       <textarea rows="10" cols="100" 
name="group_description"><?php echo $group->get_description();?></textarea>
+                               <?php }else{?>
+                                       <?php echo $group->get_description();?>
+                               <?php }?>
+                               </dd>
+                               <dt><label>Kontaktperson 1</label></dt>
+                               <dd><input type="hidden" name="contact1_id" 
value="<?php echo $contactperson1->get_id();?>"/></dd>
+                               <dt><label for="contact1_name">Navn</label></dt>
+                               <dd>
+                                       <input type="text" name="contact1_name" 
value="<?php echo $contactperson1->get_name();?>"/><br/>
+                               </dd>
+                               <dt><label 
for="contact1_phone">Telefon</label></dt>
+                               <dd>
+                                       <input type="text" 
name="contact1_phone" value="<?php echo $contactperson1->get_phone();?>"/>
+                               </dd>
+                               <dt><label 
for="contact1_mail">E-post</label></dt>
+                               <dd>
+                                       <input type="text" 
name="contact1_email" value="<?php echo $contactperson1->get_email();?>"/>
+                               </dd>
+                               <dt><label>Kontaktperson 2</label></dt>
+                               <dd><input type="hidden" name="contact2_id" 
value="<?php echo $contactperson2->get_id();?>"/></dd>
+                               <dt><label for="contact1_name">Navn</label></dt>
+                               <dd>
+                                       <input type="text" name="contact2_name" 
value="<?php echo $contactperson2->get_name();?>"/><br/>
+                               </dd>
+                               <dt><label 
for="contact1_phone">Telefon</label></dt>
+                               <dd>
+                                       <input type="text" 
name="contact2_phone" value="<?php echo $contactperson2->get_phone();?>"/>
+                               </dd>
+                               <dt><label 
for="contact1_mail">E-post</label></dt>
+                               <dd>
+                                       <input type="text" 
name="contact2_email" value="<?php echo $contactperson2->get_email();?>"/>
+                               </dd>
+                       </dl>
+                       <div class="form-buttons">
+                               <?php
+                                       if ($editable) {
+                                               echo '<input type="submit" 
name="save_group" value="' . lang('save') . '"/>';
+                                               echo '<input type="submit" 
name="store_group" value="' . lang('store') . '"/>';
+                                       }
+                               ?>
+                       </div>
+               </form>
+       </div>
+</div>
+                               
\ No newline at end of file

Modified: trunk/activitycalendar/templates/base/organization.php
===================================================================
--- trunk/activitycalendar/templates/base/organization.php      2011-10-31 
09:32:52 UTC (rev 7973)
+++ trunk/activitycalendar/templates/base/organization.php      2011-11-01 
09:04:09 UTC (rev 7974)
@@ -81,6 +81,34 @@
                                        <?php echo 
$organization->get_description();?>
                                <?php }?>
                                </dd>
+                               <dt><label>Kontaktperson 1</label></dt>
+                               <dd><input type="hidden" name="contact1_id" 
value="<?php echo $contactperson1->get_id();?>"/></dd>
+                               <dt><label for="contact1_name">Navn</label></dt>
+                               <dd>
+                                       <input type="text" name="contact1_name" 
value="<?php echo $contactperson1->get_name();?>"/><br/>
+                               </dd>
+                               <dt><label 
for="contact1_phone">Telefon</label></dt>
+                               <dd>
+                                       <input type="text" 
name="contact1_phone" value="<?php echo $contactperson1->get_phone();?>"/>
+                               </dd>
+                               <dt><label 
for="contact1_mail">E-post</label></dt>
+                               <dd>
+                                       <input type="text" 
name="contact1_email" value="<?php echo $contactperson1->get_email();?>"/>
+                               </dd>
+                               <dt><label>Kontaktperson 2</label></dt>
+                               <dd><input type="hidden" name="contact2_id" 
value="<?php echo $contactperson2->get_id();?>"/></dd>
+                               <dt><label for="contact1_name">Navn</label></dt>
+                               <dd>
+                                       <input type="text" name="contact2_name" 
value="<?php echo $contactperson2->get_name();?>"/><br/>
+                               </dd>
+                               <dt><label 
for="contact1_phone">Telefon</label></dt>
+                               <dd>
+                                       <input type="text" 
name="contact2_phone" value="<?php echo $contactperson2->get_phone();?>"/>
+                               </dd>
+                               <dt><label 
for="contact1_mail">E-post</label></dt>
+                               <dd>
+                                       <input type="text" 
name="contact2_email" value="<?php echo $contactperson2->get_email();?>"/>
+                               </dd>
                        </dl>
                        <div class="form-buttons">
                                <?php




reply via email to

[Prev in Thread] Current Thread [Next in Thread]