fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [8556]


From: Torstein
Subject: [Fmsystem-commits] [8556]
Date: Wed, 11 Jan 2012 11:16:42 +0000

Revision: 8556
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8556
Author:   vator
Date:     2012-01-11 11:16:41 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.soprocedure.inc.php
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/inc/class.uidocument.inc.php
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/inc/model/class.check_item.inc.php
    trunk/controller/inc/model/class.procedure.inc.php
    trunk/controller/templates/base/check_list/print_check_list.xsl
    trunk/controller/templates/base/check_list/register_case.xsl
    trunk/controller/templates/base/check_list/view_closed_cases.xsl
    trunk/controller/templates/base/check_list/view_control_items.xsl
    trunk/controller/templates/base/check_list/view_measurements.xsl
    trunk/controller/templates/base/check_list/view_open_cases.xsl
    trunk/controller/templates/base/procedure/view_procedures_for_control.xsl

Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php      2012-01-11 10:01:53 UTC 
(rev 8555)
+++ trunk/controller/inc/class.soprocedure.inc.php      2012-01-11 11:16:41 UTC 
(rev 8556)
@@ -183,7 +183,65 @@
 //var_dump($procedure);
                        return $procedure;
                }
+               
+               function get_single_with_documents($id, $return_type = 
"return_object")
+               {
+                       $id = (int)$id;
+                       
+                       $counter = 0;
+                       $documents = null;
+                       
 
+                       $joins = " {$this->left_join} controller_control_area 
ON (p.control_area_id = controller_control_area.id)";
+                       $joins .= " {$this->left_join} controller_document ON 
(p.id = controller_document.procedure_id)";
+                       $sql = "SELECT p.*, controller_control_area.title AS 
control_area_name, controller_document.id AS document_id, 
controller_document.title AS document_title, controller_document.description as 
document_description FROM controller_procedure p {$joins} WHERE p.id = " . $id;
+                       //var_dump($sql);
+                       $this->db->query($sql, __LINE__, __FILE__);
+                       while ($this->db->next_record()) {
+                               if($counter == 0){
+                                       $procedure = new 
controller_procedure($this->unmarshal($this->db->f('id', true), 'int'));
+                                       
$procedure->set_title($this->unmarshal($this->db->f('title', true), 'string'));
+                                       
$procedure->set_purpose($this->unmarshal($this->db->f('purpose', true), 
'string'));
+                                       
$procedure->set_responsibility($this->unmarshal($this->db->f('responsibility', 
true), 'string'));
+                                       
$procedure->set_description($this->unmarshal($this->db->f('description', true), 
'string'));
+                                       
$procedure->set_reference($this->unmarshal($this->db->f('reference', true), 
'string'));
+                                       
$procedure->set_attachment($this->unmarshal($this->db->f('attachment', true), 
'string'));
+                                       
$procedure->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
+                                       
$procedure->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+                                       
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));
+                                       
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'), 
'int'));
+                                       
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'), 
'int'));
+                                       
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_aera_id',
 'int')));
