[Fmsystem-commits] [7298]

[Erik Holm-Larsen]

Revision: 7298
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7298
Author:   erikhl
Date:     2011-05-24 09:40:16 +0000 (Tue, 24 May 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.soarena.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-24 07:06:49 UTC 
(rev 7297)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-24 09:40:16 UTC 
(rev 7298)
@@ -490,12 +490,12 @@
        
        function get_statuscodes()
        {
-               $statuscodes[] = array('0' => 'Ingen');
-               $statuscodes[] = array('1' => 'Ny');
-               $statuscodes[] = array('2' => 'Endring');
-               $statuscodes[] = array('3' => 'Akseptert');
-               $statuscodes[] = array('4' => 'Behandlet');
-               $statuscodes[] = array('5' => 'Avvist');
+               $statuscodes[] = array('id' => '0', 'name' => 'Ingen');
+               $statuscodes[] = array('id' => '1', 'name' => 'Ny');
+               $statuscodes[] = array('id' => '2', 'name' => 'Endring');
+               $statuscodes[] = array('id' => '3', 'name' => 'Akseptert');
+               $statuscodes[] = array('id' => '4', 'name' => 'Behandlet');
+               $statuscodes[] = array('id' => '5', 'name' => 'Avvist');
 
                return $statuscodes;
        }

Modified: trunk/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soarena.inc.php    2011-05-24 07:06:49 UTC 
(rev 7297)
+++ trunk/activitycalendar/inc/class.soarena.inc.php    2011-05-24 09:40:16 UTC 
(rev 7298)
@@ -25,8 +25,6 @@
        /**
         * Generate SQL query
         *
-        * @todo Add support for filter "party_type", meaning what type of 
contracts
-        * the party is involved in.
         *
         * @param string $sort_field
         * @param boolean $ascending
@@ -51,6 +49,7 @@
                        }
                        $order = "ORDER BY 
{$this->marshal($sort_field,'field')} $dir";
                }
+               
                if($search_for)
                {
                        $query = $this->marshal($search_for,'string');
@@ -78,6 +77,7 @@
                        $filter_clauses[] = "arena.id = {$id}";
                }
                
+               //filter on active/non-active
                if(isset($filters['active']))
                {
                        if($filters['active'] == 'active')
@@ -90,6 +90,7 @@
                        } 
                }
                
+               //filter on internal/not internal arena
                if(isset($filters['arena_type']))
                {
                        if($filters['arena_type'] == 'internal')
@@ -137,6 +138,13 @@
                return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
        }
        
+       /**
+        * Populates an arena-object
+        * 
+        *  @param int $arena_id
+        *  @param activitycalendar_arena $arena
+        *  @return activitycalendar_arena $arena
+        */
        protected function populate(int $arena_id, &$arena)
        {
 
@@ -151,6 +159,12 @@
                return $arena;
        }
        
+       /**
+        * Get arena name
+        *
+        * @param int $arena_id
+        * @return string arena name
+        */
        function get_arena_name($arena_id)
        {
                $result = "Ingen";
@@ -165,6 +179,11 @@
                return $result;
        }
        
+       /**
+        * Get registered buildings from property
+        *
+        * @return array buildings, [id => name]
+        */
        function get_buildings()
        {
                $buildings = array();
@@ -178,6 +197,12 @@
                return $buildings;
        }
        
+       /**
+        * Get building name from property
+        *
+        * @param int $building_id
+        * @return string building name
+        */
        function get_building_name($building_id){
                if(isset($building_id))
                {