From 975dd65bed98213e0b47eee5e14c6f31bed0d828 Mon Sep 17 00:00:00 2001 From: Ryan Laddusaw Date: Tue, 14 Aug 2018 16:26:36 -0500 Subject: [PATCH 1/6] Removed overflow hidden --- app/resources/styles/sass/app.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/resources/styles/sass/app.scss b/app/resources/styles/sass/app.scss index 5ea34c52..3da43e19 100644 --- a/app/resources/styles/sass/app.scss +++ b/app/resources/styles/sass/app.scss @@ -16,7 +16,6 @@ $linkColor: #00569f; body { margin-right: 0!important; - overflow: hidden; } main { From 22ad1d83cbc682fa627db02f16b2fa6812cc05b2 Mon Sep 17 00:00:00 2001 From: Ryan Laddusaw Date: Tue, 14 Aug 2018 16:36:10 -0500 Subject: [PATCH 2/6] Email field now disabled when box is not checked. --- app/controllers/requestController.js | 5 ++++- app/views/request/request.html | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/requestController.js b/app/controllers/requestController.js index d36a73ff..137e5b71 100644 --- a/app/controllers/requestController.js +++ b/app/controllers/requestController.js @@ -13,6 +13,9 @@ app.controller('RequestController', function ($controller, $routeParams, $scope, $scope.requestForm = undefined; + //Needs to be an object for ng-disabled + $scope.request = {}; + $scope.services = ServiceRepo.getAll(); var clear = function (type) { @@ -20,7 +23,7 @@ app.controller('RequestController', function ($controller, $routeParams, $scope, delete $scope.title; delete $scope.description; delete $scope.service; - $scope.sendUpdates = true; + $scope.request.sendUpdates = true; if ($scope.requestForm) { $scope.requestForm.$setPristine(); $scope.requestForm.$setUntouched(); diff --git a/app/views/request/request.html b/app/views/request/request.html index 6372420d..48698fe7 100644 --- a/app/views/request/request.html +++ b/app/views/request/request.html @@ -46,13 +46,13 @@

