Code Review
/
src
/
app-framework-demo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
eac68b1
)
Fixed Mutiple AutoStart Call & added Application Menu Context
author
Fulup Ar Foll
<fulup@iot.bzh>
Fri, 12 Feb 2016 14:35:00 +0000
(15:35 +0100)
committer
Fulup Ar Foll
<fulup@iot.bzh>
Fri, 12 Feb 2016 14:35:00 +0000
(15:35 +0100)
afm-client/app/Frontend/widgets/ActionButtons/ActionButtons.scss
patch
|
blob
|
history
afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
patch
|
blob
|
history
afm-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
patch
|
blob
|
history
diff --git
a/afm-client/app/Frontend/widgets/ActionButtons/ActionButtons.scss
b/afm-client/app/Frontend/widgets/ActionButtons/ActionButtons.scss
index
16f7bb5
..
6daba6a
100644
(file)
--- a/
afm-client/app/Frontend/widgets/ActionButtons/ActionButtons.scss
+++ b/
afm-client/app/Frontend/widgets/ActionButtons/ActionButtons.scss
@@
-24,4
+24,17
@@
appli-button {
img {
height: 3rem;
}
img {
height: 3rem;
}
+
+
+ .disable>i {
+ text-decoration:none; // really not needed for the Top Bar, just for general technique
+ cursor: auto;
+ color: grey !important;
+ }
+}
+
+#appliActionMenu {
+ .start-start, .stop-stop {
+ i {color: grey;}
+ }
}
}
diff --git
a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
index
e51b3b6
..
69e61b6
100644
(file)
--- a/
afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
+++ b/
afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
@@
-31,10
+31,10
@@
'<img ng-src="{{icon}}">' +
'<span class="modal-text">Application <b>{{label}}</b></span>' +
'<ul class="vertical icon-left primary menu-bar">' +
'<img ng-src="{{icon}}">' +
'<span class="modal-text">Application <b>{{label}}</b></span>' +
'<ul class="vertical icon-left primary menu-bar">' +
- '<li><a ng-click=action("start")><i class="fi-check"> Start</i></a></li>' +
- '<li><a ng-click=action("stop")><i class="fi-x"> Stop</i></a></li>' +
+ '<li
class=start-{{runstatus}}
><a ng-click=action("start")><i class="fi-check"> Start</i></a></li>' +
+ '<li
class=stop-{{runstatus}}
><a ng-click=action("stop")><i class="fi-x"> Stop</i></a></li>' +
'<li><a ng-click=action("info")><i class="fi-info"> Info</i></a></li>' +
'<li><a ng-click=action("info")><i class="fi-info"> Info</i></a></li>' +
- '<li><a ng-click=action("uninstall")><i class="fi-x"> Uninstall</i></a></li>' +
+ '<li
class=start-{{runstatus}}
><a ng-click=action("uninstall")><i class="fi-x"> Uninstall</i></a></li>' +
'</ul>' +
'';
'</ul>' +
'';
@@
-53,6
+53,7
@@
.directive('appliButton', function (AppConfig, AppCall, ModalFactory, Notification, $timeout) {
function mymethods(scope, elem, attrs) {
.directive('appliButton', function (AppConfig, AppCall, ModalFactory, Notification, $timeout) {
function mymethods(scope, elem, attrs) {
+ scope.runstatus = "stop"
scope.clicked = function () {
var notifyError = function(api, response) {
scope.clicked = function () {
var notifyError = function(api, response) {
@@
-79,23
+80,26
@@
switch (action) {
case "start":
switch (action) {
case "start":
+ if (scope.runstatus !== "stop") return;
AppCall.get ("afm-main", "start", {id: scope.appID}, function(response) {
if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
notifyError ("start", response);
return;
}
AppCall.get ("afm-main", "start", {id: scope.appID}, function(response) {
if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
notifyError ("start", response);
return;
}
-
+ scope.runstatus="start";
notifySuccess ("start", response);
});
break;
case "stop":
notifySuccess ("start", response);
});
break;
case "stop":
+ if (scope.runstatus !== "start") return;
+
AppCall.get ("afm-main", "terminate", {runid: scope.runID}, function(response) {
if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
notifyError ("stop", response);
return;
}
AppCall.get ("afm-main", "terminate", {runid: scope.runID}, function(response) {
if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
notifyError ("stop", response);
return;
}
-
+ scope.runstatus="stop";
notifySuccess ("stop", response);
});
break;
notifySuccess ("stop", response);
});
break;
@@
-109,6
+113,7
@@
// reference http://foundation.zurb.com/apps/docs/#!/angular-modules
var config = {
// reference http://foundation.zurb.com/apps/docs/#!/angular-modules
var config = {
+ id: 'appliInfoMenu',
animationIn: 'slideInFromTop',
contentScope: {
close : closeModal,
animationIn: 'slideInFromTop',
contentScope: {
close : closeModal,
@@
-125,6
+130,7
@@
break;
case "uninstall":
break;
case "uninstall":
+ if (scope.runstatus !== "stop") return;
AppCall.get ("afm-main", "uninstall", {id: scope.appID}, function(response) {
if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
notifyError ("uninstall", response);
AppCall.get ("afm-main", "uninstall", {id: scope.appID}, function(response) {
if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
notifyError ("uninstall", response);
@@
-145,13
+151,15
@@
// reference http://foundation.zurb.com/apps/docs/#!/angular-modules
var config = {
// reference http://foundation.zurb.com/apps/docs/#!/angular-modules
var config = {
+ id: 'appliActionMenu',
animationIn: 'slideInFromTop',
contentScope: {
animationIn: 'slideInFromTop',
contentScope: {
- action : actionModal,
- close : closeModal,
- icon : scope.icon,
- label : scope.label
- }, template : tmplModal
+ action : actionModal,
+ runstatus: scope.runstatus,
+ close : closeModal,
+ icon : scope.icon,
+ label : scope.label
+ }, template : tmplModal
};
// Popup Modal to render application data
scope.modal = new ModalFactory(config);
};
// Popup Modal to render application data
scope.modal = new ModalFactory(config);
diff --git
a/afm-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
b/afm-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
index
5c5b5ae
..
a7ee13f
100644
(file)
--- a/
afm-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
+++ b/
afm-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
@@
-37,21
+37,22
@@
angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
.directive ('tokenRefresh', function($timeout, $http, $location, Notification, AppConfig) {
function mymethods(scope, elem, attrs) {
.directive ('tokenRefresh', function($timeout, $http, $location, Notification, AppConfig) {
function mymethods(scope, elem, attrs) {
- scope.status=undefined; // neither thu neither false
-
-
+ scope.logged=undefined; // neither thu neither false
+
scope.online = function () {
elem.addClass ("online");
elem.removeClass ("offline");
scope.online = function () {
elem.addClass ("online");
elem.removeClass ("offline");
+ scope.logged=true;
};
scope.offline = function(){
elem.addClass ("offline");
elem.removeClass ("online");
};
scope.offline = function(){
elem.addClass ("offline");
elem.removeClass ("online");
+ scope.logged=false;
};
scope.onerror = function(data, errcode, headers) {
};
scope.onerror = function(data, errcode, headers) {
- if (scope.
status
!== false) {
+ if (scope.
logged
!== false) {
Notification.warning ({message: "AppFramework Binder Lost", delay: 5000});
scope.offline();
}
Notification.warning ({message: "AppFramework Binder Lost", delay: 5000});
scope.offline();
}
@@
-59,7
+60,7
@@
angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
};
scope.onsuccess = function(data, errcode, headers, config) {
};
scope.onsuccess = function(data, errcode, headers, config) {
- if (scope.
status
!== true) {
+ if (scope.
logged
!== true) {
if (data.request.token) AppConfig.session.token = data.request.token;
if (data.request.uuid) AppConfig.session.uuid = data.request.uuid;
if (data.request.timeout) AppConfig.session.timeout = data.request.timeout;
if (data.request.token) AppConfig.session.token = data.request.token;
if (data.request.uuid) AppConfig.session.uuid = data.request.uuid;
if (data.request.timeout) AppConfig.session.timeout = data.request.timeout;