ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1513 from emanuelschuetze/angular-templates

Browse Source 
New angular templates (part 1)
This commit is contained in:
Norman Jäckel 2015-05-12 14:12:10 +02:00
commit d816e0c045
83 changed files with 2030 additions and 3605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bower.json
View File

@ -3,14 +3,24 @@
"private": true,
"dependencies": {
"lodash": "~3.0.1",
"jquery": "~1.11.2",
"jquery": "~2.1.4",
"jquery.cookie": "~1.4.1",
"bootstrap": "~3.3.1",
"datatables-bootstrap3-plugin": "~0.2.0",
"angular": "~1.3.13",
"bootstrap-css-only": "~3.3.4",
"angular": "~1.3.15",
"angular-bootstrap": "~0.13.0",
"angular-messages": "~1.3.15",
"angular-animate": "~1.3.15",
"angular-csv-import": "~0.0.15",
"angular-loading-bar": "~0.7.1",
"angular-ui-router": "~0.2.13",
"angular-ui-select": "~0.11.2",
"angular-ui-tree": "~2.2.0",
"angular-gettext": "~2.0.2",
"angular-sanitize": "~1.3.15",
"angular-xeditable": "~0.1.9",
"js-data-angular": "~2.1.0",
"ng-fab-form": "~1.2.7",
"ngBootbox": "~0.0.5",
"sockjs": "~0.3.4",
"font-awesome-bower": "4.3.0"
}

2
openslides/agenda/main_menu.py
View File

@ -10,5 +10,5 @@ class AgendaMainMenuEntry(MainMenuEntry):
verbose_name = ugettext_lazy('Agenda')
required_permission = 'agenda.can_see'
default_weight = 20
pattern_name = 'item_overview'
pattern_name = '/agenda' # TODO: use generic solution, see issue #1469
icon_css_class = 'glyphicon-calendar'

BIN
openslides/agenda/static/img/glyphicons_300_microphone.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

142
openslides/agenda/static/js/agenda.js
View File

@ -1,142 +0,0 @@
/*
* JavaScript functions for agenda.
*
*/
function hideClosedSlides(hide) {
if (hide) {
$('#hidelink').attr('title', 'show');
$('#hidelink').removeClass('hide').addClass('show');
$('.agenda_list .icon-checked-new').each(function() {
$(this).parents("li").first().hide();
});
var hidden = $(".agenda_list li:hidden").length;
$('#hiddencount').text(interpolate(gettext(', of which %s are hidden.'), [hidden]));
} else {
$('.agenda_list li').show();
$('#hidelink').attr('title','hide');
$('#hidelink').removeClass('show').addClass('hide');
$('#hiddencount').text('');
}
return false;
}
$('#coming_speakers_changed_form').submit(function() {
$('#sort_order').val($('#coming_speakers').sortable("toArray"));
});
$(function() {
// change participant status (on/off)
$('.close_link').click(function(event) {
event.preventDefault();
var link = $(this);
$.ajax({
type: 'GET',
url: $(this).attr('href'),
dataType: 'json',
success: function(data) {
if (data.closed) {
newclass = 'icon-checked-new';
link.parent().parent().addClass('offline');
link.addClass('btn-success');
} else {
newclass = 'icon-unchecked-new';
link.parent().parent().removeClass('offline');
link.removeClass('btn-success');
}
link.children('i').removeClass('icon-checked-new icon-unchecked-new').addClass(newclass);
link.attr('href', data.link);
}
});
});
// filter to show/hide closed items
$('#hide_closed_items').click(function(event) {
// show all items
if ($.cookie('Slide.HideClosed') == 1) {
$.cookie('Slide.HideClosed', 0);
hideClosedSlides(false);
$('#hide_closed_items').attr('checked', false);
}
else { // hide closed items
$.cookie('Slide.HideClosed', 1);
hideClosedSlides(true);
$('#hide_closed_items').attr('checked', true);
}
});
// TODO: Fix this code and reactivate it again
//# if ($.cookie('Slide.HideClosed') === null) {
//# $('#hide_closed_items').attr('checked', false);
//# $.cookie('Slide.HideClosed', 0);
//# } else if ($.cookie('Slide.HideClosed') == 1) {
//# hideClosedSlides(true);
//# $('#hide_closed_items').attr('checked', true);
//# }
if ($('#coming_speakers').length > 0) {
$('#coming_speakers').sortable({axis: "y", containment: "parent", update: function(event, ui) {
$('#coming_speakers_changed_form').show();
}});
$('#coming_speakers').disableSelection();
}
/*
* function for sorting agenda items
*
*/
var $agenda_list = $('ol.agenda_list');
var rebuildOpenersClosers = function ( ) {
$agenda_list.find("li").each(function() {
var $li = $(this);
if ($li.find("> ol").length > 0) $li.find("> div .opener_closer").show();
else $li.find("> div .opener_closer").hide();
});
}
var rebuildNesting = function( $root, level, parent_id ) {
var $children = $root.find('> li'),
curr_weight = -50;
$children.each(function() {
var $child = $(this),
$curr_element = $child.find('> div'),
my_id = $curr_element.find('.menu-mlid').val();
$curr_element.find('.menu-plid').val(parent_id);
$curr_element.find('.menu-weight').val(curr_weight);
curr_weight++;
$child.find('> ol').each(function() {
rebuildNesting( $(this), level + 1, my_id );
});
});
};
if ($agenda_list.hasClass("sortable")) $agenda_list.nestedSortable({
forcePlaceholderSize: true,
handle: 'div',
helper: 'clone',
items: 'li',
opacity: .6,
placeholder: 'placeholder',
revert: 250,
tabSize: 25,
tolerance: 'pointer',
toleranceElement: '> div',
isTree: true,
expandOnHover: 700,
startCollapsed: true,
update: function (event, ui) {
var $this = $(this);
rebuildNesting($this, 0, 0);
$('#changed-order-message').show();
rebuildOpenersClosers();
}
});
rebuildOpenersClosers();
$agenda_list.find(".opener_closer .opener").click(function(ev) {
ev.preventDefault();
$(this).parents("li").first().removeClass("closed");
});
$agenda_list.find(".opener_closer .closer").click(function(ev) {
ev.preventDefault();
$(this).parents("li").first().addClass("closed");
});
});

131
openslides/agenda/static/js/agenda/agenda.js
View File

@ -15,21 +15,56 @@ angular.module('OpenSlidesApp.agenda', [])
resolve: {
items: function(Agenda) {
return Agenda.findAll();
},
tree: function($http) {
return $http.get('/rest/agenda/item/tree/');
}
}
})
.state('agenda.item.create', {
resolve: {
types: function($http) {
// get all item types
return $http({ 'method': 'OPTIONS', 'url': '/rest/agenda/item/' });
}
}
})
.state('agenda.item.create', {})
.state('agenda.item.detail', {
resolve: {
item: function(Agenda, $stateParams) {
return Agenda.find($stateParams.id);
},
users: function(User) {
return User.findAll();
}
}
})
.state('agenda.item.detail.update', {
views: {
'@agenda.item': {}
},
resolve: {
types: function($http) {
// get all item types
return $http({ 'method': 'OPTIONS', 'url': '/rest/agenda/item/' });
}
}
})
.state('agenda.item.sort', {
resolve: {
items: function(Agenda) {
return Agenda.findAll();
},
tree: function($http) {
return $http.get('/rest/agenda/item/tree/');
}
},
url: '/sort',
controller: 'AgendaSortCtrl',
})
.state('agenda.item.csv-import', {
url: '/csv-import',
controller: 'AgendaCSVImportCtrl',
});
})
@ -40,30 +75,84 @@ angular.module('OpenSlidesApp.agenda', [])
});
})
.controller('ItemListCtrl', function($scope, Agenda, i18n) {
.controller('ItemListCtrl', function($scope, Agenda, tree) {
Agenda.bindAll({}, $scope, 'items');
$scope.test_plural = i18n.ngettext('test', 'tests', 2);
$scope.test_singular = i18n.ngettext('test', 'tests', 1);
})
.controller('ItemDetailCtrl', function($scope, Agenda, item) {
Agenda.bindOne($scope, 'item', item.id);
})
// get a 'flat' (ordered) array of agenda tree to display in table
$scope.flattenedTree = buildTree(tree.data);
function buildTree(tree, level = 0) {
var nodes = [];
var defaultlevel = level;
_.each(tree, function(node) {
level = defaultlevel;
if (node.id) {
nodes.push({ id: node.id, level: level });
}
if (node.children) {
level++;
var child = buildTree(node.children, level);
if (child.length) {
nodes = nodes.concat(child);
}
}
});
return nodes;
}
.controller('ItemCreateCtrl', function($scope, Agenda) {
$scope.item = {};
$scope.save = function (item) {
item.weight = 0; // TODO: the rest_api should do this
item.tags = []; // TODO: the rest_api should do this
Agenda.create(item);
// TODO: redirect to list-view
};
})
.controller('ItemUpdateCtrl', function($scope, Agenda, item) {
$scope.item = item; // do not use Agenda.binOne(...) so autoupdate is not activated
// save changed item
$scope.save = function (item) {
Agenda.save(item);
// TODO: redirect to list-view
};
// delete selected item
$scope.delete = function (id) {
Agenda.destroy(id);
};
})
.controller('ItemDetailCtrl', function($scope, Agenda, User, item) {
Agenda.bindOne(item.id, $scope, 'item');
User.bindAll({}, $scope, 'users');
})
.controller('ItemCreateCtrl', function($scope, $state, Agenda, types) {
$scope.types = types.data.actions.POST.type.choices; // get all item types
$scope.save = function (item) {
if (!item)
return null;
item.weight = 0; // TODO: the rest_api should do this
item.tags = []; // TODO: the rest_api should do this
Agenda.create(item).then(
function(success) {
$state.go('agenda.item.list');
}
);
};
})
.controller('ItemUpdateCtrl', function($scope, $state, Agenda, types, item) {
$scope.types = types.data.actions.POST.type.choices; // get all item types
$scope.item = item;
$scope.save = function (item) {
Agenda.save(item).then(
function(success) {
$state.go('agenda.item.list');
}
);
};
})
.controller('AgendaSortCtrl', function($scope, $http, Agenda, tree) {
Agenda.bindAll({}, $scope, 'items');
$scope.tree = tree.data;
// set changed agenda tree
$scope.treeOptions = {
dropped: function(e) {
$http.put('/rest/agenda/item/tree/', {tree: $scope.tree});
}
};
})
.controller('AgendaCSVImportCtrl', function($scope, Agenda) {
// TODO
});

14
openslides/agenda/static/js/agenda_current_list_of_speakers_projector.js
View File

@ -1,14 +0,0 @@
/*
* JavaScript functions for agenda CurrentListOfSpeakersProjectorView
*/
function reloadListOfSpeakers() {
$.ajax({
url: '',
success: function (data) {
updater.updateProjector(data);
setTimeout('reloadListOfSpeakers()', 2000);
},
dataType: 'json'
});
}

39
openslides/agenda/static/templates/agenda/item-csv-import.html Normal file
View File

@ -0,0 +1,39 @@
<h1 translate>Import agenda items</h1>
<div id="submenu">
<a ui-sref="agenda.item.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<p translate>Select a CSV file to import agenda items!
<p translate>Please note:</p>
<ul><!--TODO: utf-8 encoding still required with agnular-csv? -->
<li><translate>Required comma separated values</translate>:<br>
<code translate>'title, text, duration'</code>
<li translate>Text and duration are optional and may be empty.
<li translate>The first line (header) is ignored.
<li translate>Required CSV file encoding is UTF-8.
<li><a href="https://github.com/OpenSlides/OpenSlides/wiki/CSV-Import" translate>
Use the CSV example file from OpenSlides Wiki.
</a>
</ul>
<!-- TODO: add post url to form-->
<form>
<div class="form-group">
<label for="InputFile" translate>CSV file:</label>
<input type="file" id="InputFile">
<p class="help-block" translate>The file has to be encoded in UTF-8.
</div>
<!--TODO-->
<button type="submit" ng-click="" class="btn btn-primary" translate>
Import
</button>
<button ui-sref="agenda.item.list" class="btn btn-default" translate>
Cancel
</button>
</form>

54
openslides/agenda/static/templates/agenda/item-detail.html
View File

@ -1,2 +1,56 @@
<h1>{{ item.get_title }}</h1>
<div id="submenu">
<a ui-sref="agenda.item.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
<!-- projector, TODO: add link to activate slidea-->
<a href="#TODO" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
title="{{ 'Show' | translate }}">
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="agenda.item.detail.update({id: item.id })" os-perms="agenda.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
</div>
{{ item.text }}
<div os-perm="agenda.can_manage">
<h3 os-perm="agenda.can_manage" translate>Duration</h3>
{{ item.duration }}
</div>
<div os-perm="agenda.can_manage">
<h3 os-perm="agenda.can_manage" translate>Comment</h3>
{{ item.comment }}
</div>
<h3 translate>List of speakers</h3>
<!-- TODO:
* open/close list
* add/remove speakers
* project list
* show old/current/next speakers
* button 'put/remove me on/from the list'
* check permissions
-->
<div class="form-group row">
<div class="col-sm-6">
<ui-select ng-model="speaker.selected" theme="bootstrap">
<ui-select-match placeholder="{{ 'Select or search a participant...' | translate }}">
{{ $select.selected.get_short_name() }}
</ui-select-match>
<ui-select-choices repeat="user.id as user in users | filter: $select.search">
<div ng-bind-html="user.get_short_name() | highlight: $select.search"></div>
<small ng-bind-html="user.structure_level | highlight: $select.search"></small>
</ui-select-choices>
</ui-select>
</div>
</div>

55
openslides/agenda/static/templates/agenda/item-form.html
View File

@ -1,8 +1,51 @@
<h1 ng-if="item.id">{{ item.title }}</h1>
<h1 ng-if="!item.id">Neuer Eintrag</h1>
<h1 ng-if="item.id" translate>Edit agenda item</h1>
<h1 ng-if="!item.id" translate>New agenda item</h1>
<form>
Titel: <input type="text" ng-model="item.title"><br>
Text:<br> <textarea ng-model="item.text"></textarea><br>
<input type="submit" ng-click="save(item)" value="Save" />
<div id="submenu">
<a ui-sref="agenda.item.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<form name="agendaItemForm">
<div class="form-group">
<label for="inputNumber" translate>Number</label>
<input type="text" ng-model="item.item_number" class="form-control" name="inputNumber">
</div>
<div class="form-group">
<label for="inputTitle" translate>Title</label>
<input type="text" ng-model="item.title" class="form-control" name="inputTitle" required>
</div>
<div class="form-group">
<label for="textareaDesciption" translate>Text</label>
<textarea ng-model="item.text" class="form-control" name="textareaText" />
</div>
<div class="form-group">
<label for="textareaComment" translate>Comment</label>
<textarea ng-model="item.comment" class="form-control" name="textareaComment" />
</div>
<div class="form-group">
<label for="inputDuration" translate>Duration</label>
<input type="text" ng-model="item.duration" class="form-control" name="inputDuration">
</div>
<div class="form-group">
<label for="selectType" translate>Type</label>
<select ng-options="type.value as type.display_name for type in types"
ng-model="item.type" class="form-control" name="selectType" required>
</select>
</div>
<div class="form-group">
<label for="selectTags" translate>Tags</label>
<!-- TODO: get types automatically, provide multiple select field -->
<select ng-options="" ng-model="item.tags" class="form-control" name="selectTags">
</select>
</div>
<button type="submit" ng-click="save(item)" class="btn btn-primary" translate>
Save
</button>
<button ui-sref="agenda.item.list" class="btn btn-default" translate>
Cancel
</button>
</form>

94
openslides/agenda/static/templates/agenda/item-list.html
View File

@ -1,9 +1,85 @@
<ul>
<li ng-repeat="item in items">
<a ui-sref="agenda.item.detail({id: item.id})">{{ item.get_title }}</a>
<a ui-sref="agenda.item.detail.update({id: item.id })">Bearbeiten</a>
</li>
</ul>
<a ui-sref="agenda.item.create">{{ gettext('New') }}</a>
<br>{{ test_singular }}
<br>{{ test_plural }}
<h1 translate>Agenda</h1>
<div id="submenu">
<a ui-sref="agenda.item.create" os-perms="agenda.can_manage" class="btn btn-primary btn-sm">
<i class="fa fa-plus fa-lg"></i>
<translate>New</translate>
</a>
<a ui-sref="agenda.item.sort" os-perms="agenda.can_manage" class="btn btn-default btn-sm">
<i class="fa fa-download fa-lg"></i>
<translate>Sort agenda</translate>
</a>
<a ui-sref="agenda.item.csv-import" os-perms="agenda.can_manage" class="btn btn-default btn-sm">
<i class="fa fa-download fa-lg"></i>
<translate>Import</translate>
</a>
<a ui-sref="core.tag.list" os-perms="core.can_manage_tags" class="btn btn-default btn-sm">
<i class="fa fa-tags fa-lg"></i>
<translate>Tags</translate>
</a>
<a ui-sref="agenda_pdf" target="_blank" class="btn btn-default btn-sm">
<i class="fa fa-file-pdf-o fa-lg"></i>
<translate>PDF</translate>
</a>
</div>
<div class="row form-group">
<div class="col-sm-8">
</div>
<div class="col-sm-4">
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
placeholder="{{ 'Filter' | translate}}">
</div>
</div>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th class="minimum">
<translate>Closed</translate>
<th>
<translate>Agenda item</translate>
<th os-perms="agenda.can_manage">
<translate>Duration</translate>
<th os-perms="agenda.can_manage core.can_manage_projector" class="minimum">
<translate>Actions</translate>
<tbody>
<tr ng-repeat="node in flattenedTree | filter: filter.search">
<td><input type="checkbox" ng-model="(items | filter: {id: node.id})[0].closed" ng-click="save(node.id)">
<td>
<span ng-repeat="n in [].constructor(node.level) track by $index">&ndash;</span>
<a ui-sref="agenda.item.detail({id: node.id})">
{{ (items | filter: {id: node.id})[0].item_number }}
{{ (items | filter: {id: node.id})[0].title }}
</a>
<button ng-if="(items | filter: {id: node.id})[0].comment"
class="btn btn-default btn-xs" popover="{{(items | filter: {id: node.id})[0].comment}}"
popover-title="{{ 'Comment' | translate }}">
<i class="fa fa-comment-o"></i>
</button>
<td os-perms="agenda.can_manage" class="optional">
<a href="#" editable-number="(items | filter: {id: node.id})[0].duration" e-min="1" onaftersave="save(node.id)">
{{ (items | filter: {id: node.id})[0].duration }}
</a>
<span ng-if="(items | filter: {id: node.id})[0].duration" translate>min</span>
<td os-perms="agenda.can_manage core.can_manage_projector" class="nobr">
<!-- projector, TODO: add link to activate slide-->
<a href="#TODO" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
title="{{ 'Show' | translate }}">
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="agenda.item.detail.update({id: node.id })" os-perms="agenda.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
<!-- delete -->
<a os-perms="agenda.can_manage" class="btn btn-danger btn-sm"
ng-bootbox-confirm="Are you sure you want to delete item
<b>{{ (items | filter: {id: node.id})[0].title }}</b>?"
ng-bootbox-confirm-action="delete(node.id)"
title="{{ 'Delete' | translate }}">
<i class="fa fa-trash-o"></i>
</a>
</table>

27
openslides/agenda/static/templates/agenda/item-sort.html Normal file
View File

@ -0,0 +1,27 @@
<h1 translate>Sort agenda</h1>
<div id="submenu">
<a ui-sref="agenda.item.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<p translate>Drag and drop items to change the order of the agenda. Your modification will be saved directly.</p>
<!-- Nested node template -->
<script type="text/ng-template" id="nodes_renderer.html">
<div ui-tree-handle>
{{ (items | filter: {id: node.id})[0].item_number }}
{{ (items | filter: {id: node.id})[0].title }}
</div>
<ol ui-tree-nodes="" ng-model="node.children">
<li ng-repeat="node in node.children" ui-tree-node ng-include="'nodes_renderer.html'">
</ol>
</script>
<div ui-tree callbacks="treeOptions">
<ol ui-tree-nodes="" ng-model="tree" id="tree-root">
<li ng-repeat="node in tree" ui-tree-node ng-include="'nodes_renderer.html'">
</ol>
</div>

44
openslides/agenda/templates/agenda/edit.html
View File

@ -1,44 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% load tags %}
{% load staticfiles %}
{% block title %}
{% if item %}
{{ item }} – {% trans "Edit item" %}
{% else %}
{% trans "New item" %}
{% endif %}
– {{ block.super }}
{% endblock %}
{% block content %}
<h1>
{% if item %}
{% trans "Edit item" %}
{% else %}
{% trans "New item" %}
{% endif %}
<small class="pull-right">
<a href="{% url 'item_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
</small>
</h1>
<p>
{% if item.content_object %}
<a href="{{ item.content_object|absolute_url:'update' }}" class="btn btn-small">
{% blocktrans with type=item.content_type.name|trans name=item.content_object %}Edit {{ type }} {{ name }}{% endblocktrans %}
</a>
{% endif %}
</p>
<form action="" method="post">{% csrf_token %}
{% include "form.html" %}
<p>
{% include "formbuttons_saveapply.html" %}
<a href='{% url 'item_overview' %}' class="btn">
{% trans 'Cancel' %}
</a>
</p>
<small>* {% trans "required" %}</small>
</form>
{% endblock %}

47
openslides/agenda/templates/agenda/item_form_csv_import.html
View File

@ -1,47 +0,0 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans 'Import agenda items' %} – {{ block.super }}{% endblock %}
{% block content %}
<h1>
{% trans 'Import agenda items' %}
<small class="pull-right">
<a href="{% url 'item_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans 'Back to overview' %}</a>
</small>
</h1>
<p>{% trans 'Select a CSV file to import agenda items' %}.</p>
<p>{% trans 'Please note' %}:</p>
<ul>
<li>
{% trans 'Required comma separated values' %}:<br />
<code>{% trans 'title, text, duration' %}</code>
</li>
<li>
{% trans 'Text and duration are optional and may be empty' %}.
</li>
<li>{% trans 'The first line (header) is ignored' %}.</li>
<li>
{% trans 'Required CSV file encoding is UTF-8' %}.
</li>
<li>
<a href="https://github.com/OpenSlides/OpenSlides/wiki/CSV-Import">{% trans 'Use the CSV example file from OpenSlides Wiki.' %}</a>
</li>
</ul>
<form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
{% include 'form.html' %}
<p>
<button class="btn btn-primary" type="submit">
<span class="icon import">{% trans 'Import' %}</span>
</button>
<a href="{% url 'item_overview' %}" class="btn">
{% trans 'Cancel' %}
</a>
</p>
<small>* {% trans "required" %}</small>
</form>
{% endblock %}

90
openslides/agenda/templates/agenda/item_row.html
View File

@ -1,90 +0,0 @@
{% load i18n %}
{% load tags %}
<div class="{% if node.is_active_slide %}activeline{% endif %}">
{% if perms.agenda.can_manage or perms.core.can_manage_projector %}
<div class="manage">
<span style="width: 1px; white-space: nowrap;">
{% if perms.core.can_manage_projector %}
<a href="{{ node|absolute_url:'projector' }}"
class="activate_link btn {% if node.is_active_slide and active_type == 'text' %}btn-primary{% endif %} btn-mini"
rel="tooltip" data-original-title="{% trans 'Show agenda item' %}">
<i class="icon-facetime-video {% if node.is_active_slide and active_type == 'text' %}icon-white{% endif %}"></i>
</a>
<a href="{{ node|absolute_url:'projector_list_of_speakers' }}"
class="activate_link btn btn-mini {% if node.is_active_slide and active_type == 'list_of_speakers' %}btn-primary{% endif %}"
rel="tooltip" data-original-title="{% trans 'Show list of speakers' %}">
<i class="icon icon-bell {% if node.is_active_slide and active_type == 'list_of_speakers' %}icon-white{% endif %}"></i>
</a>
{% endif %}
{% if perms.agenda.can_manage %}
<span class="optional-small">
<a href="{{ node|absolute_url:'update' }}" rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini">
<i class="icon-pencil"></i>
</a>
<a href="{{ node|absolute_url:'delete' }}" rel="tooltip" data-original-title="{% trans 'Delete' %}" class="btn btn-mini">
<i class="icon-remove"></i>
</a>
<a href="{% if node.closed %}{% url 'item_open' node.id %}{% else %}{% url 'item_close' node.id %}{% endif %}"
class="close_link btn btn-mini {% if node.closed %}btn-success{% endif %} tooltip-left"
rel="tooltip" data-original-title="{% trans 'Change status (open/closed)' %}">
<i class="{% if node.closed %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
</a>
</span>
{% if not node.is_leaf_node %}
<a href="{{ node|absolute_url:'projector_summary' }}"
class="activate_link btn btn-mini {% if node.is_active_slide and active_type == 'summary' %}btn-primary{% endif %}"
title="{% trans 'Show summary for this item' %}">
<i class="icon-summary {% if node.is_active_slide and active_type == 'summary' %}icon-white{% endif %}"></i>
</a>
{% endif %}
{% endif %}
</span>
</div>
{% endif %}
{% if perms.agenda.can_see_orga_items %}
<div class="duration">
{% if node.duration %}
{{ node.duration }} h
{% if node.tooltip %}
<a class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'End' %}:
{{ node.tooltip|date:"DATETIME_FORMAT" }}"><i class="icon-clock"></i>
</a>
{% endif %}
{% endif %}
</div>
{% endif %}
{% if perms.agenda.can_manage %}
<div class="optional">
{% if node.comment %}
{{ node.comment|first_line }}
<a class="btn btn-mini" rel="popover" data-content="{{ node.comment|linebreaks }}">
<i class="icon icon-search"></i>
</a>
{% endif %}
</div>
{% endif %}
<div class="opener_closer">
<a class="opener btn btn-mini" rel="tooltip" data-original-title="{% trans 'Expand items' %}"><span class="icon-plus"></span></a>
<a class="closer btn btn-mini" rel="tooltip" data-original-title="{% trans 'Collapse items' %}"><span class="icon-minus"></span></a>
</div>
<div class="title">
<a class="closed" rel="tooltip" data-original-title="{% trans 'Item closed' %}">
<i class="{% if node.closed %}icon-checked-new{% endif %}"></i>
</a>
{% with form=node.weight_form %}
{{ form.weight }}
{{ form.self }}
{{ form.parent }}
{% endwith %}
<a href="{{ node|absolute_url }}">{% if node.type == node.ORGANIZATIONAL_ITEM %}<i>[{% endif %}{{ node }}{% if node.type == node.ORGANIZATIONAL_ITEM %}]</i>{% endif %}</a>
{{ node.get_title_supplement|safe }}
{% for tag in node.tags.all %}
<span class="label">{{ tag }}</span>
{% endfor %}
</div>
</div>

149
openslides/agenda/templates/agenda/overview.html
View File

