Skip to content

Sprint6 ryan cleanup #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
6 commits merged into from
Aug 15, 2018
Merged

Sprint6 ryan cleanup #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
975dd65
Removed overflow hidden
rladdusaw Aug 14, 2018
22ad1d8
Email field now disabled when box is not checked.
rladdusaw Aug 14, 2018
1a03374
Added status column to service detail idea table
rladdusaw Aug 14, 2018
14850e9
Updated variable to persist email
rladdusaw Aug 15, 2018
d548776
Service detail and idea management page modals now the same
rladdusaw Aug 15, 2018
1f8e3b7
Fixed loop to ignore visibleColumnCount
rladdusaw Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/controllers/ideaController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -195,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);
Expand Down Expand Up @@ -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;
Expand All @@ -246,6 +248,7 @@ app.controller('IdeaController', function($controller, $scope, FeatureProposalRe
};

$scope.confirmAddIdea = function (idea) {
$scope.resetIdeas();
$scope.ideaToAdd = idea;
$scope.openModal('#confirmAddIdeaModal');
};
Expand Down
7 changes: 5 additions & 2 deletions app/controllers/requestController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@ 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) {
delete $scope.type;
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();
Expand Down Expand Up @@ -50,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) {
Expand Down
4 changes: 2 additions & 2 deletions app/resources/styles/sass/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ $linkColor: #00569f;

body
{
margin-right: 0!important;
overflow: hidden;
margin-right: 0 !important;
padding-right: 0 !important;
}

main {
Expand Down
4 changes: 4 additions & 0 deletions app/resources/styles/sass/management/_management.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,7 @@ thead th span.desc {
.filter-remove:hover {
cursor: pointer;
}

.btn-action {
margin-bottom: 6px !important;
}
8 changes: 4 additions & 4 deletions app/views/detail/service/ideas.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<td title="'Title'">{{idea.title}}</td>
<td title="'Description'">{{idea.description}}</td>
<td title="'Last Modified'">{{idea.lastModified | date : 'medium'}}</td>
<td title="'Status'">{{idea.state | ideaState}}</td>
<td class="actions-column text-center" title="'Actions'">
<span class="glyphicon glyphicon glyphicon-triangle-top" title="elevate" ng-click="confirmElevateMultiple([idea])"></span>
<span class="glyphicon glyphicon-plus" title="add to proposal" ng-click="confirmAddIdea(idea)"></span>
<!-- <span class="glyphicon glyphicon-pencil" title="edit" ng-click="editIdea(idea)"></span> -->
<span ng-if="canManageServices()" class="glyphicon glyphicon-trash" title="delete" ng-click="confirmDelete(idea)"></span>
<span class="glyphicon glyphicon-pencil" title="edit" ng-click="editIdea(idea)"></span>
</td>
</tr>
</table>

<modal modal-id="addIdeaModal" modal-view="views/modals/detail/service/addIdeaModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
<modal modal-id="deleteIdeaModal" modal-view="views/modals/detail/service/deleteIdeaModal.html" modal-header-class="modal-header-danger" wvr-modal-backdrop="static"></modal>
<modal modal-id="editIdeaModal" modal-view="views/modals/detail/service/editIdeaModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
<modal modal-id="rejectIdeaModal" modal-view="views/modals/detail/service/rejectIdeaModal.html" modal-header-class="modal-header-warning" wvr-modal-backdrop="static"></modal>
<modal modal-id="sendToHelpdeskModal" modal-view="views/modals/detail/service/sendToHelpdeskModal.html" modal-header-class="modal-header-warning" wvr-modal-backdrop="static"></modal>
<modal modal-id="elevateMultipleModal" modal-view="views/modals/detail/service/elevateMultipleModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
<modal modal-id="confirmAddIdeaModal" modal-view="views/modals/detail/service/confirmAddIdeaModal.html" modal-header-class="modal-header-primary" modal-fullscreen="true" wvr-modal-backdrop="static"></modal>
</div>
3 changes: 2 additions & 1 deletion app/views/management/ideas.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
</td>
<td class="actions-column text-center">
<span ng-if="canManageServices()" class="glyphicon glyphicon-pencil" title="edit" ng-click="editIdea(idea)"></span>
<span ng-if="canManageServices()" class="glyphicon glyphicon-trash" title="delete" ng-click="confirmDelete(idea)"></span>
</td>
</tr>
</tbody>
Expand All @@ -36,6 +35,8 @@
<modal modal-id="editIdeaModal" modal-view="views/modals/detail/service/editIdeaModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
<modal modal-id="rejectIdeaModal" modal-view="views/modals/detail/service/rejectIdeaModal.html" modal-header-class="modal-header-warning" wvr-modal-backdrop="static"></modal>
<modal modal-id="sendToHelpdeskModal" modal-view="views/modals/detail/service/sendToHelpdeskModal.html" modal-header-class="modal-header-warning" wvr-modal-backdrop="static"></modal>
<modal modal-id="elevateMultipleModal" modal-view="views/modals/detail/service/elevateMultipleModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
<modal modal-id="confirmAddIdeaModal" modal-view="views/modals/detail/service/confirmAddIdeaModal.html" modal-header-class="modal-header-primary" modal-fullscreen="true" wvr-modal-backdrop="static"></modal>
</weaver-table-modals>

</weaver-table>
Expand Down
8 changes: 5 additions & 3 deletions app/views/modals/detail/service/editIdeaModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ <h3 class="modal-title">Edit Idea</h3>
<label class="pull-left">Available Actions</label>
</div>
<div class="row">
<button ng-disabled="updating || ideaData.state === 'ELEVATED'" type="button" class="btn btn-danger pull-left" ng-click="confirmDelete(ideaData)">Delete Idea</button>
<button ng-if="ideaData.state === 'WAITING_ON_REVIEW'" ng-disabled="updating" type="button" class="btn btn-warning pull-left" ng-click="confirmReject(ideaData)">Reject Idea</button>
<button ng-if="ideaData.state === 'WAITING_ON_REVIEW'" ng-disabled="updating" type="button" class="btn btn-warning pull-left" ng-click="confirmSendToHelpdesk(ideaData)">Send to Helpdesk</button>
<button ng-disabled="updating || ideaData.state === 'ELEVATED'" type="button" class="btn btn-danger pull-left btn-action" ng-click="confirmDelete(ideaData)">Delete Idea</button>
<button ng-if="ideaData.state === 'WAITING_ON_REVIEW'" ng-disabled="updating" type="button" class="btn btn-warning pull-left btn-action" ng-click="confirmReject(ideaData)">Reject Idea</button>
<button ng-if="ideaData.state === 'WAITING_ON_REVIEW'" ng-disabled="updating" type="button" class="btn btn-warning pull-left btn-action" ng-click="confirmSendToHelpdesk(ideaData)">Send to Helpdesk</button>
<button ng-if="ideaData.state === 'WAITING_ON_REVIEW'" ng-disabled="updating" type="button" class="btn btn-info pull-left btn-action" ng-click="confirmElevateMultiple([ideaData])">Elevate</button>
<button ng-if="ideaData.state === 'WAITING_ON_REVIEW'" ng-disabled="updating" type="button" class="btn btn-primary pull-left btn-action" ng-click="confirmAddIdea(ideaData)">Add to FP</button>
</div>
<hr>

Expand Down
8 changes: 4 additions & 4 deletions app/views/request/request.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ <h3>Please provide a title and a description for
</select>
</div>
<div ng-if="type === 'FEATURE'" class="form-group">
<div class="checkbox">
<label><input type="checkbox" ng-model="sendUpdates">Send me email updates</label>
</div>
<div class="checkbox">
<label><input type="checkbox" ng-model="request.sendUpdates">Send me email updates</label>
</div>
</div>
<div ng-if="type === 'FEATURE'" class="form-group">
<label for="email">Email:</label>
<input ng-disabled="!sendUpdates" class="form-control" id="email" type="email" name="email" ng-model="email" aria-describedby="email">
<input ng-disabled="!request.sendUpdates" class="form-control" id="email" type="email" name="email" ng-model="email" aria-describedby="email">
</div>
<div class="pull-right">
<button type="button" class="btn btn-default" ng-click="reset()">Back</button>
Expand Down