even more refactoring

TAMULib · Jun 27, 2018 · 7f1403f · 7f1403f
1 parent 150858a
commit 7f1403f
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 54 deletions.
diff --git a/app/controllers/projectController.js b/app/controllers/projectController.js
@@ -118,7 +118,7 @@ app.controller('ProjectController', function ($controller, $scope, $rootScope, N
         return $scope.remoteProjects[remoteProjectManagerId];
     };
 
-    $scope.getVersionProject = function (project) {
+    $scope.getRemoteProject = function (project) {
         if (project.scopeId && project.remoteProjectManager && !project.versionProject) {
             project.versionProject = {};
             RemoteProjectService.getByScopeId(project.remoteProjectManager.id, project.scopeId).then(function (versionProject) {

diff --git a/app/controllers/remoteProjectManagerController.js b/app/controllers/remoteProjectManagerController.js
@@ -6,10 +6,10 @@ app.controller('RemoteProjectManagerController', function ($controller, $scope,
 
     $scope.remoteProjectManagers = RemoteProjectManagerRepo.getAll();
 
-    $scope.vmsToCreate = RemoteProjectManagerRepo.getScaffold();
+    $scope.remoteProjectManagerToCreate = RemoteProjectManagerRepo.getScaffold();
 
-    $scope.vmsToEdit = {};
-    $scope.vmsToDelete = {};
+    $scope.remoteProjectManagerToEdit = {};
+    $scope.remoteProjectManagerToDelete = {};
 
     RemoteProjectManagerRepo.getTypes().then(function (types) {
         $scope.serviceTypes = types;
@@ -33,42 +33,42 @@ app.controller('RemoteProjectManagerController', function ($controller, $scope,
     $scope.resetRemoteProjectManagerForms();
 
     $scope.createRemoteProjectManager = function () {
-        RemoteProjectManagerRepo.create($scope.vmsToCreate).then(function (res) {
+        RemoteProjectManagerRepo.create($scope.remoteProjectManagerToCreate).then(function (res) {
             if (angular.fromJson(res.body).meta.status === 'SUCCESS') {
                 $scope.cancelCreateRemoteProjectManager();
             }
         });
     };
 
     $scope.cancelCreateRemoteProjectManager = function () {
-        $scope.vmsToCreate = RemoteProjectManagerRepo.getScaffold();
+        $scope.remoteProjectManagerToCreate = RemoteProjectManagerRepo.getScaffold();
         $scope.resetRemoteProjectManagerForms();
     };
 
     $scope.editRemoteProjectManager = function (remoteProjectManager) {
-        $scope.vmsToEdit = angular.copy(remoteProjectManager);
+        $scope.remoteProjectManagerToEdit = angular.copy(remoteProjectManager);
         $scope.openModal('#editRemoteProjectManagerModal');
     };
 
     $scope.updateRemoteProjectManager = function () {
-        $scope.vmsToEdit.dirty(true);
-        $scope.vmsToEdit.save().then(function () {
+        $scope.remoteProjectManagerToEdit.dirty(true);
+        $scope.remoteProjectManagerToEdit.save().then(function () {
             $scope.cancelEditRemoteProjectManager();
         });
     };
 
     $scope.cancelEditRemoteProjectManager = function () {
-        $scope.vmsToEdit.refresh();
+        $scope.remoteProjectManagerToEdit.refresh();
         $scope.resetRemoteProjectManagerForms();
     };
 
     $scope.confirmDeleteRemoteProjectManager = function (remoteProjectManager) {
-        $scope.vmsToDelete = remoteProjectManager;
+        $scope.remoteProjectManagerToDelete = remoteProjectManager;
         $scope.openModal('#deleteRemoteProjectManagerModal');
     };
 
     $scope.cancelDeleteRemoteProjectManager = function () {
-        $scope.vmsToDelete = {};
+        $scope.remoteProjectManagerToDelete = {};
         $scope.closeModal();
     };
 

diff --git a/app/controllers/versionManagementSoftwareController.js b/app/controllers/versionManagementSoftwareController.js
@@ -6,10 +6,10 @@ app.controller('RemoteProjectManagerController', function ($controller, $scope,
 
     $scope.remoteProjectManagers = RemoteProjectManagerRepo.getAll();
 
-    $scope.vmsToCreate = RemoteProjectManagerRepo.getScaffold();
+    $scope.remoteProjectManagerToCreate = RemoteProjectManagerRepo.getScaffold();
 
-    $scope.vmsToEdit = {};
-    $scope.vmsToDelete = {};
+    $scope.remoteProjectManagerToEdit = {};
+    $scope.remoteProjectManagerToDelete = {};
 
     RemoteProjectManagerRepo.getTypes().then(function (types) {
         $scope.serviceTypes = types;
@@ -33,42 +33,42 @@ app.controller('RemoteProjectManagerController', function ($controller, $scope,
     $scope.resetRemoteProjectManagerForms();
 
     $scope.createRemoteProjectManager = function () {
-        RemoteProjectManagerRepo.create($scope.vmsToCreate).then(function (res) {
+        RemoteProjectManagerRepo.create($scope.remoteProjectManagerToCreate).then(function (res) {
             if (angular.fromJson(res.body).meta.status === 'SUCCESS') {
                 $scope.cancelCreateRemoteProjectManager();
             }
         });
     };
 
     $scope.cancelCreateRemoteProjectManager = function () {
-        $scope.vmsToCreate = RemoteProjectManagerRepo.getScaffold();
+        $scope.remoteProjectManagerToCreate = RemoteProjectManagerRepo.getScaffold();
         $scope.resetRemoteProjectManagerForms();
     };
 
     $scope.editRemoteProjectManager = function (remoteProjectManager) {
-        $scope.vmsToEdit = angular.copy(remoteProjectManager);
+        $scope.remoteProjectManagerToEdit = angular.copy(remoteProjectManager);
         $scope.openModal('#editRemoteProjectManagerModal');
     };
 
     $scope.updateRemoteProjectManager = function () {
-        $scope.vmsToEdit.dirty(true);
-        $scope.vmsToEdit.save().then(function () {
+        $scope.remoteProjectManagerToEdit.dirty(true);
+        $scope.remoteProjectManagerToEdit.save().then(function () {
             $scope.cancelEditRemoteProjectManager();
         });
     };
 
     $scope.cancelEditRemoteProjectManager = function () {
-        $scope.vmsToEdit.refresh();
+        $scope.remoteProjectManagerToEdit.refresh();
         $scope.resetRemoteProjectManagerForms();
     };
 
     $scope.confirmDeleteRemoteProjectManager = function (remoteProjectManager) {
-        $scope.vmsToDelete = remoteProjectManager;
+        $scope.remoteProjectManagerToDelete = remoteProjectManager;
         $scope.openModal('#deleteRemoteProjectManagerModal');
     };
 
     $scope.cancelDeleteRemoteProjectManager = function () {
-        $scope.vmsToDelete = {};
+        $scope.remoteProjectManagerToDelete = {};
         $scope.closeModal();
     };
 

diff --git a/app/views/management/projects.html b/app/views/management/projects.html
@@ -6,8 +6,8 @@
   <table ng-table="tableParams" show-filter="false" class="table table-bordered table-striped project-table">
     <tr ng-repeat="project in $data | orderBy: 'name'">
       <td title="'Project'">{{project.name}}</td>
-      <td title="'Version Management Software'">{{project.remoteProjectManager.name}}</td>
-      <td title="'Version Project'">{{getVersionProject(project).name}}</td>
+      <td title="'Remote Project Manager'">{{project.remoteProjectManager.name}}</td>
+      <td title="'Remote Project'">{{getRemoteProject(project).name}}</td>
       <td title="'Scope Id'">{{project.scopeId}}</td>
       <td class="actions-column text-center" title="'Actions'">
         <span class="glyphicon glyphicon-pencil" title="edit" ng-click="editProject(project)"></span>

diff --git a/app/views/modals/addRemoteProjectManagerModal.html b/app/views/modals/addRemoteProjectManagerModal.html
@@ -10,15 +10,16 @@ <h4 class="modal-title">Create Version Management Software</h4>
   <validationmessage results="remoteProjectManagerForms.getResults()"></validationmessage>
 
   <div class="modal-body">
-    <validatedinput model="vmsToCreate" property="name" label="Name" placeholder="Name of the Version Management Software" form="remoteProjectManagerForms.create"
-      validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()">
+    <validatedinput model="remoteProjectManagerToCreate" property="name" label="Name" placeholder="Name of the Version Management Software"
+      form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()">
     </validatedinput>
 
-    <validatedselect options="serviceTypes" optionvalue="value" optionproperty="gloss" model="vmsToCreate" property="type" label="Type"
-      form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()">
+    <validatedselect options="serviceTypes" optionvalue="value" optionproperty="gloss" model="remoteProjectManagerToCreate" property="type"
+      label="Type" form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()">
     </validatedselect>
 
-    <remoteProjectManager-form ng-if="vmsToCreate.type" management-settings="typeSettings(vmsToCreate.type)" model="vmsToCreate">
+    <remoteProjectManager-form ng-if="remoteProjectManagerToCreate.type" management-settings="typeSettings(remoteProjectManagerToCreate.type)"
+      model="remoteProjectManagerToCreate">
     </remoteProjectManager-form>
   </div>
   <div class="modal-footer">

diff --git a/app/views/modals/deleteRemoteProjectManagerModal.html b/app/views/modals/deleteRemoteProjectManagerModal.html
@@ -1,4 +1,4 @@
-<form name="remoteProjectManagerForm.delete" ng-submit="deleteRemoteProjectManager(vmsToDelete)" novalidate>
+<form name="remoteProjectManagerForm.delete" ng-submit="deleteRemoteProjectManager(remoteProjectManagerToDelete)" novalidate>
   <div class="modal-header {{attr.modalHeaderClass}}">
     <button type="button" class="close modal-close" aria-label="Close" ng-click="cancelDeleteRemoteProjectManager()">
       <span aria-hidden="true">&times;</span>
@@ -7,7 +7,7 @@ <h4 class="modal-title">Confirm Removal</h4>
   </div>
   <div class="modal-body">
     <h3>Are you sure you want to remove:</h3>
-    <p>{{vmsToDelete.name}}</p>
+    <p>{{remoteProjectManagerToDelete.name}}</p>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-default" ng-click="cancelDeleteRemoteProjectManager()">Cancel</button>

diff --git a/app/views/modals/editRemoteProjectManagerModal.html b/app/views/modals/editRemoteProjectManagerModal.html
@@ -10,15 +10,16 @@ <h4 class="modal-title">Edit Version Managent Software</h4>
   <validationmessage results="remoteProjectManagerForms.getResults()"></validationmessage>
 
   <div class="modal-body">
-    <validatedinput model="vmsToEdit" property="name" label="Name" placeholder="Name of the Version Management Software" form="remoteProjectManagerForms.edit"
-      validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()">
+    <validatedinput model="remoteProjectManagerToEdit" property="name" label="Name" placeholder="Name of the Version Management Software"
+      form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()">
     </validatedinput>
 
-    <validatedselect options="serviceTypes" optionvalue="value" optionproperty="gloss" model="vmsToEdit" property="type" label="Type"
-      form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()">
+    <validatedselect options="serviceTypes" optionvalue="value" optionproperty="gloss" model="remoteProjectManagerToEdit" property="type"
+      label="Type" form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()">
     </validatedselect>
 
-    <remoteProjectManager-form ng-if="vmsToEdit.type" management-settings="typeSettings(vmsToEdit.type)" model="vmsToEdit">
+    <remoteProjectManager-form ng-if="remoteProjectManagerToEdit.type" management-settings="typeSettings(remoteProjectManagerToEdit.type)"
+      model="remoteProjectManagerToEdit">
     </remoteProjectManager-form>
   </div>
 

diff --git a/tests/unit/controllers/remoteProjectManagerControllerTest.js b/tests/unit/controllers/remoteProjectManagerControllerTest.js
@@ -72,7 +72,7 @@ describe('controller: RemoteProjectManagerController', function () {
     });
 
     describe('Do the scope methods work as expected', function () {
-        it('resetRemoteProjectManagerForms should reset Version Management Software forms', function () {
+        it('resetRemoteProjectManagerForms should reset Remote Project Manager forms', function () {
 
             var modal = angular.element(cache.get('app/views/modals/addRemoteProjectManagerModal.html'));
             modal = $compile(modal)(scope);
@@ -88,7 +88,7 @@ describe('controller: RemoteProjectManagerController', function () {
             expect(form.$dirty).toEqual(false);
         });
 
-        it('createRemoteProjectManager should create a new Version Management Software', function () {
+        it('createRemoteProjectManager should create a new Remote Project Manager', function () {
             var length = mockRemoteProjectManageres.length + 1;
             var newRemoteProjectManager = {
                 "id": 4,
@@ -100,7 +100,7 @@ describe('controller: RemoteProjectManagerController', function () {
                     "username": "username4"
                 }
             };
-            scope.vmsToCreate = newRemoteProjectManager;
+            scope.remoteProjectManagerToCreate = newRemoteProjectManager;
             scope.createRemoteProjectManager();
 
             expect(RemoteProjectManagerRepo.findById(newRemoteProjectManager.id)).toEqual(newRemoteProjectManager);
@@ -130,18 +130,18 @@ describe('controller: RemoteProjectManagerController', function () {
             spyOn(scope, 'resetRemoteProjectManagerForms');
             spyOn(RemoteProjectManagerRepo, 'getScaffold').and.returnValue(scaffold);
 
-            scope.vmsToCreate = newRemoteProjectManager;
+            scope.remoteProjectManagerToCreate = newRemoteProjectManager;
             scope.cancelCreateRemoteProjectManager();
 
-            expect(scope.vmsToCreate.name).toEqual('');
+            expect(scope.remoteProjectManagerToCreate.name).toEqual('');
             expect(scope.resetRemoteProjectManagerForms).toHaveBeenCalled();
         });
 
-        it('editRemoteProjectManager should set the vmsToEdit and open the modal', function () {
+        it('editRemoteProjectManager should set the remoteProjectManagerToEdit and open the modal', function () {
             spyOn(scope, 'openModal');
             scope.editRemoteProjectManager(mockRemoteProjectManageres[0]);
 
-            expect(scope.vmsToEdit).toEqual(mockRemoteProjectManageres[0]);
+            expect(scope.remoteProjectManagerToEdit).toEqual(mockRemoteProjectManageres[0]);
             expect(scope.openModal).toHaveBeenCalled();
         });
 
@@ -150,7 +150,7 @@ describe('controller: RemoteProjectManagerController', function () {
             spyOn(RemoteProjectManager, 'dirty');
             deferred = $q.defer();
             spyOn(RemoteProjectManager, 'save').and.returnValue(deferred.promise);
-            scope.vmsToEdit = RemoteProjectManager;
+            scope.remoteProjectManagerToEdit = RemoteProjectManager;
             scope.updateRemoteProjectManager();
             deferred.resolve();
             scope.$apply();
@@ -160,34 +160,34 @@ describe('controller: RemoteProjectManagerController', function () {
             expect(RemoteProjectManager.save).toHaveBeenCalled();
         });
 
-        it('cancelEditRemoteProjectManager should clear out vmsToEdit and call resetRemoteProjectManagerForms', function () {
+        it('cancelEditRemoteProjectManager should clear out remoteProjectManagerToEdit and call resetRemoteProjectManagerForms', function () {
             spyOn(scope, 'resetRemoteProjectManagerForms');
-            scope.vmsToEdit = RemoteProjectManager;
+            scope.remoteProjectManagerToEdit = RemoteProjectManager;
             scope.cancelEditRemoteProjectManager();
 
-            expect(scope.vmsToEdit.name).not.toBeDefined();
+            expect(scope.remoteProjectManagerToEdit.name).not.toBeDefined();
             expect(scope.resetRemoteProjectManagerForms).toHaveBeenCalled();
         });
 
-        it('confirmDeleteRemoteProjectManager should set the vmsToDelete and open the modal', function () {
+        it('confirmDeleteRemoteProjectManager should set the remoteProjectManagerToDelete and open the modal', function () {
             spyOn(scope, 'openModal');
             scope.confirmDeleteRemoteProjectManager(mockRemoteProjectManageres[0]);
 
             expect(scope.openModal).toHaveBeenCalled();
-            expect(scope.vmsToDelete).toEqual(mockRemoteProjectManageres[0]);
+            expect(scope.remoteProjectManagerToDelete).toEqual(mockRemoteProjectManageres[0]);
         });
 
-        it('cancelDeleteRemoteProjectManager should clear vmsToDelete and close the modal', function () {
+        it('cancelDeleteRemoteProjectManager should clear remoteProjectManagerToDelete and close the modal', function () {
             spyOn(scope, 'closeModal');
-            scope.vmsToDelete = mockRemoteProjectManageres[0];
+            scope.remoteProjectManagerToDelete = mockRemoteProjectManageres[0];
             scope.cancelDeleteRemoteProjectManager();
 
             expect(scope.closeModal).toHaveBeenCalled();
-            expect(scope.vmsToDelete).toEqual({});
+            expect(scope.remoteProjectManagerToDelete).toEqual({});
         });
 
         it('deleteRemoteProjectManager should call the repo delete method and then call cancelDeleteRemoteProjectManager when successful', function () {
-            scope.vmsToDelete = Project;
+            scope.remoteProjectManagerToDelete = Project;
             deferred = $q.defer();
             spyOn(RemoteProjectManagerRepo, 'delete').and.returnValue(deferred.promise);
             spyOn(scope, 'cancelDeleteRemoteProjectManager');