complete env setting, adding datepicker

Author: Tang,Hejun

app/css/_base.scss

@@ -19,6 +19,9 @@ span[class^="ilabicon-"].disabled, span[class^="intelicon-"].disabled {
 	cursor: not-allowed;
 	color: $gray;
 }
+.btn span[class*="icon"] {
+	color: white;
+}
 /* A */
 a[ng-click] {
 	cursor: pointer;

app/css/main.scss

@@ -186,7 +186,14 @@ input[type="checkbox"] {
  {
     color: $red;
 }
-
+/* override date picker */
+div[datepicker] {
+    .btn {
+        min-width: auto;
+        width: auto;
+        border: none;
+    }
+}
 
 /*sortable table header */
 

app/main/environment/envs.html

@@ -33,7 +33,7 @@ <h5>Add Environment</h5>
     <div class="one-env col-md-12" dir-paginate="env in Envs.envs | filter: searchEnv | itemsPerPage: 5">
         <h5><a ui-sref="envs.basic({envId: env.id})">{{env.name}}</a></h5>
         <p class="description">{{env.owner}}</p>
-        <span class="ilabicon-vm"></span>Virtual machines:{{env.virtualMachines.length}}<span class="intelicon-laptop"></span>Physical machines:{{env.physicalMachines.length}}<span class="intelicon-network"></span>Networks: {{env.networks.length}}<span class="intelicon-users-people-solid"></span>Users: {{env.users.length}}
+        <span class="ilabicon-vm"></span>Virtual machines:{{env.summary.virtualMachines}}<span class="intelicon-laptop"></span>Physical machines:{{env.summary.physicalMachines}}<span class="intelicon-network"></span>Networks: {{env.summary.networks}}<span class="intelicon-users-people-solid"></span>Users: {{env.summary.users}}
     </div>
     <dir-pagination-controls max-size="5"></dir-pagination-controls>
 </div>

app/main/environment/setting/setting.controller.js

@@ -3,25 +3,29 @@
 	angular.module('ilab')
 		.controller('EnvSettingCtrl', EnvSettingCtrl);
 
-	EnvSettingCtrl.$inject = ['_env', 'environmentService', 'alert'];
+	EnvSettingCtrl.$inject = ['_env', 'environmentService', 'alert', '$state'];
 
-	function EnvSettingCtrl(_env, environmentService, alert) {
+	function EnvSettingCtrl(_env, environmentService, alert, $state) {
 		var self = this;
 
 		self.tmpEnv = {};
 		self.updateEnv = updateEnv;
 		self.resetEnv = resetEnv;
+		self.deleteEnv = deleteEnv;
 		activate();
 
 		function activate() {
 			angular.copy(_env, self.tmpEnv);
 			console.log(self.tmpEnv);
+
+			self.tmpEnv.expiryDate = new Date(self.tmpEnv.expiryDate);
+			console.log(self.tmpEnv);
 		}
 
 		function updateEnv() {
 			angular.extend(_env, self.tmpEnv);
 			console.log(_env.expiryDate.toISOString());
-			_env.expiryDate = _env.expiryDate.toISOString();
+			_env.expire_date = _env.expiryDate.toISOString();
 			_env.put().then(function(data) {
 				console.log(data);
 				alert.open({type: 'success', message: 'update success'});
@@ -32,5 +36,11 @@
 			angular.copy(_env, self.tmpEnv);
 			console.log(self.tmpEnv);
 		}
+		function deleteEnv() {
+			_env.remove().then(function(data) {
+				console.log('removed');
+				$state.go('envs.list');
+			});
+		}
 	}
 })();

app/main/environment/setting/setting.html

@@ -16,7 +16,7 @@ <h5>Basic Settings</h5>
 	    <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="text" class="form-control" id="env_expire" ng-model="EnvSetting.tmpEnv.expiryDate" datepicker-popup is-open="EnvSetting.dateIsOpen" ng-click="EnvSetting.dateIsOpen = true" show-weeks="false" show-button-bar="false">
 	            <input type="checkbox" id="env_never_expire" ng-model="EnvSetting.tmpEnv.neverExpire">
 	            <label for="env_never_expire">Never</label>
 	        </div>
@@ -28,4 +28,14 @@ <h5>Basic Settings</h5>
 	        </div>
 	    </div>
 	</form>
+</div>
+
+<div class="ilab-section">
+	<h5>Environment Users</h5>
+	placeholder
+</div>
+
+<div class="ilab-section">
+	<h5>Delete Environment</h5>
+	<button class="btn btn-danger" ng-click="EnvSetting.deleteEnv()"><span class="intelicon-trash-outlined"></span>Delete Environment</button>
 </div>

app/main/ilab.config.js

@@ -52,7 +52,7 @@
                 },
                 resolve: {
                     _envs: function(environmentService) {
-                        return environmentService.getList({expand: 'virtualMachines,physicalMachines,networks,users'});
+                        return environmentService.getList({expand: 'summary'});
                     }
                 },
                 breadcrumb: {
@@ -238,7 +238,7 @@
 
     function restangular(RestangularProvider) {
         RestangularProvider.setBaseUrl('/services/api/');
-        // RestangularProvider.setDefaultHttpFields({cache: true});
+        RestangularProvider.setDefaultHttpFields({cache: true});
         // RestangularProvider.setDefaultHttpFields({'withCredentials': true});
     }