[Fmsystem-commits] [9875] Fixes after testing 20/08

[Erik Holm-Larsen]

Revision: 9875
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9875
Author:   erikhl
Date:     2012-08-20 08:22:40 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Fixes after testing 20/08
code for generating groups based on activities

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.uiactivities.inc.php
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/templates/base/activity_new.php
    trunk/activitycalendarfrontend/templates/base/organization_edit.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-08-20 06:56:22 UTC 
(rev 9874)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-08-20 08:22:40 UTC 
(rev 9875)
@@ -1494,4 +1494,18 @@
 
             return isset($result);
         }
+        
+        function update_activity_group($activity_id, $group_id)
+        {
+            $id = intval($activity_id);
+            $g_id = intval($group_id);
+                       
+            $values = "group_id = " . $g_id;
+            var_dump("UPDATE activity_activity SET {$values} WHERE id={$id}");
+            //die;
+
+            $result = $this->db->query("UPDATE activity_activity SET {$values} 
WHERE id={$id}", __LINE__,__FILE__);
+
+            return isset($result);
+        }
 }

Modified: trunk/activitycalendar/inc/class.socontactperson.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.socontactperson.inc.php    2012-08-20 
06:56:22 UTC (rev 9874)
+++ trunk/activitycalendar/inc/class.socontactperson.inc.php    2012-08-20 
08:22:40 UTC (rev 9875)
@@ -406,4 +406,36 @@
        $result = $this->db->query($sql, __LINE__, __FILE__);
                return isset($result);
        }
+        
+        function add_new_group_contact($contact)
+       {
+            $name = $contact->get_name();
+            $phone = $contact->get_phone();
+            $mail = $contact->get_email();
+            $group_id = $contact->get_group_id();
+
+            $columns[] = 'name';
+            $columns[] = 'phone';
+            $columns[] = 'email';
+            $columns[] = 'group_id';
+            $cols = implode(',',$columns);
+
+            $values[] = "'{$name}'";
+            $values[] = "'{$phone}'";
+            $values[] = "'{$mail}'";
+            $values[] = $group_id;
+            $vals = implode(',',$values);
+
+            $sql = "INSERT INTO bb_group_contact ({$cols}) VALUES ({$vals})";
+            $result = $this->db->query($sql, __LINE__, __FILE__);
+            
+            if(isset($result))
+            {
+                return $this->db->get_last_insert_id('bb_group_contact', 'id');
+            }
+            else
+            {
+                return 0;
+            }
+       }
 }
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php    2012-08-20 06:56:22 UTC 
(rev 9874)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php    2012-08-20 08:22:40 UTC 
(rev 9875)
@@ -537,5 +537,40 @@
                }
                
        }
+        
+        function add_new_group_from_activity($group_info)
+       {
+            $name = $group_info['name'];
+            $orgid = $group_info['organization_id'];
+            $description = $group_info['description'];
+            $activity_id = 1;
+            $show_in_portal = 1; 
+
+            $columns[] = 'name';
+            $columns[] = 'description';
+            $columns[] = 'organization_id';
+            $columns[] = 'activity_id';
+            $columns[] = 'show_in_portal';
+            $cols = implode(',',$columns);
+
+            $values[] = $this->marshal($name, 'string');
+            $values[] = $this->marshal($description, 'string');
+            $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.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-20 
06:56:22 UTC (rev 9874)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-20 
08:22:40 UTC (rev 9875)
@@ -747,21 +747,32 @@
         
         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'];
+                $title_new = $a['title'];
+                    if(strlen($title_new) > 50)
+               {
+                       $title_new = substr($title_new,0,49);
+               }
+                $group_info['name'] = $title_new;
                 $group_info['organization_id'] =  $a['organization'];
                 $group_info['description'] = $a['description'];
                 
+                //add new group
+                $new_group_id = 
$this->so_group->add_new_group_from_activity($group_info);
+                var_dump("lagt til gruppen " . $group_info['name'] . " med id 
" . $new_group_id);
+                $this->so_activity->update_activity_group($a['id'], 
$new_group_id);
                 $cp = 
$this->so_contact->get_booking_contact_persons($a['organization']);
-
-                _debug_array($group_info);
-                _debug_array($cp);
+                foreach ($cp as $c)
+                {
+                    $c->set_group_id($new_group_id);
+                    $contact_id = $this->so_contact->add_new_group_contact($c);
+                    var_dump("Lagt til kontaktperson " . $c->get_name() . " på 
gruppe " . $group_info['name']);
+                    //_debug_array($c);
+                }
             }
         }
 }

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-20 
06:56:22 UTC (rev 9874)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-20 
08:22:40 UTC (rev 9875)
@@ -814,6 +814,7 @@
                                        $org_info['orgnr'] = 
phpgw::get_var('orgno');
                                        $org_info['homepage'] = 
phpgw::get_var('homepage');
                                        $org_info['street'] = 
phpgw::get_var('address');
+                                        $org_info['streetnumber'] = 
phpgw::get_var('number');
                                        $org_info['zip'] = 
phpgw::get_var('postzip');
                                        $org_info['postaddress'] = 
phpgw::get_var('postaddress');
                                        $org_info['status'] = "change";

Modified: trunk/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new.php      
2012-08-20 06:56:22 UTC (rev 9874)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php      
2012-08-20 08:22:40 UTC (rev 9875)
@@ -162,7 +162,7 @@
 {
        if(document.getElementById('title').value == null || 
document.getElementById('title').value == '')
        {
-               alert("Tittel må fylles ut!");
+               alert("Navn på aktivitet må fylles ut!");
                return false;
        }
        if(document.getElementById('description').value == null || 
document.getElementById('description').value == '')

Modified: trunk/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/organization_edit.php 
2012-08-20 06:56:22 UTC (rev 9874)
+++ trunk/activitycalendarfrontend/templates/base/organization_edit.php 
2012-08-20 08:22:40 UTC (rev 9875)
@@ -13,7 +13,7 @@
        //url = 
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
 + address;
        url = 
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
 + address;
 
-var divcontent_start = "<select name=\"address_select\" id=\"address_select\" 
size\"5\">";
+var divcontent_start = "<select name=\"address_select\" id=\"address_select\" 
size\"5\" onChange='setAddressValue(this)'>";
 var divcontent_end = "</select>";
        
        var callback = {