[Fmsystem-commits] [10432]

[Torstein]

Revision: 10432
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10432
Author:   vator
Date:     2012-11-02 11:43:04 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uirequirement.inc.php
    trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
    trunk/logistic/setup/phpgw_no.lang
    trunk/logistic/templates/base/allocation/book_resources.xsl
    trunk/logistic/templates/base/css/base.css
    trunk/logistic/templates/base/requirement/requirement_overview.xsl
    trunk/logistic/templates/base/requirement/requirement_tabs.xsl

Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php      2012-11-02 10:55:19 UTC 
(rev 10431)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-11-02 11:43:04 UTC 
(rev 10432)
@@ -317,6 +317,8 @@
                                        $requirement = 
$this->so->get_single($requirement_id);
                                }
 
+                               $activity = 
$this->so_activity->get_single($requirement->get_activity_id());
+                               
                                $location_info = 
$GLOBALS['phpgw']->locations->get_name($requirement->get_location_id());
                                
                                $tabs = $this->make_tab_menu($requirement_id);
@@ -326,6 +328,7 @@
                                        'tabs'                          => 
$GLOBALS['phpgw']->common->create_tabs($tabs, 0),
                                        'view'                          => 
"requirement_details",
                                        'requirement' => $requirement,
+                                       'activity'      => $activity,
                                        'location'              => 
$location_info,
                                );
 

Modified: trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2012-11-02 10:55:19 UTC (rev 10431)
+++ trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2012-11-02 11:43:04 UTC (rev 10432)
@@ -153,10 +153,15 @@
                                                        'label' => 
lang('Resource id'),
                                                        'sortable' => true
                                                ),
+                                               array(
+                                                       'key' => 'delete_link',
+                                                       'label' => 
lang('Delete'),
+                                                       'sortable' => true
+                                               ),
                                        )
                                ),
-                       );
-
+                       );                      
+                       
                        self::render_template_xsl(array('datatable_common'), 
$data);
                }
 
@@ -224,10 +229,14 @@
                        {
                                if (isset($result))
                                {
-                                       $rows[] = $result->serialize();
+                                       $requirement = $result->serialize();
+                                       
+                                       $delete_href = 
self::link(array('menuaction' => 
'logistic.uirequirementresource_allocation.delete', 'id' => 
$requirement['id']));
+                                       $requirement['delete_link'] = "<a 
class=\"btn-sm delete\" href=\"{$delete_href}\">Slett</a>";
+                                       $rows[] = $requirement;
                                }
                        }
-
+                       
                        // ... add result data
                        $result_data = array('results' => $rows);
 
@@ -379,8 +388,10 @@
                                
                                $resource_alloc_id = $this->so->store( 
$resource_alloc );
                        }
+                       
+                       $activity_id = 
$this->so_activity->get_single($requirement->get_activity_id()); 
 
-                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement_resource_allocation.index', 'id' 
=> $allocation_id));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.view_resource_allocation', 
'activity_id' => $activity_id));
                }
                
                function convert_to_array($object_list)

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-02 10:55:19 UTC (rev 10431)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-02 11:43:04 UTC (rev 10432)
@@ -75,4 +75,5 @@
 Status requirement     logistic        no      Status behov
 select logistic        no      Velg
 Add project    logistic        no      Nytt prosjekt
-Booking of resources   logistic        no      Bestilling av ressurser
\ No newline at end of file
+Booking of resources   logistic        no      Bestilling av ressurser
+Requirement to activity        logistic        no      Krav for aktiviteten
\ No newline at end of file

Modified: trunk/logistic/templates/base/allocation/book_resources.xsl
===================================================================
--- trunk/logistic/templates/base/allocation/book_resources.xsl 2012-11-02 
10:55:19 UTC (rev 10431)
+++ trunk/logistic/templates/base/allocation/book_resources.xsl 2012-11-02 
11:43:04 UTC (rev 10432)
@@ -10,7 +10,7 @@
        <div class="content-wrp">
                
                <div id="requirement-wrp">
-                       <h3>Detaljer for behov</h3>
+                       <h3 style="margin: 0 0 10px 0;">Detaljer for behov</h3>
                        <ul>
                                <li>
                                        <label 
for="start_date">Startdato</label><span><xsl:value-of 
select="php:function('date', $date_format, 
number(requirement/start_date))"/></span>
@@ -89,7 +89,7 @@
                                        </xsl:for-each>
                                </div>                  
                                
-                               <input type="submit" value="Lagre" />
+                               <input type="submit" value="Lagre bestilling" />
                        </form>
        </div>
 </div>

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-11-02 10:55:19 UTC (rev 
10431)
+++ trunk/logistic/templates/base/css/base.css  2012-11-02 11:43:04 UTC (rev 
10432)
@@ -2374,13 +2374,18 @@
 }
 
 .yui-dt19-col-delete_link .yui-dt-liner, .yui-dt19-col-alloc_link 
.yui-dt-liner {
-       text-align: right;      
+       text-align: center;     
 }
 
 .yui-dt19-col-no_of_items .yui-dt-liner, .yui-dt19-col-allocated .yui-dt-liner 
{
        text-align: center;
 }
 
+
+#allocation-container .yui-dt-col-delete_link .yui-dt-liner {
+       text-align: center;
+}
+       
 #add-requirement-btn {
     float: left;
     margin-left: 715px;

Modified: trunk/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-11-02 10:55:19 UTC (rev 10431)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-11-02 11:43:04 UTC (rev 10432)
@@ -91,7 +91,8 @@
                                {key:"fm_bim_item_name", label:'Navn på 
ressurs', sortable:true},
                                {key:"resource_type_descr", 
label:'Ressurstype', sortable:true}, 
                                {key:"location_code", label:'Lokasjonskode', 
sortable:true},
-                               {key:"fm_bim_item_address", label:'Adresse', 
sortable:true}
+                               {key:"fm_bim_item_address", label:'Adresse', 
sortable:true},
+                               {key:"delete_link", label:'Slett bestilling', 
sortable:true}
                            ]; 
                        
                                
YAHOO.portico.inlineTableHelper('allocation-container', requestUrl, 
myColumnDefs);

Modified: trunk/logistic/templates/base/requirement/requirement_tabs.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_tabs.xsl      
2012-11-02 10:55:19 UTC (rev 10431)
+++ trunk/logistic/templates/base/requirement/requirement_tabs.xsl      
2012-11-02 11:43:04 UTC (rev 10432)
@@ -9,6 +9,16 @@
                        <xsl:call-template name="yui_phpgw_i18n"/>
                
                        <xsl:choose>
+                               <xsl:when test="requirement/id != '' or 
requirement/id != 0">
+                                       <h1 style="float:left;"> 
+                                               <span>
+                                                       <xsl:value-of 
select="php:function('lang', 'Requirement to activity')" />
+                                               </span>
+                                               <span style="margin-left:5px;">
+                                                       <xsl:value-of 
select="activity/name" />
+                                               </span>
+                                       </h1>
+                               </xsl:when>
                                <xsl:when test="activity/id != '' or 
activity/id != 0">
                                        <h1 style="float:left;"> 
                                                <span>