[Fmsystem-commits] [10193]

[Torstein]

Revision: 10193
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10193
Author:   vator
Date:     2012-10-10 10:24:54 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.sorequirement.inc.php
    trunk/logistic/inc/class.uirequirement.inc.php
    trunk/logistic/inc/model/class.requirement.inc.php
    trunk/logistic/setup/phpgw_no.lang
    trunk/logistic/templates/base/requirement/requirement_item.xsl

Modified: trunk/logistic/inc/class.sorequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.sorequirement.inc.php      2012-10-10 09:05:51 UTC 
(rev 10192)
+++ trunk/logistic/inc/class.sorequirement.inc.php      2012-10-10 10:24:54 UTC 
(rev 10193)
@@ -41,7 +41,7 @@
                                'activity_id',
                                'date_from',
                                'date_to',
-                               'no_of_elements',
+                               'no_of_items',
                                'location_id',
                                'create_user',
                                'create_date'
@@ -49,9 +49,9 @@
 
                        $values = array(
                                $this->marshal($requirement->get_activity_id(), 
'int'),
-                               $this->marshal($requirement->get_date_from(), 
'string'),
-                               $this->marshal($requirement->get_date_to(), 
'string'),
-                               
$this->marshal($requirement->get_no_of_elements(), 'int'),
+                               $this->marshal($requirement->get_date_from(), 
'int'),
+                               $this->marshal($requirement->get_date_to(), 
'int'),
+                               $this->marshal($requirement->get_no_of_items(), 
'int'),
                                $this->marshal($requirement->get_location_id(), 
'int'),
                                $this->marshal($requirement->get_create_user(), 
'int'),
                                $this->marshal(strtotime('now'), 'int')
@@ -78,7 +78,7 @@
                                'activity_id=' . 
$this->marshal($requirement->get_activity_id(), 'int'),
                                'date_from=' . 
$this->marshal($requirement->get_date_from(), 'int'),
                                'date_to=' . 
$this->marshal($requirement->get_date_to(), 'int'),
-                               'no_of_elements=' . 
$this->marshal($requirement->get_no_of_elements(), 'int'),
+                               'no_of_items=' . 
$this->marshal($requirement->get_no_of_items(), 'int'),
                                'location_id=' . 
$this->marshal($requirement->get_location_id(), 'int')
                        );
 

Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php      2012-10-10 09:05:51 UTC 
(rev 10192)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-10-10 10:24:54 UTC 
(rev 10193)
@@ -33,6 +33,7 @@
        phpgw::import_class('logistic.soactivity');
 
        include_class('logistic', 'requirement');
+       phpgw::import_class('phpgwapi.datetime');
 
        class uirequirement extends phpgwapi_uicommon
        {
@@ -243,6 +244,7 @@
                {
                        $activity_id = phpgw::get_var('activity_id');
                        $requirement_id = phpgw::get_var('id');
+                       
                
                        if ($activity_id && is_numeric($activity_id))
                        {
@@ -253,14 +255,19 @@
                        {
                                $requirement = 
$this->so->get_single($requirement_id);
                        }
+                       else
+                       {
+                               $requirement = new logistic_requirement();
+                       }
                        
                        if (isset($_POST['save_requirement']))
                        {
                                $requirement->set_id( phpgw::get_var('id') );
+                               $requirement->set_activity_id( 
phpgw::get_var('activity_id') );
                                $requirement->set_location_id( 
phpgw::get_var('location_id') );
-                               $requirement->set_no_of_elements( 
phpgw::get_var('no_of_elements') );
-                               
-                               if(phpgw::get_var('start_date','string') != '')
+                               $requirement->set_no_of_items( 
phpgw::get_var('no_of_items') );
+                       
+                               if(phpgw::get_var('date_from','string') != '')
                                {
                                        $start_date_ts = 
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('date_from','string') );
                                        
$requirement->set_date_from($start_date_ts);
@@ -270,7 +277,7 @@
                                        $requirement->set_date_from(0);
                                }
 
-                               if( phpgw::get_var('end_date','string') != '')
+                               if( phpgw::get_var('date_to','string') != '')
                                {
                                        $end_date_ts = 
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('date_to','string') );
                                        $requirement->set_date_to($end_date_ts);
@@ -281,7 +288,7 @@
                                }
 
                                print_r($requirement);
-                               $requirement_id = 
$this->so->store($requirement);
+                       //      $requirement_id = 
$this->so->store($requirement);
 
                                
//$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'logistic.uirequirement.view', 'id' => $requirement_id));
                        }

Modified: trunk/logistic/inc/model/class.requirement.inc.php
===================================================================
--- trunk/logistic/inc/model/class.requirement.inc.php  2012-10-10 09:05:51 UTC 
(rev 10192)
+++ trunk/logistic/inc/model/class.requirement.inc.php  2012-10-10 10:24:54 UTC 
(rev 10193)
@@ -27,6 +27,7 @@
         * @subpackage logistic
         * @version $Id $
         */
+       
        include_class('logistic', 'model', '/inc/model/');
 
        class logistic_requirement extends logistic_model
@@ -37,7 +38,7 @@
                protected $activity_id;
                protected $date_from;
                protected $date_to;
-               protected $no_of_elements;
+               protected $no_of_items;
                protected $location_id;
                
                /**
@@ -61,14 +62,14 @@
                        return $this->id;
                }
 
-               public function set_no_of_elements($no_of_elements)
+               public function set_no_of_items($no_of_items)
                {
-                       $this->no_of_elements = $no_of_elements;
+                       $this->no_of_items = $no_of_items;
                }
 
-               public function get_no_of_elements()
+               public function get_no_of_items()
                {
-                       return $this->no_of_elements;
+                       return $this->no_of_items;
                }
                
                public function set_location_id($location_id)

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-10-10 09:05:51 UTC (rev 10192)
+++ trunk/logistic/setup/phpgw_no.lang  2012-10-10 10:24:54 UTC (rev 10193)
@@ -49,5 +49,5 @@
 Muliple checkbox       logistic        no      Flervalgs avkrysningsboks
 event  logistic        no      Hendelse
 Link   logistic        no      Lenke
-Add requirement to activity    logistic        no      Legg krav til 
aktiviteten
+Add requirement to activity    logistic        no      Registrer behov for 
aktiviteten
 Add requirement        logistic        no      Legg til krav
\ No newline at end of file

Modified: trunk/logistic/templates/base/requirement/requirement_item.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_item.xsl      
2012-10-10 09:05:51 UTC (rev 10192)
+++ trunk/logistic/templates/base/requirement/requirement_item.xsl      
2012-10-10 10:24:54 UTC (rev 10193)
@@ -29,7 +29,7 @@
        <div class="yui-content" style="padding: 20px;">
                <div id="details">
                        <form action="#" method="post">
-                               <input type="hidden" name="id" value = 
"{activity/id}" />
+                               <input type="hidden" name="activity_id" value = 
"{activity/id}" />
                                                        
                                <dl class="proplist-col">
                                        <dt>