From 446ba0ce28900dff562a0b847be9ca4a26630db0 Mon Sep 17 00:00:00 2001
From: abijah <abijah@97e9348a-65ac-dc4b-aefc-98561f571b83>
Date: Fri, 24 Jul 2009 02:07:43 +0000
Subject: [PATCH] Added a much more user friendly way to present the data1-4
 labels for each type, now that we have a tender_types table.  Still not a
 perfect solution, but definitely good enough for now.  Modified the
 application to recognize the new tender_types table.  There may be other
 modifications necessary, but this gets the most obvious spot.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@378 97e9348a-65ac-dc4b-aefc-98561f571b83
---
 controllers/tenders_controller.php |  2 +-
 models/tender.php                  |  1 +
 models/tender_type.php             |  9 +++++++++
 views/tenders/view.ctp             | 15 +++++++++++----
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 models/tender_type.php

diff --git a/controllers/tenders_controller.php b/controllers/tenders_controller.php
index 850885b..02dc059 100644
--- a/controllers/tenders_controller.php
+++ b/controllers/tenders_controller.php
@@ -84,7 +84,7 @@ class TendersController extends AppController {
     // Get the Tender and related fields
     $tender = $this->Tender->find
       ('first', array
-       ('contain' => false,
+       ('contain' => array('TenderType'),
 	));
 
     // REVISIT <AP>: 20090713
diff --git a/models/tender.php b/models/tender.php
index 666bc22..a407f64 100644
--- a/models/tender.php
+++ b/models/tender.php
@@ -2,6 +2,7 @@
 class Tender extends AppModel {
 
 	var $belongsTo = array(
+		'TenderType',
 		'LedgerEntry',
 		'DepositTransaction' => array(
 			'className' => 'Transaction',
diff --git a/models/tender_type.php b/models/tender_type.php
new file mode 100644
index 0000000..12d7875
--- /dev/null
+++ b/models/tender_type.php
@@ -0,0 +1,9 @@
+<?php
+class TenderType extends AppModel {
+
+	var $hasMany = array(
+		'Tender',
+	);
+
+}
+?>
\ No newline at end of file
diff --git a/views/tenders/view.ctp b/views/tenders/view.ctp
index 57e9bfc..c99d097 100644
--- a/views/tenders/view.ctp
+++ b/views/tenders/view.ctp
@@ -9,15 +9,22 @@ echo '<div class="tender view">' . "\n";
  * Tender Detail Main Section
  */
 
+$ttype  = $tender['TenderType'];
 $tender = $tender['Tender'];
 
 $rows = array();
 $rows[] = array('ID',          $tender['id']);
 $rows[] = array('Name',        $tender['name']);
-$rows[] = array('Data 1',      $tender['data1']);
-$rows[] = array('Data 2',      $tender['data2']);
-$rows[] = array('Data 3',      $tender['data3']);
-$rows[] = array('Data 4',      $tender['data4']);
+$rows[] = array('Type',        $ttype['name']);
+/* $rows[] = array('Type',        $html->link($ttype['name'], */
+/* 					   array('controller' => 'tender_types', */
+/* 						 'action'     => 'view', */
+/* 						 $ttype['id']))); */
+
+for ($i=1; $i<=4; ++$i) 
+  if (!empty($ttype["data{$i}_name"]))
+    $rows[] = array($ttype["data{$i}_name"], $tender["data{$i}"]);
+
 $rows[] = array('Comment',     $tender['comment']);
 
 echo $this->element('table',