[Fmsystem-commits] [10399]

[Torstein]

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


Modified Paths:
--------------
    trunk/logistic/inc/class.uirequirement.inc.php
    trunk/logistic/setup/phpgw_no.lang

Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php      2012-10-31 13:36:07 UTC 
(rev 10398)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-10-31 14:01:59 UTC 
(rev 10399)
@@ -161,8 +161,17 @@
                                $filters = array('requirement_id' => 
$entry['id']);
                                $num_allocated = 
$this->so_resource_allocation->get_count($search_for, $search_type, $filters);
                                
-                               $entry['status'] = $num_allocated;
+                               if($num_allocated == $num_required)
+                               {
+                                       $entry['status'] = "OK";        
+                               }
+                               else
+                               {
+                                       $entry['status'] = "MANGLER";
+                               }
                                
+                               $entry['allocated'] = $num_allocated;
+                               
                                $href = self::link(array('menuaction' => 
'logistic.uirequirement.delete', 'id' => $entry['id']));
                                $entry['delete_link'] = "<a class=\"btn-sm 
delete\" href=\"{$href}\">Slett krav</a>";
                                
@@ -246,10 +255,15 @@
                                                ),
                                                array(
                                                        'key' => 'no_of_items',
-                                                       'label' => lang('No of 
items'),
+                                                       'label' => lang('Num 
required'),
                                                        'sortable' => false
                                                ),
                                                array(
+                                                       'key' => 'allocated',
+                                                       'label' => lang('Num 
allocated'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
                                                        'key' => 'location_id',
                                                        'label' => 
lang('Resource type'),
                                                        'sortable' => false

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-10-31 13:36:07 UTC (rev 10398)
+++ trunk/logistic/setup/phpgw_no.lang  2012-10-31 14:01:59 UTC (rev 10399)
@@ -54,6 +54,7 @@
 Requirement details    logistic        no      Detaljer for behov
 Add constraints        logistic        no      Legg til kriterier på behovet
 No of items    logistic        no      Antall
+Num required   logistic        no      Trenger antall 
 Resource type  logistic        no      Ressurstype
 t_new_booking_allocation       logistic        no      Registrer ny booking på 
dette behovet
 t_view_booking_allocations     logistic        no      Vis registrerte 
bookinger på dette behovet
@@ -66,4 +67,6 @@
 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
+Allocate resources     logistic        no      Alloker ressurser
+Num allocated  logistic        no      Antall allokert
+Status logistic        no      Status
\ No newline at end of file