[Phpgroupware-cvs] property/class.soproject.php, 1.1.1.2

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.soproject.php

date: 2004/07/04 17:25:21;  author: sigurdne;  state: Exp;  lines: +32 -12

Log Message:
no message
=====================================================================
Index: property/class.soproject.php
diff -u property/class.soproject.php:1.1.1.1 
property/class.soproject.php:1.1.1.2
--- property/class.soproject.php:1.1.1.1        Wed Jun  2 20:07:06 2004
+++ property/class.soproject.php        Sun Jul  4 17:25:21 2004
@@ -702,28 +702,48 @@
                        if($project['delete_request'])
                        {
                                $receipt = 
$this->delete_request_from_project($project['delete_request'],$project['project_id']);
-
                        }
 
-                       if($GLOBALS['phpgw']->db->committrans())
+                       
$this->update_request_status($project['project_id'],$project['status'],$project['cat_id'],$project['coordinator']);
+
+                       if ($old_status != $project['status'])
                        {
-                               
$this->update_request_status($project['project_id'],$project['status'],$project['cat_id'],$project['coordinator']);
+                               
$historylog->add('S',$project['project_id'],$project['status']);
 
-                               if ($old_status != $project['status'])
-                               {
-                                       
$historylog->add('S',$project['project_id'],$project['status']);
-                               }
-                               if ($old_categroy != $project['cat_id'])
+                               $GLOBALS['phpgw']->db->Execute("UPDATE 
fm_workorder set status='". $project['status'] . "' WHERE project_id= '" . 
$project['project_id'] ."'");
+
+                               $dbresult2 = 
$GLOBALS['phpgw']->db->Execute("SELECT id from fm_workorder WHERE project_id=" 
.  (int)$project['project_id']);
+                               while (!$dbresult2->EOF)
                                {
-                                       
$historylog->add('T',$project['project_id'],$project['cat_id']);
+                                       $workorder[] = $dbresult2->fields['id'];
+                                       $dbresult2->MoveNext();
                                }
-                               if ($old_coordinator != $project['coordinator'])
+
+                               if (isset($workorder) AND is_array($workorder))
                                {
-                                       
$historylog->add('C',$project['project_id'],$project['coordinator']);
+                                       $historylog_workorder   = 
CreateObject($this->currentapp.'_historylog','workorder');
+                                       foreach($workorder as $workorder_id)
+                                       {
+                                               
$historylog_workorder->add('S',$workorder_id,$project['status']);
+                                       }
                                }
 
-                               $receipt['message'][] = 
array('msg'=>lang('project %1 has been edited',$project['project_id']));
+                               $receipt['notice_owner'][]=lang('Status 
changed') . ': ' . $project['status'];
+
                        }
+                       if ($old_categroy != $project['cat_id'])
+                       {
+                               
$historylog->add('T',$project['project_id'],$project['cat_id']);
+                       }
+                       if ($old_coordinator != $project['coordinator'])
+                       {
+                               
$historylog->add('C',$project['project_id'],$project['coordinator']);
+                               $receipt['notice_owner'][]=lang('Coordinator 
changed') . ': ' . 
$GLOBALS['phpgw']->accounts->id2name($project['coordinator']);
+                       }
+
+                       $receipt['message'][] = array('msg'=>lang('project %1 
has been edited',$project['project_id']));
+
+                       $GLOBALS['phpgw']->db->committrans()
                        return $receipt;
 
                }