[Fmsystem-commits] [10390]

[Torstein]

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


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

Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php      2012-10-30 15:06:55 UTC 
(rev 10389)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-10-31 08:41:11 UTC 
(rev 10390)
@@ -144,7 +144,6 @@
                                }
                        }
 
-
                        $line_id = 0; // optional preselect
                        foreach($rows as &$entry)
                        {
@@ -155,7 +154,12 @@
                                        $_checked = 'checked="checked"';
                                }
 
-                               $entry['select'] = "<input id=\"select_line\" 
type =\"radio\" {$_checked} name=\"values[select_line]\" 
value=\"{$entry['id']}\">";
+                               $href = self::link(array('menuaction' => 
'logistic.uirequirement.delete', 'id' => $entry['id']));
+                               $entry['delete_link'] = "<a class=\"btn-sm 
delete\" href=\"{$href}\">Slett</a>";
+                               
+                               $entry['select'] = "<input 
class=\"select_line\" type =\"radio\" {$_checked} name=\"values[select_line]\" 
value=\"{$entry['id']}\">";
+                               $href = self::link(array('menuaction' => 
'logistic.uirequirement_resource_allocation.edit', 'requirement_id' => 
$entry['id']));
+                               $entry['alloc_link'] = "<a class=\"btn-sm 
alloc\" href=\"{$href}\">Alloker</a>";
                        }
 
                        // ... add result data
@@ -251,13 +255,15 @@
                                                        'hidden' => true
                                                ),
                                                array(
-                                                       'id' => 
'btn_criteria_id',
-                                                       'name' => 'criteria_id',
-                                                       'value' => lang('search 
criteria'),
-                                                       'type' => 'button',
-                                                       'style' => 'filter',
-                                                       'tab_index' => 4
+                                                       'key' => 'delete_link',
+                                                       'label' => lang('Delete 
requirement'),
+                                                       'sortable' => false,
                                                ),
+                                               array(
+                                                       'key' => 'alloc_link',
+                                                       'label' => 
lang('Allocate resources'),
+                                                       'sortable' => false,
+                                               ),
                                        )
                                ),
                        );

Modified: trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2012-10-30 15:06:55 UTC (rev 10389)
+++ trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2012-10-31 08:41:11 UTC (rev 10390)
@@ -339,8 +339,6 @@
                        $allocation_suggestions = 
$so_entity->get_eav_list($criterias_array);
                        
                        
-                       print_r( $view_criterias_array );
-                       
                        $data = array
                        (
                                'requirement'                                   
        => $requirement,
@@ -377,7 +375,7 @@
                                $resource_alloc_id = $this->so->store( 
$resource_alloc );
                        }
 
-                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement_resource_allocation.view', 'id' 
=> $allocation_id));
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement_resource_allocation.index', 'id' 
=> $allocation_id));
                }
                
                function convert_to_array($object_list)

Modified: trunk/logistic/js/logistic/resource_allocation.js
===================================================================
--- trunk/logistic/js/logistic/resource_allocation.js   2012-10-30 15:06:55 UTC 
(rev 10389)
+++ trunk/logistic/js/logistic/resource_allocation.js   2012-10-31 08:41:11 UTC 
(rev 10390)
@@ -7,7 +7,6 @@
                
                updateAllocationTable( requirement_id );
     });
-       
 });
 
 

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-10-30 15:06:55 UTC (rev 10389)
+++ trunk/logistic/setup/phpgw_no.lang  2012-10-31 08:41:11 UTC (rev 10390)
@@ -64,3 +64,6 @@
 Add criterias  logistic        no      Legg til kriterier
 favorites      logistic        no      Favoritter
 toggle as favorite     logistic        no      Legg til / fjern som favoritt
+Add allocation to requirement  logistic        no      Alloker ressurser til 
krav
+Delete requirement     logistic        no Slett krav
+Allocate resources     logistic        no      Alloker ressurser
\ No newline at end of file

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-10-30 15:06:55 UTC (rev 
10389)
+++ trunk/logistic/templates/base/css/base.css  2012-10-31 08:41:11 UTC (rev 
10390)
@@ -2323,4 +2323,25 @@
     color: #092845;
     font-weight: bold;
     padding: 5px 20px;
+}
+
+#resource_alloc_wrp {
+       margin: 20px;
+       padding: 20px;  
+}
+
+#resource_alloc_wrp #btn_menu {
+       float:left;
+       margin-left: 20px;
+}
+
+#resource_alloc_wrp input[type="submit"] {
+    font-size: 13px;
+    margin-bottom: 1px;
+    padding: 2px 0;
+    width: 160px;
+}
+
+#resource_alloc_wrp h2{
+       margin-top: 0;  
 }
\ No newline at end of file

Modified: trunk/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-10-30 15:06:55 UTC (rev 10389)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-10-31 08:41:11 UTC (rev 10390)
@@ -18,23 +18,30 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
        <xsl:call-template name="yui_phpgw_i18n"/>
        
-       <div style="margin: 20px; padding: 20px;" class="content-wrp">
-                 <form action="" name="acl_form" id="acl_form" method="post">
-                               <div id="paging"></div>
-       
-                               <div style="margin-bottom: 40px;" 
id="requirement-container"></div>
-                               
-                               <xsl:variable name="params">
-                                       
<xsl:text>menuaction:logistic.uirequirement.edit, activity_id:</xsl:text>
-                                       <xsl:value-of select="activity/id" />
+       <div id="resource_alloc_wrp" class="content-wrp">
+
+                       <div id="paging"></div>
+
+                       <h2>Krav</h2>
+                       <div style="float:left;margin-bottom: 40px;" 
id="requirement-container"></div>
+
+                       <div id="btn_menu">
+                               <xsl:variable name="add_requirement_url">
+                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uirequirement.edit' )" />
                                </xsl:variable>
-                               <xsl:variable name="edit_url">
-                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $params )" />
-                               </xsl:variable>
-                               <a class="btn" href="{$edit_url}"><xsl:value-of 
select="php:function('lang', 'Add requirement')" /></a>
                                
-                               <div style="margin-top: 40px;" 
id="allocation-container"></div>
-                       </form>
+                               <form action="{$add_requirement_url}" 
name="acl_form" id="acl_form" method="post">
+                                       <input type="hidden" name="activity_id" 
value="{activity/id}" />
+                                       <input class="btn" type="submit">
+                                               <xsl:attribute name="value">
+                                                       <xsl:value-of 
select="php:function('lang', 'Add requirement')" />
+                                               </xsl:attribute>
+                                       </input>
+                               </form>
+                               </div>
+                               
+                       <h2 style="clear:both;">Allokering av krav</h2>
+                       <div id="allocation-container"></div>
        </div>
        <xsl:call-template name="datasource-definition" />
 </xsl:template>