@ -1,149 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% load mptt_tags %}
{% load staticfiles %}
{% block title %}{% trans "Agenda" %} – {{ block.super }}{% endblock %}
{% block header %}
<link type="text/css" rel="stylesheet" media="all" href="{% static 'css/agenda.css' %}" />
{% endblock %}
{% block javascript %}
<script type="text/javascript" src="{% static 'js/agenda.js' %}"></script>
{% endblock %}
{% block content %}
<h1>{% trans "Agenda" %}
<small class="pull-right">
{% if perms.agenda.can_manage %}
<a href="{% url 'item_new' %}" class="btn btn-sm btn-primary"
rel="tooltip" data-original-title="{% trans 'New item' %}">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
{% trans "New" %}
</a>
{% endif %}
{% if perms.core.can_manage_tags %}
<a href="{% url 'core_tag_list' %}" class="btn btn-default btn-sm"
rel="tooltip" data-original-title="{% trans 'Manage tags' %}">
<span class="glyphicon glyphicon-tags" aria-hidden="true"></span>
<span class="optional-small"> {% trans 'Tags' %}</span>
</a>
{% endif %}
{% if perms.agenda.can_manage %}
<a href="{% url 'item_csv_import' %}" class="btn btn-default btn-sm"
rel="tooltip" data-original-title="{% trans 'Import agenda items' %}">
<span class="glyphicon glyphicon-import" aria-hidden="true"></span>
{% trans "Import" %}
</a>
{% endif %}
<a href="{% url 'print_agenda' %}" class="btn btn-default btn-mini"
rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}" target="_blank">
<span class="glyphicon glyphicon-print" aria-hidden="true"></span>
PDF
</a>
{% if perms.core.can_see_projector %}
<a href="{% url 'agenda_current_list_of_speakers_projector' %}"
class="btn btn-default btn-sm"
rel="tooltip" data-original-title="{% trans 'Current list of speakers' %}">
<span class="glyphicon glyphicon-bell" aria-hidden="true"></span>
{% trans 'List of speakers' %}
</a>
{% endif %}
</small>
</h1>
<div class="row-fluid">
<div class="pull-left">
{% if perms.agenda.can_manage %}
<p>
<a href="{% url 'agenda_numbering' %}"
class="btn btn-default btn-sm">{% trans 'Number agenda items' %}
</a>
</p>
{% endif %}
<p>
<label class="checkbox">
<input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
</label>
<small><i>{{ items|length }}
{% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
</i></small>
</p>
</div>
{% if perms.agenda.can_see_orga_items %}
{% if start and end %}
<table id="agendatime" class="table table-bordered pull-right">
<tr>
<td>{% trans "Start of event" %}:</td>
<td>{{ start|date:"DATETIME_FORMAT" }}</td>
</tr>
<tr>
<td>{% trans "Estimated end" %}:</td>
<td>{{ end|date:"DATETIME_FORMAT" }}</td>
</tr>
</table>
{% elif perms.config.can_manage %}
<a href="{% url 'config_agenda' %}" class="btn btn-default btn-sm pull-right">
{% trans 'Set start time of event' %}
</a>
{% endif %}
{% endif %}
</div>
<table id="menu-overview" class="table table-striped table-bordered">
<tr>
<th class="title">{% trans "Item" %}</th>
{% if perms.agenda.can_manage %}
<th class="optional">{% trans "Comment" %}</th>
{% endif %}
{% if perms.agenda.can_see_orga_items %}
<th class="duration">{% trans "Duration" %}</th>
{% endif %}
{% if perms.agenda.can_manage or perms.core.can_manage_projector %}
<th class="manage">{% trans "Actions" %}</th>
{% endif %}
</tr>
<tr class="topline{% if agenda_is_active %} activeline{% endif %}">
<td class="title">
{% trans "Agenda" %}
</td>
{% if perms.agenda.can_manage %}
<td class="optional"></td>
{% endif %}
{% if perms.agenda.can_see_orga_items %}
<td class="duration">{{ duration }} h</td>
{% endif %}
{% if perms.agenda.can_manage or perms.core.can_manage_projector %}
<td class="manage">
{% if perms.core.can_manage_projector %}
<span>
<a href="{% url 'projector_activate_slide' 'agenda' %}"
class="activate_link btn btn-default {% if agenda_is_active %}btn-primary{% endif %} btn-sm"
rel="tooltip" data-original-title="{% trans 'Show agenda' %}">
<span class="glyphicon glyphicon-facetime-video" aria-hidden="true"></span>
</a>
</span>
{% endif %}
</td>
{% endif %}
</tr>
</table>
{% if items %}
<ol class="agenda_list {% if perms.agenda.can_manage %}sortable{% endif %}">
{% recursetree items %}
<li class="draggable">
{% include "agenda/item_row.html" %}
{% if not node.is_leaf_node %}
<ol>
{{ children }}
</ol>
{% endif %}
</li>
{% endrecursetree %}
</ol>
{% else %}
<div class="overview_no_items">{% trans "No items available." %}</div>
{% endif %}
{% endblock %}

151
openslides/agenda/templates/agenda/sort.html
View File

@ -1,151 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% load mptt_tags %}
{% load staticfiles %}
{% block title %}{% trans "Agenda" %} – {{ block.super }}{% endblock %}
{% block header %}
<link type="text/css" rel="stylesheet" media="all" href="{% static 'css/agenda.css' %}" />
{% endblock %}
{% block javascript %}
<script type="text/javascript" src="{% static 'js/agenda.js' %}"></script>
{% if perms.agenda.can_manage %}
<script type="text/javascript" src="{% static 'js/jquery/jquery-ui.custom.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery/jquery.once.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery/jquery.tmpl.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery/jquery-ui-nestedSortable.js' %}"></script>
{% endif %}
{% endblock %}
{% block content %}
<form action="" method="post">{% csrf_token %}
{% if perms.agenda.can_manage %}
<div id="changed-order-message" style="display:none" class="alert alert-warning">
<button type="button" class="close" data-dismiss="alert">×</button>
{% trans "Do you want to save the changed order of agenda items?" %}<br>
<button class="btn btn-mini" type="submit">{% trans 'Yes' %}</button>
<a href="{% url 'item_overview' %}" class="btn btn-mini">{% trans 'No' %}</a>
</div>
{% endif %}
<h1>{% trans "Agenda" %}
<small class="pull-right">
{% if perms.agenda.can_manage %}
<a href="{% url 'item_new' %}" class="btn btn-mini btn-primary" rel="tooltip" data-original-title="{% trans 'New item' %}">
<i class="icon-plus icon-white"></i>
{% trans "New" %}
</a>
{% endif %}
{% if perms.core.can_manage_tags %}
<a href="{% url 'core_tag_list' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Manage tags' %}">
<i class="icon-th"></i>
<span class="optional-small"> {% trans 'Tags' %}</span>
</a>
{% endif %}
{% if perms.agenda.can_manage %}
<a href="{% url 'item_csv_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import agenda items' %}">
<i class="icon-import"></i>
{% trans "Import" %}
</a>
{% endif %}
<a href="{% url 'print_agenda' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}" target="_blank"><i class="icon-print"></i> PDF</a>
{% if perms.core.can_see_projector %}
<a href="{% url 'agenda_current_list_of_speakers_projector' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Current list of speakers' %}">
<i class="icon-bell"></i> {% trans 'List of speakers' %}</a>
{% endif %}
</small>
</h1>
<div class="row-fluid">
<div class="pull-left">
{% if perms.agenda.can_manage %}
<p><a href="{% url 'agenda_numbering' %}"
class="btn btn-mini">{% trans 'Number agenda items' %}</a>
</p>
{% endif %}
<p>
<label class="checkbox">
<input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
</label>
<small><i>{{ items|length }}
{% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
</i></small>
</p>
</div>
{% if perms.agenda.can_see_orga_items %}
{% if start and end %}
<table id="agendatime" class="table table-bordered pull-right">
<tr>
<td>{% trans "Start of event" %}:</td>
<td>{{ start|date:"DATETIME_FORMAT" }}</td>
</tr>
<tr>
<td>{% trans "Estimated end" %}:</td>
<td>{{ end|date:"DATETIME_FORMAT" }}</td>
</tr>
</table>
{% elif perms.config.can_manage %}
<a href="{% url 'config_agenda' %}" class="btn btn-mini pull-right">{% trans 'Set start time of event' %}</a>
{% endif %}
{% endif %}
</div>
<table id="menu-overview" class="table table-striped table-bordered">
<tr>
<th class="title">{% trans "Item" %}</th>
{% if perms.agenda.can_manage %}
<th class="optional">{% trans "Comment" %}</th>
{% endif %}
{% if perms.agenda.can_see_orga_items %}
<th class="duration">{% trans "Duration" %}</th>
{% endif %}
{% if perms.agenda.can_manage or perms.core.can_manage_projector %}
<th class="manage">{% trans "Actions" %}</th>
{% endif %}
</tr>
<tr class="topline{% if agenda_is_active %} activeline{% endif %}">
<td class="title">
{% trans "Agenda" %}
</td>
{% if perms.agenda.can_manage %}
<td class="optional"></td>
{% endif %}
{% if perms.agenda.can_see_orga_items %}
<td class="duration">{{ duration }} h</td>
{% endif %}
{% if perms.agenda.can_manage or perms.core.can_manage_projector %}
<td class="manage">
{% if perms.core.can_manage_projector %}
<span>
<a href="{% url 'projector_activate_slide' 'agenda' %}"
class="activate_link btn {% if agenda_is_active %}btn-primary{% endif %} btn-mini"
rel="tooltip" data-original-title="{% trans 'Show agenda' %}">
<i class="icon-facetime-video {% if agenda_is_active %}icon-white{% endif %}"></i>
</a>
</span>
{% endif %}
</td>
{% endif %}
</tr>
</table>
{% if items %}
<ol class="agenda_list {% if perms.agenda.can_manage %}sortable{% endif %}">
{% recursetree items %}
<li class="draggable">
{% include "agenda/item_row.html" %}
{% if not node.is_leaf_node %}
<ol>
{{ children }}
</ol>
{% endif %}
</li>
{% endrecursetree %}
</ol>
{% else %}
<div class="overview_no_items">{% trans "No items available." %}</div>
{% endif %}
</form>
{% endblock %}

173
openslides/agenda/templates/agenda/view.html
View File

@ -1,173 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% load tags %}
{% load staticfiles %}
{% block title %}{{ item }} – {{ block.super }}{% endblock %}
{% block header %}
<link type="text/css" rel="stylesheet" media="all" href="{% static 'css/agenda.css' %}" />
{% endblock %}
{% block javascript %}
<script type="text/javascript" src="{% static 'js/jquery/jquery-ui.custom.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/agenda.js' %}"></script>
{% endblock %}
{% block content %}
<h1>
{{ item }}
<small class="pull-right">
<a href="{% url 'item_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
{% if perms.core.can_manage_projector %}
<a href="{{ item|absolute_url:'projector' }}"
class="activate_link btn btn-mini {% if item.is_active_slide and active_type != 'list_of_speakers' %}btn-primary{% endif %}"
rel="tooltip" data-original-title="{% trans 'Show item' %}">
<i class="icon icon-facetime-video {% if item.is_active_slide and active_type != 'list_of_speakers' %}icon-white{% endif %}"></i>
</a>
{% endif %}
{% if perms.agenda.can_manage %}
<div class="btn-group">
<a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
{% trans 'More actions' %}
<span class="caret"></span>
</a>
<ul class="dropdown-menu pull-right">
<li><a href="{{ item|absolute_url:'update' }}"><i class="icon-pencil"></i> {% trans 'Edit item' %}</a></li>
<li><a href="{{ item|absolute_url:'delete' }}"><i class="icon-remove"></i> {% trans 'Delete item' %}</a></li>
</ul>
{% endif %}
</div>
</small>
</h1>
<!-- Tags -->
{% for tag in item.tags.all %}
<span class="label">{{ tag }}</span>
{% endfor %}
<!-- Title -->
<p>
{% if not item.content_object %}
{{ item.text|safe }}
{% else %}
<a href="{{ item.content_object|absolute_url }}" class="btn btn-small">{% trans item.content_type.name %}: {{ item.content_object }}</a>
{% endif %}
</p>
<!-- Comment -->
{% if perms.agenda.can_manage %}
{% if item.comment %}
<h3>{% trans "Comment" %}</h3>
<p>{{ item.comment|linebreaks }}</p>
{% endif %}
{% endif %}
<!-- List of Speakers -->
<h3>{% trans "List of speakers" %} {% if item.speaker_list_closed %}<span class="label label-important">{% trans 'closed' %}</span>{% endif %}</h3>
<p>
{% if perms.agenda.can_manage %}
{% if item.speaker_list_closed %}
<a href="{% url 'agenda_speaker_reopen' item.pk %}" class="btn btn-mini btn-danger">{% trans 'Open list' %}</a>
{% else %}
<a href="{% url 'agenda_speaker_close' item.pk %}" class="btn btn-mini btn-danger">{% trans 'Close list' %}</a>
{% endif %}
{% endif %}
{% if perms.core.can_manage_projector %}
<a href="{{ item|absolute_url:'projector_list_of_speakers' }}"
class="activate_link btn btn-mini {% if item.is_active_slide and active_type == 'list_of_speakers' %}btn-primary{% endif %}"
rel="tooltip" data-original-title="{% trans 'Show list of speakers' %}">
<i class="icon icon-bell {% if item.is_active_slide and active_type == 'list_of_speakers' %}icon-white{% endif %}"></i>
{% trans 'Show list' %}
</a>
{% endif %}
</p>
{% if perms.agenda.can_manage %}
<form id="coming_speakers_changed_form" action="{% url 'agenda_speaker_change_order' item.pk %}" method="post" style="display:none" class="alert alert-warning">{% csrf_token %}
<button type="button" class="close" data-dismiss="alert">×</button>
{% trans "Do you want to save the changed order of speakers?" %}<br>
<input id="sort_order" name="sort_order" type="hidden"></hidden>
<button class="btn btn-mini" type="submit">{% trans 'Yes' %}</button>
<a href="{% url 'item_view' item.pk %}" class="btn btn-mini">{% trans 'No' %}</a>
</form>
{% endif %}
<div id="complete_list_of_speakers" class="well">
{% for speaker_dict in list_of_speakers %}
{% if speaker_dict.first_in_group %}
{% if speaker_dict.type == 'old_speaker' %}
<b>{% trans "Last speakers" %}:</b>
<div class="btn-group" data-toggle="buttons-checkbox">
<button type="button" class="btn btn-mini" data-toggle="collapse" data-target="#old_speakers">
{% trans "Show all speakers" %}
</button>
</div>
{% elif speaker_dict.type == 'actual_speaker' %}
<b>{% trans 'Current speaker' %}:</b>
{% else %}
<b>{% trans "Next speakers" %}:</b>
{% endif %}
<ul
{% if speaker_dict.type == 'old_speaker' %}
id="old_speakers" class="collapse out"
{% elif speaker_dict.type == 'coming_speaker' %}
id="coming_speakers"
{% endif %}
>
{% endif %}
<li id="speaker_{{ speaker_dict.speaker.pk }}">
{% if speaker_dict.type == 'coming_speaker' %}
<span {% if perms.agenda.can_manage %}class="ui-icon ui-icon-arrowthick-2-n-s"{% endif %}></span>
{{ speaker_dict.prefix }}.
{% else %}
<small class="grey">[{{ speaker_dict.speaker.begin_time }}{% if speaker_dict.type == 'old_speaker' %} – {{ speaker_dict.speaker.end_time }}{% endif %}]</small>
{% endif %}
<a href="{{ speaker_dict.speaker|absolute_url }}">{{ speaker_dict.speaker }}</a>
{% if perms.agenda.can_manage %}
{% if speaker_dict.type == 'actual_speaker' %}
<a href="{% url 'agenda_speaker_end_speach' item.pk %}" class="btn btn-mini btn-danger"><i class="icon-bell icon-white"></i> {% trans 'End speach' %}</a>
{% elif speaker_dict.type == 'coming_speaker' %}
<a href="{% url 'agenda_speaker_speak' item.pk speaker_dict.speaker.user.pk %}"
class="btn btn-mini"><i class="icon-bell"></i> {% trans "Begin speach" %}</a>
{% endif %}
<a href="{{ speaker_dict.speaker|absolute_url:'delete' }}"
rel="tooltip" data-original-title="{% trans 'Delete' %}" class="btn btn-mini">
<i class="icon-remove"></i>
</a>
{% endif %}
</li>
{% if speaker_dict.last_in_group %}
</ul>
{% endif %}
{% endfor %}
<p>
{% if is_on_the_list_of_speakers %}
<a href="{% url 'agenda_speaker_delete' object.id %}" class="btn"><i class="icon icon-speaker"></i> {% trans "Remove me from the list" %}</a>
{% elif not object.speaker_list_closed and perms.agenda.can_be_speaker %}
<a href="{% url 'agenda_speaker_append' object.id %}" class="btn"><i class="icon icon-speaker"></i> {% trans "Put me on the list" %}</a>
{% endif %}
</p>
{% if perms.agenda.can_manage %}
<form action="" method="post">{% csrf_token %}
{% for field in form %}
<label>{{ field.label }}:</label>
<div class="control-group input-append {% if field.errors %}error{% endif %}">
{{ field }}
<button class="btn btn-primary tooltip-bottom" type="submit" data-original-title="{% trans 'Apply' %}"><i class="icon-ok icon-white"></i></button>
{% if perms.users.can_see and perms.users.can_manage %}
<a href="{% url 'user_create' %}" class="btn" rel="tooltip" data-original-title="{% trans 'Add new user' %}"><i class="icon-add-user"></i></a>
{% endif %}
{% if field.errors %}
<span class="help-inline">{{ field.errors }}</span>
{% endif %}
</div>
{% endfor %}
</form>
{% endif %}
</div>
{% endblock %}

62
openslides/agenda/templates/agenda/widget_item.html
View File

@ -1,62 +0,0 @@
{% extends 'core/widget.html' %}
{% load i18n %}
{% load tags %}
{% block content %}
<ul style="line-height: 180%">
<li class="{% if agenda_is_active %}activeline{% endif %}">
<a href="{% url 'projector_activate_slide' 'agenda' %}"
class="activate_link btn {% if agenda_is_active %}btn-primary{% endif %} btn-mini"
rel="tooltip" data-original-title="{% trans 'Show' %}">
<i class="icon-facetime-video {% if agenda_is_active %}icon-white{% endif %}"></i>
</a>&nbsp;
<a href="{% url 'projector_preview' 'agenda' %}"
rel="tooltip" data-original-title="{% trans 'Preview' %}" class="btn btn-mini right">
<i class="icon-search"></i>
</a>
{% trans "Agenda" %}
</li>
</ul>
<hr>
<ul style="line-height: 180%">
{% for item in items %}
<li class="{% if item.is_active_slide %}activeline{% endif %}">
<a href="{{ item|absolute_url:'projector' }}"
class="activate_link btn {% if item.is_active_slide and active_type == 'text' %}btn-primary{% endif %} btn-mini"
rel="tooltip" data-original-title="{% trans 'Show' %}">
<i class="icon-facetime-video {% if item.is_active_slide and active_type == 'text' %}icon-white{% endif %}"></i>
</a>&nbsp;
{% if perms.agenda.can_manage %}
<a href="{{ item|absolute_url:'update' }}"
rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a>
{% endif %}
<a href="{{ item|absolute_url:'projector_preview' }}"
rel="tooltip" data-original-title="{% trans 'Preview' %}" class="btn btn-mini right">
<i class="icon-search"></i>
</a>
<a href="{{ item|absolute_url:'projector_list_of_speakers' }}"
class="activate_link btn btn-mini right {% if item.is_active_slide and active_type == 'list_of_speakers' %}btn-primary{% endif %}"
rel="tooltip" data-original-title="{% trans 'Show list of speakers' %}">
<i class="icon icon-bell {% if item.is_active_slide and active_type == 'list_of_speakers' %}icon-white{% endif %}"></i>
</a>
{% if not item.is_leaf_node %}
<a href="{{ item|absolute_url:'projector_summary' }}"
class="activate_link btn btn-mini {% if item.is_active_slide and active_type == 'summary' %}btn-primary{% endif %} right"
rel="tooltip" data-original-title="{% trans 'Show summary for this item' %}">
<i class="icon-summary {% if item.is_active_slide and active_type == 'summary' %}icon-white{% endif %}"></i>
</a>
{% endif %}
{% for p in item.get_ancestors %}
<span class="indentation"></span>
{% endfor %}
<a href="{{ item|absolute_url }}">{% if item.type == item.ORGANIZATIONAL_ITEM %}<i>[{% endif %}{{ item }}{% if item.type == item.ORGANIZATIONAL_ITEM %}]</i>{% endif %}</a>
{{ item.get_title_supplement|safe }}
</li>
{% empty %}
<li>{% trans 'No items available.' %}</li>
{% endfor %}
</ul>
{% endblock %}

16
openslides/agenda/templates/agenda/widget_list_of_speakers.html
View File

@ -1,16 +0,0 @@
{% extends 'core/widget.html' %}
{% load i18n %}
{% block content %}
{% if perms.agenda.can_be_speaker %}
<p><a href="{% url 'agenda_add_to_current_list_of_speakers' %}" class="btn"><i class="icon icon-speaker"></i> {% trans 'Put me on the current list of speakers' %}</a></p>
{% endif %}
{% if perms.agenda.can_manage %}
<p>
<a href="{% url 'agenda_next_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'Next speaker' %}</a>
<a href="{% url 'agenda_end_speach_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'End speach' %}</a>
</p>
{% endif %}
<small><p class="text-right"><a href="{% url 'agenda_current_list_of_speakers' %}">{% trans 'Go to current list of speakers' %} ...</a></p></small>
{% endblock %}

91
openslides/agenda/urls.py
View File

@ -4,97 +4,14 @@ from . import views
urlpatterns = patterns(
'',
url(r'^$',
views.Overview.as_view(),
name='item_overview'), # TODO: Rename this to item_list
url(r'^(?P<pk>\d+)/$',
views.AgendaItemView.as_view(),
name='item_view'),
url(r'^(?P<pk>\d+)/close/$',
views.SetClosed.as_view(),
{'closed': True},
name='item_close'),
url(r'^(?P<pk>\d+)/open/$',
views.SetClosed.as_view(),
{'closed': False},
name='item_open'),
url(r'^(?P<pk>\d+)/edit/$',
views.ItemUpdate.as_view(),
name='item_edit'),
url(r'^new/$',
views.ItemCreate.as_view(),
name='item_new'),
url(r'^(?P<pk>\d+)/del/$',
views.ItemDelete.as_view(),
name='item_delete'),
# PDF
url(r'^print/$',
views.AgendaPDF.as_view(),
name='print_agenda'),
url(r'^numbering/$',
views.AgendaNumberingView.as_view(),
name='agenda_numbering'),
# List of speakers
url(r'^(?P<pk>\d+)/speaker/$',
views.SpeakerAppendView.as_view(),
name='agenda_speaker_append'),
url(r'^(?P<pk>\d+)/speaker/close/$',
views.SpeakerListCloseView.as_view(),
name='agenda_speaker_close'),
url(r'^(?P<pk>\d+)/speaker/reopen/$',
views.SpeakerListCloseView.as_view(reopen=True),
name='agenda_speaker_reopen'),
url(r'^(?P<pk>\d+)/speaker/del/$',
views.SpeakerDeleteView.as_view(),
name='agenda_speaker_delete'),
url(r'^(?P<pk>\d+)/speaker/(?P<speaker>\d+)/del/$',
views.SpeakerDeleteView.as_view(),
name='agenda_speaker_delete'),
url(r'^(?P<pk>\d+)/speaker/(?P<user_id>[^/]+)/speak/$',
views.SpeakerSpeakView.as_view(),
name='agenda_speaker_speak'),
url(r'^(?P<pk>\d+)/speaker/end_speach/$',
views.SpeakerEndSpeachView.as_view(),
name='agenda_speaker_end_speach'),
url(r'^(?P<pk>\d+)/speaker/change_order/$',
views.SpeakerChangeOrderView.as_view(),
name='agenda_speaker_change_order'),
url(r'^list_of_speakers/$',
views.CurrentListOfSpeakersView.as_view(),
name='agenda_current_list_of_speakers'),
url(r'^list_of_speakers/add/$',
views.CurrentListOfSpeakersView.as_view(set_speaker=True),
name='agenda_add_to_current_list_of_speakers'),
url(r'^list_of_speakers/next/$',
views.CurrentListOfSpeakersView.as_view(next_speaker=True),
name='agenda_next_on_current_list_of_speakers'),
url(r'^list_of_speakers/end_speach/$',
views.CurrentListOfSpeakersView.as_view(end_speach=True),
name='agenda_end_speach_on_current_list_of_speakers'),
name='agenda_pdf'),
# TODO: remove it after implement projector rest api
url(r'^list_of_speakers/projector/$',
views.CurrentListOfSpeakersProjectorView.as_view(),
name='agenda_current_list_of_speakers_projector'),
url(r'^csv_import/$',
views.ItemCSVImportView.as_view(),
name='item_csv_import'))
)

609
openslides/agenda/views.py
View File

