You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/08/12 07:27:48 UTC
[1/2] airavata-php-gateway git commit: Addition of reservation fields
to Compute Resource Preferenes
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop dea0686dc -> e4a20bb83
Addition of reservation fields to Compute Resource Preferenes
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/64dbd28e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/64dbd28e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/64dbd28e
Branch: refs/heads/develop
Commit: 64dbd28e49b6b8b871a77c18046a33529239a8cd
Parents: eed3374
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Aug 12 00:24:17 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Aug 12 00:24:17 2016 -0700
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 27 +++++++++++++--
.../compute-resource-preferences.blade.php | 36 ++++++++++++++++++++
2 files changed, 60 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64dbd28e/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 609026c..1d6e36a 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -46,11 +46,8 @@
</ul>
</div>
<div class="container-fluid">
-
<div class="tab-content col-md-12">
-
<div class="tab-pane active" id="tab-currentGateway">
-
<div class="panel-group" id="accordion2">
<h3>Edit your Gateway Profile</h3>
@foreach( $gateways as $indexGP => $gp )
@@ -337,6 +334,7 @@
@section('scripts')
@parent
{{ HTML::script('js/gateway.js') }}
+{{ HTML::script('js/datetimepicker.js')}}
<script>
//make first tab of accordion open by default.
//temporary fix
@@ -485,5 +483,28 @@
$("#deny-gateway").modal("show");
});
+
+ /* making datetimepicker work for reservation start and end date */
+
+ $('#datetimepicker1').datetimepicker({
+ pick12HourFormat: false
+ });
+ $('#datetimepicker2').datetimepicker({
+ pick12HourFormat: false
+ });
+ $("#datetimepicker1").on("dp.change", function (e) {
+ $('#datetimepicker2').data("DateTimePicker").setMinDate(e.date);
+
+ //hack to close calendar on selecting date
+ $(this).find(".glyphicon-calendar").click();
+ });
+ $("#datetimepicker2").on("dp.change", function (e) {
+ $('#datetimepicker1').data("DateTimePicker").setMaxDate(e.date);
+
+ //hack to close calendar on selecting date
+ $(this).find(".glyphicon-calendar").click();
+
+ });
+
</script>
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/64dbd28e/app/views/partials/compute-resource-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/compute-resource-preferences.blade.php b/app/views/partials/compute-resource-preferences.blade.php
index 4806c60..ca2566d 100644
--- a/app/views/partials/compute-resource-preferences.blade.php
+++ b/app/views/partials/compute-resource-preferences.blade.php
@@ -113,6 +113,42 @@
</div>
@endif
+<div class="form-group">
+ <label class="control-label col-md-3">Quality of Service</label>
+
+ <div class="col-md-9">
+ <input type="text" name="qualityOfService" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->qualityOfService}}@endif"/>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-md-3">Reservation</label>
+
+ <div class="col-md-9">
+ <input type="text" name="reservation" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->reservation}}@endif"/>
+ </div>
+</div>
+
+<div class="form-group col-md-6">
+ <label class="control-label col-md-3">Reservation Start Time</label>
+
+ <div class="col-md-9">
+ <input type="text" id="datetimepicker1" name="qualityOfService" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->qualityOfService}}@endif"/>
+ </div>
+</div>
+
+<div class="form-group col-md-6">
+ <label class="control-label col-md-3">Reservation End Time</label>
+
+ <div class="col-md-9">
+ <input type="text" id="datetimepicker2" name="reservationEndTime" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->reservationEndTime}}@endif"/>
+ </div>
+</div>
+
@if(Session::has("admin"))
<div class="form-group text-center">
<input type="submit" class="btn btn-primary submit-crp-form" value="Set preferences"/>
[2/2] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/e4a20bb8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e4a20bb8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e4a20bb8
Branch: refs/heads/develop
Commit: e4a20bb833abd89684ebf01c164f51fa35d6fa68
Parents: 64dbd28 dea0686
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Aug 12 00:26:31 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Aug 12 00:26:31 2016 -0700
----------------------------------------------------------------------
.../Airavata/Model/Workspace/Types.php | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------