+
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index a8e30f1b4..4edf8fd7f 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -864,23 +864,6 @@ img {
}
/** Motion **/
-#motion-os-table .identifier-col {
- width: 50px;
- min-height: 1px;
-}
-
-#motion-os-table .identifier-col > div {
- text-align: center;
-}
-
-#motion-os-table .title-col {
- width: calc(100% - 50px);
-}
-
-#motion-os-table .title-col, .os-table small {
- color: #555;
-}
-
.motion-toolbar, .speakers-toolbar {
background-color: #f5f5f5;
border-bottom: 1px solid #ddd;
@@ -900,6 +883,9 @@ img {
}
/** OS-Table **/
+.os-table small {
+ color: #555;
+}
.os-table .row {
border: 1px solid #ddd;
border-top: 0px;
@@ -913,6 +899,11 @@ img {
padding: 10px 0px 10px 0px;
}
+.os-table .id-col {
+ width: 50px;
+ min-height: 1px;
+}
+
.os-table .header-row {
border-top: 1px solid #ddd;
background-color: #f5f5f5;
@@ -960,17 +951,13 @@ img {
padding-right: 10px;
}
-.os-table .dropdown {
- display: inline-block;
-}
-
.os-table .header-row .dropdown > span, .os-table .sort-spacer {
padding: 5px 10px 5px 10px;
}
.os-table .title {
font-size: 115%;
- margin-right: 10px;
+ margin-right: 5px;
padding: 0;
background-color: transparent;
}
@@ -1079,16 +1066,6 @@ img {
margin-left: 0px !important;
}
-.dropdown-entries {
- white-space: nowrap;
-}
-
-.dropdown-entries > li {
- padding: 5px 10px 5px 10px;
- width: 100%;
- cursor: pointer;
-}
-
.slimDropDown {
padding-left: 4px !important;
padding-right: 4px !important;
@@ -1511,6 +1488,8 @@ tr.selected td {
#chatbox { width: 100%; top: 40px; }
+ .badge { font-size: 10px; }
+
/* show replacement elements, if any */
.optional-show { display: block !important; }
diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js
index 5141d87c4..e37fbd9d8 100644
--- a/openslides/core/static/js/core/base.js
+++ b/openslides/core/static/js/core/base.js
@@ -796,19 +796,6 @@ angular.module('OpenSlidesApp.core', [
}
])
-.filter('osFilter', [
- function () {
- return function (array, string, getFilterString) {
- if (!string) {
- return array;
- }
- return Array.prototype.filter.call(array, function (item) {
- return getFilterString(item).toLowerCase().indexOf(string.toLowerCase()) > -1;
- });
- };
- }
-])
-
// mark HTML as "trusted"
.filter('trusted', [
'$sce',
@@ -838,7 +825,6 @@ angular.module('OpenSlidesApp.core', [
};
})
-
// Make sure that the DS factories are loaded by making them a dependency
.run([
'ChatMessage',
diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index 4f9805ad1..cadb0dbd0 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -342,61 +342,107 @@ angular.module('OpenSlidesApp.core.site', [
}
])
-.factory('Multiselect', [
+/* This factory handles the filtering of the OS-data-tables. It contains
+ * all logic needed for the table header filtering. Things to configure:
+ * - multiselectFilters: A dict associating the filter name to a list (empty per default). E.g.
+ * { tag: [],
+ * category: [], }
+ * - booleanFilters: A dict containing a dict for every filter. The value property is a must.
+ * For displaying properties like displayName, choiceYes and choiceNo could be usefull. E.g.
+ * { isPresent: {
+ * value: undefined,
+ * displayName: gettext('Is present'), } }
+ * - propertyList, propertyFunctionList, propertyDict: See function getObjectQueryString
+ */
+.factory('osTableFilter', [
function () {
- var instance = function () {
- var areFiltersSet = function () {
- var areFiltersSet = false;
- _.forEach(self.filters, function (filterList, filter) {
- if (filterList.length > 0) {
- areFiltersSet = true;
+ var createInstance = function () {
+ var self = {
+ multiselectFilters: {},
+ booleanFilters: {},
+ filterString: '',
+ };
+ self.areFiltersSet = function () {
+ var areFiltersSet = _.find(self.multiselectFilters, function (filterList) {
+ return filterList.length > 0;
+ });
+ areFiltersSet = areFiltersSet || _.find(self.booleanFilters, function (filterDict) {
+ return filterDict.value !== undefined;
+ });
+ areFiltersSet = areFiltersSet || (self.filterString !== '');
+ return areFiltersSet !== false;
+ };
+ self.reset = function () {
+ _.forEach(self.multiselectFilters, function (filterList, filter) {
+ self.multiselectFilters[filter] = [];
+ });
+ _.forEach(self.booleanFilters, function (filterDict, filter) {
+ self.booleanFilters[filter].value = undefined;
+ });
+ self.filterString = '';
+ };
+ self.operateMultiselectFilter = function (filter, id, danger) {
+ if (!danger) {
+ if (_.indexOf(self.multiselectFilters[filter], id) > -1) {
+ // remove id
+ self.multiselectFilters[filter].splice(_.indexOf(self.multiselectFilters[filter], id), 1);
+ } else {
+ // add id
+ self.multiselectFilters[filter].push(id);
}
- });
- return areFiltersSet;
- };
- var resetFilters = function () {
- _.forEach(self.filters, function (filterList, filter) {
- self.filters[filter] = [];
- });
- };
- var getFilterString = function (obj) {
- var newList = [];
- _.forEach(self.propertyList, function (property) {
- newList.push(obj[property]);
- });
- _.forEach(self.propertyFunctionList, function (fn) {
- newList.push(fn(obj));
- });
- _.forEach(self.propertyDict, function (idFunction, property) {
- newList.push(_.map(obj[property], idFunction).join(' '));
- });
- return newList.join(' ');
- };
- var operate = function (filter, id) {
- if (_.indexOf(self.filters[filter], id) > -1) {
- // remove id
- self.filters[filter] = _.filter(self.filters[filter], function (_id) {
- return _id != id;
- });
- } else {
- // add id
- self.filters[filter].push(id);
}
};
-
- var self = {
- filters: {},
- areFiltersSet: areFiltersSet,
- resetFilters: resetFilters,
- operate: operate,
- getFilterString: getFilterString,
+ /* Three things are could be given to create the query string:
+ * - propertyList: Just a list of object's properties like ['title', 'name']
+ * - propertyFunktionList: A list of functions returning a property (e.g. [function(motion) {return motion.getTitle();}] for retrieving the motions title)
+ * - propertyDict: A dict association properties that are lists to functions on how to handle them.
+ * E.g.: {'tags': function (tag) {return tag.name;}, }
+ * The list of tags will be mapped with this function to a list of strings (tag names).
+ */
+ self.getObjectQueryString = function (obj) {
+ var stringList = [];
+ _.forEach(self.propertyList, function (property) {
+ stringList.push(obj[property]);
+ });
+ _.forEach(self.propertyFunctionList, function (fn) {
+ stringList.push(fn(obj));
+ });
+ _.forEach(self.propertyDict, function (idFunction, property) {
+ stringList.push(_.map(obj[property], idFunction).join(' '));
+ });
+ return stringList.join(' ');
};
- resetFilters(); //Initiate filters
return self;
};
return {
- instance: instance
+ createInstance: createInstance
+ };
+ }
+])
+
+/* This factory takes care of the sorting of OS-data-tables. Things to configure:
+ * - column: the default column which is the list sorted by (e.g.
+ * instance.column='title')
+ */
+.factory('osTableSort', [
+ function () {
+ var createInstance = function () {
+ var self = {
+ column: '',
+ reverse: false,
+ };
+ self.toggle = function (column) {
+ if (self.column === column) {
+ self.reverse = !self.reverse;
+ }
+ self.column = column;
+ };
+ return self;
+ };
+
+ return {
+ createInstance: createInstance
};
}
])
@@ -407,6 +453,9 @@ angular.module('OpenSlidesApp.core.site', [
* Then, all items in the array are passed, if the item_id (get with id_function) matches
* one of the ids in filterArray. id_function could also return a list of ids. Example:
* Item 1 has two tags with ids [1, 4]. filterArray == [3, 4] --> match
+ *
+ * If -1 is in the array items without an id will not be filtered. This is for implementing
+ * a filter option like: "All items without a category"
*/
.filter('MultiselectFilter', [
function () {
@@ -414,12 +463,13 @@ angular.module('OpenSlidesApp.core.site', [
if (filterArray.length === 0) {
return array;
}
+ var itemsWithoutProperty = _.indexOf(filterArray, -1) > -1;
return Array.prototype.filter.call(array, function (item) {
var id = idFunction(item);
- if (!id) {
- return false;
- } else if (typeof id === 'number') {
+ if (typeof id === 'number') {
id = [id];
+ } else if (id === null || !id.length) {
+ return itemsWithoutProperty;
}
return _.intersection(id, filterArray).length > 0;
});
@@ -427,6 +477,19 @@ angular.module('OpenSlidesApp.core.site', [
}
])
+.filter('osFilter', [
+ function () {
+ return function (array, string, getFilterString) {
+ if (!string) {
+ return array;
+ }
+ return Array.prototype.filter.call(array, function (item) {
+ return getFilterString(item).toLowerCase().indexOf(string.toLowerCase()) > -1;
+ });
+ };
+ }
+])
+
// Load the django url patterns
.run([
'runtimeStates',
diff --git a/openslides/mediafiles/static/js/mediafiles/site.js b/openslides/mediafiles/static/js/mediafiles/site.js
index ea33a45e8..525a4dc55 100644
--- a/openslides/mediafiles/static/js/mediafiles/site.js
+++ b/openslides/mediafiles/static/js/mediafiles/site.js
@@ -57,7 +57,10 @@ angular.module('OpenSlidesApp.mediafiles.site', ['ngFileUpload', 'OpenSlidesApp.
'User',
'Projector',
'ProjectionDefault',
- function($scope, $http, ngDialog, Mediafile, MediafileForm, User, Projector, ProjectionDefault) {
+ 'osTableFilter',
+ 'osTableSort',
+ 'gettext',
+ function($scope, $http, ngDialog, Mediafile, MediafileForm, User, Projector, ProjectionDefault, osTableFilter, osTableSort, gettext) {
Mediafile.bindAll({}, $scope, 'mediafiles');
User.bindAll({}, $scope, 'users');
$scope.$watch(function() {
@@ -95,44 +98,61 @@ angular.module('OpenSlidesApp.mediafiles.site', ['ngFileUpload', 'OpenSlidesApp.
updatePresentedMediafiles();
- // setup table sorting
- $scope.sortColumn = 'title';
- $scope.filterPresent = '';
- $scope.reverse = false;
-
- // function to sort by clicked column
- $scope.toggleSort = function ( column ) {
- if ( $scope.sortColumn === column ) {
- $scope.reverse = !$scope.reverse;
- }
- $scope.sortColumn = column;
- };
- // define custom search filter string
- $scope.getFilterString = function (mediafile) {
- return [
- mediafile.title,
- mediafile.mediafile.type,
- mediafile.mediafile.name,
- mediafile.uploader.get_short_name()
- ].join(" ");
+ // Filtering
+ $scope.filter = osTableFilter.createInstance();
+ $scope.filter.booleanFilters = {
+ isPrivate: {
+ value: undefined,
+ displayName: gettext('Private'),
+ choiceYes: gettext('Is private'),
+ choiceNo: gettext('Is not private'),
+ needExtraPermission: true,
+ },
+ isPdf: {
+ value: undefined,
+ displayName: gettext('Is PDF'),
+ choiceYes: gettext('Is PDF file'),
+ choiceNo: gettext('Is no PDF file'),
+ },
};
+ $scope.filter.propertyList = ['title_or_filename'];
+ $scope.filter.propertyFunctionList = [
+ function (mediafile) {return mediafile.uploader.get_short_name();},
+ function (mediafile) {return mediafile.mediafile.type;},
+ function (mediafile) {return mediafile.mediafile.name;},
+ ];
+ // Sorting
+ $scope.sort = osTableSort.createInstance();
+ $scope.sort.column = 'title_or_filename';
+ $scope.sortOptions = [
+ {name: 'title_or_filename',
+ display_name: 'Title'},
+ {name: 'timestamp',
+ display_name: 'UploadTime'},
+ {name: 'uploader.get_short_name()',
+ display_name: 'Uploader'},
+ {name: 'mediafile.type',
+ display_name: 'Type'},
+ {name: 'filesize',
+ display_name: 'Filesize'},
+ ];
// open new/edit dialog
$scope.openDialog = function (mediafile) {
ngDialog.open(MediafileForm.getDialog(mediafile));
};
- // *** delete mode functions ***
- $scope.isDeleteMode = false;
+ // *** select mode functions ***
+ $scope.isSelectMode = false;
// check all checkboxes
$scope.checkAll = function () {
angular.forEach($scope.mediafiles, function (mediafile) {
mediafile.selected = $scope.selectedAll;
});
};
- // uncheck all checkboxes if isDeleteMode is closed
+ // uncheck all checkboxes if SelectMode is closed
$scope.uncheckAll = function () {
- if (!$scope.isDeleteMode) {
+ if (!$scope.isSelectMode) {
$scope.selectedAll = false;
angular.forEach($scope.mediafiles, function (mediafile) {
mediafile.selected = false;
@@ -145,7 +165,7 @@ angular.module('OpenSlidesApp.mediafiles.site', ['ngFileUpload', 'OpenSlidesApp.
if (mediafile.selected)
Mediafile.destroy(mediafile.id);
});
- $scope.isDeleteMode = false;
+ $scope.isSelectMode = false;
$scope.uncheckAll();
};
// delete single mediafile
diff --git a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
index cf9f5515f..eb76e3c05 100644
--- a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
+++ b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
@@ -115,44 +115,21 @@
-
-
-
-
-
- Show PDF files only
-
-
-
+
+
+
+
+
+
+ {{ mediafile.filetype }}
+ (Encrypted)
+
+ {{ mediafile.filesize }}
+ {{ mediafile.timestamp | date:'yyyy-MM-dd HH:mm:ss' }}
+
+
+
+
+
+