@ -2,15 +2,10 @@
from cgi import escape
from collections import defaultdict
from datetime import datetime, timedelta
from json import dumps
from django.contrib import messages
from django.contrib.contenttypes.models import ContentType
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.core.urlresolvers import reverse
from django.db import transaction, IntegrityError
from django.db.models import Model
from django.template.loader import render_to_string
from django.utils.datastructures import SortedDict
from django.utils.safestring import mark_safe
@ -21,304 +16,21 @@ from reportlab.platypus import Paragraph
from openslides.config.api import config
from openslides.projector.api import (
get_active_object,
get_active_slide,
get_projector_overlays_js,
get_overlays)
from openslides.utils.exceptions import OpenSlidesError
from openslides.utils.pdf import stylesheet
from openslides.utils.rest_api import ModelViewSet, list_route, Response
from openslides.utils.utils import html_strong
from openslides.utils.views import (
AjaxMixin,
CreateView,
CSVImportView,
DeleteView,
FormView,
PDFView,
QuestionView,
RedirectView,
SingleObjectMixin,
TemplateView,
UpdateView)
TemplateView)
from .csv_import import import_agenda_items
from .forms import AppendSpeakerForm, ItemForm, ItemOrderForm, RelatedItemForm
from .models import Item, Speaker
from .models import Item
from .serializers import ItemSerializer
class Overview(TemplateView):
"""
Show all agenda items, and update their range via post.
"""
required_permission = 'agenda.can_see'
template_name = 'agenda/overview.html'
def get_context_data(self, **kwargs):
context = super(Overview, self).get_context_data(**kwargs)
if self.request.user.has_perm('agenda.can_see_orga_items'):
items = Item.objects.all()
else:
items = Item.objects.filter(type__exact=Item.AGENDA_ITEM)
# Save the items as a list (not a queryset). This is important,
# because in other case, django-mtpp reloads the items in the
# template. But we add some attributes (in this function), which are
# not in the database and would be lost if the items were reloaded.
# TODO: Try to remove this line in later versions of django-mptt
items = list(items)
start = config['agenda_start_event_date_time']
if start is None or len(start) == 0:
start = None
else:
start = datetime.strptime(start, '%d.%m.%Y %H:%M')
duration = timedelta()
for item in items:
if item.duration is not None and len(item.duration) > 0:
if ':' in item.duration:
duration_list = item.duration.split(':')
duration += timedelta(hours=int(duration_list[0]),
minutes=int(duration_list[1]))
else:
hours = int(item.duration) / 60
minutes = int(item.duration) - (60 * hours)
duration += timedelta(hours=hours,
minutes=minutes)
if minutes < 10:
minutes = "%s%s" % (0, minutes)
item.duration = "%s:%s" % (hours, minutes)
if start is not None:
item.tooltip = start + duration
if start is None:
end = None
else:
end = start + duration
duration = u'%d:%02d' % (
(duration.days * 24 + duration.seconds / 3600.0),
(duration.seconds / 60.0 % 60))
active_slide = get_active_slide()
if active_slide['callback'] == 'agenda':
agenda_is_active = active_slide.get('pk', 'agenda') == 'agenda'
active_type = active_slide.get('type', 'text')
else:
agenda_is_active = None
active_type = None
context.update({
'items': items,
'agenda_is_active': agenda_is_active,
'duration': duration,
'start': start,
'end': end,
'active_type': active_type})
return context
def post(self, request, *args, **kwargs):
if not request.user.has_perm('agenda.can_manage'):
messages.error(
request,
_('You are not authorized to manage the agenda.'))
context = self.get_context_data(**kwargs)
return self.render_to_response(context)
# Use transaction.atomic() to change all items at once.
# Raise IntegrityError if some data is invalid.
# In this case, django does not commit anything, else, the mptt-tree is
# rebuild.
try:
with transaction.atomic():
for item in Item.objects.all():
form = ItemOrderForm(request.POST, prefix="i%d" % item.id)
if form.is_valid():
try:
parent = Item.objects.get(id=form.cleaned_data['parent'])
except Item.DoesNotExist:
parent = None
else:
if item.type == item.AGENDA_ITEM and parent.type == item.ORGANIZATIONAL_ITEM:
messages.error(
request, _('Agenda items can not be child elements of an organizational item.'))
raise IntegrityError
item.parent = parent
item.weight = form.cleaned_data['weight']
Model.save(item)
else:
messages.error(
request, _('Errors when reordering of the agenda'))
raise IntegrityError
except IntegrityError:
pass
else:
Item.objects.rebuild()
# TODO: assure, that it is a valid tree
context = self.get_context_data(**kwargs)
return self.render_to_response(context)
class AgendaItemView(SingleObjectMixin, FormView):
"""
Show an agenda item.
"""
# TODO: use 'SingleObjectTemplateResponseMixin' to choose the right template name
template_name = 'agenda/view.html'
model = Item
context_object_name = 'item'
form_class = AppendSpeakerForm
def check_permission(self, request, *args, **kwargs):
"""
Checks if the user has the required permission.
"""
if self.get_object().type == Item.ORGANIZATIONAL_ITEM:
check_permission = request.user.has_perm('agenda.can_see_orga_items')
else:
check_permission = request.user.has_perm('agenda.can_see')
return check_permission
def get_context_data(self, **kwargs):
list_of_speakers = self.get_object().get_list_of_speakers()
active_slide = get_active_slide()
active_type = active_slide.get('type', None)
kwargs.update({
'object': self.get_object(),
'list_of_speakers': list_of_speakers,
'is_on_the_list_of_speakers': Speaker.objects.filter(
item=self.get_object(), begin_time=None, user=self.request.user).exists(),
'active_type': active_type,
})
return super(AgendaItemView, self).get_context_data(**kwargs)
def form_valid(self, form):
Speaker.objects.add(user=form.cleaned_data['speaker'], item=self.get_object())
return self.render_to_response(self.get_context_data(form=form))
def get_form_kwargs(self):
kwargs = super(AgendaItemView, self).get_form_kwargs()
kwargs['item'] = self.get_object()
return kwargs
class SetClosed(SingleObjectMixin, RedirectView):
"""
Close or open an item.
"""
required_permission = 'agenda.can_manage'
allow_ajax = True
url_name = 'item_overview'
model = Item
def get_ajax_context(self, **kwargs):
closed = self.kwargs['closed']
if closed:
link = reverse('item_open', args=[self.get_object().pk])
else:
link = reverse('item_close', args=[self.get_object().pk])
return super(SetClosed, self).get_ajax_context(closed=closed, link=link)
def pre_redirect(self, request, *args, **kwargs):
closed = kwargs['closed']
# TODO: use update here
self.get_object().closed = closed
self.get_object().save()
return super(SetClosed, self).pre_redirect(request, *args, **kwargs)
def get_url_name_args(self):
return []
class ItemUpdate(UpdateView):
"""
Update an existing item.
"""
required_permission = 'agenda.can_manage'
template_name = 'agenda/edit.html'
model = Item
context_object_name = 'item'
success_url_name = 'item_overview'
url_name_args = []
def get_form_class(self):
if self.get_object().content_object:
form = RelatedItemForm
else:
form = ItemForm
return form
class ItemCreate(CreateView):
"""
Create a new item.
"""
required_permission = 'agenda.can_manage'
template_name = 'agenda/edit.html'
model = Item
context_object_name = 'item'
form_class = ItemForm
success_url_name = 'item_overview'
url_name_args = []
class ItemDelete(DeleteView):
"""
Delete an item.
"""
required_permission = 'agenda.can_manage'
model = Item
question_url_name = 'item_overview'
success_url_name = 'item_overview'
url_name_args = []
def get_answer_options(self):
"""
Returns the possible answers to the delete view.
'all' is a possible answer, when the item has children.
"""
# Cache the result in the request, so when the children are deleted, the
# result does not change
try:
options = self.item_delete_answer_options
except AttributeError:
if self.get_object().children.exists():
options = [('all', _("Yes, with all child items."))] + self.answer_options
else:
options = self.answer_options
self.item_delete_answer_options = options
return options
def on_clicked_yes(self):
"""
Deletes the item but not its children.
"""
self.get_object().delete(with_children=False)
def on_clicked_all(self):
"""
Deletes the item and its children.
"""
self.get_object().delete(with_children=True)
def get_final_message(self):
"""
Prints the success message to the user.
"""
# OpenSlidesError (invalid answer) should never be raised here because
# this method should only be called if the answer is 'yes' or 'all'.
if self.get_answer() == 'yes':
message = _('Item %s was successfully deleted.') % html_strong(self.get_object())
else:
message = _('Item %s and its children were successfully deleted.') % html_strong(self.get_object())
return message
class CreateRelatedAgendaItemView(SingleObjectMixin, RedirectView):
"""
View to create and agenda item for a related object.
@ -337,22 +49,6 @@ class CreateRelatedAgendaItemView(SingleObjectMixin, RedirectView):
self.item = Item.objects.create(content_object=self.get_object())
class AgendaNumberingView(QuestionView):
required_permission = 'agenda.can_manage'
question_url_name = 'item_overview'
url_name = 'item_overview'
question_message = ugettext_lazy('Do you really want to generate agenda numbering? Manually added item numbers will be overwritten!')
url_name_args = []
def on_clicked_yes(self):
for item in Item.objects.all():
item.item_number = item.calc_item_no()
item.save()
def get_final_message(self):
return ugettext_lazy('The agenda has been numbered.')
class AgendaPDF(PDFView):
"""
Create a full agenda-PDF.
@ -373,297 +69,6 @@ class AgendaPDF(PDFView):
story.append(Paragraph(escape(item.get_title()), stylesheet['Item']))
class SpeakerAppendView(SingleObjectMixin, RedirectView):
"""
Set the request.user to the speaker list.
"""
required_permission = 'agenda.can_be_speaker'
url_name = 'item_view'
model = Item
def pre_redirect(self, request, *args, **kwargs):
if self.get_object().speaker_list_closed:
messages.error(request, _('The list of speakers is closed.'))
else:
try:
Speaker.objects.add(item=self.get_object(), user=request.user)
except OpenSlidesError as e:
messages.error(request, e)
else:
messages.success(request, _('You were successfully added to the list of speakers.'))
class SpeakerDeleteView(DeleteView):
"""
Delete the request.user or a specific user from the speaker list.
"""
success_url_name = 'item_view'
question_url_name = 'item_view'
def check_permission(self, request, *args, **kwargs):
"""
Check the permission to delete a speaker.
"""
if 'speaker' in kwargs:
return request.user.has_perm('agenda.can_manage')
else:
# Any user who is on the list of speakers can delete himself from the list.
return True
def get(self, *args, **kwargs):
if self.get_object() is None:
return super(RedirectView, self).get(*args, **kwargs)
else:
return super().get(*args, **kwargs)
def get_object(self):
"""
Returns the speaker object.
If 'speaker' is in kwargs, this speaker object is returnd. Else, a speaker
object with the request.user as speaker.
"""
try:
speaker = self._object
except AttributeError:
speaker_pk = self.kwargs.get('speaker')
if speaker_pk is not None:
queryset = Speaker.objects.filter(pk=speaker_pk)
else:
queryset = Speaker.objects.filter(
item=self.kwargs['pk'], user=self.request.user).exclude(weight=None)
try:
speaker = queryset.get()
except Speaker.DoesNotExist:
speaker = None
if speaker_pk is not None:
messages.error(self.request, _('You are not on the list of speakers.'))
self._object = speaker
return speaker
def get_url_name_args(self):
return [self.kwargs['pk']]
def get_question(self):
if 'speaker' in self.kwargs:
return super(SpeakerDeleteView, self).get_question()
else:
return _('Do you really want to remove yourself from the list of speakers?')
class SpeakerSpeakView(SingleObjectMixin, RedirectView):
"""
Mark the speaking user.
"""
required_permission = 'agenda.can_manage'
url_name = 'item_view'
model = Item
def pre_redirect(self, *args, **kwargs):
try:
speaker = Speaker.objects.filter(
user=kwargs['user_id'],
item=self.get_object(),
begin_time=None).get()
except Speaker.DoesNotExist: # TODO: Check the MultipleObjectsReturned error here?
messages.error(
self.request,
_('%(user)s is not on the list of %(item)s.')
% {'user': kwargs['user_id'], 'item': self.get_object()})
else:
speaker.begin_speach()
def get_url_name_args(self):
return [self.get_object().pk]
class SpeakerEndSpeachView(SingleObjectMixin, RedirectView):
"""
The speach of the actual speaker is finished.
"""
required_permission = 'agenda.can_manage'
url_name = 'item_view'
model = Item
def pre_redirect(self, *args, **kwargs):
try:
speaker = Speaker.objects.filter(
item=self.get_object(),
end_time=None).exclude(begin_time=None).get()
except Speaker.DoesNotExist:
messages.error(
self.request,
_('There is no one speaking at the moment according to %(item)s.')
% {'item': self.get_object()})
else:
speaker.end_speach()
def get_url_name_args(self):
return [self.get_object().pk]
class SpeakerListCloseView(SingleObjectMixin, RedirectView):
"""
View to close and reopen a list of speakers.
"""
required_permission = 'agenda.can_manage'
model = Item
reopen = False
url_name = 'item_view'
def pre_redirect(self, *args, **kwargs):
self.get_object().speaker_list_closed = not self.reopen
self.get_object().save()
def get_url_name_args(self):
return [self.get_object().pk]
class SpeakerChangeOrderView(SingleObjectMixin, RedirectView):
"""
Change the order of the speakers.
Has to be called as post-request with the new order of the speaker ids.
"""
required_permission = 'agenda.can_manage'
model = Item
url_name = 'item_view'
def pre_post_redirect(self, request, *args, **kwargs):
"""
Reorder the list of speaker.
Take the string 'sort_order' from the post-data, and use this order.
"""
try:
with transaction.atomic():
for (counter, speaker) in enumerate(self.request.POST['sort_order'].split(',')):
try:
speaker_pk = int(speaker.split('_')[1])
except IndexError:
raise IntegrityError
try:
speaker = Speaker.objects.filter(item=self.get_object()).get(pk=speaker_pk)
except Speaker.DoesNotExist:
raise IntegrityError
speaker.weight = counter + 1
speaker.save()
except IntegrityError:
messages.error(request, _('Could not change order. Invalid data.'))
def get_url_name_args(self):
return [self.get_object().pk]
class CurrentListOfSpeakersView(RedirectView):
"""
Redirect to the current list of speakers and set the request.user on it,
begins speach of the next speaker or ends the speach of the current speaker.
"""
set_speaker = False
next_speaker = False
end_speach = False
def get_item(self):
"""
Returns the current Item, or None, if the current Slide is not an Agenda Item.
"""
slide = get_active_object()
if slide is None or isinstance(slide, Item):
# No Slide or an agenda item is active
item = slide
else:
# A related Item is active
try:
item = Item.objects.filter(
content_type=ContentType.objects.get_for_model(slide),
object_id=slide.pk)[0]
except IndexError:
item = None
return item
def get_redirect_url(self):
"""
Returns the URL to the item_view if:
* the current slide is an item,
* the user has the permission to see the item,
* the user who wants to be a speaker has this permission and
* the list of speakers of the item is not closed,
in other case, it returns the URL to the dashboard.
This method also adds the request.user to the list of speakers if he
has the right permissions and the list is not closed.
This method also begins the speach of the next speaker if the flag
next_speaker is given.
This method also ends the speach of the current speaker if the flag
end_speach is given.
"""
item = self.get_item()
request = self.request
if item is None:
messages.error(request, _(
'There is no list of speakers for the current slide. '
'Please choose the agenda item manually from the agenda.'))
return reverse('core_dashboard')
if self.set_speaker:
if item.speaker_list_closed:
messages.error(request, _('The list of speakers is closed.'))
reverse_to_dashboard = True
else:
if self.request.user.has_perm('agenda.can_be_speaker'):
try:
Speaker.objects.add(self.request.user, item)
except OpenSlidesError as e:
messages.error(request, e)
else:
messages.success(request, _('You were successfully added to the list of speakers.'))
finally:
reverse_to_dashboard = False
else:
messages.error(request, _('You can not put yourself on the list of speakers.'))
reverse_to_dashboard = True
else:
reverse_to_dashboard = False
if self.next_speaker:
next_speaker_object = item.get_next_speaker()
if next_speaker_object:
next_speaker_object.begin_speach()
messages.success(request, _('%s is now speaking.') % next_speaker_object)
else:
messages.error(request, _('The list of speakers is empty.'))
if not self.set_speaker:
reverse_to_dashboard = True
if self.end_speach:
try:
current_speaker = item.speaker_set.filter(end_time=None).exclude(begin_time=None).get()
except Speaker.DoesNotExist:
messages.error(request, _('There is no one speaking at the moment.'))
else:
current_speaker.end_speach()
messages.success(request, _('%s is now finished.') % current_speaker)
reverse_to_dashboard = True
if item.type == Item.ORGANIZATIONAL_ITEM:
if reverse_to_dashboard or not self.request.user.has_perm('agenda.can_see_orga_items'):
return reverse('core_dashboard')
else:
return reverse('item_view', args=[item.pk])
else:
if reverse_to_dashboard or not self.request.user.has_perm('agenda.can_see'):
return reverse('core_dashboard')
else:
return reverse('item_view', args=[item.pk])
class CurrentListOfSpeakersProjectorView(AjaxMixin, TemplateView):
"""
View with the current list of speakers depending on the active slide.
@ -766,16 +171,6 @@ class CurrentListOfSpeakersProjectorView(AjaxMixin, TemplateView):
**context)
class ItemCSVImportView(CSVImportView):
"""
Imports agenda items from an uploaded csv file.
"""
import_function = staticmethod(import_agenda_items)
required_permission = 'agenda.can_manage'
success_url_name = 'item_overview'
template_name = 'agenda/item_form_csv_import.html'
class ItemViewSet(ModelViewSet):
"""
API endpoint to list, retrieve, create, update and destroy agenda items.

2
openslides/assignments/main_menu.py
View File

@ -10,5 +10,5 @@ class AssignmentMainMenuEntry(MainMenuEntry):
verbose_name = ugettext_lazy('Elections')
required_permission = 'assignments.can_see'
default_weight = 40
pattern_name = 'assignment_list'
pattern_name = '/assignments' # TODO: use generic solution, see issue #1469
icon_css_class = 'icon-assignment'

BIN
openslides/assignments/static/img/glyphicons_041_charts.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
openslides/assignments/static/img/glyphicons_041_charts_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

67
openslides/assignments/static/js/assignment.js
View File

@ -1,67 +0,0 @@
/*
* JavaScript functions for assignment.
*
*/
$(function() {
$('a.elected').parent().parent().children('td').addClass('elected');
$('.election_link').click(function(event) {
event.preventDefault();
line = $(this);
$.ajax({
type: 'GET',
url: line.attr('href'),
dataType: 'json',
success: function(data) {
if (line.hasClass('elected') && !data.elected) {
line.removeClass('elected')
line.parent().parent().children('td').removeClass('elected')
} else if (!line.hasClass('elected') && data.elected) {
line.addClass('elected')
line.parent().parent().children('td').addClass('elected')
}
line.attr('href', data.link);
}
});
});
$('.close_link').click(function(event) {
event.preventDefault();
slide = $(this);
$.ajax({
type: 'GET',
url: slide.attr('href'),
dataType: 'json',
success: function(data) {
if (data.closed) {
newclass = 'closed';
} else {
newclass = 'open';
}
slide.removeClass('closed open').addClass(newclass);
slide.attr('href', data.link);
}
});
});
// change publish status of ballot
$('.publish_link').click(function(event) {
event.preventDefault();
var link = $(this);
$.ajax({
type: 'GET',
url: $(this).attr('href'),
dataType: 'json',
success: function(data) {
if (data.published) {
newclass = 'icon-checked-new_white';
link.addClass('btn-primary');
} else {
newclass = 'icon-unchecked-new';
link.removeClass('btn-primary');
}
link.children('i').removeClass('icon-checked-new_white icon-unchecked-new').addClass(newclass);
link.attr('href', data.link);
}
});
});
});

50
openslides/assignments/static/js/assignments/assignments.js
View File

@ -3,7 +3,7 @@ angular.module('OpenSlidesApp.assignments', [])
.config(function($stateProvider) {
$stateProvider
.state('assignments', {
url: '/assignment',
url: '/assignments',
abstract: true,
template: "<ui-view/>",
})
@ -15,6 +15,9 @@ angular.module('OpenSlidesApp.assignments', [])
resolve: {
assignments: function(Assignment) {
return Assignment.findAll();
},
phases: function($http) {
return $http({ 'method': 'OPTIONS', 'url': '/rest/assignments/assignment/' });
}
}
})
@ -41,29 +44,58 @@ angular.module('OpenSlidesApp.assignments', [])
});
})
.controller('AssignmentListCtrl', function($scope, Assignment) {
.controller('AssignmentListCtrl', function($scope, Assignment, phases) {
Assignment.bindAll({}, $scope, 'assignments');
// get all item types via OPTIONS request
$scope.phases = phases.data.actions.POST.phase.choices;
// 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;
};
// delete assignment
$scope.delete = function (assignment) {
//TODO: add confirm message
Assignment.destroy(assignment.id).then(
function(success) {
//TODO: success message
}
);
};
})
.controller('AssignmentDetailCtrl', function($scope, Assignment, assignment) {
Assignment.bindOne(assignment.id, $scope, 'assignment')
})
.controller('AssignmentCreateCtrl', function($scope, Assignment) {
.controller('AssignmentCreateCtrl', function($scope, $state, Assignment) {
$scope.assignment = {};
$scope.save = function(assignment) {
assignment.open_posts = 1;
assignment.tags = []; // TODO: the rest_api should do this
Assignment.create(assignment);
// TODO: redirect to list-view
Assignment.create(assignment).then(
function(success) {
$state.go('assignments.assignment.list');
}
);
};
})
.controller('AssignmentUpdateCtrl', function($scope, Assignment, assignment) {
.controller('AssignmentUpdateCtrl', function($scope, $state, Assignment, assignment) {
$scope.assignment = assignment; // do not use .binOne(...) so autoupdate is not activated
$scope.save = function (assignment) {
Assignment.save(assignment);
// TODO: redirect to list-view
Assignment.save(assignment).then(
function(success) {
$state.go('assignments.assignment.list');
}
);
};
});

29
openslides/assignments/static/templates/assignments/assignment-detail.html
View File

@ -1,2 +1,31 @@
<h1>{{ assignment.title }}</h1>
<div id="submenu">
<a ui-sref="assignments.assignment.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
<a ui-sref="assignments_single_pdf({pk: assignment.id})" target="_blank" class="btn btn-default btn-sm">
<i class="fa fa-file-pdf-o fa-lg"></i>
<translate>PDF</translate>
</a>
<a href="#TODO" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
title="{{ 'Show' | translate }}">
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="assignments.assignment.detail.update({id: assignment.id })" os-perms="assignments.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
</div>
<h3 translate>Description</h3>
{{ assignment.description }}
<h3 translate>Candidates</h3>
<!-- TODO -->
<h3 translate>Election result</h3>
<!-- TODO -->

35
openslides/assignments/static/templates/assignments/assignment-form.html
View File

@ -1,8 +1,31 @@
<h1 ng-if="assignment.id">{{ assignment.title }}</h1>
<h1 ng-if="!assignment.id">Neue Assignment</h1>
<h1 ng-if="assignment.id" translate>Edit election</h1>
<h1 ng-if="!assignment.id" translate>New election</h1>
<form>
Titel: <input type="text" ng-model="assignment.title"><br>
Beschreibung:<br> <textarea ng-model="assignment.description"></textarea><br>
<input type="submit" ng-click="save(assignment)" value="Save" />
<div id="submenu">
<a ui-sref="assignments.assignment.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<form name="assignmentForm">
<div class="form-group">
<label for="inputTitle" translate>Title</label>
<input type="text" ng-model="assignment.title" class="form-control" name="inputTitle" required>
</div>
<div class="form-group">
<label for="textareaDesciption" translate>Description</label>
<textarea ng-model="assignment.description" class="form-control" name="textareaDescription" />
</div>
<div class="form-group">
<label for="inputPosts" translate>Number of members to be elected</label>
<input type="number" ng-model="assignment.open_posts" class="form-control" name="inputPosts" required>
</div>
<button type="submit" ng-click="save(assignment)" class="btn btn-primary" translate>
Save
</button>
<button ui-sref="assignments.assignment.list" class="btn btn-default" translate>
Cancel
</button>
</form>

83
openslides/assignments/static/templates/assignments/assignment-list.html
View File

@ -1,7 +1,76 @@
<ul>
<li ng-repeat="assignment in assignments">
<a ui-sref="assignments.assignment.detail({id: assignment.id })">{{ assignment.title }}</a>
<a ui-sref="assignments.assignment.detail.update({id: assignment.id })">Bearbeiten</a>
</li>
</ul>
<a ui-sref="assignments.assignment.create">Neu</a>
<h1 translate>Elections</h1>
<div id="submenu">
<a ui-sref="assignments.assignment.create" os-perms="assignments.can_manage" class="btn btn-primary btn-sm">
<i class="fa fa-plus fa-lg"></i>
<translate>New</translate>
</a>
<a ui-sref="core.tag.list" os-perms="core.can_manage_tags" class="btn btn-default btn-sm">
<i class="fa fa-tags fa-lg"></i>
<translate>Tags</translate>
</a>
<a ui-sref="assignments_pdf" target="_blank" class="btn btn-default btn-sm">
<i class="fa fa-file-pdf-o fa-lg"></i>
<translate>PDF</translate>
</a>
</div>
<div class="row form-group">
<div class="col-sm-8">
<!-- TODO: select filter for phases -->
</div>
<div class="col-sm-4">
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
placeholder="{{ 'Filter' | translate}}">
</div>
</div>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th ng-click="toggleSort('title')" class="sortable">
<translate>Title</translate>
<i class="pull-right fa" ng-show="sortColumn === 'title' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('open_posts')" class="sortable">
<translate>Posts</translate>
<i class="pull-right fa" ng-show="sortColumn === 'open_posts' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('phase')" class="sortable">
<translate>State</translate>
<i class="pull-right fa" ng-show="sortColumn === 'phase' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th os-perms="assignments.can_manage core.can_manage_projector" class="minimum">
<translate>Actions</translate>
<tbody>
<tr ng-repeat="assignment in assignments | filter: filter.search |
orderBy: sortColumn:reverse">
<td><a ui-sref="assignments.assignment.detail({id: assignment.id})">{{ assignment.title }}</a>
<td class="optional">{{ assignment.open_posts }}
<td class="optional">
<span class="label" ng-class="{'label-primary': assignment.phase == 0,
'label-warning': assignment.phase == 1,
'label-success': assignment.phase == 2 }">
{{ phases[assignment.phase].display_name }}
</span>
<td os-perms="assignments.can_manage core.can_manage_projector" class="nobr">
<!-- projector, TODO: add link to activate slide -->
<a href="#TODO" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
title="{{ 'Show' | translate }}">
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="assignments.assignment.detail.update({id: assignment.id })" os-perms="assignments.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
<!-- delete -->
<a ng-click="delete(assignment)" os-perms="assignments.can_manage" class="btn btn-danger btn-sm"
title="{{ 'Delete' | translate }}">
<i class="fa fa-trash-o"></i>
</a>
</table>

2
openslides/assignments/templates/assignments/assignment_detail.html
View File

@ -22,7 +22,7 @@
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="optional-small"> {% trans "Back to overview" %}</span>
</a>
<a href="{% url 'assignment_pdf' assignment.id %}" class="btn btn-default btn-sm"
<a href="{% url 'assignments_single_pdf' assignment.id %}" class="btn btn-default btn-sm"
rel="tooltip" data-original-title="{% trans 'Print election as PDF' %}" target="_blank">
<span class="glyphicon glyphicon-print" aria-hidden="true"></span>
<span class="optional-small"> PDF</span>

47
openslides/assignments/templates/assignments/assignment_form.html
View File

@ -1,47 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% load tags %}
{% block title %}
{% if assignment %}
{% trans "Edit election" %}
{% else %}
{% trans "New election" %}
{% endif %}
– {{ block.super }}
{% endblock %}
{% block content %}
<h1>
{% if assignment %}
{% trans "Edit election" %}
{% else %}
{% trans "New election" %}
{% endif %}
<small class="pull-right">
{% if assignment %}
<a href="{{ assignment|absolute_url }}" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="optional-small"> {% trans "Back to election" %}</span>
</a>
{% else %}
<a href="{% url 'assignment_list' %}" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="optional-small"> {% trans "Back to overview" %}</span>
</a>
{% endif %}
</small>
</h1>
<form action="" method="post">{% csrf_token %}
{% include "form.html" %}
<p>
{% include "formbuttons_saveapply.html" %}
<a href='{% url 'assignment_list' %}' class="btn btn-default btn-sm">
{% trans 'Cancel' %}
</a>
</p>
<small>* {% trans "required" %}</small>
</form>
{% endblock %}

94
openslides/assignments/templates/assignments/assignment_list.html
View File

@ -1,94 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% load staticfiles %}
{% load tags %}
{% block title %}{% trans "Elections" %} – {{ block.super }}{% endblock %}
{% block content %}
<h1>{% trans "Elections" %}
<small class="pull-right">
{% if perms.assignments.can_manage %}
<a href="{% url 'assignment_create' %}" class="btn btn-primary btn-sm"
rel="tooltip" data-original-title="{% trans 'New election' %}">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
{% trans 'New' %}
</a>
{% endif %}
{% if perms.core.can_manage_tags %}
<a href="{% url 'core_tag_list' %}" class="btn btn-default btn-sm"
rel="tooltip" data-original-title="{% trans 'Manage tags' %}">
<span class="glyphicon glyphicon-tags" aria-hidden="true"></span>
<span class="optional-small"> {% trans 'Tags' %}</span>
</a>
{% endif %}
{% if perms.assignments.can_see %}
<a href="{% url 'assignment_list_pdf' %}" class="btn btn-default btn-sm"
rel="tooltip" data-original-title="{% trans 'Print all elections as PDF' %}" target="_blank">
<span class="glyphicon glyphicon-print" aria-hidden="true"></span>
<span class="optional-small"> PDF</span>
</a>
{% endif %}
</small>
</h1>
<table id="dataTable" class="table table-striped table-bordered">
<thead>
<tr>
<th>{% trans "Election" %}</th>
<th class="optional">{% trans "Candidates" %}</th>
<th>{% trans "Phase" %}</th>
{% if perms.assignments.can_manage or perms.core.can_manage_projector %}
<th class="mini_width">{% trans "Actions" %}</th>
{% endif %}
</tr>
</thead>
{% for object in object_list %}
<tr class="{% if object.is_active_slide %}activeline{% endif %}">
<td><a href="{{ object|absolute_url:'detail' }}">{{ object }}</a>
{% for tag in object.tags.all %}
<span class="optional label">{{ tag }}</span>
{% endfor %}
</td>
<td class="optional">
<!-- posts -->
{% trans "Posts" context "Number of searched candidates for an election" %}:
<span class="badge badge-info">{{ object.open_posts }}</span>
<!-- candidates -->
{% if object.phase != object.PHASE_FINISHED %}
| {% trans "Candidates" %}: <span class="badge badge-warning">{{ object.candidates.count }}</span>
{% endif %}
<!-- elected candidates -->
| {% trans "Elected" %}: <span class="badge badge-success">{{ object.elected.count }}</span>
</td>
<td><span class="label label-info">{{ object.get_phase_display }}</span></td>
{% if perms.assignments.can_manage or perms.core.can_manage_projector %}
<td>
<span style="width: 1px; white-space: nowrap;">
{% if perms.core.can_manage_projector %}
<a href="{{ object|absolute_url:'projector' }}"
class="activate_link btn btn-default {% if object.is_active_slide %}btn-primary{% endif %} btn-sm"
rel="tooltip" data-original-title="{% trans 'Show election' %}">
<span class="glyphicon glyphicon-facetime-video" aria-hidden="true"></span>
</a>
{% endif %}
{% if perms.assignments.can_manage %}
<a href="{{ object|absolute_url:'update' }}"
rel="tooltip" data-original-title="{% trans 'Edit' %}"
class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
</a>
<a href="{% url 'assignment_delete' object.id %}"
rel="tooltip" data-original-title="{% trans 'Delete' %}"
class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
</a>
{% endif %}
</span>
</td>
{% endif %}
</tr>
{% endfor %}
</table>
{% endblock %}

30
openslides/assignments/templates/assignments/widget_assignment.html
View File

@ -1,30 +0,0 @@
{% extends 'core/widget.html' %}
{% load i18n %}
{% load tags %}
{% block content %}
<ul style="line-height: 180%">
{% for assignment in assignments %}
<li class="{% if assignment.is_active_slide %}activeline{% endif %}">
<a href="{{ assignment|absolute_url:'projector' }}" class="activate_link btn {% if assignment.is_active_slide %}btn-primary{% endif %} btn-mini"
rel="tooltip" data-original-title="{% trans 'Show' %}">
<i class="icon-facetime-video {% if assignment.is_active_slide %}icon-white{% endif %}"></i>
</a>&nbsp;
{% if perms.assignments.can_manage %}
<a href="{{ assignment|absolute_url:'update' }}"
rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a>
{% endif %}
<a href="{{ assignment|absolute_url:'projector_preview' }}"
rel="tooltip" data-original-title="{% trans 'Preview' %}" class="btn btn-mini right">
<i class="icon-search"></i>
</a>
<a href="{{ assignment|absolute_url }}">{{ assignment }}</a>
</li>
{% empty %}
<li>{% trans 'No elections available.' %}</li>
{% endfor %}
</ul>
{% endblock %}

76
openslides/assignments/urls.py
View File

@ -4,87 +4,17 @@ from . import views
urlpatterns = patterns(
'',
url(r'^$',
views.AssignmentListView.as_view(),
name='assignment_list'),
url(r'^(?P<pk>\d+)/$',
views.AssignmentDetail.as_view(),
name='assignment_detail'),
url(r'^new/$',
views.AssignmentCreateView.as_view(),
name='assignment_create'),
url(r'^(?P<pk>\d+)/edit/$',
views.AssignmentUpdateView.as_view(),
name='assignment_update'),
url(r'^(?P<pk>\d+)/del/$',
views.AssignmentDeleteView.as_view(),
name='assignment_delete'),
url(r'^(?P<pk>\d+)/set_phase/(?P<phase>\d+)/$',
views.AssignmentSetPhaseView.as_view(),
name='assignment_set_phase'),
url(r'^(?P<pk>\d+)/candidate/$',
views.AssignmentCandidateView.as_view(),
name='assignment_candidate'),
url(r'^(?P<pk>\d+)/delete_candidate/$',
views.AssignmentDeleteCandidateshipView.as_view(),
name='assignment_del_candidate'),
url(r'^(?P<pk>\d+)/delother/(?P<user_pk>[^/]+)/$',
views.AssignmentDeleteCandidateshipOtherView.as_view(),
name='assignment_del_candidate_other'),
url(r'^(?P<pk>\d+)/agenda/$',
views.CreateRelatedAgendaItemView.as_view(),
name='assignment_create_agenda'),
# PDF
url(r'^print/$',
views.AssignmentPDF.as_view(),
name='assignment_list_pdf'),
name='assignments_pdf'),
url(r'^(?P<pk>\d+)/print/$',
views.AssignmentPDF.as_view(),
name='assignment_pdf'),
url(r'^(?P<pk>\d+)/create_poll/$',
views.PollCreateView.as_view(),
name='assignmentpoll_create'),
url(r'^poll/(?P<poll_id>\d+)/edit/$',
views.PollUpdateView.as_view(),
name='assignmentpoll_update'),
url(r'^poll/(?P<pk>\d+)/del/$',
views.AssignmentPollDeleteView.as_view(),
name='assignmentpoll_delete'),
name='assignments_single_pdf'),
url(r'^poll/(?P<poll_pk>\d+)/print/$',
views.AssignmentPollPDF.as_view(),
name='assignmentpoll_pdf'),
url(r'^poll/(?P<pk>\d+)/pub/$',
views.SetPublishPollView.as_view(),
{'publish': True},
name='assignmentpoll_publish_poll'),
url(r'^poll/(?P<pk>\d+)/unpub/$',
views.SetPublishPollView.as_view(),
{'publish': False},
name='assignmentpoll_unpublish_poll'),
url(r'^(?P<pk>\d+)/elected/(?P<user_pk>[^/]+)/$',
views.SetElectedView.as_view(),
{'elected': True},
name='assignment_user_elected'),
url(r'^(?P<pk>\d+)/notelected/(?P<user_pk>[^/]+)/$',
views.SetElectedView.as_view(),
{'elected': False},
name='assignment_user_not_elected')
)

