Skip to content
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

An "add all" button to listviews #196

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

An "add all" button to listviews #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a98b2ee
[nuPickers] multiple add method
rasmusfjord Apr 2, 2019
da6b3ad
[nuPickers] css changes for the add button
rasmusfjord Apr 2, 2019
c5192b2
[nuPickers] minor css change
rasmusfjord Apr 3, 2019
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
21 changes: 18 additions & 3 deletions source/nuPickers/Shared/ListPicker/ListPickerEditor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
.list-picker .text-input-bar {
border: 1px solid transparent;
padding-bottom:1px;
position: relative;
}

.list-picker .text-input-bar input {
Expand Down Expand Up @@ -90,9 +91,23 @@
background-color:transparent;
}

.list-picker .placeholders li {
border:1px dashed #ccc;
}
.list-picker .button-add-multiple {
border-left: 1px solid #ccc;
left: 43.2%;
width: 41px;
height: 30px;
top: 1px;
line-height: 30px;
}
.list-picker .button-add-multiple-positioner {
width: 48%;
min-height: 30px;
line-height: 30px;
display: inline;
}
.list-picker .placeholders li {
border: 1px dashed #ccc;
}

/*
<ul class="bars selectable">
Expand Down
263 changes: 147 additions & 116 deletions source/nuPickers/Shared/ListPicker/ListPickerEditorController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,123 +1,154 @@
// this is used as an abstract base controller for the PagedList, PrefetchList and TypeaheadList controllers

angular
.module("umbraco")
.controller("nuPickers.Shared.ListPicker.ListPickerEditorController",
['$scope', 'nuPickers.Shared.Editor.EditorResource',
function ($scope, editorResource) {

// array of option objects, for the selectable list
$scope.selectableOptions = []; // [{"key":"","label":""}...]

// array of option objects, for the selected list
$scope.selectedOptions = []; // [{"key":"","label":""}...]

// http://api.jqueryui.com/sortable/
$scope.sortableConfiguration = { axis: 'y' };

// returns true if option hasn't yet been picked, or duplicates are allowed
$scope.isSelectable = function (option) {
return ($scope.model.config.listPicker.allowDuplicates || !$scope.isUsed(option));
};

// returns true is this option has been picked
$scope.isUsed = function (option) {
return $scope.selectedOptions.map(function (option) { return option.key; }).indexOf(option.key) >= 0;
};

// return true if option can be picked
$scope.isValidSelection = function (option) {
return $scope.isSelectable(option) && ($scope.selectedOptions.length < $scope.model.config.listPicker.maxItems || $scope.model.config.listPicker.maxItems <= 0);
};

$scope.cursorUp = function () {
// TODO: move highlight / active of next selectable
};

$scope.cursorDown = function () {
// TODO: move highlight / active of previous selectable
};

$scope.enterKey = function () {
// TODO: select highlighted
}

// picking an item from 'selectable' for 'selected'
$scope.selectOption = function (option) {
if ($scope.isValidSelection(option)) {
// if sorting not allowed, then insert item in same order as in the selectable list (rebuild all picked items)
if (!allowSorting()) {

var keys = $scope.selectedOptions.map(function (option) { return option.key; }); // get existing picked keys
keys.push(option.key); // add new picked key

// rebuild all selected options to match selectable ordering
$scope.selectedOptions = [];
for (var i = 0; i < $scope.selectableOptions.length; i++) {
for (var j = 0; j < keys.length; j++) {
if ($scope.selectableOptions[i].key == keys[j]) {
$scope.selectedOptions.push($scope.selectableOptions[i]);
}
}
}
}
else {
$scope.selectedOptions.push(option);
}
.module("umbraco")
.controller("nuPickers.Shared.ListPicker.ListPickerEditorController",
['$scope', 'nuPickers.Shared.Editor.EditorResource',
function ($scope, editorResource) {

// array of option objects, for the selectable list
$scope.selectableOptions = []; // [{"key":"","label":""}...]

// array of option objects, for the selected list
$scope.selectedOptions = []; // [{"key":"","label":""}...]

// http://api.jqueryui.com/sortable/
$scope.sortableConfiguration = { axis: 'y' };

// returns true if option hasn't yet been picked, or duplicates are allowed
$scope.isSelectable = function (option) {
return ($scope.model.config.listPicker.allowDuplicates || !$scope.isUsed(option));
};

// returns true is this option has been picked
$scope.isUsed = function (option) {
return $scope.selectedOptions.map(function (option) { return option.key; }).indexOf(option.key) >= 0;
};

// return true if option can be picked
$scope.isValidSelection = function (option) {
return $scope.isSelectable(option) && ($scope.selectedOptions.length < $scope.model.config.listPicker.maxItems || $scope.model.config.listPicker.maxItems <= 0);
};

$scope.cursorUp = function () {
// TODO: move highlight / active of next selectable
};

$scope.cursorDown = function () {
// TODO: move highlight / active of previous selectable
};

$scope.enterKey = function () {
// TODO: select highlighted
}

// picking an item from 'selectable' for 'selected'
$scope.selectOption = function (option) {
if ($scope.isValidSelection(option)) {
// if sorting not allowed, then insert item in same order as in the selectable list (rebuild all picked items)
if (!allowSorting()) {

var keys = $scope.selectedOptions.map(function (option) { return option.key; }); // get existing picked keys
keys.push(option.key); // add new picked key

// rebuild all selected options to match selectable ordering
$scope.selectedOptions = [];
for (var i = 0; i < $scope.selectableOptions.length; i++) {
for (var j = 0; j < keys.length; j++) {
if ($scope.selectableOptions[i].key == keys[j]) {
$scope.selectedOptions.push($scope.selectableOptions[i]);
}
}
};

// count for number of dashed placeholders to render
$scope.getRequiredPlaceholderCount = function () {
var count = $scope.model.config.listPicker.minItems - $scope.selectedOptions.length;
if (count > 0) { return new Array(count); }
return null;
}
}

// returns true is the 'select' placeholder should be rendered
$scope.showSelectPlaceholder = function () {
return ($scope.model.config.typeaheadListPicker || $scope.model.config.listPicker.allowDuplicates || $scope.selectedOptions.length < $scope.selectableOptions.length)
&& ($scope.selectedOptions.length >= $scope.model.config.listPicker.minItems)
&& (($scope.selectedOptions.length < $scope.model.config.listPicker.maxItems) || $scope.model.config.listPicker.maxItems == 0);
else {
$scope.selectedOptions.push(option);
}

// returns true if selected options can be sorted
$scope.isSortable = function () {

// if prefetch list doesn't allow sorting
if (!allowSorting()) { return false; }

// if not allowing duplicates, then check selected items > 1
if (!$scope.model.config.listPicker.allowDuplicates && $scope.selectedOptions.length > 1) { return true; }

// duplicates allowed, so chheck there are at least 2 distinct items
var keys = $scope.selectedOptions.map(function (option) { return option.key; }); // key all selected keys
return keys.filter(function (value, index) { return keys.indexOf(value) == index; }).length >= 2;
};

// sorting is allowed unless it's a prefetch list and doesn't have the allow sorting option checked (typeahead allows)
function allowSorting() {
return !($scope.model.config.prefetchListPicker && !$scope.model.config.prefetchListPicker.allowSorting);
}
};

// picking an item from 'selectable' for 'selected'
$scope.selectAllOptions = function (options) {
console.log("TEST");
console.log(options);
for (i = 0; i < options.length; i++) {
var option = options[i];

if ($scope.isValidSelection(option)) {
// if sorting not allowed, then insert item in same order as in the selectable list (rebuild all picked items)
if (!allowSorting()) {

var keys = $scope.selectedOptions.map(function (option) { return option.key; }); // get existing picked keys
keys.push(option.key); // add new picked key

// rebuild all selected options to match selectable ordering
$scope.selectedOptions = [];
for (var i = 0; i < $scope.selectableOptions.length; i++) {
for (var j = 0; j < keys.length; j++) {
if ($scope.selectableOptions[i].key == keys[j]) {
$scope.selectedOptions.push($scope.selectableOptions[i]);
}
}
}
}
else {
$scope.selectedOptions.push(option);
}
}

// remove option from 'selected'
$scope.deselectOption = function ($index) {
$scope.selectedOptions.splice($index, 1);
};

$scope.$watchCollection('selectedOptions', function () {

// set validation state
$scope.listPickerForm.validation.$setValidity('validationMessage',
($scope.selectedOptions.length >= $scope.model.config.listPicker.minItems &&
($scope.selectedOptions.length <= $scope.model.config.listPicker.maxItems || $scope.model.config.listPicker.maxItems < 1)));

// toggle sorting ui (updated on change, for example if all picked items are identical)
$scope.sortableConfiguration.disabled = !$scope.isSortable();
});

$scope.$on("formSubmitting", function () {
$scope.model.value = editorResource.createSaveValue($scope.model.config, $scope.selectedOptions);
});

}]);
}
};

// count for number of dashed placeholders to render
$scope.getRequiredPlaceholderCount = function () {
var count = $scope.model.config.listPicker.minItems - $scope.selectedOptions.length;
if (count > 0) { return new Array(count); }
return null;
}

// returns true is the 'select' placeholder should be rendered
$scope.showSelectPlaceholder = function () {
return ($scope.model.config.typeaheadListPicker || $scope.model.config.listPicker.allowDuplicates || $scope.selectedOptions.length < $scope.selectableOptions.length)
&& ($scope.selectedOptions.length >= $scope.model.config.listPicker.minItems)
&& (($scope.selectedOptions.length < $scope.model.config.listPicker.maxItems) || $scope.model.config.listPicker.maxItems == 0);
}

// returns true if selected options can be sorted
$scope.isSortable = function () {

// if prefetch list doesn't allow sorting
if (!allowSorting()) { return false; }

// if not allowing duplicates, then check selected items > 1
if (!$scope.model.config.listPicker.allowDuplicates && $scope.selectedOptions.length > 1) { return true; }

// duplicates allowed, so chheck there are at least 2 distinct items
var keys = $scope.selectedOptions.map(function (option) { return option.key; }); // key all selected keys
return keys.filter(function (value, index) { return keys.indexOf(value) == index; }).length >= 2;
};

// sorting is allowed unless it's a prefetch list and doesn't have the allow sorting option checked (typeahead allows)
function allowSorting() {
return !($scope.model.config.prefetchListPicker && !$scope.model.config.prefetchListPicker.allowSorting);
}

// remove option from 'selected'
$scope.deselectOption = function ($index) {
$scope.selectedOptions.splice($index, 1);
};

$scope.$watchCollection('selectedOptions', function () {

// set validation state
$scope.listPickerForm.validation.$setValidity('validationMessage',
($scope.selectedOptions.length >= $scope.model.config.listPicker.minItems &&
($scope.selectedOptions.length <= $scope.model.config.listPicker.maxItems || $scope.model.config.listPicker.maxItems < 1)));

// toggle sorting ui (updated on change, for example if all picked items are identical)
$scope.sortableConfiguration.disabled = !$scope.isSortable();
});

$scope.$on("formSubmitting", function () {
$scope.model.value = editorResource.createSaveValue($scope.model.config, $scope.selectedOptions);
});

}]);
45 changes: 27 additions & 18 deletions source/nuPickers/Shared/PrefetchListPicker/PrefetchListPickerEditor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
<div ng-controller="nuPickers.Shared.ListPicker.ListPickerEditorController" class="list-picker">

<ng-form name="listPickerForm">
<input type="hidden" name="validation" ng-model="model.value" />
<span val-msg-for="validation" val-toggle-msg="validationMessage"></span>
</ng-form>
<ng-form name="listPickerForm">
<input type="hidden" name="validation" ng-model="model.value" />
<span val-msg-for="validation" val-toggle-msg="validationMessage"></span>
</ng-form>

<div ng-controller="nuPickers.Shared.PrefetchListPicker.PrefetchListPickerEditorController" ng-class="{'has-text-input-bar': model.config.prefetchListPicker.enableFiltering}">
<div ng-controller="nuPickers.Shared.PrefetchListPicker.PrefetchListPickerEditorController" ng-class="{'has-text-input-bar': model.config.prefetchListPicker.enableFiltering}">

<!-- filter -->
<div class="text-input-bar"
ng-show="model.config.prefetchListPicker.enableFiltering">
<input type="text"
placeholder="filter"
ng-model="filter"
ng-trim="false"
nu-cursor-up="cursorUp()"
nu-cursor-down="cursorDown()"
nu-enter-key="enterKey()" />
<!-- filter -->
<div class="text-input-bar"
ng-show="model.config.prefetchListPicker.enableFiltering">
<input type="text"
placeholder="filter"
ng-model="filter"
ng-trim="false"
nu-cursor-up="cursorUp()"
nu-cursor-down="cursorDown()"
nu-enter-key="enterKey()" />
<div class="button-add-multiple-positioner">

<a href=""
class="button icon color-orange active icon-add button-add-multiple"
ng-mouseleave="lit = false" ng-click="lit = false; selectAllOptions(selectableOptions)"
>
</a>
</div>

</div>

<ng-include src="'/App_Plugins/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html'"></ng-include>
<ng-include src="'/App_Plugins/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html'"></ng-include>
<ng-include src="'/App_Plugins/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html'"></ng-include>
<ng-include src="'/App_Plugins/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html'"></ng-include>

</div>
</div>
</div>