From 5202955a03f92d7e22ab7e468cecbc56397455d6 Mon Sep 17 00:00:00 2001
From: Arman KYOKCHAN <akyokchyan@scores-decisions.com>
Date: Tue, 25 Jun 2013 08:52:29 +0000
Subject: [PATCH] issue #0001649: Design modifications

---
 .../scripts/giant/startmonitoring.phtml       |  7 ++++--
 .../scripts/giant/stopmonitoring.phtml        | 22 ++++++++++++++++++-
 .../scripts/giant/updatemonitoring.phtml      | 22 ++++++++++++++++++-
 library/Giant/WSgiant.php                     |  2 +-
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/application/views/default/scripts/giant/startmonitoring.phtml b/application/views/default/scripts/giant/startmonitoring.phtml
index ff8981139..0a4966b1f 100644
--- a/application/views/default/scripts/giant/startmonitoring.phtml
+++ b/application/views/default/scripts/giant/startmonitoring.phtml
@@ -40,7 +40,7 @@
 </div>
 <?if ($this->result) :?>
 	<div class="gen_div">
-	  <div class='monitor_resp radius'><div class="left_div"><b>ProviderOrderId</b></div> <div class="right_div"><?=$this->result->Order->ProviderOrderId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>InternalOrderId</b></div> <div class="right_div"><?=$this->result->Order->InternalOrderId?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>ConsumerId</b></div> <div class="right_div"><?=$this->result->Order->ConsumerId?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>CustomerId</b></div> <div class="right_div"><?=$this->result->Order->CustomerId?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>ProviderId</b></div> <div class="right_div"><?=$this->result->Order->ProviderId?></div></div>
@@ -50,10 +50,13 @@
 	  <div class='monitor_resp radius'><div class="left_div"><b>EventType</b></div> <div class="right_div"><?=$this->result->Order->EventType?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>CategoryName</b></div> <div class="right_div"><?=$this->result->Order->CategoryName?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>Version</b></div> <div class="right_div"><?=$this->result->Order->Version?></div></div>
-	  <div class='monitor_resp radius'><div class="left_div"><b>LanguageCode</b></div> <div class="right_div"><?=$this->result->Order->OrderStatus?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>LanguageCode</b></div> <div class="right_div"><?=$this->result->Order->LanguageCode?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>OrderStatus</b></div> <div class="right_div"><?=$this->result->Order->OrderStatus?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>OrderDateTime</b></div> <div class="right_div"><?=$this->result->Order->OrderDateTime?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>DateTimeCompleted</b></div> <div class="right_div"><?=$this->result->Order->DateTimeCompleted?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>PreferredStartDate</b></div> <div class="right_div"><?=$this->result->Order->PreferredStartDate?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>ActualStartDate</b></div> <div class="right_div"><?=$this->result->Order->ActualStartDate?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>PreferredEndDate</b></div> <div class="right_div"><?=$this->result->Order->PreferredEndDate?></div></div>
 	  <div class='monitor_resp radius'><div class="left_div"><b>ActualEndDate</b></div> <div class="right_div"><?=$this->result->Order->ActualEndDate?></div></div>
 	</div>
 	<?endif?>
diff --git a/application/views/default/scripts/giant/stopmonitoring.phtml b/application/views/default/scripts/giant/stopmonitoring.phtml
index 8a684f55e..fbc62c821 100644
--- a/application/views/default/scripts/giant/stopmonitoring.phtml
+++ b/application/views/default/scripts/giant/stopmonitoring.phtml
@@ -20,6 +20,26 @@
 <div id="loading" class="hide_monitor" style="display:none;z-index: 1;">
 	<center><img style="padding-top:30%" src="/themes/default/images/giant/19-1.gif" /></center>
 </div>