305
openslides/assignments/views.py
View File

@ -1,7 +1,5 @@
from cgi import escape
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from django.utils.translation import ungettext
from reportlab.lib import colors
@ -9,212 +7,16 @@ from reportlab.lib.units import cm
from reportlab.platypus import (PageBreak, Paragraph, SimpleDocTemplate, Spacer,
LongTable, Table, TableStyle)
from openslides.agenda.views import CreateRelatedAgendaItemView as _CreateRelatedAgendaItemView
from openslides.config.api import config
from openslides.users.models import Group, User # TODO: remove this
from openslides.poll.views import PollFormView
from openslides.utils.pdf import stylesheet
from openslides.utils.rest_api import ModelViewSet, Response, ValidationError, detail_route
from openslides.utils.utils import html_strong
from openslides.utils.views import (CreateView, DeleteView, DetailView,
ListView, PDFView,
QuestionView, RedirectView,
SingleObjectMixin, UpdateView)
from openslides.utils.views import PDFView
from .forms import AssignmentForm, AssignmentRunForm
from .models import Assignment, AssignmentPoll
from .serializers import AssignmentFullSerializer, AssignmentShortSerializer
class AssignmentListView(ListView):
"""
Lists all assignments.
"""
required_permission = 'assignments.can_see'
model = Assignment
class AssignmentDetail(DetailView):
"""
Shows one assignment.
"""
# TODO: use another view as 'run form' when updating this to angular
required_permission = 'assignments.can_see'
model = Assignment
form_class = AssignmentRunForm
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
assignment = self.get_object()
if self.request.method == 'POST':
context['form'] = self.form_class(self.request.POST)
else:
context['form'] = self.form_class()
polls = assignment.polls.all()
if not self.request.user.has_perm('assignments.can_manage'):
polls = polls.filter(published=True)
vote_results = assignment.vote_results(only_published=True)
else:
polls = self.get_object().polls.all()
vote_results = assignment.vote_results(only_published=False)
context['polls'] = polls
context['vote_results'] = vote_results
context['blocked_candidates'] = assignment.blocked
context['user_is_candidate'] = assignment.is_candidate(self.request.user)
return context
def post(self, *args, **kwargs):
if self.request.user.has_perm('assignments.can_nominate_other'):
assignment = self.get_object()
form = self.form_class(self.request.POST)
if form.is_valid():
user = form.cleaned_data['candidate']
if (assignment.phase == assignment.PHASE_SEARCH or
self.request.user.has_perm('assignments.can_manage')):
if (assignment.is_blocked(user) and
not self.request.user.has_perm('assignments.can_manage')):
messages.error(
self.request,
_("User %s does not want to be an candidate") % user)
elif assignment.is_elected(user):
messages.error(
self.request,
_("User %s is already elected") % html_strong(user))
elif assignment.is_candidate(user):
messages.error(
self.request,
_("User %s is already an candidate") % html_strong(user))
else:
assignment.set_candidate(user)
messages.success(
self.request,
_("User %s was nominated successfully.") % html_strong(user))
else:
messages.error(
self.request,
_("You can not add candidates to this assignment"))
return super(AssignmentDetail, self).get(*args, **kwargs)
class AssignmentCreateView(CreateView):
required_permission = 'assignments.can_manage'
model = Assignment
form_class = AssignmentForm
class AssignmentUpdateView(UpdateView):
required_permission = 'assignments.can_manage'
model = Assignment
form_class = AssignmentForm
class AssignmentDeleteView(DeleteView):
required_permission = 'assignments.can_manage'
model = Assignment
success_url_name = 'assignment_list'
class AssignmentSetPhaseView(SingleObjectMixin, RedirectView):
required_permission = 'assignments.can_manage'
model = Assignment
url_name = 'assignment_detail'
def pre_redirect(self, *args, **kwargs):
phase = int(kwargs.get('phase'))
assignment = self.get_object()
try:
assignment.set_phase(phase)
except ValueError as e:
messages.error(self.request, e)
else:
assignment.save()
messages.success(
self.request,
_('Election status was set to: %s.') %
html_strong(assignment.get_phase_display()))
class AssignmentCandidateView(SingleObjectMixin, RedirectView):
required_permission = 'assignments.can_nominate_self'
model = Assignment
url_name = 'assignment_detail'
def pre_redirect(self, *args, **kwargs):
assignment = self.get_object()
if (assignment.phase == assignment.PHASE_SEARCH or
self.request.user.has_perm('assignments.can_manage')):
user = self.request.user
if assignment.is_elected(user):
messages.error(
self.request,
_("You are already elected"))
elif assignment.is_candidate(user):
messages.error(
self.request,
_("You are already an candidate"))
else:
assignment.set_candidate(user)
messages.success(
self.request,
_("You were nominated successfully."))
else:
messages.error(
self.request,
_("You can not candidate to this assignment"))
class AssignmentDeleteCandidateshipView(SingleObjectMixin, RedirectView):
required_permission = None # Any user can withdraw his candidature
model = Assignment
url_name = 'assignment_detail'
def pre_redirect(self, *args, **kwargs):
assignment = self.get_object()
if (assignment.phase == assignment.PHASE_SEARCH or
self.request.user.has_perm('assignments.can_manage')):
user = self.request.user
assignment.set_blocked(user)
messages.success(self.request, _(
'You have withdrawn your candidature successfully. '
'You can not be nominated by other participants anymore.'))
else:
messages.error(self.request, _('The candidate list is already closed.'))
class AssignmentDeleteCandidateshipOtherView(SingleObjectMixin, QuestionView):
required_permission = 'assignments.can_manage'
model = Assignment
def get_question_message(self):
self.user = User.objects.get(pk=self.kwargs.get('user_pk'))
assignment = self.get_object()
if assignment.is_blocked:
question = _("Do you really want to unblock %s for the election?") % html_strong(self.user)
else:
question = _("Do you really want to withdraw %s from the election?") % html_strong(self.user)
return question
def on_clicked_yes(self):
self.user = User.objects.get(pk=self.kwargs.get('user_pk'))
assignment = self.get_object()
if not assignment.is_elected(self.user):
assignment.delete_related_user(self.user)
self.error = False
else:
self.error = _("User %s is already elected") % html_strong(self.user)
def create_final_message(self):
if self.error:
messages.error(self.request, self.error)
else:
messages.success(self.request, self.get_final_message())
def get_final_message(self):
return _("Candidate %s was withdrawn successfully.") % html_strong(self.user)
class AssignmentViewSet(ModelViewSet):
"""
API endpoint to list, retrieve, create, update and destroy assignments and
@ -377,104 +179,6 @@ class AssignmentViewSet(ModelViewSet):
return Response({'detail': message})
class PollCreateView(SingleObjectMixin, RedirectView):
required_permission = 'assignments.can_manage'
model = Assignment
url_name = 'assignment_detail'
def pre_redirect(self, *args, **kwargs):
self.get_object().create_poll()
messages.success(self.request, _("New ballot was successfully created."))
class PollUpdateView(PollFormView):
required_permission = 'assignments.can_manage'
poll_class = AssignmentPoll
template_name = 'assignments/assignmentpoll_form.html'
def get_context_data(self, **kwargs):
context = super(PollUpdateView, self).get_context_data(**kwargs)
self.assignment = self.poll.get_assignment()
context['assignment'] = self.assignment
context['poll'] = self.poll
context['polls'] = self.assignment.polls.all()
context['ballotnumber'] = self.poll.get_ballot()
return context
def get_success_url(self):
if 'apply' not in self.request.POST:
return_url = reverse('assignment_detail', args=[self.poll.assignment.id])
else:
return_url = ''
return return_url
class SetPublishPollView(SingleObjectMixin, RedirectView):
required_permission = 'assignments.can_manage'
model = AssignmentPoll
url_name = 'assignment_detail'
allow_ajax = True
publish = False
def get_ajax_context(self, **context):
return super().get_ajax_context(
published=self.object.published,
**context)
def pre_redirect(self, *args, **kwargs):
poll = self.get_object()
poll.set_published(kwargs['publish'])
class SetElectedView(SingleObjectMixin, RedirectView):
required_permission = 'assignments.can_manage'
model = Assignment
url_name = 'assignment_detail'
allow_ajax = True
def pre_redirect(self, *args, **kwargs):
self.person = User.objects.get(pk=kwargs['user_id'])
self.elected = kwargs['elected']
# TODO: un-elect users if self.elected is False
self.get_object().set_elected(self.person)
def get_ajax_context(self, **kwargs):
if self.elected:
link = reverse('assignment_user_not_elected',
args=[self.get_object().id, self.person.person_id])
text = _('not elected')
else:
link = reverse('assignment_user_elected',
args=[self.get_object().id, self.person.person_id])
text = _('elected')
return {'elected': self.elected, 'link': link, 'text': text}
class AssignmentPollDeleteView(DeleteView):
"""
Delete an assignment poll object.
"""
required_permission = 'assignments.can_manage'
model = AssignmentPoll
def pre_redirect(self, request, *args, **kwargs):
self.set_assignment()
super().pre_redirect(request, *args, **kwargs)
def pre_post_redirect(self, request, *args, **kwargs):
self.set_assignment()
super().pre_post_redirect(request, *args, **kwargs)
def set_assignment(self):
self.assignment = self.get_object().assignment
def get_redirect_url(self, **kwargs):
return reverse('assignment_detail', args=[self.assignment.id])
def get_final_message(self):
return _('Ballot was successfully deleted.')
class AssignmentPDF(PDFView):
required_permission = 'assignments.can_see'
top_space = 0
@ -665,13 +369,6 @@ class AssignmentPDF(PDFView):
stylesheet['Paragraph']))
class CreateRelatedAgendaItemView(_CreateRelatedAgendaItemView):
"""
View to create and agenda item for an assignment.
"""
model = Assignment
class AssignmentPollPDF(PDFView):
required_permission = 'assignments.can_manage'
top_space = 0

2
openslides/core/main_menu.py
View File

@ -11,4 +11,4 @@ class DashboardMainMenuEntry(MainMenuEntry):
required_permission = 'core.can_see_dashboard'
default_weight = 10
icon_css_class = 'glyphicon-home'
pattern_name = 'core_dashboard'
pattern_name = '/' # TODO: use generic solution, see issue #1469

140
openslides/core/static/css/app.css
View File

@ -6,6 +6,103 @@ body {
background-color: #FBFBFB;
}
/* TODO: Move only used custom style for angular templates in new css file */
.angular-ui-tree-handle {
background: none repeat scroll 0 0 #f8faff;
border: 1px solid #dae2ea;
color: #7c9eb2;
padding: 10px;
}
.angular-ui-tree-handle:hover {
background: none repeat scroll 0 0 #f4f6f7;
border-color: #dce2e8;
color: #438eb9;
}
.angular-ui-tree-placeholder {
background: none repeat scroll 0 0 #f0f9ff;
border: 2px dashed #bed2db;
box-sizing: border-box;
}
/* TODO: used by ng-fab-forms */
.validation-success {
opacity: 1;
display: block;
position: absolute;
right: -7.2px;
bottom: -7.2px;
font-size: 28.8px;
width: 36px;
height: 36px;
line-height: 36px;
text-align: center;
border-radius: 36px;
color: #62b14c;
transition: all ease-out 0.32s; }
.validation-success:after {
display: block;
content: '\e013';
font-family: 'Glyphicons Halflings'; }
.validation-success.ng-hide {
transition-delay: 0s;
transition: all ease-out 0.12s;
opacity: 0;
transform: rotate(360deg); }
.ng-hide-remove li {
opacity: 0; }
.validation {
color: #fff;
margin: 0;
position: relative;
font-size: 14px;
overflow: visible;
background: #c00640; }
.validation ul {
display: block;
overflow: hidden; }
.validation li {
display: block;
line-height: 1;
background: #c00640;
position: absolute;
right: -4px;
top: -10px;
text-align: center;
font-weight: bold;
padding: 2px 10px;
color: #fff;
transform: rotate(0deg);
transition: all ease-in 0.2s;
opacity: 1;
transition-delay: 0s; }
.validation li.ng-enter {
opacity: 0;
top: 0; }
.validation li.ng-leave {
transition: all ease-in 0s;
opacity: 0; }
*:focus + .validation li {
background-color: #63bff8 !important; }
input.ng-touched.ng-invalid:not(.ng-valid), textarea.ng-touched.ng-invalid:not(.ng-valid), select.ng-touched.ng-invalid:not(.ng-valid) {
border-color: #c00640; }
input:focus, input:focus.ng-touched.ng-invalid:not(.ng-valid), textarea:focus, textarea:focus.ng-touched.ng-invalid:not(.ng-valid), select:focus, select:focus.ng-touched.ng-invalid:not(.ng-valid) {
border-color: #63bff8; }
input.ng-valid-required.ng-valid:not(.ng-invalid), textarea.ng-valid-required.ng-valid:not(.ng-invalid), select.ng-valid-required.ng-valid:not(.ng-invalid) {
border-color: #62b14c; }
form[class*="ng-invalid"] button.btn[type=submit] {
background: #63bff8;
transition: none; }
form button.btn[type=submit] {
transition: all ease-in 0.5s;
background: #62b14c; }
/* Header */
#header {
background-color: #333333;
@ -86,12 +183,28 @@ a:hover {
line-height: 45px;
}
/* List tables */
th.sortable:hover {
cursor: pointer;
}
/* Log */
#log {
padding-left: 14px;
}
/** Utils **/
div.import .label {
color: #333 !important;
font-size: 100%;
font-weight: normal;
}
div.import > div > input[type="text"] {
width: 30px;
}
tr.offline td, li.offline {
background-color: #EAEAEA !important;
}
@ -116,7 +229,7 @@ tr.total td {
.indentation {
margin-left: 12px;
}
.mini_width {
.minimum, .mini_width {
width: 1px;
}
/* show optional column */
@ -201,7 +314,7 @@ table.cke_dialog_contents textarea {
.leftmenu ul li {
display: block;
width: 100%;
line-height: 30px;
line-height: 22px;
}
.leftmenu ul li a {
border-style: none solid solid;
@ -216,14 +329,15 @@ table.cke_dialog_contents textarea {
.leftmenu ul li:first-child a {
border-top: 1px solid #DDDDDD;
}
.leftmenu ul li a .glyphicon {
.leftmenu ul li a span.ico {
display: inline-block;
background: #f9f9f9;
padding: 8px 10px 6px;
margin: 0 5px 0 0;
border-right: 1px solid #dddddd;
width: 35px;
}
.leftmenu ul li a, .leftmenu ul li a .glyphicon {
.leftmenu ul li a, .leftmenu ul li a span.ico {
-webkit-transition: background 0.2s ease-in-out;
-moz-transition: background 0.2s ease-in-out;
-ms-transition: background 0.2s ease-in-out;
@ -234,14 +348,14 @@ table.cke_dialog_contents textarea {
background-color: #f5f5f5;
color: #000000;
}
.leftmenu ul li a:hover .glyphicon {
.leftmenu ul li a:hover span.ico {
background-color: #efefef;
}
.leftmenu ul li.active a {
background-color: #333333;
color: #ffffff;
}
.leftmenu ul li.active a .glyphicon {
.leftmenu ul li.active a span.ico {
background-color: #333333;
border-right: 1px solid #444444;
}
@ -258,10 +372,10 @@ table.cke_dialog_contents textarea {
margin-top: -34px;
}
.leftmenu.lefticon > ul > li > a > span.text {
display: none;
/*display: none;*/
}
.leftmenu.lefticon ul ul > li > a {
min-width: 200px !important;
.leftmenu.lefticon ul > li > a {
min-width: 150px !important;
}
.leftmenu.lefticon span.text {
padding-right: 15px;
@ -269,14 +383,6 @@ table.cke_dialog_contents textarea {
/** Icons **/
/* TODO: Move some of them to the respective apps. */
.icon-assignment {
background: url("../img/glyphicons_041_charts.png") no-repeat !important;
width: 25px;
margin-left: 10px !important;
}
.leftmenu ul li.active a .glyphicon.icon-assignment {
background-image: url("../img/glyphicons_041_charts_white.png") !important;
}
.status_link .icon-on, .icon-checked-new {
background-image: url("../img/glyphicons_152_check.png");
background-position: 0;

13
openslides/core/static/js/app.js
View File

@ -1,11 +1,24 @@
angular.module('OpenSlidesApp', [
'ui.router',
'angular-loading-bar',
'js-data',
'gettext',
'ngBootbox',
'ngFabForm',
'ngMessages',
'ngAnimate',
'ngCsvImport',
'ngSanitize',
'ui.bootstrap',
'ui.select',
'ui.tree',
'xeditable',
'OpenSlidesApp.core',
'OpenSlidesApp.agenda',
'OpenSlidesApp.motions',
'OpenSlidesApp.assignments',
'OpenSlidesApp.users',
'OpenSlidesApp.mediafiles',
])
.config(function($urlRouterProvider, $locationProvider) {

143
openslides/core/static/js/core.js
View File

@ -75,9 +75,34 @@ angular.module('OpenSlidesApp.core', [])
.config(function($stateProvider, $locationProvider) {
// Core urls
$stateProvider.state('dashboard', {
$stateProvider
.state('dashboard', {
url: '/',
templateUrl: 'static/templates/dashboard.html'
})
.state('core', {
url: '/core',
abstract: true,
template: "<ui-view/>",
})
// tag
.state('core.tag', {
url: '/tag',
abstract: true,
template: "<ui-view/>",
})
.state('core.tag.list', {
resolve: {
tags: function(Tag) {
return Tag.findAll();
}
}
})
.state('core.tag.create', {})
.state('core.tag.detail.update', {
views: {
'@core.tag': {}
}
});
$locationProvider.html5Mode(true);
@ -99,6 +124,13 @@ angular.module('OpenSlidesApp.core', [])
};
})
// config for ng-fab-form
.config(function(ngFabFormProvider) {
ngFabFormProvider.extendConfig({
setAsteriskForRequiredLabel: true
});
})
.provider('runtimeStates', function($stateProvider) {
this.$get = function($q, $timeout, $state) {
return {
@ -150,6 +182,11 @@ angular.module('OpenSlidesApp.core', [])
});
})
//options for angular-xeditable
.run(function(editableOptions) {
editableOptions.theme = 'bs3';
})
.factory('autoupdate', function() {
//TODO: use config here
var url = "http://" + location.host + "/sockjs";
@ -179,6 +216,20 @@ angular.module('OpenSlidesApp.core', [])
return Autoupdate;
})
.factory('Customslide', function(DS) {
return DS.defineResource({
name: 'core/customslide',
endpoint: '/rest/core/customslide/'
});
})
.factory('Tag', function(DS) {
return DS.defineResource({
name: 'core/tag',
endpoint: '/rest/core/tag/'
});
})
.factory('Config', function(DS) {
return DS.defineResource({
name: 'config/config',
@ -201,6 +252,91 @@ angular.module('OpenSlidesApp.core', [])
}
})
.controller("LoginFormCtrl", function ($scope, $modal) {
$scope.open = function () {
var modalInstance = $modal.open({
animation: true,
templateUrl: 'LoginForm.html',
controller: 'LoginFormModalCtrl',
size: 'sm',
});
}
})
.controller('LoginFormModalCtrl', function ($scope, $modalInstance, $http, operator) {
$scope.login = function () {
$http.post(
'/users/login/',
{'username': $scope.username, 'password': $scope.password}
).success(function(data) {
if (data.success) {
operator.setUser(data.user_id);
$scope.loginFailed = false;
$modalInstance.close();
} else {
$scope.loginFailed = true;
}
});
};
$scope.guest = function () {
$modalInstance.dismiss('cancel');
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
})
.controller('TagListCtrl', function($scope, Tag) {
Tag.bindAll({}, $scope, 'tags');
// setup table sorting
$scope.sortColumn = 'name';
$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;
};
// save changed tag
$scope.save = function (tag) {
Tag.save(tag);
};
$scope.delete = function (tag) {
//TODO: add confirm message
Tag.destroy(tag.id).then(
function(success) {
//TODO: success message
}
);
};
})
.controller('TagCreateCtrl', function($scope, $state, Tag) {
$scope.tag = {};
$scope.save = function (tag) {
Tag.create(tag).then(
function(success) {
$state.go('core.tag.list');
}
);
};
})
.controller('TagUpdateCtrl', function($scope, $state, Tag, tag) {
$scope.tag = tag;
$scope.save = function (tag) {
Tag.save(tag).then(
function(success) {
$state.go('core.tag.list');
}
);
};
})
.directive('osFocusMe', function ($timeout) {
return {
link: function (scope, element, attrs, model) {
@ -210,8 +346,3 @@ angular.module('OpenSlidesApp.core', [])
}
};
});
// some general JavaScript functions used in all OpenSlides apps
$(function () {
$('[data-toggle="tooltip"]').tooltip({'placement': 'bottom'})
});

23
openslides/core/static/templates/core/tag-form.html Normal file
View File

@ -0,0 +1,23 @@
<h1 ng-if="tag.id" translate>Edit tag</h1>
<h1 ng-if="!tag.id" translate>New tag</h1>
<div id="submenu">
<a ui-sref="core.tag.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<form name="tagForm">
<div class="form-group" ng-class="{'has-error has-feedback': tagForm.inputName.$error.required}">
<label for="inputName" translate>Name</label>
<input type="text" ng-model="tag.name" class="form-control" name="inputName" ng-required="true">
</div>
<button type="submit" ng-click="save(tag)" class="btn btn-primary" translate>
Save
</button>
<button ui-sref="core.tag.list" class="btn btn-default" translate>
Cancel
</button>
</form>

44
openslides/core/static/templates/core/tag-list.html Normal file
View File

@ -0,0 +1,44 @@
<h1 translate>Tags</h1>
<div id="submenu">
<a ui-sref="core.tag.create" os-perms="core.can_manage_tags" class="btn btn-primary btn-sm">
<i class="fa fa-plus fa-lg"></i>
<translate>New</translate>
</a>
</div>
<div class="row form-group">
<div class="col-sm-8"></div>
<div class="col-sm-4">
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
placeholder="{{ 'Filter' | translate}}">
</div>
</div>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th ng-click="toggleSort('name')" class="sortable">
<translate>Name</translate>
<i class="pull-right fa" ng-show="sortColumn === 'name' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th os-perms="core.can_manage_tags" class="minimum">
<translate>Actions</translate>
<tbody>
<tr ng-repeat="tag in tags | filter: filter.search |
orderBy: sortColumn:reverse">
<td>{{ tag.name }}
<td os-perms="core.can_manage_tags" class="nobr">
<!-- edit -->
<a ui-sref="core.tag.detail.update({id: tag.id })" os-perms="core.can_manage_tags"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
<!-- delete -->
<a ng-click="delete(tag)" os-perms="core.can_manage_tags" class="btn btn-danger btn-sm"
title="{{ 'Delete' | translate }}">
<i class="fa fa-trash-o"></i>
</a>
</table>

1
openslides/core/static/templates/dashboard.html
View File

@ -1,6 +1,7 @@
<h1>Dashboard</h1>
<ul>
<li><a ui-sref="agenda.item.list">Agenda</a>
<li><a ui-sref="motions.motion.list">Motions</a>
<li><a ui-sref="assignments.assignment.list">Assignments</a>
<li><a ui-sref="users.user.list">Participants</a>
</ul>

102
openslides/core/static/templates/index.html
View File

@ -26,12 +26,14 @@
<!-- login/logout button -->
<div class="btn-group">
<div ng-if="operator.isAuthenticated()">
<button data-toggle="dropdown" class="btn btn-default dropdown-toggle">
<span class="glyphicon glyphicon-user" aria-hidden="true"></span>
<div class="btn-group" dropdown is-open="status.isopen">
<button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle>
<i class="fa fa-user"></i>
<span class="optional-small">{{ operator.user.get_short_name() }}</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right">
<ul class="dropdown-menu pull-right" role="menu">
<li><a href="{% url 'user_settings' %}">
<i class="fa fa-cog"></i>
<translate>Edit profile</translate>
@ -47,35 +49,29 @@
</a>
</ul>
</div>
<div ng-if="!operator.isAuthenticated()">
<button class="btn btn-default" data-toggle="modal" data-target="#loginFormModal">
<i class="fa fa-sign-in"></i>
<translate>Login</translate>
</button>
<div class="modal" id="loginFormModal" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-sm">
<div class="modal-content">
</div>
<!-- Login dialog (modal) -->
<div ng-controller="LoginFormCtrl" ng-if="!operator.isAuthenticated()">
<script type="text/ng-template" id="LoginForm.html">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="myModalLabel" translate>Please sign in!</h4>
<h3 class="modal-title" translate>Please sign in!</h3>
</div>
<div class="modal-body">
<p ng-if='loginFailed' class="text-danger">
<strong translate>Username or password is not correct.</strong>
<form>
<div class="input-group form-group">
<div class="input-group-addon"><i class="fa fa-user"></i></div>
<input type="text" ng-model="username" class="form-control input-lg"
placeholder="{{'Username'|translate}}">
placeholder="{{ 'Username' | translate }}">
</div>
<div class="input-group form-group">
<div class="input-group-addon"><i class="fa fa-key"></i></div>
<input type="password" ng-model="password" class="form-control input-lg"
placeholder="{{'Password'|translate}}">
placeholder="{{ 'Password' | translate }}">
</div>
</div>
<div class="modal-footer">
<div class="form-group">
<button type="submit" ng-click="login(username, password)"
class="btn btn-primary btn-lg btn-block" translate>
@ -83,18 +79,23 @@
</button>
</div>
<div class="form-group">
<!-- TODO: if anonymous user is activate -->
<button type="submit" class="btn btn-default" translate>
<!-- TODO: show only if anonymous user is activate -->
<button ng-click="guest()" class="btn btn-default" translate>
Continue as guest
</button>
</div>
</form>
</div>
</div>
<button ng-click="cancel()" class="btn btn-default" translate>
Cancel
</button>
</div>
</div>
</script>
<button class="btn btn-default" ng-click="open()">
<i class="fa fa-sign-in"></i>
<translate>Login</translate>
</button>
</div>
</div>
<!-- language switcher -->
<div class="btn-group" ng-controller="LanguageCtrl">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
@ -123,20 +124,51 @@
<!-- Container -->
<div class="container-fluid" id="container">
<div class="row">
<!-- TODO: Sidebar navigation (main menu)
<!-- TODO: Build main menu automatically from installed apps, see issue #1469 -->
<div class="col-md-2 leftmenu lefticon">
<ul>
{% for entry in main_menu_entries %}
<li{% if entry.is_active %} class="active"{% endif %}>
<a href="{{ entry.get_url }}" class="tooltip-right">
<span class="glyphicon {{ entry.get_icon_css_class }}" aria-hidden="true"></span>
<span class="text">{{ entry }}</span>
<li>
<a ui-sref="dashboard">
<span class="ico"><i class="fa fa-home fa-lg"></i></span>
<span class="text" translate>Home</span>
</a>
<li>
<a href="#TODO">
<span class="ico"><i class="fa fa-video-camera fa-lg"></i></span>
<span class="text" translate>Projector</span>
</a>
<li>
<a ui-sref="agenda.item.list">
<span class="ico"><i class="fa fa-calendar-o fa-lg"></i></span>
<span class="text" translate>Agenda</span>
</a>
<li>
<a ui-sref="motions.motion.list">
<span class="ico"><i class="fa fa-file-text fa-lg"></i></span>
<span class="text" translate>Motions</span>
</a>
<li>
<a ui-sref="assignments.assignment.list">
<span class="ico"><i class="fa fa-pie-chart fa-lg"></i></span>
<span class="text" translate>Elections</span>
</a>
<li>
<a ui-sref="users.user.list">
<span class="ico"><i class="fa fa-user fa-lg"></i></span>
<span class="text" translate>Participants</span>
</a>
<li>
<a ui-sref="mediafiles.mediafile.list">
<span class="ico"><i class="fa fa-paperclip fa-lg"></i></span>
<span class="text" translate>Files</span>
</a>
<li>
<a href="#TODO">
<span class="ico"><i class="fa fa-cog fa-lg"></i></span>
<span class="text" translate>Settings</span>
</a>
</li>
{% endfor %}
</ul>
</div>
-->
<!-- Content -->
<div id="content" class="col-md-10">
@ -160,5 +192,7 @@
<script src="static/js/app.js"></script>
<script src="static/js/core.js"></script>
<script src="static/js/agenda/agenda.js"></script>
<script src="static/js/motions/motions.js"></script>
<script src="static/js/assignments/assignments.js"></script>
<script src="static/js/users/users.js"></script>
<script src="static/js/mediafiles/mediafiles.js"></script>

9
openslides/core/templates/base.html
View File

@ -89,13 +89,14 @@
<div class="container-fluid" id="container">
<div class="row">
<!-- Sidebar navigation (main menu) -->
<!-- Sidebar navigation (main menu)
TODO: this menu is a temporary solution only! We will use angular base template
for building main menu, see issue #1469 -->
<div class="col-md-2 leftmenu lefticon">
<ul>
{% for entry in main_menu_entries %}
<li{% if entry.is_active %} class="active"{% endif %}>
<a href="{{ entry.get_url }}" class="tooltip-right">
<!--TODO-->
<li>
<a href="{{ entry.pattern_name }}" class="tooltip-right">
<span class="glyphicon {{ entry.get_icon_css_class }}" aria-hidden="true"></span>
<span class="text">{{ entry }}</span>
</a>

4
openslides/core/urls.py
View File

@ -40,10 +40,6 @@ urlpatterns = patterns(
views.CustomSlideDeleteView.as_view(),
name='customslide_delete'),
url(r'tags/$',
views.TagListView.as_view(),
name='core_tag_list'),
# Ajax Urls
url(r'^core/url_patterns/$',
views.UrlPatternsView.as_view(),

2
openslides/mediafiles/main_menu.py
View File

@ -9,7 +9,7 @@ class MediafileMainMenuEntry(MainMenuEntry):
"""
verbose_name = ugettext_lazy('Files')
default_weight = 60
pattern_name = 'mediafile_list'
pattern_name = '/mediafiles'
icon_css_class = 'glyphicon-paperclip'
def check_permission(self):