+                                       
$procedure->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 'string')));
+                               }
+                               
+                               if($this->db->f('document_id', true) != ''){
+                                       $document = new 
controller_document($this->unmarshal($this->db->f('document_id', true), 'int'));
+                                       
$document->set_procedure_id($procedure->get_id());
+                                       
$document->set_title($this->unmarshal($this->db->f('document_title', true), 
'string'));
+                                       
$document->set_description($this->unmarshal($this->db->f('document_description',
 true), 'string'));
+                                       
+                                       if($return_type == "return_array")
+                                               $documents_array[] = 
$document->toArray();
+                                       else
+                                               $documents_array[] = $document;
+                               }
+                               
+                               $counter++;
+                       }
+                       
+                       if($procedure != null){
+                               $procedure->set_documents($documents_array);
+
+                               if($return_type == "return_array")
+                                       return $procedure->toArray();
+                               else
+                                       return $procedure;
+                       }else {
+                               return null;
+                       }
+               }
+
                function get_procedures_by_control_area_id($control_area_id)
                {
                        $results = array();

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2012-01-11 10:01:53 UTC 
(rev 8555)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-01-11 11:16:41 UTC 
(rev 8556)
@@ -402,7 +402,7 @@
                        
                        $check_list = 
$this->so_check_list->get_single($check_list_id);
                        
-                       $closed_check_items_and_cases = 
$this->so_check_item->get_check_items_and_cases($check_list_id, 'closed', 
'return_array');
+                       $closed_check_items_and_cases = 
$this->so_check_item->get_check_items_and_cases($check_list_id, 'closed', null, 
'return_array');
                                                        
                        $data = array
                        (

Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php       2012-01-11 10:01:53 UTC 
(rev 8555)
+++ trunk/controller/inc/class.uidocument.inc.php       2012-01-11 11:16:41 UTC 
(rev 8556)
@@ -432,7 +432,7 @@
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('controller') . '::' . lang('Procedure');
 
                                //self::render_template_xsl('procedure_item', 
$data);
-                               
self::render_template_xsl(array('procedure_tabs', 'common', 
'procedure_documents'), $data);
+                               
self::render_template_xsl(array('procedure/procedure_tabs', 'common', 
'procedure/procedure_documents'), $data);
                        }
                }
        }
\ No newline at end of file

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2012-01-11 10:01:53 UTC 
(rev 8555)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2012-01-11 11:16:41 UTC 
(rev 8556)
@@ -487,7 +487,7 @@
                        
                        $control = $this->so_control->get_single($control_id);
                        
-                       $control_procedure = $this->so->get_single( 
$control->get_procedure_id() );
+                       $control_procedure = 
$this->so->get_single_with_documents( $control->get_procedure_id(), 
"return_array" );
                        
                        $control_groups = 
$this->so_control_group_list->get_control_groups_by_control($control_id);
                
@@ -501,7 +501,7 @@
                        
                        $data = array
                        (
-                               'control_procedure'                     => 
$control_procedure->toArray(),
+                               'control_procedure'                     => 
$control_procedure,
                                'group_procedures_array'        => 
$group_procedures_array
                        );
                        

Modified: trunk/controller/inc/model/class.check_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.check_item.inc.php 2012-01-11 10:01:53 UTC 
(rev 8555)
+++ trunk/controller/inc/model/class.check_item.inc.php 2012-01-11 11:16:41 UTC 
(rev 8556)
@@ -39,7 +39,6 @@
                protected $status;
                protected $comment;
                protected $check_list_id;
-               protected $message_ticket_id;
                protected $measurement;
                                
                // Objects
@@ -92,13 +91,6 @@
                
                public function get_check_list_id() { return 
$this->check_list_id; }
                
