You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/02/09 16:55:45 UTC
[17/50] [abbrv] airavata-php-gateway git commit: fixing some datacat
visualization issues
fixing some datacat visualization issues
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/fefaa795
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/fefaa795
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/fefaa795
Branch: refs/heads/master
Commit: fefaa795b596c74e559258adc4e9947852994811
Parents: 8ab4d61
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 28 15:47:27 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 28 15:47:27 2016 -0500
----------------------------------------------------------------------
app/controllers/DataCatController.php | 2 +-
app/views/datacat/select.blade.php | 8 +++++---
app/views/datacat/summary.blade.php | 10 +++++-----
3 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/fefaa795/app/controllers/DataCatController.php
----------------------------------------------------------------------
diff --git a/app/controllers/DataCatController.php b/app/controllers/DataCatController.php
index d528f64..9bf9c94 100755
--- a/app/controllers/DataCatController.php
+++ b/app/controllers/DataCatController.php
@@ -17,7 +17,7 @@ class DataCatController extends BaseController
{
//FIXME
$result = json_decode(file_get_contents('http://localhost:9000/query-api/select?q=sddslfnlsdf'), true);
- return View::make('datacat/summary', array("result" => $result[4]));
+ return View::make('datacat/summary', array("result" => $result[0]));
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/fefaa795/app/views/datacat/select.blade.php
----------------------------------------------------------------------
diff --git a/app/views/datacat/select.blade.php b/app/views/datacat/select.blade.php
index 2cdb27e..bb9cac7 100755
--- a/app/views/datacat/select.blade.php
+++ b/app/views/datacat/select.blade.php
@@ -7,13 +7,14 @@
@parent
@stop
@section('content')
- <div class="container" style="max-width: 80%;">
+ <div style="margin: 25px">
@if ( isset($results))
@if (sizeof($results) != 0)
<div id="re" class="table-responsive">
<table class="table">
<tr>
<th>FinalGeom</th>
+ <th>InChI</th>
<th>Formula</th>
<th>Energy</th>
<th>ZPE</th>
@@ -26,7 +27,7 @@
<th>CodeVersion</th>
</tr>
@foreach($results as $key=>$result)
- @if(isset($result['Formula']))
+ @if(isset($result['InChI']))
<tr>
<td>
<div id="mol_{{$key}}" style="width: 100px; height: 100px; background-color: black;"></div>
@@ -59,7 +60,8 @@
</script>
@endif
</td>
- <td>@if(isset($result['Formula']))<a href="summary" target="_blank">{{$result['Formula']}}</a>@endif</td>
+ <td>@if(isset($result['InChI']))<a href="summary" target="_blank">{{$result['InChI']}}</a>@endif</td>
+ <td>@if(isset($result['Formula'])){{$result['Formula']}}@endif</td>
<td>@if(isset($result['Energy'])){{$result['Energy']}}@endif</td>
<td>@if(isset($result['ZPE'])){{$result['ZPE']}}@endif</td>
<td>@if(isset($result['CalcType'])){{$result['CalcType']}}@endif</td>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/fefaa795/app/views/datacat/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/datacat/summary.blade.php b/app/views/datacat/summary.blade.php
index bcfbbf6..a486b22 100755
--- a/app/views/datacat/summary.blade.php
+++ b/app/views/datacat/summary.blade.php
@@ -7,16 +7,12 @@
@parent
@stop
@section('content')
- <div class="container" style="max-width: 60%;">
+ <div style="margin-left: 5%; margin-right: 5%; margin-top: 5px; margin-bottom: 5px">
@if ( isset($result))
<h1>Molecule Summary</h1>
</br>
<table class="table table-bordered">
<tr>
- <td><strong>Formula</strong></td>
- <td>@if(isset($result['Formula']))<a href="#">{{$result['Formula']}}</a>@endif</td>
- </tr>
- <tr>
<td><strong>FinalGeom</strong></td>
<td>
<div id="mol" style="width: 200px; height: 200px; background-color: black;"></div>
@@ -66,6 +62,10 @@
<td><strong>CanonicalSMILES</strong></td>
<td>@if(isset($result['CanonicalSMILES'])){{$result['CanonicalSMILES']}}@endif</td>
</tr>
+ <tr>
+ <td><strong>Formula</strong></td>
+ <td>@if(isset($result['Formula']))<a href="#">{{$result['Formula']}}</a>@endif</td>
+ </tr>
</table>
</br>