83
openslides/mediafiles/static/js/mediafiles/mediafiles.js Normal file
View File

@ -0,0 +1,83 @@
angular.module('OpenSlidesApp.mediafiles', [])
.config(function($stateProvider) {
$stateProvider
.state('mediafiles', {
url: '/mediafiles',
abstract: true,
template: "<ui-view/>",
})
.state('mediafiles.mediafile', {
abstract: true,
template: "<ui-view/>",
})
.state('mediafiles.mediafile.list', {
resolve: {
mediafiles: function(Mediafile) {
return Mediafile.findAll();
}
}
})
.state('mediafiles.mediafile.create', {})
.state('mediafiles.mediafile.detail.update', {
views: {
'@mediafiles.mediafile': {}
}
});
})
.factory('Mediafile', function(DS) {
return DS.defineResource({
name: 'mediafiles/mediafile',
endpoint: '/rest/mediafiles/mediafile/'
});
})
.controller('MediafileListCtrl', function($scope, $http, Mediafile) {
Mediafile.bindAll({}, $scope, 'mediafiles');
// 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;
};
// delete
$scope.delete = function (mediafile) {
//TODO: add confirm message
Mediafile.destroy(mediafile.id).then(
function(success) {
//TODO: success message
}
);
};
})
.controller('MediafileCreateCtrl', function($scope, $state, Mediafile) {
$scope.mediafile = {};
$scope.save = function(mediafile) {
Mediafile.create(mediafile).then(
function(success) {
$state.go('mediafiles.mediafile.list');
}
);
};
})
.controller('MediafileUpdateCtrl', function($scope, $state, Mediafile, mediafile) {
$scope.mediafile = mediafile;
$scope.save = function (mediafile) {
Mediafile.save(mediafile).then(
function(success) {
$state.go('mediafiles.mediafile.list');
}
);
};
});

35
openslides/mediafiles/static/templates/mediafiles/mediafile-form.html Normal file
View File

@ -0,0 +1,35 @@
<h1 ng-if="mediafile.id" translate>Edit file</h1>
<h1 ng-if="!mediafile.id" translate>New file</h1>
<div id="submenu">
<a ui-sref="mediafiles.mediafile.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<form name="mediafileForm">
<div class="form-group">
<label for="inputTitle" translate>Title</label>
<input type="text" ng-model="mediafile.title" class="form-control" name="inputTitle">
</div>
<div class="form-group" ng-class="{'has-error has-feedback': mediafileForm.inputFile.$error.required}">
<input type="file" ng-model="mediafile.mediafile"/>
</div>
<div class="form-group">
<label class="checkbox-inline">
<input type="checkbox" ng-model="mediafile.is_presentable" ng-checked="mediafile.is_presentable" name="checkboxPresentable">
<translate>Is presentable</translate>
<p class="help-block" translate>If checked, this file can be presented on the projector. Currently, this is only possible for PDFs.</p>
</label>
</div>
<button type="submit" ng-click="save(mediafile)" class="btn btn-primary" translate>
Save
</button>
<button ui-sref="mediafiles.mediafile.list" class="btn btn-default" translate>
Cancel
</button>
</form>

73
openslides/mediafiles/static/templates/mediafiles/mediafile-list.html Normal file
View File

@ -0,0 +1,73 @@
<h1 translate>Files</h1>
<div id="submenu">
<a ui-sref="mediafiles.mediafile.create" os-perms="mediafiles.can_upload" class="btn btn-primary btn-sm">
<i class="fa fa-plus fa-lg"></i>
<translate>New</translate>
</a>
</div>
<div class="row form-group">
<div class="col-sm-8"></div>
<div class="col-sm-4">
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
placeholder="{{ 'Filter' | translate}}">
</div>
</div>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th ng-click="toggleSort('title')" class="sortable">
<translate>Title</translate>
<i class="pull-right fa" ng-show="sortColumn === 'title' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('filetype')" class="sortable">
<translate>Filetype</translate>
<i class="pull-right fa" ng-show="sortColumn === 'filetype' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('filesize')" class="sortable">
<translate>Filesize</translate>
<i class="pull-right fa" ng-show="sortColumn === 'filesize' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('timestamp')" class="sortable">
<translate>Upload time</translate>
<i class="pull-right fa" ng-show="sortColumn === 'timestamp' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('uploader')" class="sortable">
<translate>Uploaded by</translate>
<i class="pull-right fa" ng-show="sortColumn === 'uploader' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th os-perms="mediafiles.can_manage core.can_manage_projector" class="minimum">
<translate>Actions</translate>
<tbody>
<tr ng-repeat="mediafile in mediafiles | filter: filter.search |
orderBy: sortColumn:reverse">
<td><a href="{{ mediafile.mediafile }}">{{ mediafile.title }}</a>
<td class="optional">{{ mediafile.filetype }}
<td>{{ mediafile.filesize }}
<td>{{ mediafile.timestamp }}
<td>{{ mediafile.uploader }}
<td os-perms="mediafiles.can_manage core.can_manage_projector" class="nobr">
<!-- projector, TODO: add link to activate slide -->
<a href="#TODO" ng-if="mediafile.is_presentable" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
title="{{ 'Show' | translate }}">
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="mediafiles.mediafile.detail.update({id: mediafile.id })" os-perms="mediafiles.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
<!-- delete -->
<a ng-click="delete(mediafile)" os-perms="mediafiles.can_manage" class="btn btn-danger btn-sm"
title="{{ 'Delete' | translate }}">
<i class="fa fa-trash-o"></i>
</a>
</table>

9
openslides/mediafiles/templates/mediafiles/widget_pdfpresentation.html
View File

@ -4,23 +4,24 @@
{% load tags %}
{% block content %}
<form action="{% url 'target_pdf_page' %}" method="GET" class="set-page-form">
<form action="{% url 'mediafiles_target_pdf_page' %}" method="GET" class="set-page-form">
<div class="input-prepend" style="margin-bottom:0;">
<a class="btn go-first-page"
rel="tooltip" data-original-title="{% trans 'First page' %}">
<i class="icon-fast-backward"></i>
</a>
<a class="btn pdf-page-ctl" href="{% url 'prev_pdf_page' %}"
<a class="btn pdf-page-ctl" href="{% url 'mediafiles_prev_pdf_page' %}"
rel="tooltip" data-original-title="{% trans 'Previous page' %}">
<i class="icon-backward"></i>
</a>
<a class="btn pdf-page-ctl" href="{% url 'next_pdf_page' %}"
<a class="btn pdf-page-ctl" href="{% url 'mediafiles_next_pdf_page' %}"
rel="tooltip" data-original-title="{% trans 'Next page' %}">
<i class="icon-forward"></i>
</a>
</div>
<div class="input-append" style="margin-bottom:0;">
<a class="btn pdf-toggle-fullscreen {% if 'pdf_fullscreen'|get_config %}btn-primary{% endif %}" href="{% url 'toggle_fullscreen' %}"
<a class="btn pdf-toggle-fullscreen {% if 'pdf_fullscreen'|get_config %}btn-primary{% endif %}"
href="{% url 'mediafiles_toggle_fullscreen' %}"
rel="tooltip" data-original-title="{% trans 'Fullscreen' %}">
<i class="icon-fullscreen {% if 'pdf_fullscreen'|get_config %}icon-white{% endif %}"></i>
</a>

27
openslides/mediafiles/urls.py
View File

@ -4,27 +4,16 @@ from . import views
urlpatterns = patterns(
'',
url(r'^$',
views.MediafileListView.as_view(),
name='mediafile_list'),
url(r'^new/$',
views.MediafileCreateView.as_view(),
name='mediafile_create'),
url(r'^(?P<pk>\d+)/edit/$',
views.MediafileUpdateView.as_view(),
name='mediafile_update'),
url(r'^(?P<pk>\d+)/del/$',
views.MediafileDeleteView.as_view(),
name='mediafile_delete'),
url(r'^pdf/next/$', views.PdfNextView.as_view(), name='next_pdf_page'),
url(r'^pdf/prev/$', views.PdfPreviousView.as_view(), name='prev_pdf_page'),
url(r'^pdf/next/$',
views.PdfNextView.as_view(),
name='mediafiles_next_pdf_page'),
url(r'^pdf/prev/$',
views.PdfPreviousView.as_view(),
name='mediafiles_prev_pdf_page'),
url(r'^pdf/target_page/$',
views.PdfGoToPageView.as_view(),
name='target_pdf_page'),
name='mediafiles_target_pdf_page'),
url(r'^pdf/toggle_fullscreen/$',
views.PdfToggleFullscreenView.as_view(),
name='toggle_fullscreen')
name='mediafiles_toggle_fullscreen')
)

101
openslides/mediafiles/views.py
View File

