issue #0001649: Design modifications

This commit is contained in:
Arman KYOKCHAN 2013-06-24 13:37:01 +00:00
parent a70341410e
commit fd852294bc
5 changed files with 58 additions and 10 deletions

View File

@ -130,14 +130,18 @@
</div>
<?php endif;?>
<?php if(!empty($this->modification)): ?>
<h1>Liste des monitoring<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
<a class="dial" title="Start Monitoring" href='/giant/startmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Start monitoring</a><br />
<a class="dial" title="Stop Monitoring" href='/giant/stopmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Stop monitoring</a><br />
<a class="dial" title="Update Monitoring" href='/giant/updatemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Update monitoring</a><br />
<a title="Retrive Monitoring" href='/giant/retrivemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>/InternalOrderId/32768032781/StartFrom/1'>Retrive monitoring</a>
<div class='monitor_but'>
<a class="dial" title="Start Monitoring" href='/giant/startmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Start monitoring</a>
<a class="dial" title="Stop Monitoring" href='/giant/stopmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Stop monitoring</a>
<a class="dial" title="Update Monitoring" href='/giant/updatemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Update monitoring</a>
</div>
<br><br><br><br>
<div class='retrive_but'>
<a title="Retrive Monitoring" href='/giant/retrivemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>/InternalOrderId/32768032781/StartFrom/1'>Retrive monitoring</a><br />
</div>
<?php echo'<pre>';print_r($this->modification); ?>
<?php endif;?>
</div>

View File

@ -38,6 +38,24 @@
<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>ProviderOrderId</b></div> <div class="right_div"><?=$this->result->Order->ProviderOrderId?></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->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>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" />

View File

@ -61,5 +61,9 @@ $(document).ready( function()
$('.'+$.alink+'').fadeIn(500);
});
$(function() {
$( ".monitor_but a,.retrive_but a" )
.button();
});
});

View File

@ -13,7 +13,7 @@ $("[required]").on("change", function(){
$(document).ready(function() {
validate();
$(function() {
$( "#accordion" ).accordion({heightStyle: "content", collapsible: true });
$( "#accordion" ).accordion({heightStyle: "content", collapsible: true,active: false });
});
$(function() {
$.datepicker.setDefaults( $.datepicker.regional[ "fr" ] );
@ -36,6 +36,9 @@ $(document).ready(function() {
$.post('/giant/'+action, values, function(data) {
$('#dial').html(data);
$('form').remove();
$(".ui-dialog-buttonpane button:contains('Valider')").remove();
$('.ui-dialog-content').css('overflow','auto');
});
}
}, {

View File

@ -318,4 +318,23 @@
-ms-border-radius: 4px;
-icab-border-radius: 4px;
border-radius: 4px;
}
.monitor_but
{
width: 441px;
margin: 0 auto;
}
.monitor_but a
{
margin: 7px;
float:left;
}
.monitor_resp
{
height: 16px;
clear: both;
margin: 5px;
padding: 5px;
background: #eee;
width: 601px;
}