-<?php echo'<pre>'; print_r($this->values);print_r($this->result);?>
+<?if ($this->result) :?>
+	<div class="gen_div">
+	  <div class='monitor_resp radius'><div class="left_div"><b>InternalOrderId</b></div> <div class="right_div"><?=$this->result->Order->InternalOrderId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>ConsumerId</b></div> <div class="right_div"><?=$this->result->Order->ConsumerId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>CustomerId</b></div> <div class="right_div"><?=$this->result->Order->CustomerId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>ProviderId</b></div> <div class="right_div"><?=$this->result->Order->ProviderId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>CountryCode</b></div> <div class="right_div"><?=$this->result->Order->CountryCode?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>CompanyId</b></div> <div class="right_div"><?=$this->result->Order->CompanyId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>OrderType</b></div> <div class="right_div"><?=$this->result->Order->OrderType?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>EventType</b></div> <div class="right_div"><?=$this->result->Order->EventType?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>CategoryName</b></div> <div class="right_div"><?=$this->result->Order->CategoryName?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>Version</b></div> <div class="right_div"><?=$this->result->Order->Version?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>LanguageCode</b></div> <div class="right_div"><?=$this->result->Order->LanguageCode?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>OrderStatus</b></div> <div class="right_div"><?=$this->result->Order->OrderStatus?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>OrderDateTime</b></div> <div class="right_div"><?=$this->result->Order->OrderDateTime?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>DateTimeCompleted</b></div> <div class="right_div"><?=$this->result->Order->DateTimeCompleted?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>ActualStartDate</b></div> <div class="right_div"><?=$this->result->Order->ActualStartDate?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>PreferredEndDate</b></div> <div class="right_div"><?=$this->result->Order->PreferredEndDate?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>ActualEndDate</b></div> <div class="right_div"><?=$this->result->Order->ActualEndDate?></div></div>
+	</div>
+	<?endif?>
 </div>
 <script type="text/javascript" src="/themes/default/scripts/giant_monitoring.js" />
\ No newline at end of file
diff --git a/application/views/default/scripts/giant/updatemonitoring.phtml b/application/views/default/scripts/giant/updatemonitoring.phtml
index 8c675e6cd..c5e4bca2e 100644
--- a/application/views/default/scripts/giant/updatemonitoring.phtml
+++ b/application/views/default/scripts/giant/updatemonitoring.phtml
@@ -41,6 +41,26 @@
 <div id="loading" class="hide_monitor" style="display:none;z-index: 1;">
 	<center><img style="padding-top:30%" src="/themes/default/images/giant/19-1.gif" /></center>
 </div>
-<?php echo'<pre>'; print_r($this->values);print_r($this->result);?>
+<?if ($this->result) :?>
+	<div class="gen_div">
+	  <div class='monitor_resp radius'><div class="left_div"><b>InternalOrderId</b></div> <div class="right_div"><?=$this->result->Order->InternalOrderId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>ConsumerId</b></div> <div class="right_div"><?=$this->result->Order->ConsumerId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>CustomerId</b></div> <div class="right_div"><?=$this->result->Order->CustomerId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>ProviderId</b></div> <div class="right_div"><?=$this->result->Order->ProviderId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>CountryCode</b></div> <div class="right_div"><?=$this->result->Order->CountryCode?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>CompanyId</b></div> <div class="right_div"><?=$this->result->Order->CompanyId?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>OrderType</b></div> <div class="right_div"><?=$this->result->Order->OrderType?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>EventType</b></div> <div class="right_div"><?=$this->result->Order->EventType?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>CategoryName</b></div> <div class="right_div"><?=$this->result->Order->CategoryName?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>Version</b></div> <div class="right_div"><?=$this->result->Order->Version?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>LanguageCode</b></div> <div class="right_div"><?=$this->result->Order->LanguageCode?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>OrderStatus</b></div> <div class="right_div"><?=$this->result->Order->OrderStatus?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>OrderDateTime</b></div> <div class="right_div"><?=$this->result->Order->OrderDateTime?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>DateTimeCompleted</b></div> <div class="right_div"><?=$this->result->Order->DateTimeCompleted?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>PreferredStartDate</b></div> <div class="right_div"><?=$this->result->Order->PreferredStartDate?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>ActualStartDate</b></div> <div class="right_div"><?=$this->result->Order->ActualStartDate?></div></div>
+	  <div class='monitor_resp radius'><div class="left_div"><b>ActualEndDate</b></div> <div class="right_div"><?=$this->result->Order->ActualEndDate?></div></div>
+	</div>
+	<?endif?>
 </div>
 <script type="text/javascript" src="/themes/default/scripts/giant_monitoring.js" />
\ No newline at end of file
diff --git a/library/Giant/WSgiant.php b/library/Giant/WSgiant.php
index f98dbe8d3..c59b296d7 100644
--- a/library/Giant/WSgiant.php
+++ b/library/Giant/WSgiant.php
@@ -249,7 +249,7 @@ Class CreditData extends GiantFunction
 	protected function UpdateMonitoringOptions($CompanyId, $InternalOrderId, $CategorieName, $EventType, $PreferredStartDate, $Version, $LanguageCode)
 	{
 		$parametres = new stdClass();
-		$parametres->ProviderOrderId = $InternalOrderId;
+		$parametres->InternalOrderId = (float)$InternalOrderId;
 		if (!empty($CategorieName)) {$parametres->NewCategoryName = $CategorieName;}
 		if (!empty($EventType)) {$parametres->NewEventType = $EventType;}
 		if (!empty($PreferredStartDate)) {$parametres->PreferredStartDate = $PreferredStartDate;}