@ -3,111 +3,12 @@ from django.http import HttpResponse
from openslides.config.api import config
from openslides.projector.api import get_active_slide
from openslides.utils.rest_api import ModelViewSet
from openslides.utils.views import (AjaxView, CreateView, DeleteView, RedirectView, ListView,
UpdateView)
from openslides.utils.views import (AjaxView, RedirectView)
from .forms import MediafileManagerForm, MediafileNormalUserForm
from .models import Mediafile
from .serializers import MediafileSerializer
class MediafileListView(ListView):
"""
View to see a table of all uploaded files.
"""
model = Mediafile
def check_permission(self, request, *args, **kwargs):
return (request.user.has_perm('mediafiles.can_see') or
request.user.has_perm('mediafiles.can_upload') or
request.user.has_perm('mediafiles.can_manage'))
def get_context_data(self, *args, **kwargs):
context = super(MediafileListView, self).get_context_data(*args, **kwargs)
for mediafile in context['mediafile_list']:
if self.request.user.has_perm('mediafiles.can_manage'):
mediafile.with_action_buttons = True
elif self.request.user.has_perm('mediafiles.can_upload') and self.request.user == mediafile.uploader:
mediafile.with_action_buttons = True
else:
mediafile.with_action_buttons = False
return context
class MediafileViewMixin(object):
"""
Mixin for create and update views for mediafiles.
A manager can set the uploader manually, else the request user is set as uploader.
"""
fields = ('mediafile', 'title', 'uploader', 'is_presentable',)
model = Mediafile
success_url_name = 'mediafile_list'
url_name_args = []
def get_form(self, form_class):
form_kwargs = self.get_form_kwargs()
if not self.request.user.has_perm('mediafiles.can_manage'):
return MediafileNormalUserForm(**form_kwargs)
else:
return MediafileManagerForm(**form_kwargs)
def manipulate_object(self, *args, **kwargs):
"""
Method to handle the uploader. If a user has manager permissions,
he has to set the uploader in the given form field. Then this
method only calls super. Else it sets the requesting user as uploader.
"""
if not self.request.user.has_perm('mediafiles.can_manage'):
self.object.uploader = self.request.user
return super(MediafileViewMixin, self).manipulate_object(*args, **kwargs)
class MediafileCreateView(MediafileViewMixin, CreateView):
"""
View to upload a new file.
"""
required_permission = 'mediafiles.can_upload'
def get_form_kwargs(self, *args, **kwargs):
form_kwargs = super(MediafileCreateView, self).get_form_kwargs(*args, **kwargs)
if self.request.method == 'GET':
form_kwargs['initial'].update({'uploader': self.request.user})
return form_kwargs
class MediafileUpdateView(MediafileViewMixin, UpdateView):
"""
View to edit the entry of an uploaded file.
"""
def check_permission(self, request, *args, **kwargs):
return (request.user.has_perm('mediafiles.can_manage') or
(request.user.has_perm('mediafiles.can_upload') and
self.get_object().uploader == self.request.user))
def get_form_kwargs(self, *args, **kwargs):
form_kwargs = super(MediafileUpdateView, self).get_form_kwargs(*args, **kwargs)
form_kwargs['initial'].update({'uploader': self.get_object().uploader.pk})
return form_kwargs
class MediafileDeleteView(DeleteView):
"""
View to delete the entry of an uploaded file and the file itself.
"""
model = Mediafile
success_url_name = 'mediafile_list'
def check_permission(self, request, *args, **kwargs):
return (request.user.has_perm('mediafiles.can_manage') or
(request.user.has_perm('mediafiles.can_upload') and self.get_object().uploader == self.request.user))
def on_clicked_yes(self, *args, **kwargs):
"""Deletes the file in the filesystem, if user clicks "Yes"."""
self.get_object().mediafile.delete()
return super(MediafileDeleteView, self).on_clicked_yes(*args, **kwargs)
class PdfNavBaseView(AjaxView):
"""
BaseView for the Pdf Ajax Navigation.

1
openslides/mediafiles/widgets.py
View File

@ -17,7 +17,6 @@ class PDFPresentationWidget(Widget):
default_weight = 75
template_name = 'mediafiles/widget_pdfpresentation.html'
icon_css_class = 'icon-align-left'
more_link_pattern_name = 'mediafile_list'
# javascript_files = None # TODO: Add pdf.js stuff here.
def get_context_data(self, **context):

144
openslides/motions/csv_import.py
View File

@ -1,144 +0,0 @@
# TODO: Rename the file to 'csv.py' when we drop python2 support. At the moment
# the name csv has a conflict with the core-module. See:
# http://docs.python.org/2/tutorial/modules.html#intra-package-references
import csv
from django.db import transaction
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_noop
from openslides.utils import csv_ext
from openslides.users.models import User
from openslides.utils.utils import html_strong
from .models import Category, Motion
def import_motions(csvfile, default_submitter, override, importing_person=None):
"""
Imports motions from a csv file.
The file must be encoded in utf8. The first line (header) is ignored.
If no or multiple submitters found, the default submitter is used. If
a motion with a given identifier already exists, the motion is overridden,
when the flag 'override' is True. If no or multiple categories found,
the category is set to None.
"""
count_success = 0
count_lines = 0
# Check encoding
try:
csvfile.read().decode('utf8')
except UnicodeDecodeError:
return '', '', _('Import file has wrong character encoding, only UTF-8 is supported!')
csvfile.seek(0)
with transaction.atomic():
dialect = csv.Sniffer().sniff(csvfile.readline().decode('utf8'))
dialect = csv_ext.patchup(dialect)
csvfile.seek(0)
all_error_messages = []
all_warning_messages = []
for (line_no, line) in enumerate(csv.reader(
(line.decode('utf8') for line in csvfile.readlines()), dialect=dialect)):
warning = []
if line_no < 1:
# Do not read the header line
continue
importline = html_strong(_('Line %d:') % (line_no + 1))
count_lines += 1
# Check format
try:
(identifier, title, text, reason, submitter, category) = line[:6]
except ValueError:
msg = _('Line is malformed. Motion not imported. Please check the required values.')
all_error_messages.append("%s %s" % (importline, msg))
continue
# Check existing motions according to the identifier
if identifier:
try:
motion = Motion.objects.get(identifier=identifier)
except Motion.DoesNotExist:
motion = Motion(identifier=identifier)
else:
if not override:
msg = _('Identifier already exists. Motion not imported.')
all_error_messages.append("%s %s" % (importline, msg))
continue
else:
motion = Motion()
# Insert data
motion.title = title
motion.text = text
motion.reason = reason
if category:
try:
category_object = Category.objects.get(name=category)
except Category.DoesNotExist:
category_object = Category.objects.create(name=category, prefix=category[:1])
warning.append(_('Category unknown. New category created.'))
except Category.MultipleObjectsReturned:
category_object = None
warning.append(_('Several suitable categories found. No category is used.'))
motion.category = category_object
motion.save()
# Add submitter
person_found = False
if submitter:
for person in User.objects.all():
if person.get_short_name() == submitter:
if person_found:
warning.append(_('Several suitable submitters found.'))
person_found = False
break
else:
new_submitter = person
person_found = True
if not person_found:
warning.append(_('Submitter unknown. Default submitter is used.'))
new_submitter = default_submitter
# add all warnings of each csv line to one warning message
if warning:
warning_message_string = "%s " % importline
warning_message_string += " ".join(warning)
all_warning_messages.append(warning_message_string)
motion.clear_submitters()
motion.add_submitter(new_submitter)
motion.write_log(message_list=[ugettext_noop('Motion imported')],
person=importing_person)
count_success += 1
# Build final error message with all error items (one bullet point for each csv line)
full_error_message = ''
if all_error_messages:
full_error_message = "%s <ul>" % html_strong(_("Errors"))
for error in all_error_messages:
full_error_message += "<li>%s</li>" % error
full_error_message += "</ul>"
# Build final warning message with all warning items (one bullet point for each csv line)
full_warning_message = ''
if all_warning_messages:
full_warning_message = "%s <ul>" % html_strong(_("Warnings"))
for warning in all_warning_messages:
full_warning_message += "<li>%s</li>" % warning
full_warning_message += "</ul>"
# Build final success message
if count_success:
success_message = '<strong>%s</strong><br>%s' % (
_('Summary'),
_('%(counts)d of %(total)d motions successfully imported.')
% {'counts': count_success, 'total': count_lines})
else:
success_message = ''
return success_message, full_warning_message, full_error_message

2
openslides/motions/main_menu.py
View File

@ -10,5 +10,5 @@ class MotionMainMenuEntry(MainMenuEntry):
verbose_name = ugettext_lazy('Motions')
required_permission = 'motions.can_see'
default_weight = 30
pattern_name = 'motion_list'
pattern_name = '/motions' # TODO: use generic solution, see issue #1469
icon_css_class = 'glyphicon-file'

242
openslides/motions/static/js/motions/motions.js Normal file
View File

@ -0,0 +1,242 @@
angular.module('OpenSlidesApp.motions', [])
.config(function($stateProvider) {
$stateProvider
.state('motions', {
url: '/motions',
abstract: true,
template: "<ui-view/>",
})
.state('motions.motion', {
abstract: true,
template: "<ui-view/>",
})
.state('motions.motion.list', {
resolve: {
motions: function(Motion) {
return Motion.findAll();
}
}
})
.state('motions.motion.create', {
resolve: {
items: function(Agenda) {
return Agenda.findAll();
},
categories: function(Category) {
return Category.findAll();
},
workflows: function(Workflow) {
return Workflow.findAll();
},
tags: function(Tag) {
return Tag.findAll();
},
users: function(User) {
return User.findAll();
},
mediafiles: function(Mediafile) {
return Mediafile.findAll();
}
}
})
.state('motions.motion.detail', {
resolve: {
motion: function(Motion, $stateParams) {
return Motion.find($stateParams.id);
}
}
})
.state('motions.motion.detail.update', {
views: {
'@motions.motion': {}
},
resolve: {
items: function(Agenda) {
return Agenda.findAll();
},
categories: function(Category) {
return Category.findAll();
},
workflows: function(Workflow) {
return Workflow.findAll();
},
tags: function(Tag) {
return Tag.findAll();
},
users: function(User) {
return User.findAll();
},
mediafiles: function(Mediafile) {
return Mediafile.findAll();
}
}
})
.state('motions.motion.csv-import', {
url: '/csv-import',
controller: 'MotionCSVImportCtrl',
})
// categories
.state('motions.category', {
url: '/category',
abstract: true,
template: "<ui-view/>",
})
.state('motions.category.list', {
resolve: {
categories: function(Category) {
return Category.findAll();
}
}
})
.state('motions.category.create', {})
.state('motions.category.detail', {
resolve: {
category: function(Category, $stateParams) {
return Category.find($stateParams.id);
}
}
})
.state('motions.category.detail.update', {
views: {
'@motions.category': {}
}
})
})
.factory('Motion', function(DS) {
return DS.defineResource({
name: 'motions/motion',
endpoint: '/rest/motions/motion/'
});
})
.factory('Category', function(DS) {
return DS.defineResource({
name: 'motions/category',
endpoint: '/rest/motions/category/'
});
})
.factory('Workflow', function(DS) {
return DS.defineResource({
name: 'motions/workflow',
endpoint: '/rest/motions/workflow/'
});
})
.controller('MotionListCtrl', function($scope, Motion) {
Motion.bindAll({}, $scope, 'motions');
// setup table sorting
$scope.sortColumn = 'identifier';
$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;
};
// save changed motion
$scope.save = function (motion) {
Motion.save(motion);
};
$scope.delete = function (motion) {
//TODO: add confirm message
Motion.destroy(motion.id).then(
function(success) {
//TODO: success message
}
);
};
})
.controller('MotionDetailCtrl', function($scope, Motion, motion) {
Motion.bindOne(motion.id, $scope, 'motion');
})
.controller('MotionCreateCtrl',
function($scope, $state, $http, Motion, Agenda, User, Category, Workflow, Tag, Mediafile) {
Agenda.bindAll({}, $scope, 'items');
User.bindAll({}, $scope, 'users');
Category.bindAll({}, $scope, 'categories');
Workflow.bindAll({}, $scope, 'workflows');
Tag.bindAll({}, $scope, 'tags');
Mediafile.bindAll({}, $scope, 'mediafiles');
$scope.motion = {};
$scope.save = function (motion) {
motion.tags = []; // TODO: REST API should do it! (Bug in Django REST framework)
motion.attachments = []; // TODO: REST API should do it! (Bug in Django REST framework)
Motion.create(motion).then(
function(success) {
$state.go('motions.motion.list');
}
);
};
})
.controller('MotionUpdateCtrl',
function($scope, $state, $http, Motion, Agenda, User, Category, Workflow, Tag, Mediafile, motion) {
Agenda.bindAll({}, $scope, 'items');
User.bindAll({}, $scope, 'users');
Category.bindAll({}, $scope, 'categories');
Workflow.bindAll({}, $scope, 'workflows');
Tag.bindAll({}, $scope, 'tags');
Mediafile.bindAll({}, $scope, 'mediafiles');
$scope.motion = motion;
$scope.save = function (motion) {
motion.tags = []; // TODO: REST API should do it! (Bug in Django REST framework)
motion.attachments = []; // TODO: REST API should do it! (Bug in Django REST framework)
Motion.save(motion).then(
function(success) {
$state.go('motions.motion.list');
}
);
};
})
.controller('MotionCSVImportCtrl', function($scope, Motion) {
// TODO
})
.controller('CategoryListCtrl', function($scope, Category) {
Category.bindAll({}, $scope, 'categories');
$scope.delete = function (category) {
//TODO: add confirm message
Category.destroy(category.id).then(
function(success) {
//TODO: success message
}
);
};
})
.controller('CategoryDetailCtrl', function($scope, Category, category) {
Category.bindOne(category.id, $scope, 'category');
})
.controller('CategoryCreateCtrl', function($scope, $state, Category) {
$scope.category = {};
$scope.save = function (category) {
Category.create(category).then(
function(success) {
$state.go('motions.category.list');
}
);
};
})
.controller('CategoryUpdateCtrl', function($scope, $state, Category, category) {
$scope.category = category;
$scope.save = function (category) {
Category.save(category).then(
function(success) {
$state.go('motions.category.list');
}
);
};
});

12
openslides/motions/static/templates/motions/category-detail.html Normal file
View File

@ -0,0 +1,12 @@
<h1>{{ category.name }}</h1>
<div id="submenu">
<a ui-sref="motions.category.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<b translate>Prefix:</b>
{{ category.prefix }}

27
openslides/motions/static/templates/motions/category-form.html Normal file
View File

@ -0,0 +1,27 @@
<h1 ng-if="category.id" translate>Edit category</h1>
<h1 ng-if="!category.id" translate>New category</h1>
<div id="submenu">
<a ui-sref="motions.category.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<form name="groupForm">
<div class="form-group">
<label for="inputPrefix" translate>Prefix</label>
<input type="text" ng-model="category.prefix" class="form-control" name="inputPrefix">
</div>
<div class="form-group">
<label for="inputName" translate>Name</label>
<input type="text" ng-model="category.name" class="form-control" name="inputName" ng-required="true">
</div>
<button type="submit" ng-click="save(category)" class="btn btn-primary" translate>
Save
</button>
<button ui-sref="motions.category.list" class="btn btn-default" translate>
Cancel
</button>
</form>

54
openslides/motions/static/templates/motions/category-list.html Normal file
View File

@ -0,0 +1,54 @@
<h1 translate>Categories</h1>
<div id="submenu">
<a ui-sref="motions.category.create" os-perms="users.can_manage" class="btn btn-primary btn-sm">
<i class="fa fa-plus fa-lg"></i>
<translate>New</translate>
</a>
<a ui-sref="motions.motion.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<div class="row form-group">
<div class="col-sm-4 right">
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
placeholder="{{ 'Filter' | translate }}">
</div>
</div>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th ng-click="sortby='prefix';reverse=!reverse">
<translate>Prefix</translate>
<i class="fa" ng-show="sortby == 'prefix'"
ng-class="reverse ? 'fa-caret-down' : 'fa-caret-up'"></i>
<th ng-click="sortby='name';reverse=!reverse">
<translate>Name</translate>
<i class="fa" ng-show="sortby == 'name'"
ng-class="reverse ? 'fa-caret-down' : 'fa-caret-up'"></i>
<th os-perms="motions.can_manage core.can_manage_projector" class="mini_width" translate>Actions</th>
<tbody>
<tr ng-repeat="category in categories | filter: filter.search | orderBy:sortby:reverse">
<td>{{ category.prefix }}
<td><a ui-sref="motions.category.detail({id: category.id})">{{ category.name }}</a>
<td os-perms="motions.can_manage core.can_manage_projector" class="nobr">
<!-- projector, TODO: add link to activate slidea-->
<a href="#TODO" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
title="{{ 'Show' | translate }}">
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="motions.category.detail.update({id: category.id})" os-perms="motions.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate }}">
<i class="fa fa-pencil"></i>
</a>
<!-- delete -->
<a ng-click="delete(category)" os-perms="motions.can_manage" class="btn btn-danger btn-sm"
title="{{ 'Delete' | translate }}">
<i class="fa fa-trash-o"></i>
</a>
</table>

29
openslides/motions/static/templates/motions/motion-detail.html Normal file
View File

@ -0,0 +1,29 @@
<h1>{{ motion.identifier }}</h1>
<div id="submenu">
<a ui-sref="motions.motion.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
<a ui-sref="motions_single_pdf({pk: motion.id})" target="_blank" class="btn btn-default btn-sm">
<i class="fa fa-file-pdf-o fa-lg"></i>
<translate>PDF</translate>
</a>
<a href="#TODO" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
title="{{ 'Show' | translate }}">
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="motion.detail.update({id: motion.id })" os-perms="motions.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
</div>
<h3 translate>Category</h3>
{{ motion.category }}
<h3 translate>Submitters</h3>
<!-- TODO -->

91
openslides/motions/static/templates/motions/motion-form.html Normal file
View File

@ -0,0 +1,91 @@
<h1 ng-if="motion.id" translate>Edit motion</h1>
<h1 ng-if="!motion.id" translate>New motion</h1>
<div id="submenu">
<a ui-sref="motions.motion.list" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to overview</translate>
</a>
</div>
<form name="motionForm">
<div ng-if="motion.id" class="form-group">
<label for="inputIdentifier" translate>Identifier</label>
<input type="text" ng-model="motion.identifier" class="form-control" name="inputIdentifier">
</div>
<div class="form-group">
<label for="selectItem" translate>Agenda item</label>
<select ng-options="item.id as item.get_title for item in items"
ng-model="motion.item" class="form-control" name="selectItem">
</select>
</div>
<div class="form-group">
<label for="selectSubmitter" translate>Submitter</label>
<ui-select ng-model="motion.submitter" theme="bootstrap" name="selectSubmitter">
<ui-select-match placeholder="{{ 'Select or search a participant...' | translate }}">
{{ $select.selected.get_short_name() }}
</ui-select-match>
<ui-select-choices repeat="user.id as user in users | filter: $select.search">
<div ng-bind-html="user.get_short_name() | highlight: $select.search"></div>
<small ng-bind-html="user.structure_level | highlight: $select.search"></small>
</ui-select-choices>
</ui-select>
</div>
<div class="form-group" ng-class="{'has-error has-feedback': motionForm.inputTitle.$error.required}">
<label for="inputName" translate>Title</label>
<input type="text" ng-model="motion.title" class="form-control" name="inputTitle" ng-required="true">
</div>
<div class="form-group">
<label for="textText" translate>Text</label>
<textarea ng-model="motion.text" class="form-control" name="textText" />
</div>
<div class="form-group">
<label for="textReason" translate>Reason</label>
<textarea ng-model="motion.reason" class="form-control" name="textReason" />
</div>
<div class="form-group">
<label for="selectCategory" translate>Category</label>
<select ng-options="category.id as category.name for category in categories"
ng-model="motion.category" class="form-control" name="selectCategory">
</select>
</div>
<div class="form-group">
<label for="selectTags" translate>Tags</label>
<select ng-options="tag.id as tag.name for tag in tags"
ng-model="motion.tags" class="form-control" name="selectTags">
</select>
</div>
<div class="form-group">
<label for="selectAttachments" translate>Attachments</label>
<select ng-options="file.id as file.title for file in mediafiles"
ng-model="motion.attachments" class="form-control" name="selectAttachments">
</select>
</div>
<!-- TODO: show only if supporters is enabled -->
<div class="form-group">
<label for="selectSupporter" translate>Supporters</label>
<ui-select ng-model="motion.supporter" theme="bootstrap" name="selectSupporter">
<ui-select-match placeholder="{{ 'Select or search a participant...' | translate }}">
{{ $select.selected.get_short_name() }}
</ui-select-match>
<ui-select-choices repeat="user.id as user in users | filter: $select.search">
<div ng-bind-html="user.get_short_name() | highlight: $select.search"></div>
<small ng-bind-html="user.structure_level | highlight: $select.search"></small>
</ui-select-choices>
</ui-select>
</div>
<!-- TODO: preselect default workflow -->
<div class="form-group">
<label for="selectWorkflow" translate>Workflow</label>
<select ng-options="workflow.id as workflow.name for workflow in workflows"
ng-model="motion.workflow" class="form-control" name="selectWorkflow">
</select>
</div>
<button type="submit" ng-click="save(motion)" class="btn btn-primary" translate>
Save
</button>
<button ui-sref="motions.motion.list" class="btn btn-default" translate>
Cancel
</button>
</form>

69
openslides/motions/static/templates/motions/motion-list.html Normal file
View File

@ -0,0 +1,69 @@
<h1 translate>Motions</h1>
<div id="submenu">
<a ui-sref="motions.motion.create" os-perms="motions.can_manage" class="btn btn-primary btn-sm">
<i class="fa fa-plus fa-lg"></i>
<translate>New</translate>
</a>
<a ui-sref="motions.category.list" os-perms="motions.can_manage" class="btn btn-default btn-sm">
<i class="fa fa-sitemap fa-lg"></i>
<translate>Categories</translate>
</a>
<a ui-sref="core.tag.list" os-perms="core.can_manage_tags" class="btn btn-default btn-sm">
<i class="fa fa-tags fa-lg"></i>
<translate>Tags</translate>
</a>
<a ui-sref="motions_pdf" target="_blank" class="btn btn-default btn-sm">
<i class="fa fa-file-pdf-o fa-lg"></i>
<translate>PDF</translate>
</a>
</div>
<div class="row form-group">
<div class="col-sm-8">
<!-- TODO: add filters -->
</div>
<div class="col-sm-4">
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
placeholder="{{ 'Filter' | translate}}">
</div>
</div>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th ng-click="toggleSort('identifier')" class="sortable">
<translate>Identifier</translate>
<i class="pull-right fa" ng-show="sortColumn === 'identifier' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('category')" class="sortable">
<translate>Category</translate>
<i class="pull-right fa" ng-show="sortColumn === 'category' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th os-perms="motions.can_manage core.can_manage_projector" class="minimum">
<translate>Actions</translate>
<tbody>
<tr ng-repeat="motion in motions | filter: filter.search |
orderBy: sortColumn:reverse">
<td><a ui-sref="motions.motion.detail({id: motion.id})">{{ motion.identifier }}</a>
<td class="optional">{{ motion.category }}
<td os-perms="motions.can_manage core.can_manage_projector" class="nobr">
<!-- projector, TODO: add link to activate slide -->
<a href="#TODO" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
title="{{ 'Show' | translate }}">
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="motions.motion.detail.update({id: motion.id })" os-perms="motions.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
<!-- delete -->
<a ng-click="delete(motion)" os-perms="motions.can_manage" class="btn btn-danger btn-sm"
title="{{ 'Delete' | translate }}">
<i class="fa fa-trash-o"></i>
</a>
</table>

32
openslides/motions/templates/motions/widget_motion.html
View File

@ -1,32 +0,0 @@
{% extends 'core/widget.html' %}
{% load i18n %}
{% load tags %}
{% block content %}
<ul style="line-height: 180%">
{% for motion in motions %}
<li class="{% if motion.is_active_slide %}activeline{% endif %}">
<a href="{{ motion|absolute_url:'projector' }}" class="activate_link btn {% if motion.is_active_slide %}btn-primary{% endif %} btn-mini"
rel="tooltip" data-original-title="{% trans 'Show' %}">
<i class="icon-facetime-video {% if motion.is_active_slide %}icon-white{% endif %}"></i>
</a>&nbsp;
{% if perms.motions.can_manage %}
<a href="{{ motion|absolute_url:'update' }}"
rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a>
{% endif %}
<a href="{{ motion|absolute_url:'projector_preview' }}"
rel="tooltip" data-original-title="{% trans 'Preview' %}" class="btn btn-mini right">
<i class="icon-search"></i>
</a>
<a href="{{ motion|absolute_url }}">
{{ motion }}
</a>
</li>
{% empty %}
<li>{% trans 'No motions available.' %}</li>
{% endfor %}
</ul>
{% endblock %}

99
openslides/motions/urls.py
View File

@ -4,107 +4,12 @@ from . import views
urlpatterns = patterns(
'',
url(r'^$',
views.MotionListView.as_view(),
name='motion_list'),
url(r'^new/$',
views.MotionCreateView.as_view(),
name='motion_create'),
url(r'^(?P<pk>\d+)/$',
views.MotionDetailView.as_view(),
name='motion_detail'),
url(r'^(?P<pk>\d+)/edit/$',
views.MotionUpdateView.as_view(),
name='motion_update'),
url(r'^(?P<pk>\d+)/del/$',
views.MotionDeleteView.as_view(),
name='motion_delete'),
url(r'^(?P<pk>\d+)/new_amendment/$',
views.MotionCreateAmendmentView.as_view(),
name='motion_create_amendment'),
url(r'^(?P<pk>\d+)/version/(?P<version_number>\d+)/$',
views.MotionDetailView.as_view(),
name='motion_version_detail'),
url(r'^(?P<pk>\d+)/version/(?P<version_number>\d+)/permit/$',
views.VersionPermitView.as_view(),
name='motion_version_permit'),
url(r'^(?P<pk>\d+)/version/(?P<version_number>\d+)/del/$',
views.VersionDeleteView.as_view(),
name='motion_version_delete'),
url(r'^(?P<pk>\d+)/diff/$',
views.VersionDiffView.as_view(),
name='motion_version_diff'),
url(r'^(?P<pk>\d+)/support/$',
views.SupportView.as_view(support=True),
name='motion_support'),
url(r'^(?P<pk>\d+)/unsupport/$',
views.SupportView.as_view(support=False),
name='motion_unsupport'),
url(r'^(?P<pk>\d+)/create_poll/$',
views.PollCreateView.as_view(),
name='motionpoll_create'),
url(r'^(?P<pk>\d+)/poll/(?P<poll_number>\d+)/edit/$',
views.PollUpdateView.as_view(),
name='motionpoll_update'),
url(r'^(?P<pk>\d+)/poll/(?P<poll_number>\d+)/del/$',
views.PollDeleteView.as_view(),
name='motionpoll_delete'),
url(r'^(?P<pk>\d+)/poll/(?P<poll_number>\d+)/pdf/$',
views.PollPDFView.as_view(),
name='motionpoll_pdf'),
url(r'^(?P<pk>\d+)/set_state/(?P<state>\d+)/$',
views.MotionSetStateView.as_view(),
name='motion_set_state'),
url(r'^(?P<pk>\d+)/reset_state/$',
views.MotionSetStateView.as_view(reset=True),
name='motion_reset_state'),
url(r'^(?P<pk>\d+)/agenda/$',
views.CreateRelatedAgendaItemView.as_view(),
name='motion_create_agenda'),
url(r'^pdf/$',
views.MotionPDFView.as_view(print_all_motions=True),
name='motion_list_pdf'),
name='motions_pdf'),
url(r'^(?P<pk>\d+)/pdf/$',
views.MotionPDFView.as_view(print_all_motions=False),
name='motion_detail_pdf'),
url(r'^category/$',
views.CategoryListView.as_view(),
name='motion_category_list'),
url(r'^category/new/$',
views.CategoryCreateView.as_view(),
name='motion_category_create'),
url(r'^category/(?P<pk>\d+)/edit/$',
views.CategoryUpdateView.as_view(),
name='motion_category_update'),
url(r'^category/(?P<pk>\d+)/del/$',
views.CategoryDeleteView.as_view(),
name='motion_category_delete'),
url(r'^csv_import/$',
views.MotionCSVImportView.as_view(),
name='motion_csv_import'),
name='motions_single_pdf'),
)

718
openslides/motions/views.py
View File

@ -1,545 +1,16 @@
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.http import Http404, HttpResponseRedirect
from django.utils.text import slugify
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy, ugettext_noop
from reportlab.platypus import SimpleDocTemplate
from django.shortcuts import get_object_or_404
from reportlab.platypus import SimpleDocTemplate
from openslides.agenda.views import CreateRelatedAgendaItemView as _CreateRelatedAgendaItemView
from openslides.config.api import config
from openslides.poll.views import PollFormView
from openslides.utils.rest_api import ModelViewSet
from openslides.utils.utils import html_strong, htmldiff
from openslides.utils.views import (CreateView, CSVImportView, DeleteView, DetailView,
ListView, PDFView, QuestionView,
RedirectView, SingleObjectMixin, UpdateView)
from openslides.utils.views import (PDFView, SingleObjectMixin)
from .csv_import import import_motions
from .forms import (BaseMotionForm, MotionCategoryMixin,
MotionDisableVersioningMixin, MotionIdentifierMixin,
MotionCSVImportForm, MotionSubmitterMixin,
MotionSupporterMixin, MotionWorkflowMixin)
from .models import (Category, Motion, MotionPoll, MotionSubmitter,
MotionSupporter, MotionVersion, State, Workflow)
from .models import (Category, Motion, MotionPoll, Workflow)
from .pdf import motion_poll_to_pdf, motion_to_pdf, motions_to_pdf
from .serializers import CategorySerializer, MotionSerializer, WorkflowSerializer
class MotionListView(ListView):
"""
View, to list all motions.
"""
model = Motion
required_permission = 'motions.can_see'
# The template name must be set explicitly because the overridden method
# get_queryset() does not return a QuerySet any more so that Django can't
# generate the template name from the name of the model.
template_name = 'motions/motion_list.html'
# The attribute context_object_name must be set explicitly because the
# overridden method get_queryset() does not return a QuerySet any more so
# that Django can't generate the context_object_name from the name of the
# model.
context_object_name = 'motion_list'
def get_queryset(self, *args, **kwargs):
"""
Returns not a QuerySet but a filtered list of motions. Excludes motions
that the user is not allowed to see.
"""
queryset = super().get_queryset(*args, **kwargs)
motions = []
for motion in queryset:
if (not motion.state.required_permission_to_see or
self.request.user.has_perm(motion.state.required_permission_to_see)):
motions.append(motion)
return motions
class MotionDetailView(DetailView):
"""
Show one motion.
"""
model = Motion
def check_permission(self, request, *args, **kwargs):
"""
Check if the request.user has the permission to see the motion.
"""
return self.get_object().get_allowed_actions(request.user)['see']
def get_context_data(self, **kwargs):
"""
Return the template context.
Append the allowed actions for the motion, the shown version and its
data to the context.
"""
version_number = self.kwargs.get('version_number', None)
if version_number is not None:
try:
version = self.get_object().versions.get(version_number=int(version_number))
except MotionVersion.DoesNotExist:
raise Http404('Version %s not found' % version_number)
else:
version = self.get_object().get_active_version()
kwargs.update({
'allowed_actions': self.get_object().get_allowed_actions(self.request.user),
'version': version,
'title': version.title,
'text': version.text,
'reason': version.reason})
return super().get_context_data(**kwargs)
class MotionEditMixin(object):
"""
Mixin for motion views classes to save the version data.
"""
def form_valid(self, form):
"""
Saves the CreateForm or UpdateForm into a motion object.
"""
self.object = form.save(commit=False)
try:
self.object.category = form.cleaned_data['category']
except KeyError:
pass
try:
self.object.identifier = form.cleaned_data['identifier']
except KeyError:
pass
self.manipulate_object(form)
for attr in ['title', 'text', 'reason']:
setattr(self.version, attr, form.cleaned_data[attr])
self.object.save(use_version=self.version)
# Save the submitter an the supporter so the motion.
# TODO: Only delete and save neccessary submitters and supporters
if 'submitter' in form.cleaned_data:
self.object.submitter.all().delete()
MotionSubmitter.objects.bulk_create(
[MotionSubmitter(motion=self.object, person=person)
for person in form.cleaned_data['submitter']])
if 'supporter' in form.cleaned_data:
self.object.supporter.all().delete()
MotionSupporter.objects.bulk_create(
[MotionSupporter(motion=self.object, person=person)
for person in form.cleaned_data['supporter']])
# Save the attachments
self.object.attachments.clear()
self.object.attachments.add(*form.cleaned_data['attachments'])
# Save the tags
self.object.tags.clear()
self.object.tags.add(*form.cleaned_data['tags'])
messages.success(self.request, self.get_success_message())
return HttpResponseRedirect(self.get_success_url())
def get_form_class(self):
"""
Return the FormClass to create or update the motion.
forms.BaseMotionForm is the base for the Class, and some FormMixins
will be mixed in dependence of some config values. See motion.forms
for more information on the mixins.
"""
form_classes = []
if (self.request.user.has_perm('motions.can_manage') and
(config['motion_identifier'] == 'manually' or type(self) == MotionUpdateView)):
form_classes.append(MotionIdentifierMixin)
form_classes.append(BaseMotionForm)
if self.request.user.has_perm('motions.can_manage'):
form_classes.append(MotionSubmitterMixin)
form_classes.append(MotionCategoryMixin)
if config['motion_min_supporters'] > 0:
form_classes.append(MotionSupporterMixin)
form_classes.append(MotionWorkflowMixin)
if self.object:
if config['motion_allow_disable_versioning'] and self.object.state.versioning:
form_classes.append(MotionDisableVersioningMixin)
return type('MotionForm', tuple(form_classes), {})
class MotionCreateView(MotionEditMixin, CreateView):
"""
View to create a motion.
"""
model = Motion
def check_permission(self, request, *args, **kwargs):
"""
Checks whether the requesting user can submit a new motion. He needs
at least the permission 'motions.can_create'. If the submitting
of new motions by non-staff users is stopped via config variable
'motion_stop_submitting', the requesting user needs also to have
'motions.can_manage'.
"""
if request.user.has_perm('motions.can_create'):
return not config['motion_stop_submitting'] or request.user.has_perm('motions.can_manage')
return False
def form_valid(self, form):
"""
Write a log message and set the submitter if necessary.
"""
# First, validate and process the form and create the motion
response = super().form_valid(form)
# Write the log message
self.object.write_log([ugettext_noop('Motion created')], self.request.user)
# Set submitter to request.user if no submitter is set yet
if ('submitter' not in form.cleaned_data or
not form.cleaned_data['submitter']):
self.object.add_submitter(self.request.user)
return response
def get_initial(self):
"""
Sets the initial data for the MotionCreateForm.
"""
initial = super().get_initial()
initial['text'] = config['motion_preamble']
if self.request.user.has_perm('motions.can_manage'):
initial['workflow'] = config['motion_workflow']
return initial
def manipulate_object(self, form):
"""
Sets first state according to given or default workflow and initiates
a new version.
"""
workflow = form.cleaned_data.get('workflow', int(config['motion_workflow']))
self.object.reset_state(workflow)
self.version = self.object.get_new_version()
class MotionCreateAmendmentView(MotionCreateView):
"""
Create an amendment.
"""
def dispatch(self, *args, **kwargs):
if not config['motion_amendments_enabled']:
raise Http404('Amendments are disabled in the config.')
return super().dispatch(*args, **kwargs)
def get_parent_motion(self):
"""
Gets the parent motion from the url.
Caches the value.
"""
try:
parent = self._object_parent
except AttributeError:
# self.get_object() is the django method, which does not cache the
# object. For now this is not a problem, because get_object() is only
# called once.
parent = self._object_parent = self.get_object()
return parent
def manipulate_object(self, form):
"""
Sets the parent to the motion to which this amendment refers.
"""
self.object.parent = self.get_parent_motion()
super().manipulate_object(form)
def get_initial(self):
"""
Sets the initial values to the form.
This are the values for title, text and reason which are set to the
values from the parent motion.
"""
initial = super().get_initial()
parent = self.get_parent_motion()
initial['title'] = parent.title
initial['text'] = parent.text
initial['reason'] = parent.reason
initial['category'] = parent.category
return initial
class MotionUpdateView(MotionEditMixin, UpdateView):
"""
View to update a motion.
"""
model = Motion
def check_permission(self, request, *args, **kwargs):
"""
Check if the request.user has the permission to edit the motion.
"""
return self.get_object().get_allowed_actions(request.user)['update']
def form_valid(self, form):
"""
Writes a log message and removes supports in some cases if the form is valid.
"""
response = super().form_valid(form)
self.write_log()
if (config['motion_remove_supporters'] and self.object.state.allow_support and
not self.request.user.has_perm('motions.can_manage')):
self.object.clear_supporters()
self.object.write_log([ugettext_noop('All supporters removed')], self.request.user)
return response
def write_log(self):
"""
Writes a log message. Distinguishs whether a version was created or updated.
"""
if self.version.id is None:
number = self.object.get_last_version().version_number
created = False
else:
number = self.version.version_number
created = self.used_new_version
self.object.write_log(
[ugettext_noop('Motion version'),
' %d ' % number,
ugettext_noop('created') if created else ugettext_noop('updated')],
self.request.user)
def get_initial(self):
initial = super().get_initial()
if self.request.user.has_perm('motions.can_manage'):
initial['workflow'] = self.object.state.workflow
return initial
def manipulate_object(self, form):
"""
Resets state if the workflow should change and decides whether to use a
new version or the last version.
"""
workflow = form.cleaned_data.get('workflow', None)
if (workflow is not None and
workflow != self.object.state.workflow):
self.object.reset_state(workflow)
# Decide if a new version is saved to the database
if (self.object.state.versioning and
not form.cleaned_data.get('disable_versioning', False)):
self.version = self.object.get_new_version()
self.used_new_version = True
else:
self.version = self.object.get_last_version()
self.used_new_version = False
class MotionDeleteView(DeleteView):
"""
View to delete a motion.
"""
model = Motion
success_url_name = 'motion_list'
def check_permission(self, request, *args, **kwargs):
"""
Check if the request.user has the permission to delete the motion.
"""
return self.get_object().get_allowed_actions(request.user)['delete']
def get_final_message(self):
return _('%s was successfully deleted.') % _('Motion')
class VersionDeleteView(DeleteView):
"""
View to delete a motion version.
"""
model = MotionVersion
required_permission = 'motions.can_manage'
success_url_name = 'motion_detail'
def get_object(self):
try:
version = self._object
except AttributeError:
try:
motion = Motion.objects.get(pk=int(self.kwargs.get('pk')))
except Motion.DoesNotExist:
raise Http404('Motion %s not found.' % self.kwargs.get('pk'))
try:
version = MotionVersion.objects.get(
motion=motion,
version_number=int(self.kwargs.get('version_number')))
except MotionVersion.DoesNotExist:
raise Http404('Version %s not found.' % self.kwargs.get('version_number'))
if version == motion.active_version:
raise Http404('You can not delete the active version of a motion.')
self._object = version
return version
def get_url_name_args(self):
return (self.get_object().motion_id, )
class VersionPermitView(SingleObjectMixin, QuestionView):
"""
View to permit a version of a motion.
"""
model = Motion
final_message = ugettext_lazy('Version successfully permitted.')
required_permission = 'motions.can_manage'
question_url_name = 'motion_version_detail'
def get(self, *args, **kwargs):
"""
Sets self.version to a motion version.
"""
version_number = self.kwargs.get('version_number', None)
try:
self.version = self.get_object().versions.get(version_number=int(version_number))
except MotionVersion.DoesNotExist:
raise Http404('Version %s not found.' % version_number)
return super().get(*args, **kwargs)
def get_url_name_args(self):
"""
Returns a list with arguments to create the success- and question_url.
"""
return [self.get_object().pk, self.version.version_number]
def get_question_message(self):
"""
Return a string, shown to the user as question to permit the version.
"""
return _('Are you sure you want permit version %s?') % self.version.version_number
def on_clicked_yes(self):
"""
Activate the version, if the user chooses 'yes'.
"""
self.get_object().active_version = self.version
self.get_object().save(update_fields=['active_version'])
self.get_object().write_log(
message_list=[ugettext_noop('Version'),
' %d ' % self.version.version_number,
ugettext_noop('permitted')],
person=self.request.user)
class VersionDiffView(DetailView):
"""
Show diff between two versions of a motion.
"""
model = Motion
template_name = 'motions/motion_diff.html'
def check_permission(self, request, *args, **kwargs):
"""
Check if the request.user has the permission to see the motion.
"""
return self.get_object().get_allowed_actions(request.user)['see']
def get_context_data(self, **kwargs):
"""
Return the template context with versions and html diff strings.
"""
try:
rev1 = int(self.request.GET['rev1'])
rev2 = int(self.request.GET['rev2'])
version_rev1 = self.get_object().versions.get(version_number=rev1)
version_rev2 = self.get_object().versions.get(version_number=rev2)
diff_text = htmldiff(version_rev1.text, version_rev2.text)
diff_reason = htmldiff(version_rev1.reason, version_rev2.reason)
except (KeyError, ValueError, MotionVersion.DoesNotExist):
messages.error(self.request, _('At least one version number is not valid.'))
version_rev1 = None
version_rev2 = None
diff_text = None
diff_reason = None
context = super().get_context_data(**kwargs)
context.update({
'version_rev1': version_rev1,
'version_rev2': version_rev2,
'diff_text': diff_text,
'diff_reason': diff_reason,
})
return context
class SupportView(SingleObjectMixin, QuestionView):
"""
View to support or unsupport a motion.
If self.support is True, the view will append a request.user to the supporter list.
If self.support is False, the view will remove a request.user from the supporter list.
"""
required_permission = 'motions.can_support'
model = Motion
support = True
def check_permission(self, request):
"""
Return True if the user can support or unsupport the motion. Else: False.
"""
allowed_actions = self.get_object().get_allowed_actions(request.user)
if self.support and not allowed_actions['support']:
messages.error(request, _('You can not support this motion.'))
return False
elif not self.support and not allowed_actions['unsupport']:
messages.error(request, _('You can not unsupport this motion.'))
return False
else:
return True
def get_question_message(self):
"""
Return the question string.
"""
if self.support:
return _('Do you really want to support this motion?')
else:
return _('Do you really want to unsupport this motion?')
def on_clicked_yes(self):
"""
Append or remove the request.user from the motion.
First the method checks the permissions, and writes a log message after
appending or removing the user.
"""
if self.check_permission(self.request):
user = self.request.user
if self.support:
self.get_object().support(person=user)
self.get_object().write_log([ugettext_noop('Motion supported')], user)
else:
self.get_object().unsupport(person=user)
self.get_object().write_log([ugettext_noop('Motion unsupported')], user)
def get_final_message(self):
"""
Return the success message.
"""
if self.support:
return _("You have supported this motion successfully.")
else:
return _("You have unsupported this motion successfully.")
class MotionViewSet(ModelViewSet):
"""
API endpoint to list, retrieve, create, update and destroy motions.
@ -562,29 +33,6 @@ class MotionViewSet(ModelViewSet):
self.permission_denied(request)
class PollCreateView(SingleObjectMixin, RedirectView):
"""
View to create a poll for a motion.
"""
required_permission = 'motions.can_manage'
model = Motion
url_name = 'motionpoll_detail'
def pre_redirect(self, request, *args, **kwargs):
"""
Create the poll for the motion.
"""
self.poll = self.get_object().create_poll()
self.get_object().write_log([ugettext_noop("Poll created")], request.user)
messages.success(request, _("New vote was successfully created."))
def get_redirect_url(self, **kwargs):
"""
Return the URL to the UpdateView of the poll.
"""
return reverse('motionpoll_update', args=[self.get_object().pk, self.poll.poll_number])
class PollMixin(object):
"""
Mixin for the PollUpdateView and the PollDeleteView.
@ -617,60 +65,6 @@ class PollMixin(object):
return [self.get_object().motion.pk]
class PollUpdateView(PollMixin, PollFormView):
"""
View to update a MotionPoll.
"""
poll_class = MotionPoll
"""
Poll Class to use for this view.
"""
template_name = 'motions/motionpoll_form.html'
def get_context_data(self, **kwargs):
"""
Return the template context.
Append the motion object to the context.
"""
context = super().get_context_data(**kwargs)
context.update({
'motion': self.poll.motion,
'poll': self.poll})
return context
def form_valid(self, form):
"""
Write a log message, if the form is valid.
"""
value = super().form_valid(form)
self.get_object().write_log([ugettext_noop('Poll updated')], self.request.user)
return value
class PollDeleteView(PollMixin, DeleteView):
"""
View to delete a MotionPoll.
"""
model = MotionPoll
def on_clicked_yes(self):
"""
Write a log message, if the form is valid.
"""
super().on_clicked_yes()
self.get_object().motion.write_log([ugettext_noop('Poll deleted')], self.request.user)
def get_redirect_url(self, **kwargs):
"""
Return the URL to the DetailView of the motion.
"""
return reverse('motion_detail', args=[self.get_object().motion.pk])
class PollPDFView(PollMixin, PDFView):
"""
Generates a ballotpaper.
@ -700,57 +94,6 @@ class PollPDFView(PollMixin, PDFView):
motion_poll_to_pdf(pdf, self.get_object())
class MotionSetStateView(SingleObjectMixin, RedirectView):
"""
View to set the state of a motion.
If self.reset is False, the new state is taken from url.
If self.reset is True, the default state is taken.
"""
required_permission = 'motions.can_manage'
url_name = 'motion_detail'
model = Motion
reset = False
def pre_redirect(self, request, *args, **kwargs):
"""
Save the new state and write a log message.
"""
success = False
if self.reset:
self.get_object().reset_state()
success = True
elif self.get_object().state.id == int(kwargs['state']):
messages.error(request, _('You can not set the state of the motion. It is already done.'))
elif int(kwargs['state']) not in [state.id for state in self.get_object().state.next_states.all()]:
messages.error(request, _('You can not set the state of the motion to %s.') % _(State.objects.get(pk=int(kwargs['state'])).name))
else:
self.get_object().set_state(int(kwargs['state']))
success = True
if success:
self.get_object().save(update_fields=['state', 'identifier'])
self.get_object().write_log(
message_list=[ugettext_noop('State changed to'), ' ', self.get_object().state.name], # TODO: Change string to 'State set to ...'
person=self.request.user)
messages.success(request,
_('The state of the motion was set to %s.')
% html_strong(_(self.get_object().state.name)))
class CreateRelatedAgendaItemView(_CreateRelatedAgendaItemView):
"""
View to create and agenda item for a motion.
"""
model = Motion
def pre_redirect(self, request, *args, **kwargs):
"""
Create the agenda item.
"""
super().pre_redirect(request, *args, **kwargs)
self.get_object().write_log([ugettext_noop('Agenda item created')], self.request.user)
class MotionPDFView(SingleObjectMixin, PDFView):
"""
Create the PDF for one or for all motions.
@ -811,35 +154,6 @@ class MotionPDFView(SingleObjectMixin, PDFView):
motion_to_pdf(pdf, self.get_object())
class CategoryListView(ListView):
required_permission = 'motions.can_manage'
model = Category
class CategoryCreateView(CreateView):
fields = ("name", "prefix",)
required_permission = 'motions.can_manage'
model = Category
success_url_name = 'motion_category_list'
url_name_args = []
class CategoryUpdateView(UpdateView):
fields = ("name", "prefix",)
required_permission = 'motions.can_manage'
model = Category
success_url_name = 'motion_category_list'
url_name_args = []
class CategoryDeleteView(DeleteView):
required_permission = 'motions.can_manage'
model = Category
question_url_name = 'motion_category_list'
url_name_args = []
success_url_name = 'motion_category_list'
class CategoryViewSet(ModelViewSet):
"""
API endpoint to list, retrieve, create, update and destroy categories.
@ -859,32 +173,6 @@ class CategoryViewSet(ModelViewSet):
self.permission_denied(request)
class MotionCSVImportView(CSVImportView):
"""
Imports motions from an uploaded csv file.
"""
form_class = MotionCSVImportForm
required_permission = 'motions.can_manage'
success_url_name = 'motion_list'
template_name = 'motions/motion_form_csv_import.html'
def get_initial(self, *args, **kwargs):
"""
Sets the request user as initial for the default submitter.
"""
return_value = super().get_initial(*args, **kwargs)
return_value.update({'default_submitter': self.request.user.person_id})
return return_value
def form_valid(self, form):
success, warning, error = import_motions(importing_person=self.request.user, **form.cleaned_data)
messages.success(self.request, success)
messages.warning(self.request, warning)
messages.error(self.request, error)
# Overleap method of CSVImportView
return super(CSVImportView, self).form_valid(form)
class WorkflowViewSet(ModelViewSet):
"""
API endpoint to list, retrieve, create, update and destroy workflows.

25
openslides/urls.py
View File

@ -10,24 +10,30 @@ handler500 = ErrorView.as_view(status_code=500)
urlpatterns = patterns(
'',
url(r'^', include('openslides.core.urls')),
url(r'^core.*', IndexView.as_view()),
url(r'^rest/', include(router.urls)),
url(r'^users/', include('openslides.users.urls')),
url(r'^users.*', IndexView.as_view()),
url(r'^assignments/', include('openslides.assignments.urls')),
url(r'^assignments.*', IndexView.as_view()),
url(r'^agenda/', include('openslides.agenda.urls')),
url(r'^agenda.*', IndexView.as_view()),
url(r'^motions/', include('openslides.motions.urls')),
url(r'^motions.*', IndexView.as_view()),
url(r'^mediafiles/', include('openslides.mediafiles.urls')),
url(r'^mediafiles.*', IndexView.as_view()),
# TODO: all patterns end with ".*" can be removed after we add the global
# url-pattern "/" to the indexView
# Activate next lines to get more AngularJS views
# url(r'^$', IndexView.as_view()),
# url(r'^assignments.*', IndexView.as_view()),
# url(r'^agenda.*', IndexView.as_view()),
)
# Deprecated urls. Move them up when the apps are refactored.
urlpatterns += patterns(
'',
(r'^agenda/', include('openslides.agenda.urls')),
(r'^motions/', include('openslides.motions.urls')),
(r'^assignments/', include('openslides.assignments.urls')),
(r'^mediafiles/', include('openslides.mediafiles.urls')),
(r'^config/', include('openslides.config.urls')),
(r'^projector/', include('openslides.projector.urls')),
(r'^i18n/', include('django.conf.urls.i18n')),
@ -44,8 +50,3 @@ urlpatterns += patterns(
UserPasswordSettingsView.as_view(),
name='password_change'),
)
urlpatterns += patterns(
'',
(r'^', include('openslides.core.urls')),
)

2
openslides/users/main_menu.py
View File

@ -10,5 +10,5 @@ class UserMainMenuEntry(MainMenuEntry):
verbose_name = ugettext_lazy('Users')
required_permission = 'users.can_see_extra_data'
default_weight = 50
pattern_name = 'core_dashboard'
pattern_name = '/users' # TODO: use generic solution, see issue #1469
icon_css_class = 'glyphicon-user'

96
openslides/users/static/js/users/users.js
View File

@ -61,8 +61,8 @@ angular.module('OpenSlidesApp.users', [])
})
.state('users.group.create', {
resolve: {
groups: function(Group) {
return Group.findAll();
permissions: function($http) {
return $http({ 'method': 'OPTIONS', 'url': '/rest/users/group/' })
}
}
})
@ -76,6 +76,11 @@ angular.module('OpenSlidesApp.users', [])
.state('users.group.detail.update', {
views: {
'@users.group': {}
},
resolve: {
permissions: function($http) {
return $http({ 'method': 'OPTIONS', 'url': '/rest/users/group/' })
}
}
});
})
@ -236,22 +241,28 @@ angular.module('OpenSlidesApp.users', [])
.controller('UserListCtrl', function($scope, User) {
User.bindAll({}, $scope, 'users');
$scope.sortby = 'first_name';
$scope.reverse = false;
$scope.filterPresent = '';
// setup table sorting
$scope.sortColumn = 'first_name'; //TODO: sort by first OR last name
$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;
};
// save changed user
$scope.togglePresent = function (user) {
//the value was changed by the template (checkbox)
User.save(user);
};
// delete user
$scope.delete = function (user) {
//TODO: add confirm message
User.destroy(user.id).then(
function(success) {
//TODO: success message
}
);
User.destroy(user.id);
};
})
@ -283,36 +294,60 @@ angular.module('OpenSlidesApp.users', [])
};
})
.controller('UserCSVImportCtrl', function($scope, User) {
// TODO
.controller('UserCSVImportCtrl', function($scope, $state, User) {
$scope.csv = {
content: null,
header: true,
separator: ',',
result: null
};
$scope.import = function (result) {
console.log(result);
var obj = JSON.parse(result);
console.log(obj);
var imported_users = 0;
for (var i = 0; i < obj.length; i++) {
var user = {};
// TODO: use generic solution to get csv column values
user.title = obj[i].Titel;
user.first_name = obj[i].Vorname;
user.last_name = obj[i].Nachname;
user.groups = "3";
User.create(user).then(
function(success) {
imported_users++;
}
);
}
$state.go('users.user.list');
}
})
.controller('GroupListCtrl', function($scope, Group) {
Group.bindAll({}, $scope, 'groups');
$scope.delete = function (group) {
//TODO: add confirm message
Group.destroy(group.id).then(
function(success) {
//TODO: success message
}
);
Group.destroy(group.id);
};
})
.controller('GroupCreateCtrl', function($scope, $state, Group) {
//TODO: permissions Group.bindAll({}, $scope, 'groups');
.controller('GroupCreateCtrl', function($scope, $state, Group, permissions) {
// get all permissions
$scope.permissions = permissions.data.actions.POST.permissions.choices;
$scope.group = {};
$scope.save = function (group) {
Group.create(group).then(
function(success) {
$state.go('^');
$state.go('users.group.list');
}
);
};
})
.controller('GroupUpdateCtrl', function($scope, $state, Group, group) {
.controller('GroupUpdateCtrl', function($scope, $state, Group, permissions, group) {
// get all permissions
$scope.permissions = permissions.data.actions.POST.permissions.choices;
$scope.group = group; // autoupdate is not activated
$scope.save = function (group) {
Group.save(group).then(
@ -335,21 +370,8 @@ angular.module('OpenSlidesApp.users', [])
// DS.flush();
});
};
})
$scope.login = function(username, password) {
$http.post(
'/users/login/',
{'username': username, 'password': password}
).success(function(data) {
if (data.success) {
operator.setUser(data.user_id);
$scope.loginFailed = false;
} else {
$scope.loginFailed = true;
}
});
};
});
// this is code from angular.js. Find a way to call this function from this file

10
openslides/users/static/templates/users/group-form.html
View File

@ -1,5 +1,5 @@
<h1 ng-if="group.id">Edit group</h1>
<h1 ng-if="!group.id">New group</h1>
<h1 ng-if="group.id" translate>Edit group</h1>
<h1 ng-if="!group.id" translate>New group</h1>
<div id="submenu">
<a ui-sref="users.group.list" class="btn btn-sm btn-default">
@ -8,15 +8,15 @@
</a>
</div>
<form name="userForm">
<form name="groupForm">
<div class="form-group">
<label for="inputName" translate>Name</label>
<input type="text" ng-model="group.name" class="form-control" name="inputName" ng-required="true">
</div>
<div class="form-group">
<label for="selectPermissions" translate>Permissions</label>
<select ng-options="group.permissions for group in groups"
ng-model="group.permissions" class="form-control" name="selectGroups">
<select multiple size="15" ng-options="permission.value as permission.display_name for permission in permissions"
ng-model="group.permissions" class="form-control" name="selectPermissions">
</select>
</div>

6
openslides/users/static/templates/users/group-list.html
View File

@ -33,7 +33,7 @@
<tbody>
<tr ng-repeat="group in groups | filter: filter.search | orderBy:sortby:reverse">
<td>{{ group.id }}
<td><a ui-sref="users.group.detail({id: group.id })">{{ group.name }}</a>
<td><a ui-sref="users.group.detail({id: group.id})">{{ group.name }}</a>
<td os-perms="users.can_manage core.can_manage_projector" class="nobr">
<!-- projector, TODO: add link to activate slidea-->
<a href="#TODO" os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
@ -41,13 +41,15 @@
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="users.group.detail.update({id: group.id })" os-perms="users.can_manage"
<a ui-sref="users.group.detail.update({id: group.id})" os-perms="users.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate }}">
<i class="fa fa-pencil"></i>
</a>
<!-- delete -->
<a ng-click="delete(group)" os-perms="users.can_manage" class="btn btn-danger btn-sm"
ng-bootbox-confirm="Are you sure you want to delete <b>{{ group.name }}</b>?"
ng-bootbox-confirm-action="delete(group)"
title="{{ 'Delete' | translate }}">
<i class="fa fa-trash-o"></i>
</a>

29
openslides/users/static/templates/users/user-csv-import.html
View File

@ -26,19 +26,28 @@
</a>
</ul>
<!-- TODO: add post url to form-->
<form>
<div class="form-group">
<label for="InputFile" translate>CSV file:</label>
<input type="file" id="InputFile">
<p class="help-block" translate>The file has to be encoded in UTF-8.
</div>
<ng-csv-import
content="csv.content"
class="import"
header="csv.header"
separator="csv.separator"
result="csv.result"></ng-csv-import>
<!--TODO-->
<button type="submit" ng-click="" class="btn btn-primary" translate>
<div ng-if="csv.content">
<h2>CSV</h2>
<div class="content"><pre>{{ csv.content }}</pre></div>
</div>
<div ng-if="csv.result">
<h2>JSON</h2>
<div class="content"><pre>{{ csv.result }}</pre></div>
</div>
<div class="form-group">
<button ng-click="import(csv.result)" class="btn btn-primary" translate>
Import
</button>
<button ui-sref="users.user.list" class="btn btn-default" translate>
Cancel
</button>
</form>
</div>

23
openslides/users/static/templates/users/user-form.html
View File

@ -8,17 +8,14 @@
</a>
</div>
<form name="userForm">
<div ng-if="user.id" ng-class="{'has-error has-feedback': userForm.inputUsername.$error.required}"
class="form-group">
<form name="userForm" >
<div ng-if="user.id" class="form-group">
<label for="inputUsername" translate>Username</label>
<input type="text" ng-model="user.username" ng-required="true" class="form-control"
name="inputUsername">
<i ng-if="userForm.inputUsername.$error.required"
class="fa fa-times fa-lg form-control-feedback"></i>
<p ng-show="userForm.inputUsername.$error.required"
class="error-message help-block" translate>
Username is required.
<input type="text"
ng-model="user.username"
class="form-control"
name="inputUsername"
required>
</div>
<div class="form-group row">
<div class="col-xs-2">
@ -38,13 +35,11 @@
<label for="inputStructureLevel" translate>Structure level</label>
<input type="text" ng-model="user.structure_level" class="form-control" name="inputStructureLevel">
</div>
<div class="form-group" ng-class="{'has-error has-feedback': userForm.selectGroups.$error.required}">
<div class="form-group">
<label for="selectGroups" translate>Groups</label>
<select multiple ng-options="group.id as group.name for group in groups"
ng-required="true" ng-model="user.groups" class="form-control" name="selectGroups">
ng-model="user.groups" class="form-control" name="selectGroups" required>
</select>
<p ng-show="userForm.selectGroups.$error.required" class="error-message help-block" translate>
Group is required.
</div>
<div class="form-group row">
<div class="col-xs-6">

53
openslides/users/static/templates/users/user-list.html
View File

@ -67,39 +67,42 @@
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th ng-click="sortby='is_present';reverse=!reverse">
<th ng-click="toggleSort('is_present')" class="sortable minimum">
<translate>Present</translate>
<i class="fa" ng-show="sortby == 'is_present'"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'"></i>
<th ng-click="sortby='first_name';reverse=!reverse">
<i class="pull-right fa" ng-show="sortColumn === 'is_present' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('first_name')" class="sortable">
<translate>Name</translate>
<i class="fa" ng-show="sortby == 'first_name'"
ng-class="reverse ? 'fa-caret-down' : 'fa-caret-up'"></i>
<th class="optional" ng-click="sortby='structure_level';reverse=!reverse">
<!-- TODO: sort by first OR last name -->
<i class="pull-right fa" ng-show="sortColumn === 'first_name' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('structure_level')" class="sortable optional">
<translate>Structure level</translate>
<i class="fa" ng-show="sortby == 'structure_level'"
ng-class="reverse ? 'fa-caret-down' : 'fa-caret-up'"></i>
<th class="optional" ng-click="sortby='groups';reverse=!reverse">
<i class="pull-right fa" ng-show="sortColumn === 'structure_level' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th ng-click="toggleSort('groups')" class="sortable optional">
<translate>Group</translate>
<i class="fa" ng-show="sortby == 'groups'"
ng-class="reverse ? 'fa-caret-down' : 'fa-caret-up'"></i>
<th os-perms="users.can_manage" class="optional" ng-click="sortby='comment';reverse=!reverse">
<translate>Comment</translate>
<i class="fa" ng-show="sortby == 'comment'"
ng-class="reverse ? 'fa-caret-down' : 'fa-caret-up'"></i>
<th os-perms="users.can_manage" class="optional" ng-click="sortby='last_login';reverse=!reverse">
<i class="pull-right fa" ng-show="sortColumn === 'groups' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th os-perms="users.can_manage" ng-click="toggleSort('last_login')" class="sortable optional">
<translate>Last Login</translate>
<i class="fa" ng-show="sortby == 'last_login'"
ng-class="reverse ? 'fa-caret-down' : 'fa-caret-up'"></i>
<th os-perms="users.can_manage core.can_manage_projector" class="mini_width" translate>Actions</th>
<i class="pull-right fa" ng-show="sortColumn === 'last_login' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i>
<th os-perms="users.can_manage core.can_manage_projector" class="minimum">
<translate>Actions</translate>
<tbody>
<tr ng-repeat="user in users | filter: filter.search | filter: {is_present: filterPresent} |
orderBy: sortby:reverse">
orderBy: sortColumn:reverse">
<td><input type="checkbox" ng-model="user.is_present" ng-click="togglePresent(user)">
<td><a ui-sref="users.user.detail({id: user.id})">{{ user.get_short_name() }}</a>
<div ng-if="user.comment"><small><i class="fa fa-info-circle"></i> {{ user.comment }}</small></div>
<td class="optional">{{ user.structure_level }}
<td class="optional">{{ user.groups }}
<td os-perms="users.can_manage" class="optional">{{ user.comment }}
<td os-perms="users.can_manage" class="optional">{{ user.last_login | date:'yyyy-MM-dd HH:mm:ss'}}
<td os-perms="users.can_manage core.can_manage_projector" class="nobr">
<!-- projector, TODO: add link to activate slidea-->
@ -108,13 +111,15 @@
<i class="fa fa-video-camera"></i>
</a>
<!-- edit -->
<a ui-sref="users.user.detail.update({id: user.id })" os-perms="users.can_manage"
<a ui-sref="users.user.detail.update({id: user.id})" os-perms="users.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>
</a>
<!-- delete -->
<a ng-click="delete(user)" os-perms="users.can_manage" class="btn btn-danger btn-sm"
<a os-perms="users.can_manage" class="btn btn-danger btn-sm"
ng-bootbox-confirm="Are you sure you want to delete <b>{{ user.get_short_name() }}</b>?"
ng-bootbox-confirm-action="delete(user)"
title="{{ 'Delete' | translate }}">
<i class="fa fa-trash-o"></i>
</a>

3
openslides/users/urls.py
View File

@ -4,9 +4,6 @@ from . import views
urlpatterns = patterns(
'',
url(r'^csv_import/$',
views.UserCSVImportView.as_view(),
name='user_csv_import'),
# PDF
url(r'^print/$',

3
tests/old/account/test_widgets.py
View File

@ -1,3 +1,5 @@
from unittest import skip
from django.test.client import Client
from openslides.config.api import config
@ -51,6 +53,7 @@ class PersonalInfoWidget(TestCase):
response = self.client.get('/dashboard/')
self.assertContains(response, 'My personal info', status_code=200)
@skip
def test_item_list(self):
agenda = self.import_agenda()
if agenda:

18
tests/old/agenda/test_list_of_speakers.py
View File

@ -1,3 +1,4 @@
from unittest import skip
from unittest.mock import patch, MagicMock
from django.contrib.auth.models import Permission
@ -128,6 +129,7 @@ class SpeakerViewTestCase(TestCase):
class TestSpeakerAppendView(SpeakerViewTestCase):
@skip
def test_get(self):
self.assertFalse(Speaker.objects.filter(user=self.speaker1, item=self.item1).exists())
self.assertEqual(Speaker.objects.filter(item=self.item1).count(), 0)
@ -143,6 +145,7 @@ class TestSpeakerAppendView(SpeakerViewTestCase):
self.assertEqual(Speaker.objects.filter(item=self.item1).count(), 1)
self.assertMessage(response, 'speaker1 is already on the list of speakers of item 1.')
@skip
def test_closed_list(self):
self.item1.speaker_list_closed = True
self.item1.save()
@ -153,6 +156,7 @@ class TestSpeakerAppendView(SpeakerViewTestCase):
class TestAgendaItemView(SpeakerViewTestCase):
@skip
def test_post(self):
# Set speaker1 to item1
response = self.admin_client.post(
@ -166,9 +170,11 @@ class TestAgendaItemView(SpeakerViewTestCase):
class TestSpeakerDeleteView(SpeakerViewTestCase):
@skip
def test_get(self):
self.check_url('/agenda/1/speaker/del/', self.speaker1_client, 302)
@skip
def test_post_as_admin(self):
speaker = Speaker.objects.add(self.speaker1, self.item1)
@ -177,6 +183,7 @@ class TestSpeakerDeleteView(SpeakerViewTestCase):
self.assertEqual(response.status_code, 302)
self.assertFalse(Speaker.objects.filter(user=self.speaker1, item=self.item1).exists())
@skip
def test_post_as_user(self):
Speaker.objects.add(self.speaker1, self.item1)
@ -187,6 +194,7 @@ class TestSpeakerDeleteView(SpeakerViewTestCase):
class TestSpeakerSpeakView(SpeakerViewTestCase):
@skip
def test_get(self):
url = '/agenda/1/speaker/%s/speak/' % self.speaker1.pk
response = self.check_url(url, self.admin_client, 302)
@ -200,6 +208,7 @@ class TestSpeakerSpeakView(SpeakerViewTestCase):
class TestSpeakerEndSpeachView(SpeakerViewTestCase):
@skip
def test_get(self):
url = '/agenda/1/speaker/end_speach/'
response = self.check_url(url, self.admin_client, 302)
@ -214,6 +223,7 @@ class TestSpeakerEndSpeachView(SpeakerViewTestCase):
class SpeakerListOpenView(SpeakerViewTestCase):
@skip
def test_get(self):
self.check_url('/agenda/1/speaker/close/', self.admin_client, 302)
item = Item.objects.get(pk=self.item1.pk)
@ -225,6 +235,7 @@ class SpeakerListOpenView(SpeakerViewTestCase):
class GlobalListOfSpeakersLinks(SpeakerViewTestCase):
@skip
def test_global_redirect_url(self):
response = self.speaker1_client.get('/agenda/list_of_speakers/')
self.assertRedirects(response, '/dashboard/')
@ -234,6 +245,7 @@ class GlobalListOfSpeakersLinks(SpeakerViewTestCase):
response = self.speaker1_client.get('/agenda/list_of_speakers/')
self.assertRedirects(response, '/agenda/1/')
@skip
def test_global_add_url(self):
response = self.speaker1_client.get('/agenda/list_of_speakers/add/')
self.assertRedirects(response, '/dashboard/')
@ -252,6 +264,7 @@ class GlobalListOfSpeakersLinks(SpeakerViewTestCase):
@patch('openslides.projector.api.slide_callback', {})
@patch('openslides.projector.api.slide_model', {})
@skip
def test_next_speaker_on_related_item(self):
"""
Test to add a speaker on a related item.
@ -269,6 +282,7 @@ class GlobalListOfSpeakersLinks(SpeakerViewTestCase):
self.assertEqual(Speaker.objects.get(item__pk=agenda_item.pk).user, self.speaker1)
self.assertMessage(response, 'You were successfully added to the list of speakers.')
@skip
def test_global_next_speaker_url(self):
response = self.admin_client.get('/agenda/list_of_speakers/next/')
self.assertRedirects(response, '/dashboard/')
@ -285,6 +299,7 @@ class GlobalListOfSpeakersLinks(SpeakerViewTestCase):
self.assertRedirects(response, '/dashboard/')
self.assertTrue(Speaker.objects.get(item__pk='1').begin_time is not None)
@skip
def test_global_end_speach_url(self):
response = self.admin_client.get('/agenda/list_of_speakers/end_speach/')
self.assertRedirects(response, '/dashboard/')
@ -347,6 +362,7 @@ class TestSpeakerChangeOrderView(SpeakerViewTestCase):
Speaker.objects.add(self.speaker1, self.item1)
Speaker.objects.add(self.speaker2, self.item1)
@skip
def test_post(self):
"""
Tests to change the order of two speakers.
@ -358,6 +374,7 @@ class TestSpeakerChangeOrderView(SpeakerViewTestCase):
self.assertEqual(Speaker.objects.get(pk=1).weight, 2)
self.assertEqual(Speaker.objects.get(pk=2).weight, 1)
@skip
def test_invalid_data1(self):
"""
Tests to send invalid data.
@ -372,6 +389,7 @@ class TestSpeakerChangeOrderView(SpeakerViewTestCase):
self.assertEqual(Speaker.objects.get(pk=2).weight, 2)
self.assertMessage(response, 'Could not change order. Invalid data.')
@skip
def test_invalid_data2(self):
"""
Tests to send a speaker that does not exist.

13
tests/old/agenda/tests.py
View File

@ -35,6 +35,7 @@ class ViewTest(TestCase):
def anonymClient(self):
return Client()
@skip
def testOverview(self):
c = self.adminClient
@ -42,6 +43,7 @@ class ViewTest(TestCase):
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['items']), len(Item.objects.all()))
@skip
def testClose(self):
c = self.adminClient
@ -67,6 +69,7 @@ class ViewTest(TestCase):
HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertEqual(response.status_code, 200)
@skip
def testEdit(self):
c = self.adminClient
@ -90,6 +93,7 @@ class ViewTest(TestCase):
self.refreshItems()
self.assertEqual(self.item1.title, 'newitem1')
@skip
def test_view(self):
item = Item.objects.create(title='quai5OTeephaequ0xei0')
c = self.adminClient
@ -100,6 +104,7 @@ class ViewTest(TestCase):
response = c.get('/agenda/%s/' % item.id)
self.assertContains(response, 'quai5OTeephaequ0xei0')
@skip
def test_change_item_order(self):
data = {
'i1-self': 1,
@ -119,6 +124,7 @@ class ViewTest(TestCase):
self.assertIsNone(Item.objects.get(pk=1).parent)
self.assertEqual(Item.objects.get(pk=2).parent_id, 1)
@skip
def test_change_item_order_with_orga_item(self):
self.item1.type = 2
self.item1.save()
@ -172,6 +178,7 @@ class ViewTest(TestCase):
self.assertEqual(Item.objects.get(pk=1).parent_id, 0)
self.assertEqual(Item.objects.get(pk=2).parent_id, 0)
@skip
def test_delete(self):
response = self.adminClient.get('/agenda/%s/del/' % self.item1.pk)
self.assertRedirects(response, '/agenda/')
@ -179,6 +186,7 @@ class ViewTest(TestCase):
self.assertRedirects(response, '/agenda/')
self.assertFalse(Item.objects.filter(pk=1).exists())
@skip
def test_delete_item_with_children(self):
item1 = Item.objects.create(title='item1')
item2 = Item.objects.create(title='item2', parent=item1)
@ -187,6 +195,7 @@ class ViewTest(TestCase):
query = Item.objects.filter(pk__in=[item1.pk, item2.pk])
self.assertFalse(query)
@skip
def test_delete_item_with_wrong_answer(self):
response = self.adminClient.post(
'/agenda/%s/del/' % self.item1.pk,
@ -194,6 +203,7 @@ class ViewTest(TestCase):
self.assertRedirects(response, '/agenda/')
self.assertTrue(Item.objects.filter(pk=self.item1.pk).exists())
@skip
def test_orga_item_permission(self):
# Prepare
self.item1.type = Item.ORGANIZATIONAL_ITEM
@ -218,6 +228,7 @@ class ViewTest(TestCase):
response = client.get('/agenda/2/')
self.assertEqual(response.status_code, 200)
@skip
def test_orga_item_with_orga_parent_one(self):
item1 = Item.objects.create(title='item1_Taeboog1de1sahSeiM8y', type=2)
response = self.adminClient.post(
@ -231,6 +242,7 @@ class ViewTest(TestCase):
None,
'Agenda items can not be child elements of an organizational item.')
@skip
def test_orga_item_with_orga_parent_two(self):
item1 = Item.objects.create(title='item1_aeNg4Heibee8ULooneep')
Item.objects.create(title='item2_fooshaeroo7Ohvoow0hoo', parent=item1)
@ -244,6 +256,7 @@ class ViewTest(TestCase):
None,
'Organizational items can not have agenda items as child elements.')
@skip
def test_csv_import(self):
"""
Test to upload a csv file.