Please provide a title and a description for
-
- -
+
+ +
- +
From 1a033741e95079a9677bb2e6d7db88f61a0fbc7c Mon Sep 17 00:00:00 2001 From: Ryan Laddusaw Date: Tue, 14 Aug 2018 16:47:27 -0500 Subject: [PATCH 3/6] Added status column to service detail idea table --- app/views/detail/service/ideas.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/detail/service/ideas.html b/app/views/detail/service/ideas.html index d0058043..98cd7d94 100644 --- a/app/views/detail/service/ideas.html +++ b/app/views/detail/service/ideas.html @@ -11,6 +11,7 @@ {{idea.title}} {{idea.description}} {{idea.lastModified | date : 'medium'}} + {{idea.state | ideaState}} From 14850e9ecadd856abe1f8655fb26f2bd91ad3e8c Mon Sep 17 00:00:00 2001 From: Ryan Laddusaw Date: Wed, 15 Aug 2018 08:28:27 -0500 Subject: [PATCH 4/6] Updated variable to persist email --- app/controllers/requestController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/requestController.js b/app/controllers/requestController.js index 137e5b71..be02c889 100644 --- a/app/controllers/requestController.js +++ b/app/controllers/requestController.js @@ -53,7 +53,7 @@ app.controller('RequestController', function ($controller, $routeParams, $scope, if ($scope.service) { request.service = $scope.service; } - if ($scope.sendUpdates) { + if ($scope.request.sendUpdates) { request.email = $scope.email; } ServiceRepo.submitRequest(request).then(function (message) { From d5487765385257addefe5d80c274782d30629a4e Mon Sep 17 00:00:00 2001 From: Ryan Laddusaw Date: Wed, 15 Aug 2018 09:02:41 -0500 Subject: [PATCH 5/6] Service detail and idea management page modals now the same --- app/controllers/ideaController.js | 3 +++ app/resources/styles/sass/app.scss | 3 ++- app/resources/styles/sass/management/_management.scss | 4 ++++ app/views/detail/service/ideas.html | 7 +++---- app/views/management/ideas.html | 3 ++- app/views/modals/detail/service/editIdeaModal.html | 8 +++++--- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/controllers/ideaController.js b/app/controllers/ideaController.js index 2c971cae..21271894 100644 --- a/app/controllers/ideaController.js +++ b/app/controllers/ideaController.js @@ -60,6 +60,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe ServiceRepo.ready().then(function () { $scope.tableParams = $scope.ideaRepo.getTableParams(); + $scope.featureProposalsTableParams = FeatureProposalRepo.getTableParams(); $scope.resetIdeas = function () { $scope.resetForms($scope.ideaData); @@ -238,6 +239,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe }; $scope.confirmElevateMultiple = function (ideas) { + $scope.resetIdeas(); $scope.fpData.ideas = ideas; $scope.fpData.title = ideas[0].title; $scope.fpData.description = ideas[0].description; @@ -246,6 +248,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe }; $scope.confirmAddIdea = function (idea) { + $scope.resetIdeas(); $scope.ideaToAdd = idea; $scope.openModal('#confirmAddIdeaModal'); }; diff --git a/app/resources/styles/sass/app.scss b/app/resources/styles/sass/app.scss index 3da43e19..ae3c3ca7 100644 --- a/app/resources/styles/sass/app.scss +++ b/app/resources/styles/sass/app.scss @@ -15,7 +15,8 @@ $linkColor: #00569f; body { - margin-right: 0!important; + margin-right: 0 !important; + padding-right: 0 !important; } main { diff --git a/app/resources/styles/sass/management/_management.scss b/app/resources/styles/sass/management/_management.scss index 26f0e4c2..84746d3c 100644 --- a/app/resources/styles/sass/management/_management.scss +++ b/app/resources/styles/sass/management/_management.scss @@ -96,3 +96,7 @@ thead th span.desc { .filter-remove:hover { cursor: pointer; } + +.btn-action { + margin-bottom: 6px !important; +} diff --git a/app/views/detail/service/ideas.html b/app/views/detail/service/ideas.html index 98cd7d94..086ea056 100644 --- a/app/views/detail/service/ideas.html +++ b/app/views/detail/service/ideas.html @@ -13,10 +13,7 @@ {{idea.lastModified | date : 'medium'}} {{idea.state | ideaState}} - - - - + @@ -24,6 +21,8 @@ + +
diff --git a/app/views/management/ideas.html b/app/views/management/ideas.html index 6e8c0f8a..aea9d0f8 100644 --- a/app/views/management/ideas.html +++ b/app/views/management/ideas.html @@ -23,7 +23,6 @@ - @@ -36,6 +35,8 @@ + + diff --git a/app/views/modals/detail/service/editIdeaModal.html b/app/views/modals/detail/service/editIdeaModal.html index 1fd7b8de..257c82bd 100644 --- a/app/views/modals/detail/service/editIdeaModal.html +++ b/app/views/modals/detail/service/editIdeaModal.html @@ -32,9 +32,11 @@

Edit Idea

- - - + + + + +
From 1f8e3b7f6b1237d1755452a6770c275449bed012 Mon Sep 17 00:00:00 2001 From: Ryan Laddusaw Date: Wed, 15 Aug 2018 10:02:24 -0500 Subject: [PATCH 6/6] Fixed loop to ignore visibleColumnCount --- app/controllers/ideaController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ideaController.js b/app/controllers/ideaController.js index 21271894..f59912ce 100644 --- a/app/controllers/ideaController.js +++ b/app/controllers/ideaController.js @@ -196,7 +196,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe } } } else { - for (var j in $scope.ideasTableParams.data) { + for (var j = 0; j < $scope.ideasTableParams.data.length; j++) { var ij = $scope.ideasTableParams.data[j]; if (!$scope.isSelectedIdea(ij)) { $scope.selectedIdeas.push(ij);