From 2d6617b0d9f590a25c77dad0249f2ae5e498073b Mon Sep 17 00:00:00 2001
From: hongyiliu <hongyiliu1992@gmail.com>
Date: Mon, 22 Jul 2019 16:37:23 -0700
Subject: [PATCH 1/4] Change title of every table and adjust the orders

---
 .../WebPortal/Views/Home/ViewCluster.cshtml   | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml b/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
index 2951cc326..e00fcca1c 100755
--- a/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
+++ b/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
@@ -166,7 +166,7 @@
 
 </script>
 
-<h1>Cluster Status:</h1>
+<h1>Team Virtual Cluster Status:</h1>
 
 
 <table id="cluster_status" class="table table-bordered table-condensed table-hover table-striped">
@@ -183,8 +183,22 @@
     <tbody></tbody>
 </table>
 
+<h1>
+    Team VC User Status: 
+</h1>
+
+<table id="user_status" class="table table-bordered table-condensed table-hover table-striped">
+    <thead>
+        <tr>
+            <th>User Name</th>
+            <th>Used GPU</th>
+        </tr>
+    </thead>
+    <tbody></tbody>
+</table>
 
-<h1>Cluster Usage:</h1>
+
+<h1>Physical Cluster Node Status:</h1>
 
 
 <table id="cluster_usage" class="table">
@@ -205,22 +219,10 @@
 
 
 
-<h1>
-    User Status:
-</h1>
 
-<table id="user_status" class="table table-bordered table-condensed table-hover table-striped">
-    <thead>
-        <tr>
-            <th>User Name</th>
-            <th>Used GPU</th>
-        </tr>
-    </thead>
-    <tbody></tbody>
-</table>
 
 <h1>
-    Node Status:
+    Physical Cluster Node Status:
 </h1>
 
 

From 87cbf19206e5391319550f53ed38299e2d4cda72 Mon Sep 17 00:00:00 2001
From: hongyiliu <hongyiliu1992@gmail.com>
Date: Mon, 22 Jul 2019 16:48:48 -0700
Subject: [PATCH 2/4] Fix the issue of job template display error

---
 src/WebUI/dotnet/WebPortal/Views/Home/JobSubmission.cshtml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/WebUI/dotnet/WebPortal/Views/Home/JobSubmission.cshtml b/src/WebUI/dotnet/WebPortal/Views/Home/JobSubmission.cshtml
index 604360d79..971d429f1 100755
--- a/src/WebUI/dotnet/WebPortal/Views/Home/JobSubmission.cshtml
+++ b/src/WebUI/dotnet/WebPortal/Views/Home/JobSubmission.cshtml
@@ -282,7 +282,7 @@
 
         });
 
-        $scope.$watch('current.jobtrainingtype', function (value, oldValue) {
+        $scope.$watch('current.jobtrainingtype', function (value) {
             if (value === 'PSDistJob') {
                 $scope.current.numps = 1;
                 $scope.current.resourcegpu = $scope.gpus[$scope.extras.gpuType]['num_gpu_per_node'];
@@ -334,16 +334,13 @@
             var selected = $filter('filter')($scope.joblist, { Value: $scope.curtemplateValue });
             var showName = "None";
             if ($scope.curtemplateValue > 0 && selected.length) {
-                if ($scope.lastTemplateValue && $scope.lastTemplateValue == $scope.curtemplateValue) {
-
+                if ($scope.lastTemplateValue && $scope.lastTemplateValue == $scope.curtemplateValue) { 
                 }
                 else {
-                    $scope.lastTemplateValue = $scope.curtemplateValue;
                     $scope.current = $scope.$eval(selected[0].Json);
                     $scope.loadTemplate();
                     $scope.setMounts();
                     $scope.checkCurrent();
-                    //console.log($scope.current);
 
                     if (!$scope.current.hasOwnProperty("runningasroot"))
                         $scope.current.runningasroot = false;

From 9328b8c6a7bee7bdafce081022abf0c117a68fbc Mon Sep 17 00:00:00 2001
From: hongyiliu <hongyiliu1992@gmail.com>
Date: Mon, 22 Jul 2019 17:00:10 -0700
Subject: [PATCH 3/4] Remove duplicate title

---
 src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml b/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
index e00fcca1c..eb12c322f 100755
--- a/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
+++ b/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
@@ -198,7 +198,7 @@
 </table>
 
 
-<h1>Physical Cluster Node Status:</h1>
+<h1>Physical Cluster Status:</h1>
 
 
 <table id="cluster_usage" class="table">

From 67821c77c9a2ab098532e63d5e7b12b5418846f5 Mon Sep 17 00:00:00 2001
From: hongyiliu <hongyiliu1992@gmail.com>
Date: Mon, 22 Jul 2019 17:07:04 -0700
Subject: [PATCH 4/4] Correctify title

---
 src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml b/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
index eb12c322f..328a1ef54 100755
--- a/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
+++ b/src/WebUI/dotnet/WebPortal/Views/Home/ViewCluster.cshtml
@@ -198,7 +198,7 @@
 </table>
 
 
-<h1>Physical Cluster Status:</h1>
+<h1>Physical Cluster Usage:</h1>
 
 
 <table id="cluster_usage" class="table">