complete edit env part

Tang,Hejun · Tang,Hejun · commit 8612d3ccb3e4 · 2015-08-31T20:39:34.000+08:00
diff --git a/app/css/_base.scss b/app/css/_base.scss
@@ -170,6 +170,9 @@ form.default.form-horizontal, form.default.form-inline {
 	}  
 
 }
+label {
+	cursor: pointer;
+}
 label.require {
 	&:before {
 		position: relative;
diff --git a/app/css/main.scss b/app/css/main.scss
@@ -378,3 +378,8 @@ input[type="checkbox"] {
     }
     
 }
+/* class that uses in controller area that pulls them up */
+.pull-up {
+    position: relative;
+    top: -40px;
+}
diff --git a/app/main/environment/env.controller.js b/app/main/environment/env.controller.js
@@ -1,14 +1,30 @@
 (function() {
 
-	angular.module('ilab')
-		.controller('EnvCtrl', EnvCtrl);
+    angular.module('ilab')
+        .controller('EnvCtrl', EnvCtrl);
 
-	EnvCtrl.$inject = ['_env'];
-	function EnvCtrl(_env) {
-		var that = this;
+    EnvCtrl.$inject = ['_env', '_envs', '$scope', '$state'];
 
-		that.env = _env;
-		that.activeTab = 1;
+    function EnvCtrl(_env, _envs, $scope, $state) {
+        var self = this;
 
-	}
-})();
+        self.env = _env;
+        self.envs = _envs;
+        self.activeTab = 1;
+
+        activate();
+
+        function activate() {
+        }
+        $scope.$watch(function() {
+        	return self.env;
+        }, function(newV, oldV) {
+            if (newV !== oldV) {
+                console.log(newV);
+                $state.go('envs.detail.vm', {
+                    envId: newV.id
+                });
+            }
+        });
+    }
+})();
diff --git a/app/main/environment/env.html b/app/main/environment/env.html
@@ -1,3 +1,9 @@
+<div class="pull-right pull-up">
+	<ilab-select list="Env.envs" selected-item="Env.env" attr-to-display="name" with-search></ilab-select>
+	<a ui-sref="envs.basic({envId: Env.env.id})" class="btn btn-default">Overview</a>
+	<a ui-sref="envs.detail.setting"><span class="intelicon-settings-solid clickable"></span></a>
+</div>
+
 <ul class="nav nav-tabs nav-tabs-intel">
     <li ng-class="{'active': Env.activeTab === 1}">
         <a ui-sref="envs.detail.vm">VM</a>
diff --git a/app/main/environment/envBasic/envBasic.html b/app/main/environment/envBasic/envBasic.html
@@ -1,6 +1,6 @@
-<a ui-sref="envs.detail.vm({envId: EnvBasic.env.id})" class="pull-right">advanced</a>
-<div class="list-env">
-    <h3>Virtual Machine: {{EnvBasic.env.virtualMachines.length}}</h3>
+<a ui-sref="envs.detail.vm({envId: EnvBasic.env.id})" class="btn btn-default pull-right pull-up">advanced</a>
+<div class="ilab-section">
+    <h5>Virtual Machine: {{EnvBasic.env.virtualMachines.length}}</h4>
     <div class="card-container">
         <info-card class="list-VMs" type="vm" info="vm" on-connect="EnvBasic.connect(id)" on-power="EnvBasic.powerOperation(id,op)" ng-repeat="vm in EnvBasic.env.virtualMachines"></info-card>
     </div>
diff --git a/app/main/environment/envs.controller.js b/app/main/environment/envs.controller.js
@@ -24,7 +24,7 @@
             environmentService.post(that.newEnv).then(function(data) {
                 console.log(data);
                 $state.go('envs.basic', {envId: data.id});
-            })
+            });
         }
 
         function resetEnv() {
diff --git a/app/main/environment/envs.html b/app/main/environment/envs.html
@@ -23,7 +23,7 @@ <h5>Add Environment</h5>
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-10">
                     <button type="submit" class="btn btn-primary">Add</button>
-                    <button type="reset" class="btn btn-default" ng-click="Envs.reset()">Cancel</button>
+                    <button type="button" class="btn btn-default" ng-click="Envs.reset()">Cancel</button>
                 </div>
             </div>
         </form>
diff --git a/app/main/environment/setting/setting.controller.js b/app/main/environment/setting/setting.controller.js
@@ -0,0 +1,36 @@
+(function() {
+
+	angular.module('ilab')
+		.controller('EnvSettingCtrl', EnvSettingCtrl);
+
+	EnvSettingCtrl.$inject = ['_env', 'environmentService', 'alert'];
+
+	function EnvSettingCtrl(_env, environmentService, alert) {
+		var self = this;
+
+		self.tmpEnv = {};
+		self.updateEnv = updateEnv;
+		self.resetEnv = resetEnv;
+		activate();
+
+		function activate() {
+			angular.copy(_env, self.tmpEnv);
+			console.log(self.tmpEnv);
+		}
+
+		function updateEnv() {
+			angular.extend(_env, self.tmpEnv);
+			console.log(_env.expiryDate.toISOString());
+			_env.expiryDate = _env.expiryDate.toISOString();
+			_env.put().then(function(data) {
+				console.log(data);
+				alert.open({type: 'success', message: 'update success'});
+			});
+		}
+
+		function resetEnv() {
+			angular.copy(_env, self.tmpEnv);
+			console.log(self.tmpEnv);
+		}
+	}
+})();
diff --git a/app/main/environment/setting/setting.html b/app/main/environment/setting/setting.html
@@ -0,0 +1,31 @@
+<div class="ilab-section">
+	<h5>Basic Settings</h5>
+	<form class="form-horizontal default" ng-submit="EnvSetting.updateEnv()">
+	    <div class="form-group">
+	        <label for="env_name" class="col-sm-2 control-label require">Name:</label>
+	        <div class="col-sm-10">
+	            <input type="text" class="form-control" id="env_name" ng-model="EnvSetting.tmpEnv.name" placeholder="Environment name" required>
+	        </div>
+	    </div>
+	    <div class="form-group">
+	        <label for="env_desc" class="col-sm-2 control-label">Description:</label>
+	        <div class="col-sm-10">
+	            <input type="text" class="form-control" id="env_desc" ng-model="EnvSetting.tmpEnv.description" placeholder="Description">
+	        </div>
+	    </div>
+	    <div class="form-group">
+	        <label for="env_expire" class="col-sm-2 control-label">Expiration:</label>
+	        <div class="col-sm-10">
+	            <input type="date" class="form-control" id="env_expire" ng-model="EnvSetting.tmpEnv.expiryDate">
+	            <input type="checkbox" id="env_never_expire" ng-model="EnvSetting.tmpEnv.neverExpire">
+	            <label for="env_never_expire">Never</label>
+	        </div>
+	    </div>
+	    <div class="form-group">
+	        <div class="col-sm-offset-2 col-sm-10">
+	            <button type="submit" class="btn btn-primary">update</button>
+	            <button type="button" class="btn btn-default" ng-click="EnvSetting.resetEnv()">Cancel</button>
+	        </div>
+	    </div>
+	</form>
+</div>
diff --git a/app/main/ilab.config.js b/app/main/ilab.config.js
@@ -50,8 +50,10 @@
                         }
                     }
                 },
