[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-09-23 Thread ndoshi 
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/58191f67
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/58191f67
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/58191f67

Branch: refs/heads/develop
Commit: 58191f67ee14b1727dd92ae3ef7e120cb11f6a53
Parents: 91377e5 4eec7b2
Author: Nipurn Doshi 
Authored: Thu Sep 22 22:50:18 2016 -0700
Committer: Nipurn Doshi 
Committed: Thu Sep 22 22:50:18 2016 -0700

--
 app/libraries/ExperimentUtilities.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-08-27 Thread ndoshi 
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/3f5ea2f2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3f5ea2f2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3f5ea2f2

Branch: refs/heads/develop
Commit: 3f5ea2f2bead25005d6a9669509a6f416700a74e
Parents: f8cb990 1618472
Author: Nipurn Doshi 
Authored: Thu Aug 25 03:23:17 2016 -0700
Committer: Nipurn Doshi 
Committed: Thu Aug 25 03:23:17 2016 -0700

--
 app/controllers/ExperimentController.php| 166 +++--
 app/controllers/ProjectController.php   |  83 +++--
 .../Airavata/Model/Messaging/Event/Types.php| 124 +++--
 .../Airavata/Model/Workspace/Types.php  |  25 +++
 app/libraries/ExperimentUtilities.php   |  31 ++--
 app/libraries/ProjectUtilities.php  |  23 ++-
 app/libraries/SharingUtilities.php  |  28 ++-
 .../Wsis/Stubs/AuthenticationAdminStub.php  |   3 +
 app/routes.php  |   8 +
 app/views/experiment/create-complete.blade.php  |   2 +
 app/views/experiment/edit.blade.php |   2 +
 .../partials/experiment-container.blade.php |  16 +-
 app/views/partials/experiment-info.blade.php|  29 ++-
 app/views/partials/sharing-form-modal.blade.php |   2 +-
 app/views/partials/streaming-data.blade.php |   4 +
 app/views/project/browse.blade.php  |   4 +-
 app/views/project/edit.blade.php|   3 +
 app/views/project/summary.blade.php |  12 +-
 public/js/sharing/share.js  |  77 +---
 public/js/sharing/sharing_utils.js  |   8 +-
 public/js/simstream.js  | 180 +++
 21 files changed, 675 insertions(+), 155 deletions(-)
--

[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-05-03 Thread ndoshi 
Merge branch 'develop' of 
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

# Conflicts:
#   app/libraries/CommonUtilities.php
#   app/views/admin/manage-notices.blade.php


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/b280206b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b280206b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b280206b

Branch: refs/heads/develop
Commit: b280206b5841b45190f6df3e1da4a90189350193
Parents: b01d107 cfdd539
Author: Nipurn Doshi 
Authored: Tue May 3 15:15:22 2016 -0400
Committer: Nipurn Doshi 
Committed: Tue May 3 15:15:22 2016 -0400

--
 app/controllers/AccountController.php|   17 +-
 app/filters.php  |2 +
 app/libraries/Airavata/API/Airavata.php  | 1175 +
 app/libraries/CommonUtilities.php|   56 +-
 app/views/account/dashboard.blade.php|2 +-
 app/views/admin/manage-notices.blade.php |   38 +-
 6 files changed, 488 insertions(+), 802 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b280206b/app/libraries/CommonUtilities.php
--
diff --cc app/libraries/CommonUtilities.php
index fed4c17,6744079..3c7e248
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@@ -101,7 -100,7 +101,7 @@@ class CommonUtilitie
  public static function create_nav_bar()
  {
  $menus = array();
--if (Session::has('loggedin') && (Session::has('authorized-user') || 
Session::has('admin')
++if ( Session::has('loggedin') && (Session::has('authorized-user') || 
Session::has('admin')
  || Session::has('admin-read-only'))) {
  $menus = array
  (
@@@ -203,7 -202,7 +203,7 @@@
  
  //notification bell
  $notices = array();
--$notices = array_reverse( CommonUtilities::get_all_notices() );
++$notices = CommonUtilities::get_all_notices();
  echo CommonUtilities::get_notices_ui( $notices);
  
  
@@@ -230,43 -229,42 +230,61 @@@
  }
  
  public static function get_notices_ui( $notices){
- 
 +$notifVisibility = "";
- $countOfNotices = count( $notices);
+ 
 -   $notifVisibility = "";
 -$countOfNotices = count( $notices);
 -$newNotices = 0;
 -if( Session::has("notice-count")){
 -$newNotices = $countOfNotices - Session::get("notice-count");
 -if( !$newNotices)
 -$notifVisibility = "hide";
 -}
 -else
 -$newNotices = count( $notices);
 -
 -$noticesUI = '' .
 -'' .
 -'' .
 -'' . $newNotices . ''.
 -'';
 -
 -foreach( $notices as $notice){
++$publishedNoticesCount = 0;
++$currentTime = floatval( time()*1000);
++$noticesUI = "";
++foreach( $notices as $notice){
++if( $currentTime >= $notice->publishedTime && $currentTime <= 
$notice->expirationTime)
++{
++$publishedNoticesCount++;
++$textColor = "text-info";
++if( $notice->priority == NotificationPriority::LOW)
++$textColor = "text-primary";
++elseif( $notice->priority ==NotificationPriority::NORMAL)
++$textColor = "text-warning";
++elseif( $notice->priority == NotificationPriority::HIGH)
++$textColor = "text-danger";
+ $noticesUI .= '
+ 
 -' . 
$notice->title . '
++' . 
$notice->title . '
+ ' 
. $notice->notificationMessage . '
 -' . date("m/d/Y h:i:s A T", 
$notice->publishedTime) . '
++' . date("m/d/Y h:i:s A T", 
$notice->publishedTime/1000) . '
+ 
+  
+ ';
+ }
 -$noticesUI .= '
 -
++}
++
++$countOfNotices = $publishedNoticesCount;
 +$newNotices = 0;
 +if( Session::has("notice-count")){
 +$newNotices = $countOfNotices - Session::get("notice-count");
 +}
 +else
 +$newNotices = $countOfNotices;
 +
 +if( !$newNotices)
 +$notifVisibility = "hide";
 +
 +$noticesUI = '' .
- '' .
- '' .
- '' . $newNotices . ''.
- '';
++''

[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-04-27 Thread ndoshi 
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/873aec41
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/873aec41
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/873aec41

Branch: refs/heads/develop
Commit: 873aec41bbe80f427c63473d08f06950987cbfac
Parents: a14cd91 8b67709
Author: Nipurn Doshi 
Authored: Tue Apr 26 12:25:40 2016 -0400
Committer: Nipurn Doshi 
Committed: Tue Apr 26 12:25:40 2016 -0400

--
 app/libraries/Airavata/API/Airavata.php | 3062 ++
 .../Airavata/Model/Data/Product/Types.php   |  879 +
 .../Airavata/Model/Data/Resource/Types.php  |  854 +
 app/libraries/Airavata/Model/Process/Types.php  |   23 +
 .../Airavata/Model/Scheduling/Types.php |   69 +
 .../Airavata/Model/Workspace/Types.php  |  190 ++
 6 files changed, 4447 insertions(+), 630 deletions(-)
--