From aae41714ab0a1ea4de748c503260e19e16a6fda9 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Mon, 14 Mar 2011 12:30:03 +1100
Subject: [PATCH] added fixJobs to set FKs on job table. Adding jobs now sets
 these keys properly

---
 controllers/jobs_controller.php | 23 ++++++++++++++---
 models/job.php                  | 10 +++++++-
 views/elements/job_table.ctp    |  4 +--
 views/jobs/fix_jobs.ctp         | 44 +++++++++++++++++++++++++++++++++
 views/jobs/index.ctp            |  4 +--
 5 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 views/jobs/fix_jobs.ctp

diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php
index 20bada3e..5a9ff4da 100755
--- a/controllers/jobs_controller.php
+++ b/controllers/jobs_controller.php
@@ -66,7 +66,9 @@ class JobsController extends AppController {
 	    $jobLetter = $enquiry['State']['enqform'];
 
 	    $this->data['Job']['title'] = $monthYearShort.$jobLetter."J".$new_job_number;
-
+	    $this->data['Job']['state_id'] = $enquiry['Enquiry']['state_id'];
+	    $this->data['Job']['customer_id'] = $enquiry['Enquiry']['customer_id'];
+	    $this->data['Job']['contact_id'] = $enquiry['Enquiry']['contact_id'];
 
 
 
@@ -189,9 +191,24 @@ class JobsController extends AppController {
      *
      * Will fetch the right ID the same way the Index does, then update each record.
      */
-    function fixCustomerIDs() {
+    function fixJobs() {
+
+	$jobs = $this->Job->find('all');
+
+	foreach($jobs as $job) {
+	    $this->Job->id = $job['Job']['id'];
+	    $this->data = $job;
+
+	    $this->data['Job']['customer_id'] = $job['Enquiry']['customer_id'];
+	    $this->data['Job']['state_id'] = $job['Enquiry']['state_id'];
+	    $this->data['Job']['contact_id'] = $job['Enquiry']['contact_id'];
+	    $this->Job->save($this->data);
+	    
+	}
+
+	$this->set('jobs', $this->Job->find('all'));
+
 
-	
     }
 }
 ?>
\ No newline at end of file
diff --git a/models/job.php b/models/job.php
index ca106f8e..f0faf131 100755
--- a/models/job.php
+++ b/models/job.php
@@ -29,7 +29,15 @@ class Job extends AppModel {
 			    'counterCache' => true
 	    ),
 
-	    'Currency'
+	    'Currency' => array(
+			    'className' => 'Currency',
+			    'foreignKey' => 'currency_id'
+	    ),
+
+	  'Customer' => array(
+			    'className' => 'Customer',
+			    'foreignKey' => 'customer_id'
+	    )
     );
 
     var $hasAndBelongsToMany = array(
diff --git a/views/elements/job_table.ctp b/views/elements/job_table.ctp
index c416dad1..e87305cf 100644
--- a/views/elements/job_table.ctp
+++ b/views/elements/job_table.ctp
@@ -58,8 +58,8 @@
             </td>
 	    <td><?=$poLink?></td>
             <td>
-                    <?php echo $html->link($customers[$job['Enquiry']['customer_id']], array('controller'=>'customers',
-                    'action'=>'view', $job['Enquiry']['customer_id'])); ?>
+                    <?php echo $html->link($job['Customer']['name'], array('controller'=>'customers',
+                    'action'=>'view', $job['Job']['customer_id'])); ?>
             </td>
             <td>
                     <?php echo $job['Job']['customer_order_number']; ?>
diff --git a/views/jobs/fix_jobs.ctp b/views/jobs/fix_jobs.ctp
new file mode 100644
index 00000000..6e3bafdf
--- /dev/null
+++ b/views/jobs/fix_jobs.ctp
@@ -0,0 +1,44 @@
+<table>
+    <tr>
+	<th>id</th>
+	
+	<th>customer_id</th>
+	<th>Enq Cust ID</th>
+
+	<th>state_id</th>
+	<th>Enq State ID</th>
+	<th>contact_id</th>
+	<th>Enq Contact ID</th>
+    </tr>
+
+
+<?
+
+
+foreach($jobs as $job):
+?>
+    <tr>
+	<td><?=$job['Job']['id'];?></td>
+
+	<td><?=$job['Job']['customer_id'];?></td>
+	<td><?=$job['Enquiry']['customer_id'];?></td>
+
+	<td><?=$job['Job']['state_id']?></td>
+	<td><?=$job['Enquiry']['state_id']?></td>
+
+	<td><?=$job['Job']['contact_id']?></td>
+	<td><?=$job['Enquiry']['contact_id']?></td>
+    </tr>
+
+<?
+endforeach;?>
+
+</table>
+
+
+<?
+debug($jobs);
+
+
+
+?>
\ No newline at end of file
diff --git a/views/jobs/index.ctp b/views/jobs/index.ctp
index 0ca9c89f..2428abd2 100755
--- a/views/jobs/index.ctp
+++ b/views/jobs/index.ctp
@@ -61,8 +61,8 @@
             </td>
 	    <td><?=$poLink?></td>
             <td>
-                    <?php echo $html->link($customers[$job['Enquiry']['customer_id']], array('controller'=>'customers',
-                    'action'=>'view', $job['Enquiry']['customer_id'])); ?>
+                    <?php echo $html->link($job['Customer']['name'], array('controller'=>'customers',
+                    'action'=>'view', $job['Job']['customer_id'])); ?>
             </td>
             <td>
                     <?php echo $job['Job']['customer_order_number']; ?>