-                controller: function() {
-                    console.log('data');
+                resolve: {
+                    _envs: function(environmentService) {
+                        return environmentService.getList({expand: 'virtualMachines,physicalMachines,networks,users'});
+                    }
                 },
                 breadcrumb: {
                     proxy: 'envs.list'
@@ -66,17 +68,12 @@
                         controllerAs: 'Envs'
                     }
                 },
-                resolve: {
-                    _envs: function(environmentService) {
-                        return environmentService.getList({expand: 'virtualMachines,physicalMachines,networks,users'});
-                    }
-                },
                 breadcrumb: {
                     name: 'All environments'
                 }
             })
-            .state('envs.detail', {
-                abstract: true,
+            .state('envs.detail', { 
+                // abstract: true,
                 url: "/environment/:envId",
                 views: {
                     'content@envs': {
@@ -91,7 +88,7 @@
                     }
                 },
                 breadcrumb: {
-                    name: false
+                    name: '{{_env.name}}'
                 }            
             })
             .state('envs.detail.vm', {
@@ -105,12 +102,11 @@
                 },
                 resolve: {
                     _vms: function(_env) {
-                        console.log(_env.virtualMachines);
                         return _env.virtualMachines;
                     }
                 },
                 breadcrumb: {
-                    name: '{{_env.name}}'
+                    name: 'Virtual Machines'
                 }            
             })
             .state('envs.detail.pm', {
@@ -129,7 +125,7 @@
                     }
                 },
                 breadcrumb: {
-                    name: '{{_env.name}}'
+                    name: 'Physical Machines'
                 }
             })
             .state('envs.detail.pm.add', {
@@ -167,6 +163,19 @@
                     name: 'Basic View'
                 }
             })
+            .state('envs.detail.setting', {
+                url: "/setting",
+                views: {
+                    'content@envs': {
+                        templateUrl: "main/environment/setting/setting.html",
+                        controller: 'EnvSettingCtrl',
+                        controllerAs: 'EnvSetting'
+                    }
+                },
+                breadcrumb: {
+                    name: 'Environment Settings'
+                }
+            })
             .state('lab', {
                 abstract: true,
                 url: "/lab",
@@ -229,7 +238,7 @@
 
     function restangular(RestangularProvider) {
         RestangularProvider.setBaseUrl('/services/api/');
-        RestangularProvider.setDefaultHttpFields({cache: true});
+        // RestangularProvider.setDefaultHttpFields({cache: true});
         // RestangularProvider.setDefaultHttpFields({'withCredentials': true});
     }
 
@@ -239,11 +248,16 @@
         paginationTemplateProvider.setPath('main/templates/pagination.tpl.html');
     }
 
-    init.$inject = ['$rootScope'];
+    init.$inject = ['$rootScope', '$state'];
 
-    function init($rootScope) {
+    function init($rootScope, $state) {
         $rootScope.page = {
             title: 'default page title'
         };
+        $rootScope.$on('$stateChangeSuccess', function(e, toState, toParams) {
+            if(toState.name === 'envs.detail') {
+                $state.go('envs.detail.vm', toParams);
+            }
+        });
     }
 })();

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,9 @@ form.default.form-horizontal, form.default.form-inline {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`}`
	`173`	`+label {`
	`174`	`+ cursor: pointer;`
	`175`	`+}`
`173`	`176`	`label.require {`
`174`	`177`	`&:before {`
`175`	`178`	`position: relative;`
Original file line number	Diff line number	Diff line change
`@@ -378,3 +378,8 @@ input[type="checkbox"] {`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`}`
	`381`	`+/* class that uses in controller area that pulls them up */`
	`382`	`+.pull-up {`
	`383`	`+ position: relative;`
	`384`	`+ top: -40px;`
	`385`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`environmentService.post(that.newEnv).then(function(data) {`
`25`	`25`	`console.log(data);`
`26`	`26`	`$state.go('envs.basic', {envId: data.id});`
`27`		`- })`
	`27`	`+ });`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`function resetEnv() {`