diff --git a/controllers/emails_controller.php b/controllers/emails_controller.php index be36d12c..b43f74f1 100755 --- a/controllers/emails_controller.php +++ b/controllers/emails_controller.php @@ -100,6 +100,14 @@ class EmailsController extends AppController { } + /** + * View Emails to, from or CC a particular user ID. + * + * + */ + function view_user_emails($id) { + + } } ?> diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php index 9c22d1a0..719874c6 100755 --- a/controllers/enquiries_controller.php +++ b/controllers/enquiries_controller.php @@ -106,7 +106,7 @@ class EnquiriesController extends AppController { else { $this->redirect('/'); } - + } @@ -479,7 +479,7 @@ class EnquiriesController extends AppController { if(count($words) == 2) { $contactConditions = array('AND'=>array('Contact.first_name LIKE' => "%$words[0]%", - 'Contact.last_name LIKE' => "%$words[1]%")); + 'Contact.last_name LIKE' => "%$words[1]%")); } else { $contactConditions = array('OR'=>array('Contact.first_name LIKE' => "%$searchQuery%", @@ -542,7 +542,25 @@ class EnquiriesController extends AppController { + function view_user_enquiries($id = null) { + if($id == null) { + $this->Session->setFlash('Invalid Enquiry ID'); + $this->redirect(array('action'=>'index')); + } + else { + $this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.user_id' => $id))); + + $statuses = $this->Enquiry->Status->find('all', array('recursive'=>0)); + $status_list = array(); + foreach ($statuses as $status) { + $statusid = $status['Status']['id']; + $status_list[$statusid] = $status['Status']['name']; + } + $this->set('status_list', $status_list); + $this->layout = 'ajax'; + } + } } diff --git a/controllers/users_controller.php b/controllers/users_controller.php index 5a629838..8acd8d17 100755 --- a/controllers/users_controller.php +++ b/controllers/users_controller.php @@ -99,17 +99,9 @@ class UsersController extends AppController { break; case 'user': - $this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.user_id' => $id))); + //$this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.user_id' => $id))); - $statuses = $this->User->Enquiry->Status->find('all', array('recursive'=>0)); - $status_list = array(); - foreach ($statuses as $status) { - $statusid = $status['Status']['id']; - $status_list[$statusid] = $status['Status']['name']; - } - $this->set('status_list', $status_list); - $this->render('viewUser'); break; @@ -118,12 +110,6 @@ class UsersController extends AppController { break; } - - - - - - } @@ -250,11 +236,7 @@ class UsersController extends AppController { } } - - - - - + diff --git a/views/enquiries/view_user_enquiries.ctp b/views/enquiries/view_user_enquiries.ctp new file mode 100644 index 00000000..ca298b85 --- /dev/null +++ b/views/enquiries/view_user_enquiries.ctp @@ -0,0 +1 @@ +element('enquiry_table', $enquiries); ?> \ No newline at end of file diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index bbdf6022..9f3596fa 100755 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -37,6 +37,7 @@
+ -
image('ajax-loader.gif'); ?>
+
image('ajax-loader.gif'); ?>
diff --git a/views/users/view_user.ctp b/views/users/view_user.ctp index f2fa4c1d..b1200d7f 100644 --- a/views/users/view_user.ctp +++ b/views/users/view_user.ctp @@ -1,3 +1,7 @@ +link('view_user'); ?> + + +

@@ -30,21 +34,20 @@

+ + + +
+ +
+ + element('enquiry_table', $enquiries); + //echo $this->element('enquiry_table', $user['Enquiry']); } else { echo "No Enquiries for this User"; } ?> - - -
- -
- - diff --git a/webroot/js/view_user.js b/webroot/js/view_user.js new file mode 100644 index 00000000..f6ca9d94 --- /dev/null +++ b/webroot/js/view_user.js @@ -0,0 +1,44 @@ +$(function() { + + $('#hide').hide(); + $('#enquiryTable').hide(); + + $("#ajaxLoad").hide(); + + $("#ajaxLoad").bind("ajaxSend", function() { + $(this).show(); + }).bind("ajaxComplete", function() { + $(this).hide(); + }); + + + + var userID = $('#userID').text(); + + var alreadyFetched = false; + + $('#show').click(function() { + $(this).hide(); + $('#hide').show(); + + if(alreadyFetched == false) { + $.get('/enquiries/view_user_enquiries/'+userID, function(data) { + $('#enquiryTable').html(data); + }); + alreadyFetched = true; + } + $('#enquiryTable').slideDown('fast'); + + }); + + + $('#hide').click(function() { + $(this).hide(); + $('#show').show(); + + $('#enquiryTable').slideUp('fast'); + + }); + + +}); \ No newline at end of file