-               public function set_message_ticket_id($message_ticket_id)
-               {
-                       $this->message_ticket_id = $message_ticket_id;
-               }
-               
-               public function get_message_ticket_id() { return 
$this->message_ticket_id; }
-               
                public function set_measurement($measurement)
                {
                        $this->measurement = $measurement;

Modified: trunk/controller/inc/model/class.procedure.inc.php
===================================================================
--- trunk/controller/inc/model/class.procedure.inc.php  2012-01-11 10:01:53 UTC 
(rev 8555)
+++ trunk/controller/inc/model/class.procedure.inc.php  2012-01-11 11:16:41 UTC 
(rev 8556)
@@ -204,6 +204,11 @@
                {
                        return $this->documents;
                }
+
+               public function set_documents($documents)
+               {
+                       $this->documents = $documents;
+               }
                
                /**
                 * Add a document to this procedure. This method does not check 
if

Modified: trunk/controller/templates/base/check_list/print_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/print_check_list.xsl     
2012-01-11 10:01:53 UTC (rev 8555)
+++ trunk/controller/templates/base/check_list/print_check_list.xsl     
2012-01-11 11:16:41 UTC (rev 8556)
@@ -1,6 +1,6 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
 
-<xsl:template match="view_control_items">
+<xsl:template match="data">
 
 <ul class="groups">
        <xsl:for-each select="saved_groups_with_items_array">

Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl        
2012-01-11 10:01:53 UTC (rev 8555)
+++ trunk/controller/templates/base/check_list/register_case.xsl        
2012-01-11 11:16:41 UTC (rev 8556)
@@ -30,6 +30,8 @@
                        <xsl:choose>
                                <xsl:when 
test="control_items_for_check_list/child::node()">
                                
+                                       <div class="expand_menu"><div 
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul 
alle</div></div>
+                               
                                        <ul id="control_items_list" 
class="check_items expand_list">
                                                <xsl:for-each 
select="control_items_for_check_list">
                                                        <li>

Modified: trunk/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_cases.xsl    
2012-01-11 10:01:53 UTC (rev 8555)
+++ trunk/controller/templates/base/check_list/view_closed_cases.xsl    
2012-01-11 11:16:41 UTC (rev 8556)
@@ -32,8 +32,6 @@
                <xsl:choose>
                        <xsl:when 
test="closed_check_items_and_cases/child::node()">
                                
-                       <div class="expand_menu"><div class="expand_all">Vis 
alle</div><div class="collapse_all focus">Skjul alle</div></div>
-               
                        <ul class="check_items">
                                <xsl:for-each 
select="closed_check_items_and_cases">
                                        <xsl:choose>
@@ -43,8 +41,24 @@
                                                                <ul>            
                                                                        
<xsl:for-each select="cases_array">
                                                                                
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-                                                                               
<li><xsl:number/>.  <input type="checkbox"  name="case_ids[]" 
value="{$cases_id}" /><xsl:value-of select="descr"/>
-                                                                               
        <div><xsl:value-of select="location_item_id"/></div>
+                                                                               
<li><xsl:value-of select="descr"/>
+                                                                               
        <xsl:choose>
+                                                                               
                <xsl:when test="location_item_id > 0">
+                                                                               
                        <div style="float:right;">
+                                                                               
                        <a target="_blank">
+                                                                               
                                <xsl:attribute name="href">
+                                                                               
                                        
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
+                                                                               
                                        <xsl:text>&amp;id=</xsl:text>
+                                                                               
                                        <xsl:value-of 
select="location_item_id"/>
+                                                                               
                                </xsl:attribute>
+                                                                               
                                Vis melding
+                                                                               
                        </a>
+                                                                               
                        </div>
+                                                                               
                </xsl:when>
+                                                                               
                <xsl:otherwise>
+                                                                               
                        <div style="float:right;"><span style="color:red">Ingen 
melding registrert!</span></div>
+                                                                               
                </xsl:otherwise>
+                                                                               
        </xsl:choose>
                                                                                
</li>
                                                                        
</xsl:for-each>
                                                                </ul>

Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl   
2012-01-11 10:01:53 UTC (rev 8555)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl   
2012-01-11 11:16:41 UTC (rev 8556)
@@ -51,6 +51,7 @@
                
<xsl:text>index.php?menuaction=controller.uicheck_list.print_check_list</xsl:text>
                <xsl:text>&amp;check_list_id=</xsl:text>
                <xsl:value-of select="check_list/id"/>
+               <xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
        </xsl:attribute>
        Skriv ut
 </a>

Modified: trunk/controller/templates/base/check_list/view_measurements.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_measurements.xsl    
2012-01-11 10:01:53 UTC (rev 8555)
+++ trunk/controller/templates/base/check_list/view_measurements.xsl    
2012-01-11 11:16:41 UTC (rev 8556)
@@ -64,7 +64,7 @@
                                                                       </div>
                                                                       <div 
class="form-buttons">
                                                                                
        <xsl:variable name="lang_save"><xsl:value-of 
select="php:function('lang', 'save_check_item')" /></xsl:variable>
-                                                                               
        <input type="submit" name="save_control" value="Oppdatert registert 
måling" class="not_active" title="{$lang_save}" />
+                                                                               
        <input type="submit" name="save_control" value="Oppdater registert 
måling" class="not_active" title="{$lang_save}" />
                                                                                
</div>
                                                                        </div>
                                                                </form>

Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl      
2012-01-11 10:01:53 UTC (rev 8555)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl      
2012-01-11 11:16:41 UTC (rev 8556)
@@ -32,8 +32,6 @@
                <xsl:choose>
                        <xsl:when 
test="open_check_items_and_cases/child::node()">
                                
-                       <div class="expand_menu"><div class="expand_all">Vis 
alle</div><div class="collapse_all focus">Skjul alle</div></div>
-               
                        <ul class="check_items">
                                <xsl:for-each 
select="open_check_items_and_cases">
                                        <xsl:choose>
@@ -47,7 +45,7 @@
                                                                                
        <xsl:choose>
                                                                                
                <xsl:when test="location_item_id > 0">
                                                                                
                        <div style="float:right;">
-                                                                               
                        <a>
+                                                                               
                        <a target="_blank">
                                                                                
                                <xsl:attribute name="href">
                                                                                
                                        
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
                                                                                
                                        <xsl:text>&amp;id=</xsl:text>

Modified: 
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
--- trunk/controller/templates/base/procedure/view_procedures_for_control.xsl   
2012-01-11 10:01:53 UTC (rev 8555)
+++ trunk/controller/templates/base/procedure/view_procedures_for_control.xsl   
2012-01-11 11:16:41 UTC (rev 8556)
@@ -3,26 +3,36 @@
 <xsl:template match="data">
        <h3 style="margin:5px 0;">Prosedyre for kontroll</h3>
        
-       <span>Tittel: </span><xsl:value-of select="control_procedure/title"/>
-       <a style="display:block;margin-top:5px;" id="print_control_items" 
target="_blank">
-               <xsl:attribute name="href">
-                       
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
-                       <xsl:text>&amp;procedure_id=</xsl:text>
-                       <xsl:value-of select="control_procedure/id"/>
-                       <xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
-               </xsl:attribute>
-               Skriv ut
-       </a>
+       <div><span>Tittel: </span><xsl:value-of 
select="control_procedure/title"/>
+               <a style="margin-left:5px;" id="print_control_items" 
target="_blank">
+                       <xsl:attribute name="href">
+                               
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
+                               <xsl:text>&amp;procedure_id=</xsl:text>
+                               <xsl:value-of select="control_procedure/id"/>
+                               
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
+                       </xsl:attribute>
+                       Skriv ut
+               </a>
+       </div>
+       <xsl:if test="control_procedure/documents/child::node()">
+               <h4 style="margin:5px 0;">Dokumenter</h4>
+               <xsl:for-each select="control_procedure/documents">
+                       <div style="margin-left:10px;">
+                               <span><xsl:value-of select="title"/></span>
+                               <span style="margin-left:10px;"><xsl:value-of 
select="description"/></span>
+                       </div>  
+               </xsl:for-each>
+       </xsl:if>
        
        <h3 style="margin:15px 0 3px 0;">Prosedyrer for grupper</h3>
        
-       <ul class="groups">
+       <ul>
                <xsl:for-each select="group_procedures_array">
-                       <li class="list_item">
+                       <li>
                                <h4 style="margin:2px 0;"><xsl:value-of 
select="procedure/title"/></h4>
-                               <div style="margin-left:10px;">
+                               <div style="margin-bottom:10px;">
                                        <span>Gruppe: </span><xsl:value-of 
select="control_group/group_name"/>
-                                       <a 
style="display:block;margin-top:5px;" id="print_control_items" target="_blank">
+                                       <a style="margin-left:5px;" 
id="print_control_items" target="_blank">
                                                <xsl:attribute name="href">
                                                        
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
                                                        
<xsl:text>&amp;procedure_id=</xsl:text>
@@ -31,7 +41,16 @@
                                                </xsl:attribute>
                                                Skriv ut
                                        </a>
-                               </div>  
+                               </div>
+                               <xsl:if test="documents/child::node()">
+                               <h4 style="margin:5px 0;">Dokumenter</h4>
+                                       <xsl:for-each select="documents">
+                                               <div style="margin-left:10px;">
+                                                       <span><xsl:value-of 
select="title"/></span>
+                                                       <span 
style="margin-left:10px;"><xsl:value-of select="description"/></span>
+                                               </div>  
+                                       </xsl:for-each>
+                               </xsl:if>
                        </li>
                </xsl:for-each>
        </ul>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]