deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Added Highchart Submodule

Browse Source
This commit is contained in:
Deon George 2013-11-14 23:24:27 +11:00
parent e01d37244c
commit f80fcdc4c1
4 changed files with 133 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "modules/lnApp"]
path = modules/lnApp
url = ssh://10.1.3.20/afs/local/git/lnapp
[submodule "modules/highchart"]
path = modules/highchart
url = ssh://10.1.3.20/afs/local/git/lnhighchart

128
modules/adsl/views/adsl/admin/edit.php Normal file
View File

@ -0,0 +1,128 @@
<div class="row">
<div class="span6">
<div class="row">
<div class="span2">
<?php echo Form::input('base_down_peak',$o->base_down_peak,array('label'=>'Base Down Peak','class'=>'span1')); ?>
</div>
<div class="span2">
<?php echo Form::input('extra_down_peak',$o->extra_down_peak,array('label'=>'Extra','class'=>'span1')); ?>
</div>
</div>
<div class="row">
<div class="span2">
<?php echo Form::input('base_down_offpeak',$o->base_down_offpeak,array('label'=>'Base Down Off Peak','class'=>'span1')); ?>
</div>
<div class="span2">
<?php echo Form::input('extra_down_offpeak',$o->extra_down_offpeak,array('label'=>'Extra','class'=>'span1')); ?>
</div>
</div>
<div class="row">
<div class="span2">
<?php echo Form::input('base_up_peak',$o->base_up_peak,array('label'=>'Base Up Peak','class'=>'span1')); ?>
</div>
<div class="span2">
<?php echo Form::input('extra_up_peak',$o->extra_up_peak,array('label'=>'Extra','class'=>'span1')); ?>
</div>
</div>
<div class="row">
<div class="span2">
<?php echo Form::input('base_up_offpeak',$o->base_up_offpeak,array('label'=>'Base Up Off Peak','class'=>'span1')); ?>
</div>
<div class="span2">
<?php echo Form::input('extra_up_offpeak',$o->extra_up_offpeak,array('label'=>'Extra','class'=>'span1')); ?>
</div>
</div>
<div class="row">
<div class="span2">
<?php echo Form::input('contract_term',$o->contract_term,array('label'=>'Contract Term','class'=>'span1')); ?>
</div>
</div>
<div class="row">
<div class="span2">
<?php echo StaticList_YesNo::form('extra_charged',$o->extra_charged,FALSE,array('label'=>'Extra Charged','class'=>'span1')); ?>
</div>
</div>
<div class="row">
<div class="span6">
<?php echo Form::select('adsl_supplier_plan_id',ORM::factory('ADSL_Supplier_Plan')->list_select(),$o->adsl_supplier_plan_id,array('label'=>'Supplier Plan')); ?>
</div>
</div>
<div class="row">
<div class="offset2">
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn">Cancel</button>
</div>
</div>
</div> <!-- /span -->
<div class="span5">
<fieldset>
<legend>Supplier Details</legend>
<div class="dl-horizontal">
<dt>Supplier</dt>
<dd><?php echo $o->supplier_plan->supplier->name; ?></dd>
<dt>Allowance</dt>
<dd><?php echo $o->allowance($o->supplier_plan->traffic_data(),TRUE); ?></dd>
<dt>Cost</dt>
<dd><?php echo $o->supplier_plan->display('base_cost'); ?></dd>
<dt>Excess</dt>
<dd><?php echo $o->supplier_plan->cost_extra($o->allowance($o->supplier_plan->traffic_data()),TRUE); ?></dd>
<dt>Speed</dt>
<dd><?php echo $o->supplier_plan->speed; ?></dd>
</div>
</fieldset>
</div> <!-- /span -->
<div class="span5">
<fieldset>
<legend>Test Traffic</legend>
<div class="row">
<div class="span2">
<?php echo Form::input('test[base_down_peak]',10000,array('label'=>'Down Peak','class'=>'span1')); ?>
</div>
<div class="span2">
<?php echo Form::input('test[base_down_offpeak]',30000,array('label'=>'Offpeak','class'=>'span1')); ?>
</div>
</div>
<div class="row">
<div class="span2">
<?php echo Form::input('test[base_up_peak]',20000,array('label'=>'Up Peak','class'=>'span1')); ?>
</div>
<div class="span2">
<?php echo Form::input('test[base_up_offpeak]',40000,array('label'=>'Offpeak','class'=>'span1')); ?>
</div>
</div>
<div class="row">
<div class="span2">
<?php echo Form::checkbox('test[charge]',1,FALSE,array('label'=>'Charges','class'=>'span1')); ?>
</div>
</div>
</fieldset>
<?php if ($test_result) : ?>
<fieldset>
<legend>Test Traffic Result</legend>
<div class="dl-horizontal">
<?php foreach ($test_result as $k=>$v) : ?>
<dt><?php echo $k; ?></dt>
<dd><?php echo $v; ?></dd>
<?php endforeach ?>
<dt>Has Offpeak?</dt>
<dd><?php echo $o->hasOffpeak(); ?></dd>
</div>
</fieldset>
<?php endif ?>
</div> <!-- /span -->
</div> <!-- /row -->

1
modules/highchart Submodule

@ -0,0 +1 @@
Subproject commit 9ed797b1d2e9a2b3b8227bbb42be01ea620916d4

2
modules/lnApp

@ -1 +1 @@
Subproject commit c014a4cec843a37c14cb77b2d453909b8ca6494e
Subproject commit 610c223cb823f2b16df3e1f49912e8ef42dc6bd7