6
tests/old/assignments/test_views.py
View File

@ -1,3 +1,5 @@
from unittest import skip
from django.test.client import Client
from openslides.assignments.models import Assignment, AssignmentPoll
@ -47,16 +49,19 @@ class TestAssignmentPollDelete(AssignmentViewTestCase):
super(TestAssignmentPollDelete, self).setUp()
self.assignment1.create_poll()
@skip
def test_get(self):
response = self.check_url('/assignments/poll/1/del/', self.admin_client, 302)
self.assertRedirects(response, 'assignments/1/')
@skip
def test_post(self):
response = self.admin_client.post('/assignments/poll/1/del/', {'yes': 1})
self.assertRedirects(response, '/assignments/1/')
class TestAssignmentDetailView(AssignmentViewTestCase):
@skip
def test_blocked_candidates_view(self):
"""
Tests that a delegate runs for a vote and then withdraws himself.
@ -94,6 +99,7 @@ class TestAssignmentPollCreateView(TestCase):
self.assignment.set_candidate(admin)
self.assertEqual(len(Assignment.objects.get(pk=self.assignment.pk).candidates), 1)
@skip
def test_assignment_poll_creation(self):
self.test_assignment_add_candidate()
self.assignment.set_phase(self.assignment.PHASE_VOTING)

2
tests/old/core/test_views.py
View File

@ -1,3 +1,4 @@
from unittest import skip
from unittest.mock import MagicMock, patch
from django.test.client import Client, RequestFactory
@ -85,6 +86,7 @@ class VersionViewTest(TestCase):
class SearchViewTest(TestCase):
@skip
def test_simple_search(self):
Item.objects.create(title='agenda_item_bnghfdjkgndkjdfg')
User.objects.create_user('CoreMaximilian', 'default')

15
tests/old/mediafiles/tests.py
View File

@ -1,5 +1,6 @@
import os
import tempfile
from unittest import skip
from django.conf import settings
from django.contrib.auth.models import Permission
@ -40,6 +41,7 @@ class MediafileTest(TestCase):
def test_str(self):
self.assertEqual(str(self.object), 'Title File 1')
@skip
def test_absolute_url(self):
self.assertEqual(self.object.get_absolute_url(), '/mediafiles/1/edit/')
self.assertEqual(self.object.get_absolute_url('update'), '/mediafiles/1/edit/')
@ -59,12 +61,14 @@ class MediafileTest(TestCase):
'client_vip_user': client_vip_user,
'client_normal_user': client_normal_user}
@skip
def test_see_mediafilelist(self):
for client in self.login_clients().values():
response = client.get('/mediafiles/')
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'mediafiles/mediafile_list.html')
@skip
def test_upload_mediafile_get_request(self):
clients = self.login_clients()
response = clients['client_manager'].get('/mediafiles/new/')
@ -79,6 +83,7 @@ class MediafileTest(TestCase):
response = clients['client_normal_user'].get('/mediafiles/new/')
self.assertEqual(response.status_code, 403)
@skip
def test_upload_mediafile_post_request(self):
# Test first user
client_1 = self.login_clients()['client_manager']
@ -119,6 +124,7 @@ class MediafileTest(TestCase):
'mediafile': new_file_3})
self.assertEqual(response_3.status_code, 403)
@skip
def test_edit_mediafile_get_request(self):
clients = self.login_clients()
response = clients['client_manager'].get('/mediafiles/1/edit/')
@ -132,6 +138,7 @@ class MediafileTest(TestCase):
response = clients['client_normal_user'].get('/mediafiles/1/edit/')
self.assertEqual(response.status_code, 403)
@skip
def test_edit_mediafile_get_request_own_file(self):
clients = self.login_clients()
self.object.uploader = self.vip_user
@ -141,6 +148,7 @@ class MediafileTest(TestCase):
self.assertNotContains(response, '<option value="2" selected="selected">mediafile_test_vip_user</option>', status_code=200)
self.assertTemplateUsed(response, 'mediafiles/mediafile_form.html')
@skip
def test_edit_mediafile_post_request(self):
# Test only one user
tmpfile_no, mediafile_2_path = tempfile.mkstemp(prefix='tmp_openslides_test_', dir=self.tmp_dir)
@ -160,6 +168,7 @@ class MediafileTest(TestCase):
object_2.mediafile.delete()
self.assertFalse(os.path.exists(path_2))
@skip
def test_edit_mediafile_post_request_own_file(self):
tmpfile_no, mediafile_2_path = tempfile.mkstemp(prefix='tmp_openslides_test_', dir=self.tmp_dir)
os.close(tmpfile_no)
@ -177,6 +186,7 @@ class MediafileTest(TestCase):
object_2.mediafile.delete()
self.assertFalse(os.path.exists(path_2))
@skip
def test_edit_mediafile_post_request_another_file(self):
client = self.login_clients()['client_vip_user']
new_file_1 = SimpleUploadedFile(name='new_test_file.txt', content=bytes('test content hello vip user', 'UTF-8'))
@ -185,6 +195,7 @@ class MediafileTest(TestCase):
'mediafile': new_file_1})
self.assertEqual(response.status_code, 403)
@skip
def test_delete_mediafile_get_request(self):
clients = self.login_clients()
response = clients['client_manager'].get('/mediafiles/1/del/')
@ -194,12 +205,14 @@ class MediafileTest(TestCase):
response = clients['client_normal_user'].get('/mediafiles/1/del/')
self.assertEqual(response.status_code, 403)
@skip
def test_delete_mediafile_get_request_own_file(self):
self.object.uploader = self.vip_user
self.object.save()
response = self.login_clients()['client_vip_user'].get('/mediafiles/1/del/')
self.assertRedirects(response, expected_url='/mediafiles/1/edit/', status_code=302, target_status_code=200)
@skip
def test_delete_mediafile_post_request(self):
tmpfile_no, mediafile_3_path = tempfile.mkstemp(prefix='tmp_openslides_test_', dir=self.tmp_dir)
os.close(tmpfile_no)
@ -209,6 +222,7 @@ class MediafileTest(TestCase):
self.assertRedirects(response_1, expected_url='/mediafiles/', status_code=302, target_status_code=200)
self.assertFalse(os.path.exists(object_3.mediafile.path))
@skip
def test_delete_mediafile_post_request_own_file(self):
tmpfile_no, mediafile_3_path = tempfile.mkstemp(prefix='tmp_openslides_test_', dir=self.tmp_dir)
os.close(tmpfile_no)
@ -218,6 +232,7 @@ class MediafileTest(TestCase):
self.assertRedirects(response_1, expected_url='/mediafiles/', status_code=302, target_status_code=200)
self.assertFalse(os.path.exists(object_3.mediafile.path))
@skip
def test_delete_mediafile_post_request_another_file(self):
tmpfile_no, mediafile_3_path = tempfile.mkstemp(prefix='tmp_openslides_test_', dir=self.tmp_dir)
os.close(tmpfile_no)

30
tests/old/motions/test_csv_import.py
View File

@ -1,7 +1,6 @@
import os
from io import BytesIO
from unittest import skip
from openslides.motions.csv_import import import_motions
from openslides.motions.models import Category, Motion
from openslides.users.models import User
from openslides.utils.test import TestCase
@ -20,6 +19,7 @@ class CSVImport(TestCase):
Category.objects.create(name='Bildung', prefix='B1')
Category.objects.create(name='Bildung', prefix='B2')
@skip
def test_example_file_de(self):
# Set config to sort names by first_name because the example csv-file
# expect this.
@ -35,11 +35,13 @@ class CSVImport(TestCase):
first_name='John',
last_name='Doe')
csv_dir = os.path.join(os.path.dirname(__file__), '..', '..', '..', 'extras', 'csv-examples')
# csv_dir = os.path.join(os.path.dirname(__file__), '..', '..', '..', 'extras', 'csv-examples')
self.assertEqual(Motion.objects.count(), 0)
with open(csv_dir + '/motions-demo_de.csv', 'rb') as f:
success_message, warning_message, error_message = import_motions(
csvfile=f, default_submitter=self.normal_user, override=False, importing_person=self.user1)
# with open(csv_dir + '/motions-demo_de.csv', 'rb') as f:
success_message, warning_message, error_message = None
# TODO: import_motions already deleted
# import_motions(csvfile=f, default_submitter=self.normal_user,
# override=False, importing_person=self.user1)
self.assertEqual(Motion.objects.count(), 11)
motion1 = Motion.objects.get(pk=1)
@ -68,19 +70,21 @@ class CSVImport(TestCase):
# check category 'Bildung'
self.assertTrue('Several suitable categories found.' in warning_message)
@skip
def test_malformed_file(self):
csv_file = BytesIO()
csv_file.write(bytes('Header\nMalformed data,\n,Title,Text,,,\n', 'utf8'))
success_message, warning_message, error_message = import_motions(
csvfile=csv_file, default_submitter=self.normal_user.id, override=False)
success_message, warning_message, error_message = None
# TODO: import_motions already deleted
# import_motions(csvfile=csv_file, default_submitter=self.normal_user.id, override=False)
self.assertEqual(success_message, '')
self.assertTrue('Line is malformed.' in error_message)
@skip
def test_wrong_encoding(self):
csv_file = BytesIO(bytes('Müller', 'iso-8859-15'))
success_message, warning_message, error_message = import_motions(
csvfile=csv_file,
default_submitter=self.normal_user.id,
override=False)
# csv_file = BytesIO(bytes('Müller', 'iso-8859-15'))
success_message, warning_message, error_message = None
# TODO: import_motions already deleted
# import_motions(csvfile=csv_file, default_submitter=self.normal_user.id, override=False)
self.assertEqual(success_message, '')
self.assertIn('Import file has wrong character encoding, only UTF-8 is supported!', error_message)

3
tests/old/motions/test_models.py
View File

@ -1,3 +1,5 @@
from unittest import skip
from openslides.config.api import config
from openslides.motions.exceptions import WorkflowError
from openslides.motions.models import Motion, State, Workflow
@ -54,6 +56,7 @@ class ModelTest(TestCase):
self._title
self.assertEqual(motion.title, 'v3')
@skip
def test_absolute_url(self):
motion_id = self.motion.id

55
tests/old/motions/test_views.py
View File

@ -1,5 +1,6 @@
import os
import tempfile
from unittest import skip
from unittest.mock import MagicMock
from django.conf import settings
@ -52,15 +53,18 @@ class MotionViewTestCase(TestCase):
class TestMotionListView(MotionViewTestCase):
@skip
def test_get(self):
self.check_url('/motions/', self.admin_client, 200)
@skip
def test_get_with_motion(self):
self.motion1.title = 'motion1_iozaixeeDuMah8sheGhe'
self.motion1.save()
response = self.admin_client.get('/motions/')
self.assertContains(response, 'motion1_iozaixeeDuMah8sheGhe')
@skip
def test_get_with_filtered_motion_list(self):
self.motion1.state.required_permission_to_see = 'motions.can_manage'
self.motion1.state.save()
@ -71,11 +75,13 @@ class TestMotionListView(MotionViewTestCase):
class TestMotionDetailView(MotionViewTestCase):
@skip
def test_get(self):
self.check_url('/motions/1/', self.admin_client, 200)
self.check_url('/motions/2/', self.admin_client, 200)
self.check_url('/motions/500/', self.admin_client, 404)
@skip
def test_attachment(self):
# Preparation
tmpfile_no, attachment_path = tempfile.mkstemp(prefix='tmp_openslides_test_', dir=settings.MEDIA_ROOT)
@ -95,6 +101,7 @@ class TestMotionDetailView(MotionViewTestCase):
self.assertNotContains(response, '<h4>Attachments:</h4>')
self.assertNotContains(response, 'TestFile_Neiri4xai4ueseGohzid')
@skip
def test_poll(self):
response = self.staff_client.get('/motions/1/create_poll/')
self.assertRedirects(response, '/motions/1/poll/1/edit/')
@ -106,6 +113,7 @@ class TestMotionDetailView(MotionViewTestCase):
response = self.staff_client.get('/motions/1/')
self.assertContains(response, '50 (100')
@skip
def test_deleted_supporter(self):
config['motion_min_supporters'] = 1
self.motion1.support(self.registered)
@ -113,6 +121,7 @@ class TestMotionDetailView(MotionViewTestCase):
self.registered.delete()
self.assertNotContains(self.admin_client.get('/motions/1/'), 'registered')
@skip
def test_get_without_required_permission_from_state(self):
self.motion1.state.required_permission_to_see = 'motions.can_manage'
self.motion1.state.save()
@ -122,6 +131,7 @@ class TestMotionDetailView(MotionViewTestCase):
self.motion1.save()
self.check_url('/motions/1/', self.registered_client, 200)
@skip
def test_get_without_required_permission_from_state_but_by_submitter(self):
self.motion1.state.required_permission_to_see = 'motions.can_manage'
self.motion1.state.save()
@ -130,6 +140,7 @@ class TestMotionDetailView(MotionViewTestCase):
class TestMotionDetailVersionView(MotionViewTestCase):
@skip
def test_get(self):
self.motion1.title = 'AFWEROBjwerGwer'
self.motion1.save(use_version=self.motion1.get_new_version())
@ -140,6 +151,7 @@ class TestMotionDetailVersionView(MotionViewTestCase):
class TestMotionVersionDiffView(MotionViewTestCase):
@skip
def test_get_without_required_permission_from_state(self):
self.motion1.reason = 'reason1_bnmkjiutufjbnvcde334'
self.motion1.save()
@ -164,9 +176,11 @@ class TestMotionVersionDiffView(MotionViewTestCase):
class TestMotionCreateView(MotionViewTestCase):
url = '/motions/new/'
@skip
def test_get(self):
self.check_url(self.url, self.admin_client, 200)
@skip
def test_admin(self):
response = self.admin_client.post(self.url, {'title': 'new motion',
'text': 'motion text',
@ -175,6 +189,7 @@ class TestMotionCreateView(MotionViewTestCase):
self.assertEqual(response.status_code, 302)
self.assertTrue(Motion.objects.filter(versions__title='new motion').exists())
@skip
def test_delegate(self):
response = self.delegate_client.post(self.url, {'title': 'delegate motion',
'text': 'motion text',
@ -184,6 +199,7 @@ class TestMotionCreateView(MotionViewTestCase):
motion = Motion.objects.get(versions__title='delegate motion')
self.assertTrue(motion.is_submitter(self.delegate))
@skip
def test_registered(self):
response = self.registered_client.post(self.url, {'title': 'registered motion',
'text': 'motion text',
@ -192,26 +208,31 @@ class TestMotionCreateView(MotionViewTestCase):
self.assertEqual(response.status_code, 403)
self.assertFalse(Motion.objects.filter(versions__title='registered motion').exists())
@skip
def test_delegate_after_stop_submitting_new_motions(self):
config['motion_stop_submitting'] = True
response = self.delegate_client.get(self.url)
self.assertEqual(response.status_code, 403)
@skip
def test_delegate_after_stop_submitting_new_motions_overview(self):
config['motion_stop_submitting'] = True
response = self.delegate_client.get('/motions/')
self.assertNotContains(response, 'href="/motions/new/"', status_code=200)
@skip
def test_staff_after_stop_submitting_new_motions(self):
config['motion_stop_submitting'] = True
response = self.staff_client.get(self.url)
self.assertEqual(response.status_code, 200)
@skip
def test_staff_after_stop_submitting_new_motions_overview(self):
config['motion_stop_submitting'] = True
response = self.staff_client.get('/motions/')
self.assertContains(response, 'href="/motions/new/"', status_code=200)
@skip
def test_identifier_not_unique(self):
Motion.objects.create(title='Another motion 3', identifier='uufag5faoX0thahBi8Fo')
config['motion_identifier'] = 'manually'
@ -221,11 +242,13 @@ class TestMotionCreateView(MotionViewTestCase):
'identifier': 'uufag5faoX0thahBi8Fo'})
self.assertFormError(response, 'form', 'identifier', 'Motion with this Identifier already exists.')
@skip
def test_empty_text_field(self):
response = self.admin_client.post(self.url, {'title': 'foo',
'submitter': self.admin.id})
self.assertFormError(response, 'form', 'text', 'This field is required.')
@skip
def test_identifier_with_category_prefix(self):
category = Category.objects.create(name='category_oosozieh9eBa9aegujee', prefix='prefix_raiLie6keik6Eikeiphi')
response = self.admin_client.post(self.url, {'title': 'motion io2iez3Iwoh3aengi5hu',
@ -236,6 +259,7 @@ class TestMotionCreateView(MotionViewTestCase):
motion = Motion.objects.filter(category=category).get()
self.assertEqual(motion.identifier, 'prefix_raiLie6keik6Eikeiphi 1')
@skip
def test_log(self):
self.assertFalse(MotionLog.objects.all().exists())
self.admin_client.post(self.url, {'title': 'new motion',
@ -247,14 +271,17 @@ class TestMotionCreateView(MotionViewTestCase):
class TestMotionCreateAmendmentView(MotionViewTestCase):
url = '/motions/1/new_amendment/'
@skip
def test_get_amendment_active(self):
config['motion_amendments_enabled'] = True
self.check_url(self.url, self.admin_client, 200)
@skip
def test_get_amendment_inactive(self):
config['motion_amendments_enabled'] = False
self.check_url(self.url, self.admin_client, 404)
@skip
def test_get_parent_motion(self):
motion = Motion.objects.create(title='Test Motion')
view = views.MotionCreateAmendmentView()
@ -263,6 +290,7 @@ class TestMotionCreateAmendmentView(MotionViewTestCase):
self.assertEqual(view.get_parent_motion(), motion)
@skip
def test_manipulate_object(self):
motion = Motion.objects.create(title='Test Motion')
view = views.MotionCreateAmendmentView()
@ -274,6 +302,7 @@ class TestMotionCreateAmendmentView(MotionViewTestCase):
self.assertEqual(view.object.parent, motion)
@skip
def test_get_initial(self):
motion = Motion.objects.create(
title='Test Motion', text='Parent Motion text', reason='test reason')
@ -288,6 +317,7 @@ class TestMotionCreateAmendmentView(MotionViewTestCase):
'category': None,
'workflow': '1'})
@skip
def test_get_initial_with_category(self):
category = Category.objects.create(name='test category')
motion = Motion.objects.create(
@ -308,9 +338,11 @@ class TestMotionCreateAmendmentView(MotionViewTestCase):
class TestMotionUpdateView(MotionViewTestCase):
url = '/motions/1/edit/'
@skip
def test_get(self):
self.check_url(self.url, self.admin_client, 200)
@skip
def test_admin(self):
response = self.admin_client.post(self.url, {'title': 'new motion_title',
'text': 'motion text',
@ -321,6 +353,7 @@ class TestMotionUpdateView(MotionViewTestCase):
motion = Motion.objects.get(pk=1)
self.assertEqual(motion.title, 'new motion_title')
@skip
def test_delegate(self):
response = self.delegate_client.post(self.url, {'title': 'my title',
'text': 'motion text',
@ -335,6 +368,7 @@ class TestMotionUpdateView(MotionViewTestCase):
motion = Motion.objects.get(pk=1)
self.assertEqual(motion.title, 'my title')
@skip
def test_versioning(self):
self.assertFalse(self.motion1.state.versioning)
workflow = self.motion1.state.workflow
@ -354,6 +388,7 @@ class TestMotionUpdateView(MotionViewTestCase):
motion = Motion.objects.get(pk=self.motion1.pk)
self.assertEqual(motion.versions.count(), 2)
@skip
def test_disable_versioning(self):
self.assertFalse(self.motion1.state.versioning)
workflow = self.motion1.state.workflow
@ -375,6 +410,7 @@ class TestMotionUpdateView(MotionViewTestCase):
motion = Motion.objects.get(pk=self.motion1.pk)
self.assertEqual(motion.versions.count(), 1)
@skip
def test_no_versioning_without_new_data(self):
self.assertFalse(self.motion1.state.versioning)
workflow = self.motion1.state.workflow
@ -397,6 +433,7 @@ class TestMotionUpdateView(MotionViewTestCase):
motion = Motion.objects.get(pk=self.motion1.pk)
self.assertEqual(motion.versions.count(), 1)
@skip
def test_set_another_workflow(self):
self.assertEqual(self.motion1.state.workflow.pk, 1)
response = self.admin_client.post(self.url, {'title': 'oori4KiaghaeSeuzaim2',
@ -410,6 +447,7 @@ class TestMotionUpdateView(MotionViewTestCase):
self.assertRedirects(response, '/motions/1/')
self.assertEqual(Motion.objects.get(pk=self.motion1.pk).state.workflow.pk, 2)
@skip
def test_remove_supporters(self):
# Setup a new motion with one supporter
config['motion_min_supporters'] = 1
@ -455,6 +493,7 @@ class TestMotionUpdateView(MotionViewTestCase):
allow_support=False)
motion.save()
@skip
def test_form_version_content(self):
"""
The content seen in the update view should be the last version
@ -471,6 +510,7 @@ class TestMotionUpdateView(MotionViewTestCase):
response = self.admin_client.get('/motions/%s/edit/' % motion.id)
self.assertEqual(response.context['form'].initial['text'], 'tpdfgojwerldkfgertdfg')
@skip
def test_log(self):
self.assertFalse(MotionLog.objects.all().exists())
@ -511,6 +551,7 @@ class TestMotionUpdateView(MotionViewTestCase):
'workflow': 2})
self.assertEqual(MotionLog.objects.get(pk=5).message_list, ['Motion version', ' 2 ', 'updated'])
@skip
def test_attachment_initial(self):
attachment = Mediafile.objects.create(title='test_title_iech1maatahShiecohca')
self.motion1.attachments.add(attachment)
@ -522,14 +563,17 @@ class TestMotionUpdateView(MotionViewTestCase):
class TestMotionDeleteView(MotionViewTestCase):
@skip
def test_get(self):
response = self.check_url('/motions/2/del/', self.admin_client, 302)
self.assertRedirects(response, '/motions/2/')
@skip
def test_admin(self):
response = self.admin_client.post('/motions/2/del/', {'yes': 'yes'})
self.assertRedirects(response, '/motions/')
@skip
def test_delegate(self):
response = self.delegate_client.post('/motions/2/del/', {'yes': 'yes'})
self.assertEqual(response.status_code, 403)
@ -544,16 +588,19 @@ class TestVersionPermitView(MotionViewTestCase):
self.motion1.title = 'new'
self.motion1.save(use_version=self.motion1.get_new_version())
@skip
def test_get(self):
response = self.check_url('/motions/1/version/2/permit/', self.admin_client, 302)
self.assertRedirects(response, '/motions/1/version/2/')
@skip
def test_post(self):
new_version = self.motion1.get_last_version()
response = self.admin_client.post('/motions/1/version/2/permit/', {'yes': 1})
self.assertRedirects(response, '/motions/1/')
self.assertEqual(self.motion1.get_active_version(), new_version)
@skip
def test_activate_old_version(self):
new_version = self.motion1.get_last_version()
first_version = self.motion1.versions.order_by('version_number')[0]
@ -568,11 +615,13 @@ class TestVersionPermitView(MotionViewTestCase):
class TestVersionDeleteView(MotionViewTestCase):
@skip
def test_get(self):
self.motion1.save(use_version=self.motion1.get_new_version(title='new', text='new'))
response = self.check_url('/motions/1/version/1/del/', self.admin_client, 302)
self.assertRedirects(response, '/motions/1/version/1/')
@skip
def test_post(self):
new_version = self.motion1.get_new_version
self.motion1.save(use_version=new_version(title='new', text='new'))
@ -583,6 +632,7 @@ class TestVersionDeleteView(MotionViewTestCase):
self.assertRedirects(response, '/motions/1/')
self.assertEqual(self.motion1.versions.count(), 2)
@skip
def test_delete_active_version(self):
self.motion1.save(use_version=self.motion1.get_new_version(title='new_title_yae6Aequaiw5saeb8suG', text='new'))
motion = Motion.objects.all()[0]
@ -592,6 +642,7 @@ class TestVersionDeleteView(MotionViewTestCase):
class MotionSetStatusView(MotionViewTestCase):
@skip
def test_set_status(self):
self.assertEqual(self.motion1.state, State.objects.get(name='submitted'))
self.check_url('/motions/1/set_state/4/', self.registered_client, 403)
@ -611,6 +662,7 @@ class CategoryViewsTest(TestCase):
self.admin_client = Client()
self.admin_client.login(username='admin', password='admin')
@skip
def test_create(self):
url = '/motions/category/new/'
response = self.admin_client.get(url)
@ -619,6 +671,7 @@ class CategoryViewsTest(TestCase):
self.assertRedirects(response, '/motions/category/')
self.assertTrue(Category.objects.filter(name='test_title_eingee0hiveeZ6coohoo').exists())
@skip
def test_update(self):
# Setup
url = '/motions/category/1/edit/'
@ -631,6 +684,7 @@ class CategoryViewsTest(TestCase):
self.assertRedirects(response, '/motions/category/')
self.assertEqual(Category.objects.get(pk=1).name, 'test_title_jaiShae1sheingahlee2')
@skip
def test_delete(self):
# Setup
url = '/motions/category/1/del/'
@ -648,6 +702,7 @@ class PollUpdateViewTest(TestCase):
self.admin_client = Client()
self.admin_client.login(username='admin', password='admin')
@skip
def test_not_existing_poll(self):
"""
Tests that a 404 is returned, when a non existing poll is requested