diff --git a/media/jquery/chosen/chosen-sprite.png b/media/jquery/chosen/chosen-sprite.png new file mode 100644 index 00000000..c57da70b Binary files /dev/null and b/media/jquery/chosen/chosen-sprite.png differ diff --git a/media/jquery/chosen/chosen-sprite@2x.png b/media/jquery/chosen/chosen-sprite@2x.png new file mode 100644 index 00000000..6b505452 Binary files /dev/null and b/media/jquery/chosen/chosen-sprite@2x.png differ diff --git a/media/jquery/chosen/chosen.css b/media/jquery/chosen/chosen.css new file mode 100644 index 00000000..b066b4c1 --- /dev/null +++ b/media/jquery/chosen/chosen.css @@ -0,0 +1,447 @@ +/*! +Chosen, a Select Box Enhancer for jQuery and Prototype +by Patrick Filler for Harvest, http://getharvest.com + +Version 1.6.2 +Full source at https://github.com/harvesthq/chosen +Copyright (c) 2011-2016 Harvest http://getharvest.com + +MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md +This file is generated by `grunt build`, do not edit it by hand. +*/ + +/* @group Base */ +.chosen-container { + position: relative; + display: inline-block; + vertical-align: middle; + font-size: 13px; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; +} +.chosen-container * { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.chosen-container .chosen-drop { + position: absolute; + top: 100%; + left: -9999px; + z-index: 1010; + width: 100%; + border: 1px solid #aaa; + border-top: 0; + background: #fff; + box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); +} +.chosen-container.chosen-with-drop .chosen-drop { + left: 0; +} +.chosen-container a { + cursor: pointer; +} +.chosen-container .search-choice .group-name, .chosen-container .chosen-single .group-name { + margin-right: 4px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-weight: normal; + color: #999999; +} +.chosen-container .search-choice .group-name:after, .chosen-container .chosen-single .group-name:after { + content: ":"; + padding-left: 2px; + vertical-align: top; +} + +/* @end */ +/* @group Single Chosen */ +.chosen-container-single .chosen-single { + position: relative; + display: block; + overflow: hidden; + padding: 0 0 0 8px; + height: 25px; + border: 1px solid #aaa; + border-radius: 5px; + background-color: #fff; + background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4)); + background: -webkit-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); + background: -moz-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); + background: -o-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); + background: linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); + background-clip: padding-box; + box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1); + color: #444; + text-decoration: none; + white-space: nowrap; + line-height: 24px; +} +.chosen-container-single .chosen-default { + color: #999; +} +.chosen-container-single .chosen-single span { + display: block; + overflow: hidden; + margin-right: 26px; + text-overflow: ellipsis; + white-space: nowrap; +} +.chosen-container-single .chosen-single-with-deselect span { + margin-right: 38px; +} +.chosen-container-single .chosen-single abbr { + position: absolute; + top: 6px; + right: 26px; + display: block; + width: 12px; + height: 12px; + background: url('chosen-sprite.png') -42px 1px no-repeat; + font-size: 1px; +} +.chosen-container-single .chosen-single abbr:hover { + background-position: -42px -10px; +} +.chosen-container-single.chosen-disabled .chosen-single abbr:hover { + background-position: -42px -10px; +} +.chosen-container-single .chosen-single div { + position: absolute; + top: 0; + right: 0; + display: block; + width: 18px; + height: 100%; +} +.chosen-container-single .chosen-single div b { + display: block; + width: 100%; + height: 100%; + background: url('chosen-sprite.png') no-repeat 0px 2px; +} +.chosen-container-single .chosen-search { + position: relative; + z-index: 1010; + margin: 0; + padding: 3px 4px; + white-space: nowrap; +} +.chosen-container-single .chosen-search input[type="text"] { + margin: 1px 0; + padding: 4px 20px 4px 5px; + width: 100%; + height: auto; + outline: 0; + border: 1px solid #aaa; + background: white url('chosen-sprite.png') no-repeat 100% -20px; + background: url('chosen-sprite.png') no-repeat 100% -20px; + font-size: 1em; + font-family: sans-serif; + line-height: normal; + border-radius: 0; +} +.chosen-container-single .chosen-drop { + margin-top: -1px; + border-radius: 0 0 4px 4px; + background-clip: padding-box; +} +.chosen-container-single.chosen-container-single-nosearch .chosen-search { + position: absolute; + left: -9999px; +} + +/* @end */ +/* @group Results */ +.chosen-container .chosen-results { + color: #444; + position: relative; + overflow-x: hidden; + overflow-y: auto; + margin: 0 4px 4px 0; + padding: 0 0 0 4px; + max-height: 240px; + -webkit-overflow-scrolling: touch; +} +.chosen-container .chosen-results li { + display: none; + margin: 0; + padding: 5px 6px; + list-style: none; + line-height: 15px; + word-wrap: break-word; + -webkit-touch-callout: none; +} +.chosen-container .chosen-results li.active-result { + display: list-item; + cursor: pointer; +} +.chosen-container .chosen-results li.disabled-result { + display: list-item; + color: #ccc; + cursor: default; +} +.chosen-container .chosen-results li.highlighted { + background-color: #3875d7; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc)); + background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%); + background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%); + background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%); + background-image: linear-gradient(#3875d7 20%, #2a62bc 90%); + color: #fff; +} +.chosen-container .chosen-results li.no-results { + color: #777; + display: list-item; + background: #f4f4f4; +} +.chosen-container .chosen-results li.group-result { + display: list-item; + font-weight: bold; + cursor: default; +} +.chosen-container .chosen-results li.group-option { + padding-left: 15px; +} +.chosen-container .chosen-results li em { + font-style: normal; + text-decoration: underline; +} + +/* @end */ +/* @group Multi Chosen */ +.chosen-container-multi .chosen-choices { + position: relative; + overflow: hidden; + margin: 0; + padding: 0 5px; + width: 100%; + height: auto; + border: 1px solid #aaa; + background-color: #fff; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff)); + background-image: -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%); + background-image: -moz-linear-gradient(#eeeeee 1%, #ffffff 15%); + background-image: -o-linear-gradient(#eeeeee 1%, #ffffff 15%); + background-image: linear-gradient(#eeeeee 1%, #ffffff 15%); + cursor: text; +} +.chosen-container-multi .chosen-choices li { + float: left; + list-style: none; +} +.chosen-container-multi .chosen-choices li.search-field { + margin: 0; + padding: 0; + white-space: nowrap; +} +.chosen-container-multi .chosen-choices li.search-field input[type="text"] { + margin: 1px 0; + padding: 0; + height: 25px; + outline: 0; + border: 0 !important; + background: transparent !important; + box-shadow: none; + color: #999; + font-size: 100%; + font-family: sans-serif; + line-height: normal; + border-radius: 0; +} +.chosen-container-multi .chosen-choices li.search-choice { + position: relative; + margin: 3px 5px 3px 0; + padding: 3px 20px 3px 5px; + border: 1px solid #aaa; + max-width: 100%; + border-radius: 3px; + background-color: #eeeeee; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-size: 100% 19px; + background-repeat: repeat-x; + background-clip: padding-box; + box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05); + color: #333; + line-height: 13px; + cursor: default; +} +.chosen-container-multi .chosen-choices li.search-choice span { + word-wrap: break-word; +} +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close { + position: absolute; + top: 4px; + right: 3px; + display: block; + width: 12px; + height: 12px; + background: url('chosen-sprite.png') -42px 1px no-repeat; + font-size: 1px; +} +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover { + background-position: -42px -10px; +} +.chosen-container-multi .chosen-choices li.search-choice-disabled { + padding-right: 5px; + border: 1px solid #ccc; + background-color: #e4e4e4; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + color: #666; +} +.chosen-container-multi .chosen-choices li.search-choice-focus { + background: #d4d4d4; +} +.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close { + background-position: -42px -10px; +} +.chosen-container-multi .chosen-results { + margin: 0; + padding: 0; +} +.chosen-container-multi .chosen-drop .result-selected { + display: list-item; + color: #ccc; + cursor: default; +} + +/* @end */ +/* @group Active */ +.chosen-container-active .chosen-single { + border: 1px solid #5897fb; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +} +.chosen-container-active.chosen-with-drop .chosen-single { + border: 1px solid #aaa; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff)); + background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%); + background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%); + background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%); + background-image: linear-gradient(#eeeeee 20%, #ffffff 80%); + box-shadow: 0 1px 0 #fff inset; +} +.chosen-container-active.chosen-with-drop .chosen-single div { + border-left: none; + background: transparent; +} +.chosen-container-active.chosen-with-drop .chosen-single div b { + background-position: -18px 2px; +} +.chosen-container-active .chosen-choices { + border: 1px solid #5897fb; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +} +.chosen-container-active .chosen-choices li.search-field input[type="text"] { + color: #222 !important; +} + +/* @end */ +/* @group Disabled Support */ +.chosen-disabled { + opacity: 0.5 !important; + cursor: default; +} +.chosen-disabled .chosen-single { + cursor: default; +} +.chosen-disabled .chosen-choices .search-choice .search-choice-close { + cursor: default; +} + +/* @end */ +/* @group Right to Left */ +.chosen-rtl { + text-align: right; +} +.chosen-rtl .chosen-single { + overflow: visible; + padding: 0 8px 0 0; +} +.chosen-rtl .chosen-single span { + margin-right: 0; + margin-left: 26px; + direction: rtl; +} +.chosen-rtl .chosen-single-with-deselect span { + margin-left: 38px; +} +.chosen-rtl .chosen-single div { + right: auto; + left: 3px; +} +.chosen-rtl .chosen-single abbr { + right: auto; + left: 26px; +} +.chosen-rtl .chosen-choices li { + float: right; +} +.chosen-rtl .chosen-choices li.search-field input[type="text"] { + direction: rtl; +} +.chosen-rtl .chosen-choices li.search-choice { + margin: 3px 5px 3px 0; + padding: 3px 5px 3px 19px; +} +.chosen-rtl .chosen-choices li.search-choice .search-choice-close { + right: auto; + left: 4px; +} +.chosen-rtl.chosen-container-single-nosearch .chosen-search, +.chosen-rtl .chosen-drop { + left: 9999px; +} +.chosen-rtl.chosen-container-single .chosen-results { + margin: 0 0 4px 4px; + padding: 0 4px 0 0; +} +.chosen-rtl .chosen-results li.group-option { + padding-right: 15px; + padding-left: 0; +} +.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div { + border-right: none; +} +.chosen-rtl .chosen-search input[type="text"] { + padding: 4px 5px 4px 20px; + background: white url('chosen-sprite.png') no-repeat -30px -20px; + background: url('chosen-sprite.png') no-repeat -30px -20px; + direction: rtl; +} +.chosen-rtl.chosen-container-single .chosen-single div b { + background-position: 6px 2px; +} +.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b { + background-position: -12px 2px; +} + +/* @end */ +/* @group Retina compatibility */ +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) { + .chosen-rtl .chosen-search input[type="text"], + .chosen-container-single .chosen-single abbr, + .chosen-container-single .chosen-single div b, + .chosen-container-single .chosen-search input[type="text"], + .chosen-container-multi .chosen-choices .search-choice .search-choice-close, + .chosen-container .chosen-results-scroll-down span, + .chosen-container .chosen-results-scroll-up span { + background-image: url('chosen-sprite@2x.png') !important; + background-size: 52px 37px !important; + background-repeat: no-repeat !important; + } +} +/* @end */ diff --git a/media/jquery/chosen/chosen.jquery.js b/media/jquery/chosen/chosen.jquery.js new file mode 100644 index 00000000..060c1628 --- /dev/null +++ b/media/jquery/chosen/chosen.jquery.js @@ -0,0 +1,1269 @@ +/*! +Chosen, a Select Box Enhancer for jQuery and Prototype +by Patrick Filler for Harvest, http://getharvest.com + +Version 1.6.2 +Full source at https://github.com/harvesthq/chosen +Copyright (c) 2011-2016 Harvest http://getharvest.com + +MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md +This file is generated by `grunt build`, do not edit it by hand. +*/ + +(function() { + var $, AbstractChosen, Chosen, SelectParser, _ref, + __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; + + SelectParser = (function() { + function SelectParser() { + this.options_index = 0; + this.parsed = []; + } + + SelectParser.prototype.add_node = function(child) { + if (child.nodeName.toUpperCase() === "OPTGROUP") { + return this.add_group(child); + } else { + return this.add_option(child); + } + }; + + SelectParser.prototype.add_group = function(group) { + var group_position, option, _i, _len, _ref, _results; + group_position = this.parsed.length; + this.parsed.push({ + array_index: group_position, + group: true, + label: this.escapeExpression(group.label), + title: group.title ? group.title : void 0, + children: 0, + disabled: group.disabled, + classes: group.className + }); + _ref = group.childNodes; + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + option = _ref[_i]; + _results.push(this.add_option(option, group_position, group.disabled)); + } + return _results; + }; + + SelectParser.prototype.add_option = function(option, group_position, group_disabled) { + if (option.nodeName.toUpperCase() === "OPTION") { + if (option.text !== "") { + if (group_position != null) { + this.parsed[group_position].children += 1; + } + this.parsed.push({ + array_index: this.parsed.length, + options_index: this.options_index, + value: option.value, + text: option.text, + html: option.innerHTML, + title: option.title ? option.title : void 0, + selected: option.selected, + disabled: group_disabled === true ? group_disabled : option.disabled, + group_array_index: group_position, + group_label: group_position != null ? this.parsed[group_position].label : null, + classes: option.className, + style: option.style.cssText + }); + } else { + this.parsed.push({ + array_index: this.parsed.length, + options_index: this.options_index, + empty: true + }); + } + return this.options_index += 1; + } + }; + + SelectParser.prototype.escapeExpression = function(text) { + var map, unsafe_chars; + if ((text == null) || text === false) { + return ""; + } + if (!/[\&\<\>\"\'\`]/.test(text)) { + return text; + } + map = { + "<": "<", + ">": ">", + '"': """, + "'": "'", + "`": "`" + }; + unsafe_chars = /&(?!\w+;)|[\<\>\"\'\`]/g; + return text.replace(unsafe_chars, function(chr) { + return map[chr] || "&"; + }); + }; + + return SelectParser; + + })(); + + SelectParser.select_to_array = function(select) { + var child, parser, _i, _len, _ref; + parser = new SelectParser(); + _ref = select.childNodes; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + child = _ref[_i]; + parser.add_node(child); + } + return parser.parsed; + }; + + AbstractChosen = (function() { + function AbstractChosen(form_field, options) { + this.form_field = form_field; + this.options = options != null ? options : {}; + if (!AbstractChosen.browser_is_supported()) { + return; + } + this.is_multiple = this.form_field.multiple; + this.set_default_text(); + this.set_default_values(); + this.setup(); + this.set_up_html(); + this.register_observers(); + this.on_ready(); + } + + AbstractChosen.prototype.set_default_values = function() { + var _this = this; + this.click_test_action = function(evt) { + return _this.test_active_click(evt); + }; + this.activate_action = function(evt) { + return _this.activate_field(evt); + }; + this.active_field = false; + this.mouse_on_container = false; + this.results_showing = false; + this.result_highlighted = null; + this.allow_single_deselect = (this.options.allow_single_deselect != null) && (this.form_field.options[0] != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false; + this.disable_search_threshold = this.options.disable_search_threshold || 0; + this.disable_search = this.options.disable_search || false; + this.enable_split_word_search = this.options.enable_split_word_search != null ? this.options.enable_split_word_search : true; + this.group_search = this.options.group_search != null ? this.options.group_search : true; + this.search_contains = this.options.search_contains || false; + this.single_backstroke_delete = this.options.single_backstroke_delete != null ? this.options.single_backstroke_delete : true; + this.max_selected_options = this.options.max_selected_options || Infinity; + this.inherit_select_classes = this.options.inherit_select_classes || false; + this.display_selected_options = this.options.display_selected_options != null ? this.options.display_selected_options : true; + this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true; + this.include_group_label_in_selected = this.options.include_group_label_in_selected || false; + this.max_shown_results = this.options.max_shown_results || Number.POSITIVE_INFINITY; + return this.case_sensitive_search = this.options.case_sensitive_search || false; + }; + + AbstractChosen.prototype.set_default_text = function() { + if (this.form_field.getAttribute("data-placeholder")) { + this.default_text = this.form_field.getAttribute("data-placeholder"); + } else if (this.is_multiple) { + this.default_text = this.options.placeholder_text_multiple || this.options.placeholder_text || AbstractChosen.default_multiple_text; + } else { + this.default_text = this.options.placeholder_text_single || this.options.placeholder_text || AbstractChosen.default_single_text; + } + return this.results_none_found = this.form_field.getAttribute("data-no_results_text") || this.options.no_results_text || AbstractChosen.default_no_result_text; + }; + + AbstractChosen.prototype.choice_label = function(item) { + if (this.include_group_label_in_selected && (item.group_label != null)) { + return "" + item.group_label + "" + item.html; + } else { + return item.html; + } + }; + + AbstractChosen.prototype.mouse_enter = function() { + return this.mouse_on_container = true; + }; + + AbstractChosen.prototype.mouse_leave = function() { + return this.mouse_on_container = false; + }; + + AbstractChosen.prototype.input_focus = function(evt) { + var _this = this; + if (this.is_multiple) { + if (!this.active_field) { + return setTimeout((function() { + return _this.container_mousedown(); + }), 50); + } + } else { + if (!this.active_field) { + return this.activate_field(); + } + } + }; + + AbstractChosen.prototype.input_blur = function(evt) { + var _this = this; + if (!this.mouse_on_container) { + this.active_field = false; + return setTimeout((function() { + return _this.blur_test(); + }), 100); + } + }; + + AbstractChosen.prototype.results_option_build = function(options) { + var content, data, data_content, shown_results, _i, _len, _ref; + content = ''; + shown_results = 0; + _ref = this.results_data; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + data = _ref[_i]; + data_content = ''; + if (data.group) { + data_content = this.result_add_group(data); + } else { + data_content = this.result_add_option(data); + } + if (data_content !== '') { + shown_results++; + content += data_content; + } + if (options != null ? options.first : void 0) { + if (data.selected && this.is_multiple) { + this.choice_build(data); + } else if (data.selected && !this.is_multiple) { + this.single_set_selected_text(this.choice_label(data)); + } + } + if (shown_results >= this.max_shown_results) { + break; + } + } + return content; + }; + + AbstractChosen.prototype.result_add_option = function(option) { + var classes, option_el; + if (!option.search_match) { + return ''; + } + if (!this.include_option_in_results(option)) { + return ''; + } + classes = []; + if (!option.disabled && !(option.selected && this.is_multiple)) { + classes.push("active-result"); + } + if (option.disabled && !(option.selected && this.is_multiple)) { + classes.push("disabled-result"); + } + if (option.selected) { + classes.push("result-selected"); + } + if (option.group_array_index != null) { + classes.push("group-option"); + } + if (option.classes !== "") { + classes.push(option.classes); + } + option_el = document.createElement("li"); + option_el.className = classes.join(" "); + option_el.style.cssText = option.style; + option_el.setAttribute("data-option-array-index", option.array_index); + option_el.innerHTML = option.search_text; + if (option.title) { + option_el.title = option.title; + } + return this.outerHTML(option_el); + }; + + AbstractChosen.prototype.result_add_group = function(group) { + var classes, group_el; + if (!(group.search_match || group.group_match)) { + return ''; + } + if (!(group.active_options > 0)) { + return ''; + } + classes = []; + classes.push("group-result"); + if (group.classes) { + classes.push(group.classes); + } + group_el = document.createElement("li"); + group_el.className = classes.join(" "); + group_el.innerHTML = group.search_text; + if (group.title) { + group_el.title = group.title; + } + return this.outerHTML(group_el); + }; + + AbstractChosen.prototype.results_update_field = function() { + this.set_default_text(); + if (!this.is_multiple) { + this.results_reset_cleanup(); + } + this.result_clear_highlight(); + this.results_build(); + if (this.results_showing) { + return this.winnow_results(); + } + }; + + AbstractChosen.prototype.reset_single_select_options = function() { + var result, _i, _len, _ref, _results; + _ref = this.results_data; + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + result = _ref[_i]; + if (result.selected) { + _results.push(result.selected = false); + } else { + _results.push(void 0); + } + } + return _results; + }; + + AbstractChosen.prototype.results_toggle = function() { + if (this.results_showing) { + return this.results_hide(); + } else { + return this.results_show(); + } + }; + + AbstractChosen.prototype.results_search = function(evt) { + if (this.results_showing) { + return this.winnow_results(); + } else { + return this.results_show(); + } + }; + + AbstractChosen.prototype.winnow_results = function() { + var escapedSearchText, option, regex, results, results_group, searchText, startpos, text, zregex, _i, _len, _ref; + this.no_results_clear(); + results = 0; + searchText = this.get_search_text(); + escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); + zregex = new RegExp(escapedSearchText, 'i'); + regex = this.get_search_regex(escapedSearchText); + _ref = this.results_data; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + option = _ref[_i]; + option.search_match = false; + results_group = null; + if (this.include_option_in_results(option)) { + if (option.group) { + option.group_match = false; + option.active_options = 0; + } + if ((option.group_array_index != null) && this.results_data[option.group_array_index]) { + results_group = this.results_data[option.group_array_index]; + if (results_group.active_options === 0 && results_group.search_match) { + results += 1; + } + results_group.active_options += 1; + } + option.search_text = option.group ? option.label : option.html; + if (!(option.group && !this.group_search)) { + option.search_match = this.search_string_match(option.search_text, regex); + if (option.search_match && !option.group) { + results += 1; + } + if (option.search_match) { + if (searchText.length) { + startpos = option.search_text.search(zregex); + text = option.search_text.substr(0, startpos + searchText.length) + '' + option.search_text.substr(startpos + searchText.length); + option.search_text = text.substr(0, startpos) + '' + text.substr(startpos); + } + if (results_group != null) { + results_group.group_match = true; + } + } else if ((option.group_array_index != null) && this.results_data[option.group_array_index].search_match) { + option.search_match = true; + } + } + } + } + this.result_clear_highlight(); + if (results < 1 && searchText.length) { + this.update_results_content(""); + return this.no_results(searchText); + } else { + this.update_results_content(this.results_option_build()); + return this.winnow_results_set_highlight(); + } + }; + + AbstractChosen.prototype.get_search_regex = function(escaped_search_string) { + var regex_anchor, regex_flag; + regex_anchor = this.search_contains ? "" : "^"; + regex_flag = this.case_sensitive_search ? "" : "i"; + return new RegExp(regex_anchor + escaped_search_string, regex_flag); + }; + + AbstractChosen.prototype.search_string_match = function(search_string, regex) { + var part, parts, _i, _len; + if (regex.test(search_string)) { + return true; + } else if (this.enable_split_word_search && (search_string.indexOf(" ") >= 0 || search_string.indexOf("[") === 0)) { + parts = search_string.replace(/\[|\]/g, "").split(" "); + if (parts.length) { + for (_i = 0, _len = parts.length; _i < _len; _i++) { + part = parts[_i]; + if (regex.test(part)) { + return true; + } + } + } + } + }; + + AbstractChosen.prototype.choices_count = function() { + var option, _i, _len, _ref; + if (this.selected_option_count != null) { + return this.selected_option_count; + } + this.selected_option_count = 0; + _ref = this.form_field.options; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + option = _ref[_i]; + if (option.selected) { + this.selected_option_count += 1; + } + } + return this.selected_option_count; + }; + + AbstractChosen.prototype.choices_click = function(evt) { + evt.preventDefault(); + if (!(this.results_showing || this.is_disabled)) { + return this.results_show(); + } + }; + + AbstractChosen.prototype.keyup_checker = function(evt) { + var stroke, _ref; + stroke = (_ref = evt.which) != null ? _ref : evt.keyCode; + this.search_field_scale(); + switch (stroke) { + case 8: + if (this.is_multiple && this.backstroke_length < 1 && this.choices_count() > 0) { + return this.keydown_backstroke(); + } else if (!this.pending_backstroke) { + this.result_clear_highlight(); + return this.results_search(); + } + break; + case 13: + evt.preventDefault(); + if (this.results_showing) { + return this.result_select(evt); + } + break; + case 27: + if (this.results_showing) { + this.results_hide(); + } + return true; + case 9: + case 38: + case 40: + case 16: + case 91: + case 17: + case 18: + break; + default: + return this.results_search(); + } + }; + + AbstractChosen.prototype.clipboard_event_checker = function(evt) { + var _this = this; + return setTimeout((function() { + return _this.results_search(); + }), 50); + }; + + AbstractChosen.prototype.container_width = function() { + if (this.options.width != null) { + return this.options.width; + } else { + return "" + this.form_field.offsetWidth + "px"; + } + }; + + AbstractChosen.prototype.include_option_in_results = function(option) { + if (this.is_multiple && (!this.display_selected_options && option.selected)) { + return false; + } + if (!this.display_disabled_options && option.disabled) { + return false; + } + if (option.empty) { + return false; + } + return true; + }; + + AbstractChosen.prototype.search_results_touchstart = function(evt) { + this.touch_started = true; + return this.search_results_mouseover(evt); + }; + + AbstractChosen.prototype.search_results_touchmove = function(evt) { + this.touch_started = false; + return this.search_results_mouseout(evt); + }; + + AbstractChosen.prototype.search_results_touchend = function(evt) { + if (this.touch_started) { + return this.search_results_mouseup(evt); + } + }; + + AbstractChosen.prototype.outerHTML = function(element) { + var tmp; + if (element.outerHTML) { + return element.outerHTML; + } + tmp = document.createElement("div"); + tmp.appendChild(element); + return tmp.innerHTML; + }; + + AbstractChosen.browser_is_supported = function() { + if ("Microsoft Internet Explorer" === window.navigator.appName) { + return document.documentMode >= 8; + } + if (/iP(od|hone)/i.test(window.navigator.userAgent) || /IEMobile/i.test(window.navigator.userAgent) || /Windows Phone/i.test(window.navigator.userAgent) || /BlackBerry/i.test(window.navigator.userAgent) || /BB10/i.test(window.navigator.userAgent) || /Android.*Mobile/i.test(window.navigator.userAgent)) { + return false; + } + return true; + }; + + AbstractChosen.default_multiple_text = "Select Some Options"; + + AbstractChosen.default_single_text = "Select an Option"; + + AbstractChosen.default_no_result_text = "No results match"; + + return AbstractChosen; + + })(); + + $ = jQuery; + + $.fn.extend({ + chosen: function(options) { + if (!AbstractChosen.browser_is_supported()) { + return this; + } + return this.each(function(input_field) { + var $this, chosen; + $this = $(this); + chosen = $this.data('chosen'); + if (options === 'destroy') { + if (chosen instanceof Chosen) { + chosen.destroy(); + } + return; + } + if (!(chosen instanceof Chosen)) { + $this.data('chosen', new Chosen(this, options)); + } + }); + } + }); + + Chosen = (function(_super) { + __extends(Chosen, _super); + + function Chosen() { + _ref = Chosen.__super__.constructor.apply(this, arguments); + return _ref; + } + + Chosen.prototype.setup = function() { + this.form_field_jq = $(this.form_field); + this.current_selectedIndex = this.form_field.selectedIndex; + return this.is_rtl = this.form_field_jq.hasClass("chosen-rtl"); + }; + + Chosen.prototype.set_up_html = function() { + var container_classes, container_props; + container_classes = ["chosen-container"]; + container_classes.push("chosen-container-" + (this.is_multiple ? "multi" : "single")); + if (this.inherit_select_classes && this.form_field.className) { + container_classes.push(this.form_field.className); + } + if (this.is_rtl) { + container_classes.push("chosen-rtl"); + } + container_props = { + 'class': container_classes.join(' '), + 'style': "width: " + (this.container_width()) + ";", + 'title': this.form_field.title + }; + if (this.form_field.id.length) { + container_props.id = this.form_field.id.replace(/[^\w]/g, '_') + "_chosen"; + } + this.container = $("
", container_props); + if (this.is_multiple) { + this.container.html('
    '); + } else { + this.container.html('' + this.default_text + '
      '); + } + this.form_field_jq.hide().after(this.container); + this.dropdown = this.container.find('div.chosen-drop').first(); + this.search_field = this.container.find('input').first(); + this.search_results = this.container.find('ul.chosen-results').first(); + this.search_field_scale(); + this.search_no_results = this.container.find('li.no-results').first(); + if (this.is_multiple) { + this.search_choices = this.container.find('ul.chosen-choices').first(); + this.search_container = this.container.find('li.search-field').first(); + } else { + this.search_container = this.container.find('div.chosen-search').first(); + this.selected_item = this.container.find('.chosen-single').first(); + } + this.results_build(); + this.set_tab_index(); + return this.set_label_behavior(); + }; + + Chosen.prototype.on_ready = function() { + return this.form_field_jq.trigger("chosen:ready", { + chosen: this + }); + }; + + Chosen.prototype.register_observers = function() { + var _this = this; + this.container.bind('touchstart.chosen', function(evt) { + _this.container_mousedown(evt); + return evt.preventDefault(); + }); + this.container.bind('touchend.chosen', function(evt) { + _this.container_mouseup(evt); + return evt.preventDefault(); + }); + this.container.bind('mousedown.chosen', function(evt) { + _this.container_mousedown(evt); + }); + this.container.bind('mouseup.chosen', function(evt) { + _this.container_mouseup(evt); + }); + this.container.bind('mouseenter.chosen', function(evt) { + _this.mouse_enter(evt); + }); + this.container.bind('mouseleave.chosen', function(evt) { + _this.mouse_leave(evt); + }); + this.search_results.bind('mouseup.chosen', function(evt) { + _this.search_results_mouseup(evt); + }); + this.search_results.bind('mouseover.chosen', function(evt) { + _this.search_results_mouseover(evt); + }); + this.search_results.bind('mouseout.chosen', function(evt) { + _this.search_results_mouseout(evt); + }); + this.search_results.bind('mousewheel.chosen DOMMouseScroll.chosen', function(evt) { + _this.search_results_mousewheel(evt); + }); + this.search_results.bind('touchstart.chosen', function(evt) { + _this.search_results_touchstart(evt); + }); + this.search_results.bind('touchmove.chosen', function(evt) { + _this.search_results_touchmove(evt); + }); + this.search_results.bind('touchend.chosen', function(evt) { + _this.search_results_touchend(evt); + }); + this.form_field_jq.bind("chosen:updated.chosen", function(evt) { + _this.results_update_field(evt); + }); + this.form_field_jq.bind("chosen:activate.chosen", function(evt) { + _this.activate_field(evt); + }); + this.form_field_jq.bind("chosen:open.chosen", function(evt) { + _this.container_mousedown(evt); + }); + this.form_field_jq.bind("chosen:close.chosen", function(evt) { + _this.input_blur(evt); + }); + this.search_field.bind('blur.chosen', function(evt) { + _this.input_blur(evt); + }); + this.search_field.bind('keyup.chosen', function(evt) { + _this.keyup_checker(evt); + }); + this.search_field.bind('keydown.chosen', function(evt) { + _this.keydown_checker(evt); + }); + this.search_field.bind('focus.chosen', function(evt) { + _this.input_focus(evt); + }); + this.search_field.bind('cut.chosen', function(evt) { + _this.clipboard_event_checker(evt); + }); + this.search_field.bind('paste.chosen', function(evt) { + _this.clipboard_event_checker(evt); + }); + if (this.is_multiple) { + return this.search_choices.bind('click.chosen', function(evt) { + _this.choices_click(evt); + }); + } else { + return this.container.bind('click.chosen', function(evt) { + evt.preventDefault(); + }); + } + }; + + Chosen.prototype.destroy = function() { + $(this.container[0].ownerDocument).unbind("click.chosen", this.click_test_action); + if (this.search_field[0].tabIndex) { + this.form_field_jq[0].tabIndex = this.search_field[0].tabIndex; + } + this.container.remove(); + this.form_field_jq.removeData('chosen'); + return this.form_field_jq.show(); + }; + + Chosen.prototype.search_field_disabled = function() { + this.is_disabled = this.form_field_jq[0].disabled; + if (this.is_disabled) { + this.container.addClass('chosen-disabled'); + this.search_field[0].disabled = true; + if (!this.is_multiple) { + this.selected_item.unbind("focus.chosen", this.activate_action); + } + return this.close_field(); + } else { + this.container.removeClass('chosen-disabled'); + this.search_field[0].disabled = false; + if (!this.is_multiple) { + return this.selected_item.bind("focus.chosen", this.activate_action); + } + } + }; + + Chosen.prototype.container_mousedown = function(evt) { + if (!this.is_disabled) { + if (evt && evt.type === "mousedown" && !this.results_showing) { + evt.preventDefault(); + } + if (!((evt != null) && ($(evt.target)).hasClass("search-choice-close"))) { + if (!this.active_field) { + if (this.is_multiple) { + this.search_field.val(""); + } + $(this.container[0].ownerDocument).bind('click.chosen', this.click_test_action); + this.results_show(); + } else if (!this.is_multiple && evt && (($(evt.target)[0] === this.selected_item[0]) || $(evt.target).parents("a.chosen-single").length)) { + evt.preventDefault(); + this.results_toggle(); + } + return this.activate_field(); + } + } + }; + + Chosen.prototype.container_mouseup = function(evt) { + if (evt.target.nodeName === "ABBR" && !this.is_disabled) { + return this.results_reset(evt); + } + }; + + Chosen.prototype.search_results_mousewheel = function(evt) { + var delta; + if (evt.originalEvent) { + delta = evt.originalEvent.deltaY || -evt.originalEvent.wheelDelta || evt.originalEvent.detail; + } + if (delta != null) { + evt.preventDefault(); + if (evt.type === 'DOMMouseScroll') { + delta = delta * 40; + } + return this.search_results.scrollTop(delta + this.search_results.scrollTop()); + } + }; + + Chosen.prototype.blur_test = function(evt) { + if (!this.active_field && this.container.hasClass("chosen-container-active")) { + return this.close_field(); + } + }; + + Chosen.prototype.close_field = function() { + $(this.container[0].ownerDocument).unbind("click.chosen", this.click_test_action); + this.active_field = false; + this.results_hide(); + this.container.removeClass("chosen-container-active"); + this.clear_backstroke(); + this.show_search_field_default(); + return this.search_field_scale(); + }; + + Chosen.prototype.activate_field = function() { + this.container.addClass("chosen-container-active"); + this.active_field = true; + this.search_field.val(this.search_field.val()); + return this.search_field.focus(); + }; + + Chosen.prototype.test_active_click = function(evt) { + var active_container; + active_container = $(evt.target).closest('.chosen-container'); + if (active_container.length && this.container[0] === active_container[0]) { + return this.active_field = true; + } else { + return this.close_field(); + } + }; + + Chosen.prototype.results_build = function() { + this.parsing = true; + this.selected_option_count = null; + this.results_data = SelectParser.select_to_array(this.form_field); + if (this.is_multiple) { + this.search_choices.find("li.search-choice").remove(); + } else if (!this.is_multiple) { + this.single_set_selected_text(); + if (this.disable_search || this.form_field.options.length <= this.disable_search_threshold) { + this.search_field[0].readOnly = true; + this.container.addClass("chosen-container-single-nosearch"); + } else { + this.search_field[0].readOnly = false; + this.container.removeClass("chosen-container-single-nosearch"); + } + } + this.update_results_content(this.results_option_build({ + first: true + })); + this.search_field_disabled(); + this.show_search_field_default(); + this.search_field_scale(); + return this.parsing = false; + }; + + Chosen.prototype.result_do_highlight = function(el) { + var high_bottom, high_top, maxHeight, visible_bottom, visible_top; + if (el.length) { + this.result_clear_highlight(); + this.result_highlight = el; + this.result_highlight.addClass("highlighted"); + maxHeight = parseInt(this.search_results.css("maxHeight"), 10); + visible_top = this.search_results.scrollTop(); + visible_bottom = maxHeight + visible_top; + high_top = this.result_highlight.position().top + this.search_results.scrollTop(); + high_bottom = high_top + this.result_highlight.outerHeight(); + if (high_bottom >= visible_bottom) { + return this.search_results.scrollTop((high_bottom - maxHeight) > 0 ? high_bottom - maxHeight : 0); + } else if (high_top < visible_top) { + return this.search_results.scrollTop(high_top); + } + } + }; + + Chosen.prototype.result_clear_highlight = function() { + if (this.result_highlight) { + this.result_highlight.removeClass("highlighted"); + } + return this.result_highlight = null; + }; + + Chosen.prototype.results_show = function() { + if (this.is_multiple && this.max_selected_options <= this.choices_count()) { + this.form_field_jq.trigger("chosen:maxselected", { + chosen: this + }); + return false; + } + this.container.addClass("chosen-with-drop"); + this.results_showing = true; + this.search_field.focus(); + this.search_field.val(this.search_field.val()); + this.winnow_results(); + return this.form_field_jq.trigger("chosen:showing_dropdown", { + chosen: this + }); + }; + + Chosen.prototype.update_results_content = function(content) { + return this.search_results.html(content); + }; + + Chosen.prototype.results_hide = function() { + if (this.results_showing) { + this.result_clear_highlight(); + this.container.removeClass("chosen-with-drop"); + this.form_field_jq.trigger("chosen:hiding_dropdown", { + chosen: this + }); + } + return this.results_showing = false; + }; + + Chosen.prototype.set_tab_index = function(el) { + var ti; + if (this.form_field.tabIndex) { + ti = this.form_field.tabIndex; + this.form_field.tabIndex = -1; + return this.search_field[0].tabIndex = ti; + } + }; + + Chosen.prototype.set_label_behavior = function() { + var _this = this; + this.form_field_label = this.form_field_jq.parents("label"); + if (!this.form_field_label.length && this.form_field.id.length) { + this.form_field_label = $("label[for='" + this.form_field.id + "']"); + } + if (this.form_field_label.length > 0) { + return this.form_field_label.bind('click.chosen', function(evt) { + if (_this.is_multiple) { + return _this.container_mousedown(evt); + } else { + return _this.activate_field(); + } + }); + } + }; + + Chosen.prototype.show_search_field_default = function() { + if (this.is_multiple && this.choices_count() < 1 && !this.active_field) { + this.search_field.val(this.default_text); + return this.search_field.addClass("default"); + } else { + this.search_field.val(""); + return this.search_field.removeClass("default"); + } + }; + + Chosen.prototype.search_results_mouseup = function(evt) { + var target; + target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first(); + if (target.length) { + this.result_highlight = target; + this.result_select(evt); + return this.search_field.focus(); + } + }; + + Chosen.prototype.search_results_mouseover = function(evt) { + var target; + target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first(); + if (target) { + return this.result_do_highlight(target); + } + }; + + Chosen.prototype.search_results_mouseout = function(evt) { + if ($(evt.target).hasClass("active-result" || $(evt.target).parents('.active-result').first())) { + return this.result_clear_highlight(); + } + }; + + Chosen.prototype.choice_build = function(item) { + var choice, close_link, + _this = this; + choice = $('
    • ', { + "class": "search-choice" + }).html("" + (this.choice_label(item)) + ""); + if (item.disabled) { + choice.addClass('search-choice-disabled'); + } else { + close_link = $('', { + "class": 'search-choice-close', + 'data-option-array-index': item.array_index + }); + close_link.bind('click.chosen', function(evt) { + return _this.choice_destroy_link_click(evt); + }); + choice.append(close_link); + } + return this.search_container.before(choice); + }; + + Chosen.prototype.choice_destroy_link_click = function(evt) { + evt.preventDefault(); + evt.stopPropagation(); + if (!this.is_disabled) { + return this.choice_destroy($(evt.target)); + } + }; + + Chosen.prototype.choice_destroy = function(link) { + if (this.result_deselect(link[0].getAttribute("data-option-array-index"))) { + this.show_search_field_default(); + if (this.is_multiple && this.choices_count() > 0 && this.search_field.val().length < 1) { + this.results_hide(); + } + link.parents('li').first().remove(); + return this.search_field_scale(); + } + }; + + Chosen.prototype.results_reset = function() { + this.reset_single_select_options(); + this.form_field.options[0].selected = true; + this.single_set_selected_text(); + this.show_search_field_default(); + this.results_reset_cleanup(); + this.form_field_jq.trigger("change"); + if (this.active_field) { + return this.results_hide(); + } + }; + + Chosen.prototype.results_reset_cleanup = function() { + this.current_selectedIndex = this.form_field.selectedIndex; + return this.selected_item.find("abbr").remove(); + }; + + Chosen.prototype.result_select = function(evt) { + var high, item; + if (this.result_highlight) { + high = this.result_highlight; + this.result_clear_highlight(); + if (this.is_multiple && this.max_selected_options <= this.choices_count()) { + this.form_field_jq.trigger("chosen:maxselected", { + chosen: this + }); + return false; + } + if (this.is_multiple) { + high.removeClass("active-result"); + } else { + this.reset_single_select_options(); + } + high.addClass("result-selected"); + item = this.results_data[high[0].getAttribute("data-option-array-index")]; + item.selected = true; + this.form_field.options[item.options_index].selected = true; + this.selected_option_count = null; + if (this.is_multiple) { + this.choice_build(item); + } else { + this.single_set_selected_text(this.choice_label(item)); + } + if (!((evt.metaKey || evt.ctrlKey) && this.is_multiple)) { + this.results_hide(); + } + this.show_search_field_default(); + if (this.is_multiple || this.form_field.selectedIndex !== this.current_selectedIndex) { + this.form_field_jq.trigger("change", { + 'selected': this.form_field.options[item.options_index].value + }); + } + this.current_selectedIndex = this.form_field.selectedIndex; + evt.preventDefault(); + return this.search_field_scale(); + } + }; + + Chosen.prototype.single_set_selected_text = function(text) { + if (text == null) { + text = this.default_text; + } + if (text === this.default_text) { + this.selected_item.addClass("chosen-default"); + } else { + this.single_deselect_control_build(); + this.selected_item.removeClass("chosen-default"); + } + return this.selected_item.find("span").html(text); + }; + + Chosen.prototype.result_deselect = function(pos) { + var result_data; + result_data = this.results_data[pos]; + if (!this.form_field.options[result_data.options_index].disabled) { + result_data.selected = false; + this.form_field.options[result_data.options_index].selected = false; + this.selected_option_count = null; + this.result_clear_highlight(); + if (this.results_showing) { + this.winnow_results(); + } + this.form_field_jq.trigger("change", { + deselected: this.form_field.options[result_data.options_index].value + }); + this.search_field_scale(); + return true; + } else { + return false; + } + }; + + Chosen.prototype.single_deselect_control_build = function() { + if (!this.allow_single_deselect) { + return; + } + if (!this.selected_item.find("abbr").length) { + this.selected_item.find("span").first().after(""); + } + return this.selected_item.addClass("chosen-single-with-deselect"); + }; + + Chosen.prototype.get_search_text = function() { + return $('
      ').text($.trim(this.search_field.val())).html(); + }; + + Chosen.prototype.winnow_results_set_highlight = function() { + var do_high, selected_results; + selected_results = !this.is_multiple ? this.search_results.find(".result-selected.active-result") : []; + do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first(); + if (do_high != null) { + return this.result_do_highlight(do_high); + } + }; + + Chosen.prototype.no_results = function(terms) { + var no_results_html; + no_results_html = $('
    • ' + this.results_none_found + ' ""
      • '); + no_results_html.find("span").first().html(terms); + this.search_results.append(no_results_html); + return this.form_field_jq.trigger("chosen:no_results", { + chosen: this + }); + }; + + Chosen.prototype.no_results_clear = function() { + return this.search_results.find(".no-results").remove(); + }; + + Chosen.prototype.keydown_arrow = function() { + var next_sib; + if (this.results_showing && this.result_highlight) { + next_sib = this.result_highlight.nextAll("li.active-result").first(); + if (next_sib) { + return this.result_do_highlight(next_sib); + } + } else { + return this.results_show(); + } + }; + + Chosen.prototype.keyup_arrow = function() { + var prev_sibs; + if (!this.results_showing && !this.is_multiple) { + return this.results_show(); + } else if (this.result_highlight) { + prev_sibs = this.result_highlight.prevAll("li.active-result"); + if (prev_sibs.length) { + return this.result_do_highlight(prev_sibs.first()); + } else { + if (this.choices_count() > 0) { + this.results_hide(); + } + return this.result_clear_highlight(); + } + } + }; + + Chosen.prototype.keydown_backstroke = function() { + var next_available_destroy; + if (this.pending_backstroke) { + this.choice_destroy(this.pending_backstroke.find("a").first()); + return this.clear_backstroke(); + } else { + next_available_destroy = this.search_container.siblings("li.search-choice").last(); + if (next_available_destroy.length && !next_available_destroy.hasClass("search-choice-disabled")) { + this.pending_backstroke = next_available_destroy; + if (this.single_backstroke_delete) { + return this.keydown_backstroke(); + } else { + return this.pending_backstroke.addClass("search-choice-focus"); + } + } + } + }; + + Chosen.prototype.clear_backstroke = function() { + if (this.pending_backstroke) { + this.pending_backstroke.removeClass("search-choice-focus"); + } + return this.pending_backstroke = null; + }; + + Chosen.prototype.keydown_checker = function(evt) { + var stroke, _ref1; + stroke = (_ref1 = evt.which) != null ? _ref1 : evt.keyCode; + this.search_field_scale(); + if (stroke !== 8 && this.pending_backstroke) { + this.clear_backstroke(); + } + switch (stroke) { + case 8: + this.backstroke_length = this.search_field.val().length; + break; + case 9: + if (this.results_showing && !this.is_multiple) { + this.result_select(evt); + } + this.mouse_on_container = false; + break; + case 13: + if (this.results_showing) { + evt.preventDefault(); + } + break; + case 32: + if (this.disable_search) { + evt.preventDefault(); + } + break; + case 38: + evt.preventDefault(); + this.keyup_arrow(); + break; + case 40: + evt.preventDefault(); + this.keydown_arrow(); + break; + } + }; + + Chosen.prototype.search_field_scale = function() { + var div, f_width, h, style, style_block, styles, w, _i, _len; + if (this.is_multiple) { + h = 0; + w = 0; + style_block = "position:absolute; left: -1000px; top: -1000px; display:none;"; + styles = ['font-size', 'font-style', 'font-weight', 'font-family', 'line-height', 'text-transform', 'letter-spacing']; + for (_i = 0, _len = styles.length; _i < _len; _i++) { + style = styles[_i]; + style_block += style + ":" + this.search_field.css(style) + ";"; + } + div = $('
      ', { + 'style': style_block + }); + div.text(this.search_field.val()); + $('body').append(div); + w = div.width() + 25; + div.remove(); + f_width = this.container.outerWidth(); + if (w > f_width - 10) { + w = f_width - 10; + } + return this.search_field.css({ + 'width': w + 'px' + }); + } + }; + + return Chosen; + + })(AbstractChosen); + +}).call(this); diff --git a/media/jquery/chosen/chosen.jquery.min.js b/media/jquery/chosen/chosen.jquery.min.js new file mode 100644 index 00000000..806018e6 --- /dev/null +++ b/media/jquery/chosen/chosen.jquery.min.js @@ -0,0 +1,2 @@ +/* Chosen v1.6.2 | (c) 2011-2016 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ +(function(){var a,AbstractChosen,Chosen,SelectParser,b,c={}.hasOwnProperty,d=function(a,b){function d(){this.constructor=a}for(var e in b)c.call(b,e)&&(a[e]=b[e]);return d.prototype=b.prototype,a.prototype=new d,a.__super__=b.prototype,a};SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(a){return"OPTGROUP"===a.nodeName.toUpperCase()?this.add_group(a):this.add_option(a)},SelectParser.prototype.add_group=function(a){var b,c,d,e,f,g;for(b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:this.escapeExpression(a.label),title:a.title?a.title:void 0,children:0,disabled:a.disabled,classes:a.className}),f=a.childNodes,g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},SelectParser.prototype.add_option=function(a,b,c){return"OPTION"===a.nodeName.toUpperCase()?(""!==a.text?(null!=b&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,title:a.title?a.title:void 0,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,group_label:null!=b?this.parsed[b].label:null,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1):void 0},SelectParser.prototype.escapeExpression=function(a){var b,c;return null==a||a===!1?"":/[\&\<\>\"\'\`]/.test(a)?(b={"<":"<",">":">",'"':""","'":"'","`":"`"},c=/&(?!\w+;)|[\<\>\"\'\`]/g,a.replace(c,function(a){return b[a]||"&"})):a},SelectParser}(),SelectParser.select_to_array=function(a){var b,c,d,e,f;for(c=new SelectParser,f=a.childNodes,d=0,e=f.length;e>d;d++)b=f[d],c.add_node(b);return c.parsed},AbstractChosen=function(){function AbstractChosen(a,b){this.form_field=a,this.options=null!=b?b:{},AbstractChosen.browser_is_supported()&&(this.is_multiple=this.form_field.multiple,this.set_default_text(),this.set_default_values(),this.setup(),this.set_up_html(),this.register_observers(),this.on_ready())}return AbstractChosen.prototype.set_default_values=function(){var a=this;return this.click_test_action=function(b){return a.test_active_click(b)},this.activate_action=function(b){return a.activate_field(b)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.allow_single_deselect=null!=this.options.allow_single_deselect&&null!=this.form_field.options[0]&&""===this.form_field.options[0].text?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.enable_split_word_search=null!=this.options.enable_split_word_search?this.options.enable_split_word_search:!0,this.group_search=null!=this.options.group_search?this.options.group_search:!0,this.search_contains=this.options.search_contains||!1,this.single_backstroke_delete=null!=this.options.single_backstroke_delete?this.options.single_backstroke_delete:!0,this.max_selected_options=this.options.max_selected_options||1/0,this.inherit_select_classes=this.options.inherit_select_classes||!1,this.display_selected_options=null!=this.options.display_selected_options?this.options.display_selected_options:!0,this.display_disabled_options=null!=this.options.display_disabled_options?this.options.display_disabled_options:!0,this.include_group_label_in_selected=this.options.include_group_label_in_selected||!1,this.max_shown_results=this.options.max_shown_results||Number.POSITIVE_INFINITY,this.case_sensitive_search=this.options.case_sensitive_search||!1},AbstractChosen.prototype.set_default_text=function(){return this.form_field.getAttribute("data-placeholder")?this.default_text=this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text:this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text,this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text},AbstractChosen.prototype.choice_label=function(a){return this.include_group_label_in_selected&&null!=a.group_label?""+a.group_label+""+a.html:a.html},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(a){var b=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return b.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},AbstractChosen.prototype.input_blur=function(a){var b=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return b.blur_test()},100))},AbstractChosen.prototype.results_option_build=function(a){var b,c,d,e,f,g,h;for(b="",e=0,h=this.results_data,f=0,g=h.length;g>f&&(c=h[f],d="",d=c.group?this.result_add_group(c):this.result_add_option(c),""!==d&&(e++,b+=d),(null!=a?a.first:void 0)&&(c.selected&&this.is_multiple?this.choice_build(c):c.selected&&!this.is_multiple&&this.single_set_selected_text(this.choice_label(c))),!(e>=this.max_shown_results));f++);return b},AbstractChosen.prototype.result_add_option=function(a){var b,c;return a.search_match&&this.include_option_in_results(a)?(b=[],a.disabled||a.selected&&this.is_multiple||b.push("active-result"),!a.disabled||a.selected&&this.is_multiple||b.push("disabled-result"),a.selected&&b.push("result-selected"),null!=a.group_array_index&&b.push("group-option"),""!==a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.style.cssText=a.style,c.setAttribute("data-option-array-index",a.array_index),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):""},AbstractChosen.prototype.result_add_group=function(a){var b,c;return(a.search_match||a.group_match)&&a.active_options>0?(b=[],b.push("group-result"),a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):""},AbstractChosen.prototype.results_update_field=function(){return this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing?this.winnow_results():void 0},AbstractChosen.prototype.reset_single_select_options=function(){var a,b,c,d,e;for(d=this.results_data,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.selected?e.push(a.selected=!1):e.push(void 0);return e},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l;for(this.no_results_clear(),d=0,f=this.get_search_text(),a=f.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),i=new RegExp(a,"i"),c=this.get_search_regex(a),l=this.results_data,j=0,k=l.length;k>j;j++)b=l[j],b.search_match=!1,e=null,this.include_option_in_results(b)&&(b.group&&(b.group_match=!1,b.active_options=0),null!=b.group_array_index&&this.results_data[b.group_array_index]&&(e=this.results_data[b.group_array_index],0===e.active_options&&e.search_match&&(d+=1),e.active_options+=1),b.search_text=b.group?b.label:b.html,(!b.group||this.group_search)&&(b.search_match=this.search_string_match(b.search_text,c),b.search_match&&!b.group&&(d+=1),b.search_match?(f.length&&(g=b.search_text.search(i),h=b.search_text.substr(0,g+f.length)+""+b.search_text.substr(g+f.length),b.search_text=h.substr(0,g)+""+h.substr(g)),null!=e&&(e.group_match=!0)):null!=b.group_array_index&&this.results_data[b.group_array_index].search_match&&(b.search_match=!0)));return this.result_clear_highlight(),1>d&&f.length?(this.update_results_content(""),this.no_results(f)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight())},AbstractChosen.prototype.get_search_regex=function(a){var b,c;return b=this.search_contains?"":"^",c=this.case_sensitive_search?"":"i",new RegExp(b+a,c)},AbstractChosen.prototype.search_string_match=function(a,b){var c,d,e,f;if(b.test(a))return!0;if(this.enable_split_word_search&&(a.indexOf(" ")>=0||0===a.indexOf("["))&&(d=a.replace(/\[|\]/g,"").split(" "),d.length))for(e=0,f=d.length;f>e;e++)if(c=d[e],b.test(c))return!0},AbstractChosen.prototype.choices_count=function(){var a,b,c,d;if(null!=this.selected_option_count)return this.selected_option_count;for(this.selected_option_count=0,d=this.form_field.options,b=0,c=d.length;c>b;b++)a=d[b],a.selected&&(this.selected_option_count+=1);return this.selected_option_count},AbstractChosen.prototype.choices_click=function(a){return a.preventDefault(),this.results_showing||this.is_disabled?void 0:this.results_show()},AbstractChosen.prototype.keyup_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(a.preventDefault(),this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:case 18:break;default:return this.results_search()}},AbstractChosen.prototype.clipboard_event_checker=function(a){var b=this;return setTimeout(function(){return b.results_search()},50)},AbstractChosen.prototype.container_width=function(){return null!=this.options.width?this.options.width:""+this.form_field.offsetWidth+"px"},AbstractChosen.prototype.include_option_in_results=function(a){return this.is_multiple&&!this.display_selected_options&&a.selected?!1:!this.display_disabled_options&&a.disabled?!1:a.empty?!1:!0},AbstractChosen.prototype.search_results_touchstart=function(a){return this.touch_started=!0,this.search_results_mouseover(a)},AbstractChosen.prototype.search_results_touchmove=function(a){return this.touch_started=!1,this.search_results_mouseout(a)},AbstractChosen.prototype.search_results_touchend=function(a){return this.touch_started?this.search_results_mouseup(a):void 0},AbstractChosen.prototype.outerHTML=function(a){var b;return a.outerHTML?a.outerHTML:(b=document.createElement("div"),b.appendChild(a),b.innerHTML)},AbstractChosen.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)||/IEMobile/i.test(window.navigator.userAgent)||/Windows Phone/i.test(window.navigator.userAgent)||/BlackBerry/i.test(window.navigator.userAgent)||/BB10/i.test(window.navigator.userAgent)||/Android.*Mobile/i.test(window.navigator.userAgent)?!1:!0},AbstractChosen.default_multiple_text="Select Some Options",AbstractChosen.default_single_text="Select an Option",AbstractChosen.default_no_result_text="No results match",AbstractChosen}(),a=jQuery,a.fn.extend({chosen:function(b){return AbstractChosen.browser_is_supported()?this.each(function(c){var d,e;return d=a(this),e=d.data("chosen"),"destroy"===b?void(e instanceof Chosen&&e.destroy()):void(e instanceof Chosen||d.data("chosen",new Chosen(this,b)))}):this}}),Chosen=function(c){function Chosen(){return b=Chosen.__super__.constructor.apply(this,arguments)}return d(Chosen,c),Chosen.prototype.setup=function(){return this.form_field_jq=a(this.form_field),this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")},Chosen.prototype.set_up_html=function(){var b,c;return b=["chosen-container"],b.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&b.push(this.form_field.className),this.is_rtl&&b.push("chosen-rtl"),c={"class":b.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(c.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=a("
      ",c),this.is_multiple?this.container.html('
        '):this.container.html('        '+this.default_text+'
          '),this.form_field_jq.hide().after(this.container),this.dropdown=this.container.find("div.chosen-drop").first(),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chosen-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chosen-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chosen-search").first(),this.selected_item=this.container.find(".chosen-single").first()),this.results_build(),this.set_tab_index(),this.set_label_behavior()},Chosen.prototype.on_ready=function(){return this.form_field_jq.trigger("chosen:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var a=this;return this.container.bind("touchstart.chosen",function(b){return a.container_mousedown(b),b.preventDefault()}),this.container.bind("touchend.chosen",function(b){return a.container_mouseup(b),b.preventDefault()}),this.container.bind("mousedown.chosen",function(b){a.container_mousedown(b)}),this.container.bind("mouseup.chosen",function(b){a.container_mouseup(b)}),this.container.bind("mouseenter.chosen",function(b){a.mouse_enter(b)}),this.container.bind("mouseleave.chosen",function(b){a.mouse_leave(b)}),this.search_results.bind("mouseup.chosen",function(b){a.search_results_mouseup(b)}),this.search_results.bind("mouseover.chosen",function(b){a.search_results_mouseover(b)}),this.search_results.bind("mouseout.chosen",function(b){a.search_results_mouseout(b)}),this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(b){a.search_results_mousewheel(b)}),this.search_results.bind("touchstart.chosen",function(b){a.search_results_touchstart(b)}),this.search_results.bind("touchmove.chosen",function(b){a.search_results_touchmove(b)}),this.search_results.bind("touchend.chosen",function(b){a.search_results_touchend(b)}),this.form_field_jq.bind("chosen:updated.chosen",function(b){a.results_update_field(b)}),this.form_field_jq.bind("chosen:activate.chosen",function(b){a.activate_field(b)}),this.form_field_jq.bind("chosen:open.chosen",function(b){a.container_mousedown(b)}),this.form_field_jq.bind("chosen:close.chosen",function(b){a.input_blur(b)}),this.search_field.bind("blur.chosen",function(b){a.input_blur(b)}),this.search_field.bind("keyup.chosen",function(b){a.keyup_checker(b)}),this.search_field.bind("keydown.chosen",function(b){a.keydown_checker(b)}),this.search_field.bind("focus.chosen",function(b){a.input_focus(b)}),this.search_field.bind("cut.chosen",function(b){a.clipboard_event_checker(b)}),this.search_field.bind("paste.chosen",function(b){a.clipboard_event_checker(b)}),this.is_multiple?this.search_choices.bind("click.chosen",function(b){a.choices_click(b)}):this.container.bind("click.chosen",function(a){a.preventDefault()})},Chosen.prototype.destroy=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.search_field[0].tabIndex&&(this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex),this.container.remove(),this.form_field_jq.removeData("chosen"),this.form_field_jq.show()},Chosen.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field_jq[0].disabled,this.is_disabled?(this.container.addClass("chosen-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus.chosen",this.activate_action),this.close_field()):(this.container.removeClass("chosen-disabled"),this.search_field[0].disabled=!1,this.is_multiple?void 0:this.selected_item.bind("focus.chosen",this.activate_action))},Chosen.prototype.container_mousedown=function(b){return this.is_disabled||(b&&"mousedown"===b.type&&!this.results_showing&&b.preventDefault(),null!=b&&a(b.target).hasClass("search-choice-close"))?void 0:(this.active_field?this.is_multiple||!b||a(b.target)[0]!==this.selected_item[0]&&!a(b.target).parents("a.chosen-single").length||(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(this.container[0].ownerDocument).bind("click.chosen",this.click_test_action),this.results_show()),this.activate_field())},Chosen.prototype.container_mouseup=function(a){return"ABBR"!==a.target.nodeName||this.is_disabled?void 0:this.results_reset(a)},Chosen.prototype.search_results_mousewheel=function(a){var b;return a.originalEvent&&(b=a.originalEvent.deltaY||-a.originalEvent.wheelDelta||a.originalEvent.detail),null!=b?(a.preventDefault(),"DOMMouseScroll"===a.type&&(b=40*b),this.search_results.scrollTop(b+this.search_results.scrollTop())):void 0},Chosen.prototype.blur_test=function(a){return!this.active_field&&this.container.hasClass("chosen-container-active")?this.close_field():void 0},Chosen.prototype.close_field=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClass("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return this.container.addClass("chosen-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},Chosen.prototype.test_active_click=function(b){var c;return c=a(b.target).closest(".chosen-container"),c.length&&this.container[0]===c[0]?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=SelectParser.select_to_array(this.form_field),this.is_multiple?this.search_choices.find("li.search-choice").remove():this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field[0].readOnly=!0,this.container.addClass("chosen-container-single-nosearch")):(this.search_field[0].readOnly=!1,this.container.removeClass("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},Chosen.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){if(this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight(),b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(f>c)return this.search_results.scrollTop(c)}},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){return this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.container.addClass("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results(),this.form_field_jq.trigger("chosen:showing_dropdown",{chosen:this}))},Chosen.prototype.update_results_content=function(a){return this.search_results.html(a)},Chosen.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClass("chosen-with-drop"),this.form_field_jq.trigger("chosen:hiding_dropdown",{chosen:this})),this.results_showing=!1},Chosen.prototype.set_tab_index=function(a){var b;return this.form_field.tabIndex?(b=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field[0].tabIndex=b):void 0},Chosen.prototype.set_label_behavior=function(){var b=this;return this.form_field_label=this.form_field_jq.parents("label"),!this.form_field_label.length&&this.form_field.id.length&&(this.form_field_label=a("label[for='"+this.form_field.id+"']")),this.form_field_label.length>0?this.form_field_label.bind("click.chosen",function(a){return b.is_multiple?b.container_mousedown(a):b.activate_field()}):void 0},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},Chosen.prototype.search_results_mouseup=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c.length?(this.result_highlight=c,this.result_select(b),this.search_field.focus()):void 0},Chosen.prototype.search_results_mouseover=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c?this.result_do_highlight(c):void 0},Chosen.prototype.search_results_mouseout=function(b){return a(b.target).hasClass("active-result")?this.result_clear_highlight():void 0},Chosen.prototype.choice_build=function(b){var c,d,e=this;return c=a("
        • ",{"class":"search-choice"}).html(""+this.choice_label(b)+""),b.disabled?c.addClass("search-choice-disabled"):(d=a("",{"class":"search-choice-close","data-option-array-index":b.array_index}),d.bind("click.chosen",function(a){return e.choice_destroy_link_click(a)}),c.append(d)),this.search_container.before(c)},Chosen.prototype.choice_destroy_link_click=function(b){return b.preventDefault(),b.stopPropagation(),this.is_disabled?void 0:this.choice_destroy(a(b.target))},Chosen.prototype.choice_destroy=function(a){return this.result_deselect(a[0].getAttribute("data-option-array-index"))?(this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1&&this.results_hide(),a.parents("li").first().remove(),this.search_field_scale()):void 0},Chosen.prototype.results_reset=function(){return this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change"),this.active_field?this.results_hide():void 0},Chosen.prototype.results_reset_cleanup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.selected_item.find("abbr").remove()},Chosen.prototype.result_select=function(a){var b,c;return this.result_highlight?(b=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?b.removeClass("active-result"):this.reset_single_select_options(),b.addClass("result-selected"),c=this.results_data[b[0].getAttribute("data-option-array-index")],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(c):this.single_set_selected_text(this.choice_label(c)),(a.metaKey||a.ctrlKey)&&this.is_multiple||this.results_hide(),this.show_search_field_default(),(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[c.options_index].value}),this.current_selectedIndex=this.form_field.selectedIndex,a.preventDefault(),this.search_field_scale())):void 0},Chosen.prototype.single_set_selected_text=function(a){return null==a&&(a=this.default_text),a===this.default_text?this.selected_item.addClass("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClass("chosen-default")),this.selected_item.find("span").html(a)},Chosen.prototype.result_deselect=function(a){var b;return b=this.results_data[a],this.form_field.options[b.options_index].disabled?!1:(b.selected=!1,this.form_field.options[b.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[b.options_index].value}),this.search_field_scale(),!0)},Chosen.prototype.single_deselect_control_build=function(){return this.allow_single_deselect?(this.selected_item.find("abbr").length||this.selected_item.find("span").first().after(''),this.selected_item.addClass("chosen-single-with-deselect")):void 0},Chosen.prototype.get_search_text=function(){return a("
          ").text(a.trim(this.search_field.val())).html()},Chosen.prototype.winnow_results_set_highlight=function(){var a,b;return b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first(),null!=a?this.result_do_highlight(a):void 0},Chosen.prototype.no_results=function(b){var c;return c=a('
        • '+this.results_none_found+' ""
          • '),c.find("span").first().html(b),this.search_results.append(c),this.form_field_jq.trigger("chosen:no_results",{chosen:this})},Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},Chosen.prototype.keydown_arrow=function(){var a;return this.results_showing&&this.result_highlight?(a=this.result_highlight.nextAll("li.active-result").first())?this.result_do_highlight(a):void 0:this.results_show()},Chosen.prototype.keyup_arrow=function(){var a;return this.results_showing||this.is_multiple?this.result_highlight?(a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},Chosen.prototype.keydown_backstroke=function(){var a;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(a=this.search_container.siblings("li.search-choice").last(),a.length&&!a.hasClass("search-choice-disabled")?(this.pending_backstroke=a,this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")):void 0)},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),8!==b&&this.pending_backstroke&&this.clear_backstroke(),b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:this.results_showing&&a.preventDefault();break;case 32:this.disable_search&&a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:a.preventDefault(),this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){for(d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],i=0,j=g.length;j>i;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";return b=a("
          ",{style:f}),b.text(this.search_field.val()),a("body").append(b),h=b.width()+25,b.remove(),c=this.container.outerWidth(),h>c-10&&(h=c-10),this.search_field.css({width:h+"px"})}},Chosen}(AbstractChosen)}).call(this); \ No newline at end of file diff --git a/media/jquery/chosen/chosen.min.css b/media/jquery/chosen/chosen.min.css new file mode 100644 index 00000000..60b11718 --- /dev/null +++ b/media/jquery/chosen/chosen.min.css @@ -0,0 +1,3 @@ +/* Chosen v1.6.2 | (c) 2011-2016 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ + +.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;-webkit-user-select:none;-moz-user-select:none;user-select:none}.chosen-container *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container .search-choice .group-name,.chosen-container .chosen-single .group-name{margin-right:4px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-weight:400;color:#999}.chosen-container .search-choice .group-name:after,.chosen-container .chosen-single .group-name:after{content:":";padding-left:2px;vertical-align:top}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:25px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:24px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(chosen-sprite.png) no-repeat 0 2px}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:#fff url(chosen-sprite.png) no-repeat 100% -20px;background:url(chosen-sprite.png) no-repeat 100% -20px;font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{color:#444;position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;word-wrap:break-word;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{color:#777;display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;margin:0;padding:0 5px;width:100%;height:auto;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:0;height:25px;outline:0;border:0!important;background:transparent!important;box-shadow:none;color:#999;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 5px 3px 0;padding:3px 20px 3px 5px;border:1px solid #aaa;max-width:100%;border-radius:3px;background-color:#eee;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-size:100% 19px;background-repeat:repeat-x;background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice span{word-wrap:break-word}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:0;background:transparent}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#222!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl.chosen-container-single-nosearch .chosen-search,.chosen-rtl .chosen-drop{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:0}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:#fff url(chosen-sprite.png) no-repeat -30px -20px;background:url(chosen-sprite.png) no-repeat -30px -20px;direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi),only screen and (min-resolution:1.5dppx){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:url(chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index a4015bf9..777295e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ coverage==4.3.4 -Django==1.10.5 -django-debug-toolbar==1.6 +Django==1.10.6 +django-debug-toolbar==1.7 docutils==0.13.1 -sqlparse==0.2.2 +sqlparse==0.2.3 freezegun==0.3.8 django-formtools==2.0 diff --git a/src/feedback/admin.py b/src/feedback/admin.py index 7a77950a..fbb3dd4f 100644 --- a/src/feedback/admin.py +++ b/src/feedback/admin.py @@ -11,14 +11,17 @@ class PersonAdmin(admin.ModelAdmin): + """Admin View für Personen""" list_display = ('__unicode__', 'email', 'fachgebiet') search_fields = ['vorname', 'nachname', 'email', ] list_filter = ('fachgebiet',) class FachgebietZuweisenForm(forms.Form): + """Form für die Zuweisung von einem Fachgebiet für eine Person.""" _selected_action = forms.CharField(widget=forms.MultipleHiddenInput) def assign_fachgebiet_action(self, request, queryset): + """Definiert eine Admin-Action für die Fachgebietzuweisung.""" form = None suggestion_list = [] @@ -58,6 +61,7 @@ def assign_fachgebiet_action(self, request, queryset): class LogInline(admin.TabularInline): + """Admin View für Log""" model = Log readonly_fields = ('veranstaltung', 'user', 'scanner', 'timestamp', 'status', 'interface') can_delete = False @@ -67,6 +71,7 @@ def has_add_permission(self, request, obj=None): class VeranstaltungAdmin(admin.ModelAdmin): + """Admin View für Veranstaltung""" fieldsets = [ ('Stammdaten', {'fields': ['typ', 'name', 'semester', 'status', 'lv_nr', 'grundstudium', 'evaluieren', @@ -85,17 +90,20 @@ class VeranstaltungAdmin(admin.ModelAdmin): inlines = [LogInline, ] def save_model(self, request, obj, form, change): + """Definiert eine Post-Save Operation.""" super(VeranstaltungAdmin, self).save_model(request, obj, form, change) - # Post-Save Operation for changed_att in form.changed_data: - if changed_att == "status": # Wenn Status sich aendert, wird es notiert + # Wenn sich der Status ändert, wird es geloggt. + if changed_att == "status": obj.log(request.user) class StatusAendernForm(forms.Form): + """Definiert eine Form für Änderung einen Status'.""" _selected_action = forms.CharField(widget=forms.MultipleHiddenInput) status = forms.ChoiceField(choices=Veranstaltung.STATUS_CHOICES) def status_aendern_action(self, request, queryset): + """Beschreibt eine Admin-Action für die Statusänderung.""" form = None if 'apply' in request.POST: @@ -121,26 +129,31 @@ def status_aendern_action(self, request, queryset): class SemesterAdmin(admin.ModelAdmin): + """Admin View für Semester""" list_display = ('__unicode__', 'sichtbarkeit', 'fragebogen') list_filter = ('sichtbarkeit', 'fragebogen') ordering = ('-semester',) class EinstellungAdmin(admin.ModelAdmin): + """Admin View für Einstellung""" list_display = ('name', 'wert') list_editable = ('wert',) class MailvorlageAdmin(admin.ModelAdmin): + """Admin View für Mailvorlage""" list_display = ('subject',) class KommentarAdmin(admin.ModelAdmin): + """Admin View für Kommentar""" list_display = ('typ', 'name', 'semester', 'autor') list_display_links = ('name',) class TutorAdmin(admin.ModelAdmin): + """Admin View für Tutor""" fieldsets = [ ('Stammdaten', {'fields': ['vorname', 'nachname', 'email', @@ -161,15 +174,18 @@ def render_change_form(self, request, context, *args, **kwargs): class BarcodeScannEventAdmin(admin.ModelAdmin): + """Admin View für BarcodeScannEvent""" list_display = ('veranstaltung', 'timestamp',) readonly_fields = ('veranstaltung', 'timestamp',) class BarcodeAllowedStateInline(admin.TabularInline): + """Admin View für BarcodeAllowedState""" model = BarcodeAllowedState class BarcodeScannerAdmin(admin.ModelAdmin): + """Admin View für BarcodeScanner""" inlines = [ BarcodeAllowedStateInline, ] @@ -177,11 +193,13 @@ class BarcodeScannerAdmin(admin.ModelAdmin): class FachgebietEmailAdminInline(admin.TabularInline): + """Admin View für FachgebietEmail""" model = FachgebietEmail extra = 1 class FachgebietAdmin(admin.ModelAdmin): + """Admin View für Fachgebiet""" list_display = ('name', 'kuerzel') list_display_links = ('name',) inlines = (FachgebietEmailAdminInline,) diff --git a/src/feedback/auth.py b/src/feedback/auth.py index 8bbda603..0f3ee078 100644 --- a/src/feedback/auth.py +++ b/src/feedback/auth.py @@ -11,7 +11,7 @@ from feedback.models.base import Veranstaltung -### Login mit Veranstalter-Rechten ############################################ +# ------------------------------ Login mit Veranstalter-Rechten ------------------------------ # class VeranstalterBackend(ModelBackend): def authenticate(self, vid, token): @@ -34,7 +34,7 @@ def authenticate(self, user, current_user=None, reset=False): return None -### Nutzung eines Fachschaftsaccounts ######################################### +# ------------------------------ Nutzung eines Fachschaftsaccounts ------------------------------ # class FSAccountBackend(RemoteUserBackend): # Login wird automatisch über RemoteUserMiddleware bzw. RemoteUserBackend abgewickelt, @@ -53,7 +53,7 @@ def clean_username(self, username): if settings.DEBUG: credentials = b64decode(username.split()[1]) user = credentials.split(':')[0] - return (smart_unicode(user)) + return smart_unicode(user) else: return username diff --git a/src/feedback/forms.py b/src/feedback/forms.py index ee9cb8f0..eea351d6 100644 --- a/src/feedback/forms.py +++ b/src/feedback/forms.py @@ -8,6 +8,7 @@ class VeranstaltungEvaluationForm(forms.ModelForm): + """Definiert die Form für den 1. Schritt des Wizards""" required_css_class = 'required' class Meta: @@ -23,6 +24,7 @@ def __init__(self, *args, **kwargs): class VeranstaltungBasisdatenForm(forms.ModelForm): + """Definiert die Form für den 2. Schritt des Wizards.""" required_css_class = 'required' def __init__(self, *args, **kwargs): @@ -69,6 +71,7 @@ class Meta: class VeranstaltungPrimaerDozentForm(forms.ModelForm): + """Definiert die Form für den 3. Schritt des Wizards.""" required_css_class = 'required' def __init__(self, *args, **kwargs): @@ -87,6 +90,7 @@ class Meta: class VeranstaltungDozentDatenForm(forms.ModelForm): + """Definiert die Form für den 4. Schritt des Wizards.""" required_css_class = 'required' def __init__(self, *args, **kwargs): @@ -101,6 +105,7 @@ class Meta: class VeranstaltungFreieFragen(forms.ModelForm): + """Definiert die Form für den 5. Schritt des Wizards.""" required_css_class = 'required' class Meta: @@ -109,6 +114,7 @@ class Meta: class VeranstaltungTutorenForm(forms.Form): + """Definiert die Form für den 6. Schritt des Wizards.""" required_css_class = 'required' csv_tutoren = forms.CharField(label='CSV', widget=forms.Textarea, required=False) @@ -120,6 +126,7 @@ def __init__(self, *args, **kwargs): class VeranstaltungVeroeffentlichung(forms.ModelForm): + """Definiert die Form für den 7. Schritt des Wizards.""" required_css_class = 'required' class Meta: @@ -128,10 +135,12 @@ class Meta: class UploadFileForm(forms.Form): + """Definiert die Form für den XML Import.""" file = forms.FileField(label='Datei') class PersonForm(forms.ModelForm): + """Definiert die Form für die Bearbeitung von Personen.""" class Meta: model = Person fields = ('geschlecht', 'email') @@ -144,7 +153,15 @@ def clean(self): raise forms.ValidationError('Das Feld für die Anrede oder Email ist leer.') +class PersonUpdateForm(forms.ModelForm): + """Definiert die Form für die Nachpflege von Personendaten""" + class Meta: + model = Person + fields = ('anschrift', 'fachgebiet') + + class KommentarModelForm(forms.ModelForm): + """Definiert die Form für Kommentare.""" def __init__(self, *args, **kwargs): veranst = kwargs.pop('veranstaltung', None) @@ -159,14 +176,19 @@ class Meta: exclude = ('veranstaltung',) -class PersonUpdateForm(forms.ModelForm): - class Meta: - model = Person - fields = ('anschrift', 'fachgebiet') +CLOSE_ORDER_CHOICES = ( + ('ja', 'Ja'), + ('nein', 'Nein') +) + + +class CloseOrderForm(forms.Form): + """Definiert die Form für das Beenden der Bestellphase""" + auswahl = forms.ChoiceField(choices=CLOSE_ORDER_CHOICES) class CreateBarcodeScannEventForm(forms.ModelForm): - """Handelt die erste haelfte von Barcode scanns""" + """Definiert die Form für einen Barcodescan-Event""" scanner_token = forms.CharField() class Meta: diff --git a/src/feedback/migrations/0035_auto_20170319_1308.py b/src/feedback/migrations/0035_auto_20170319_1308.py new file mode 100644 index 00000000..ee37f345 --- /dev/null +++ b/src/feedback/migrations/0035_auto_20170319_1308.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-03-19 13:08 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('feedback', '0034_auto_20170207_1854'), + ] + + operations = [ + migrations.AlterModelOptions( + name='barcodeallowedstate', + options={'verbose_name': 'Erlaubter Zustand', 'verbose_name_plural': 'Erlaubte Zust\xe4nde'}, + ), + migrations.AlterField( + model_name='barcodeallowedstate', + name='allow_state', + field=models.IntegerField(choices=[(100, 'Angelegt'), (200, 'Bestellung ge\xf6ffnet'), (300, 'Keine Evaluation'), (500, 'Bestellung liegt vor'), (600, 'Gedruckt'), (700, 'Versandt'), (800, 'B\xf6gen eingegangen'), (900, 'B\xf6gen gescannt'), (1000, 'Ergebnisse versandt')], null=True), + ), + migrations.AlterUniqueTogether( + name='barcodeallowedstate', + unique_together=set([('barcode_scanner', 'allow_state')]), + ), + ] diff --git a/src/feedback/migrations/0036_auto_20170319_1423.py b/src/feedback/migrations/0036_auto_20170319_1423.py new file mode 100644 index 00000000..06da165d --- /dev/null +++ b/src/feedback/migrations/0036_auto_20170319_1423.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-03-19 14:23 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('feedback', '0035_auto_20170319_1308'), + ] + + operations = [ + migrations.AlterField( + model_name='barcodeallowedstate', + name='allow_state', + field=models.IntegerField(choices=[(100, 'Angelegt'), (200, 'Bestellung ge\xf6ffnet'), (300, 'Keine Evaluation'), (310, 'Keine Evaluation final'), (500, 'Bestellung liegt vor'), (510, 'Bestellung wird verarbeitet'), (600, 'Gedruckt'), (700, 'Versandt'), (800, 'B\xf6gen eingegangen'), (900, 'B\xf6gen gescannt'), (1000, 'Ergebnisse versandt')], null=True), + ), + migrations.AlterField( + model_name='log', + name='status', + field=models.IntegerField(choices=[(100, 'Angelegt'), (200, 'Bestellung ge\xf6ffnet'), (300, 'Keine Evaluation'), (310, 'Keine Evaluation final'), (500, 'Bestellung liegt vor'), (510, 'Bestellung wird verarbeitet'), (600, 'Gedruckt'), (700, 'Versandt'), (800, 'B\xf6gen eingegangen'), (900, 'B\xf6gen gescannt'), (1000, 'Ergebnisse versandt')], default=100), + ), + migrations.AlterField( + model_name='veranstaltung', + name='status', + field=models.IntegerField(choices=[(100, 'Angelegt'), (200, 'Bestellung ge\xf6ffnet'), (300, 'Keine Evaluation'), (310, 'Keine Evaluation final'), (500, 'Bestellung liegt vor'), (510, 'Bestellung wird verarbeitet'), (600, 'Gedruckt'), (700, 'Versandt'), (800, 'B\xf6gen eingegangen'), (900, 'B\xf6gen gescannt'), (1000, 'Ergebnisse versandt')], default=100), + ), + ] diff --git a/src/feedback/models/base.py b/src/feedback/models/base.py index dd28131d..3b485d61 100644 --- a/src/feedback/models/base.py +++ b/src/feedback/models/base.py @@ -20,6 +20,7 @@ class Semester(models.Model): + """Repräsentiert ein Semester der TUD.""" FRAGEBOGEN_CHOICES = ( ('2008', 'Fragebogen 2008'), ('2009', 'Fragebogen 2009'), @@ -115,7 +116,7 @@ def current(): class Fachgebiet(models.Model): - """Repräsentiert ein Fachgebiet des Fachbereichs Informatik.""" + """Repräsentiert ein Fachgebiet für das FB20""" name = models.CharField(max_length=80) kuerzel = models.CharField(max_length=10) @@ -129,7 +130,7 @@ class Meta: class FachgebietEmail(models.Model): - """Repräsentiert den Suffix der Email-Adresse einer Person. Als Suffix ist alles ab dem @-Symbol definiert.""" + """Repräsentiert die E-Mail Domänen für die jeweiligen Fachgebiete des FBs 20.""" fachgebiet = models.ForeignKey(Fachgebiet, related_name='fachgebiet') email_suffix = models.CharField(max_length=150, help_text="Hier soll der Domainname einer Email-Adresse eines Fachgebiets stehen.", @@ -138,6 +139,11 @@ class FachgebietEmail(models.Model): @staticmethod def get_fachgebiet_from_email(email): + """ + Gibt ein Fachgebiet anhand einer E-Mail Adresse zurück + :param email: E-Mail String + :return: Fachgebiet + """ try: suffix = email.split('@')[-1] fg_id = FachgebietEmail.objects.get(email_suffix=suffix).fachgebiet_id @@ -152,6 +158,7 @@ class Meta: class Person(models.Model): + """Repräsentiert eine Person der TUD aus dem FB20.""" GESCHLECHT_CHOICES = ( ('', ''), ('m', 'Herr'), @@ -193,6 +200,11 @@ class Meta: @staticmethod def create_from_import_person(ip): + """ + Erstellt Personen aus dem Import + :param ip: die importierte Person + :return: Person + """ # Prüfen, ob Benutzer existiert try: return Person.objects.filter(vorname=ip.vorname, nachname=ip.nachname)[0] @@ -204,6 +216,11 @@ def create_from_import_person(ip): @staticmethod def persons_to_edit(semester=None): + """ + Gibt die Personen zurück, die noch bearbeitet werden müssen. + :param semester: bei None, das aktuelle Semester, ansonsten das Angegebene. + :return: Person + """ if semester is None: semester = Semester.current() return Person.objects.filter(Q(geschlecht='') | Q(email=''), veranstaltung__semester=semester)\ @@ -211,18 +228,40 @@ def persons_to_edit(semester=None): @staticmethod def all_edited_persons(): + """ + Gibt alle Personen zurück, die schon bearbeitet wurden. + :return: Person + """ return Person.objects.filter(~Q(geschlecht='') & ~Q(email='')).order_by('id').distinct() @staticmethod def persons_with_similar_names(vorname, nachname): + """ + Gibt alle Personen zurück, die sich im Namen ähneln. + :param vorname: String + :param nachname: String + :return: Person + """ return Person.all_edited_persons().filter(vorname__startswith=vorname, nachname=nachname) @staticmethod def veranstaltungen(person): + """ + Gibt die Veranstaltungen einer Person zurück. + :param person: Person + :return: Veranstaltung + """ return Veranstaltung.objects.filter(veranstalter=person) @staticmethod def replace_veranstalter(new, old): + """ + Ersetzt einen "alten" Veranstalter durch einen "neuen". + Zum Beispiel wenn Dozenten sich beim Namen ähneln und dementsprechend identisch sind. + Wenn dies der Fall ist, wird ersetzt und ein AlternativVorname erzeugt, der sich die ähnlichen Namen merkt. + :param new: die neue Person + :param old: die alte Person + """ veranstaltungen = Person.veranstaltungen(new) # replace every lecture held by 'new' with 'old' @@ -236,15 +275,22 @@ def replace_veranstalter(new, old): @staticmethod def is_veranstalter(person): + """ + prüft, ob eine Person ein Veranstalter ist. + :param person: Person + :return: True, wenn Veranstalter, ansonsten False + """ return Person.veranstaltungen(person).count() > 0 class AlternativVorname(models.Model): + """Repräsentiert einen alternativen Vornamen für eine Person.""" vorname = models.CharField(_('first name'), max_length=30, blank=True) person = models.ForeignKey(Person, on_delete=models.CASCADE) class Veranstaltung(models.Model): + """Repräsentiert eine Veranstaltung der TUD.""" TYP_CHOICES = ( ('v', 'Vorlesung'), ('vu', 'Vorlesung mit Übung'), @@ -318,7 +364,9 @@ class Veranstaltung(models.Model): STATUS_ANGELEGT = 100 STATUS_BESTELLUNG_GEOEFFNET = 200 STATUS_KEINE_EVALUATION = 300 + STATUS_KEINE_EVALUATION_FINAL = 310 STATUS_BESTELLUNG_LIEGT_VOR = 500 + STATUS_BESTELLUNG_WIRD_VERARBEITET = 510 STATUS_GEDRUCKT = 600 STATUS_VERSANDT = 700 STATUS_BOEGEN_EINGEGANGEN = 800 @@ -329,7 +377,9 @@ class Veranstaltung(models.Model): (STATUS_ANGELEGT, 'Angelegt'), (STATUS_BESTELLUNG_GEOEFFNET, 'Bestellung geöffnet'), (STATUS_KEINE_EVALUATION, 'Keine Evaluation'), + (STATUS_KEINE_EVALUATION_FINAL, 'Keine Evaluation final'), (STATUS_BESTELLUNG_LIEGT_VOR, 'Bestellung liegt vor'), + (STATUS_BESTELLUNG_WIRD_VERARBEITET, 'Bestellung wird verarbeitet'), (STATUS_GEDRUCKT, 'Gedruckt'), (STATUS_VERSANDT, 'Versandt'), (STATUS_BOEGEN_EINGEGANGEN, 'Bögen eingegangen'), @@ -393,12 +443,17 @@ class Veranstaltung(models.Model): veroeffentlichen = models.BooleanField(default=True, choices=BOOL_CHOICES) def get_next_state(self): + """ + Gibt den nächsten Status einer Veranstaltung zurück. + :return: Status einer Veranstaltung + """ try: return self.STATUS_UEBERGANG[self.status][0] # TODO: Sobald es mehrere Zustande gibt except KeyError: return None def set_next_state(self): + """Setzt den nächsten Status einer Veranstaltung.""" status = self.STATUS_UEBERGANG[self.status] if self.status == self.STATUS_BESTELLUNG_GEOEFFNET: @@ -509,9 +564,20 @@ def __unicode__(self): return u"%s [%s] (%s)" % (self.name, self.typ, self.semester.short()) def create_log(self, user, scanner, interface): + """ + Erstellt einen Log wenn sich bei einer Veranstaltung etwas geändert hat. + :param user: Über welche Benutzer die Änderung erfolgt ist. + :param scanner: Über welchen Barcodescanner die Änderung erfolgt ist. + :param interface: Über welches Interface die Änderung erfolgt ist. + """ Log.objects.create(veranstaltung=self, user=user, scanner=scanner, status=self.status, interface=interface) def log(self, interface, is_frontend=False): + """ + Die Logging-Funktion + :param interface: Über welches Interface die Änderung erfolgt ist. + :param is_frontend: Checkt, ob die Änderung über das Frontend erfolgt ist. + """ if isinstance(interface, BarcodeScanner): self.create_log(None, interface, Log.SCANNER) elif isinstance(interface, User): @@ -557,6 +623,12 @@ def link_veranstalter(self): # @see http://stackoverflow.com/a/17948593 else: return "Der Veranstalter Link wird erst nach dem Anlegen angezeigt" + def allow_order(self): + """Überprüft anhand des Status' der Veranstaltung, ob bestellt werden darf.""" + return self.status == Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR or \ + self.status == Veranstaltung.STATUS_BESTELLUNG_GEOEFFNET or \ + self.status == Veranstaltung.STATUS_KEINE_EVALUATION + def csv_to_tutor(self, csv_content): """Erzeuge Tutoren Objekte aus der CSV Eingabe der Veranstalter""" input_clean = csv_content.strip() @@ -571,9 +643,9 @@ def csv_to_tutor(self, csv_content): # skip lines which are not well formated if len(row) > 1: row = [x.strip() for x in row] - anmerkungInput = '' + anmerkung_input = '' if len(row) > 3: - anmerkungInput = row[3] + anmerkung_input = row[3] Tutor.objects.create( veranstaltung=self, @@ -581,7 +653,7 @@ def csv_to_tutor(self, csv_content): nachname=row[0], vorname=row[1], email=row[2], - anmerkung=anmerkungInput + anmerkung=anmerkung_input ) nummer += 1 @@ -595,7 +667,7 @@ class Meta: class Tutor(models.Model): - """Ein Tutor der eine Übung einer Lehrveranstaltung hält""" + """Repräsentiert Tutoren für eine Veranstaltung.""" nummer = models.PositiveSmallIntegerField() vorname = models.CharField(_('first name'), max_length=30) nachname = models.CharField(_('last name'), max_length=30) @@ -604,6 +676,7 @@ class Tutor(models.Model): veranstaltung = models.ForeignKey(Veranstaltung) def get_barcode_number(self): + """Gibt die Barcodenummer anhand der Tutorennummer zurück.""" return self.veranstaltung.get_barcode_number(tutorgruppe=self.nummer) def __unicode__(self): @@ -617,6 +690,7 @@ class Meta: class Einstellung(models.Model): + """Repräsentiert die Einstellungen für die Evaluation.""" name = models.CharField(max_length=100, unique=True) wert = models.CharField(max_length=255, blank=True) @@ -634,6 +708,7 @@ def __unicode__(self): class Mailvorlage(models.Model): + """Repräsentiert eine Mailvorlage""" subject = models.CharField(max_length=100, unique=True) body = models.TextField() @@ -648,7 +723,7 @@ class Meta: class BarcodeScanner(models.Model): - """Ein Barcode Scanner der fuer das Scannen von Barcodes benutzt wird""" + """Repräsentiert einen Barcodescanner.""" token = models.CharField(max_length=64, unique=True) description = models.TextField() @@ -662,12 +737,19 @@ class Meta: class BarcodeAllowedState(models.Model): + """Repräsentiert die erlaubten Zustände für einen Barcodescanner.""" barcode_scanner = models.ForeignKey(BarcodeScanner) - allow_state = models.IntegerField(choices=Veranstaltung.STATUS_CHOICES, null=True, unique=True) + allow_state = models.IntegerField(choices=Veranstaltung.STATUS_CHOICES, null=True) + + class Meta: + verbose_name = 'Erlaubter Zustand' + verbose_name_plural = 'Erlaubte Zustände' + unique_together = (('barcode_scanner', 'allow_state'),) + app_label = 'feedback' class BarcodeScannEvent(models.Model): - """Stell den Scann eines Barcodes dar""" + """Repräsentiert einen Scan-Event für einen Barcodescanner""" veranstaltung = models.ForeignKey(Veranstaltung) scanner = models.ForeignKey(BarcodeScanner) tutorgroup = models.ForeignKey(Tutor, null=True, blank=True) @@ -680,14 +762,13 @@ class Meta: app_label = 'feedback' def save(self, *args, **kwargs): - """Extrahiere die Veranstaltungsdaten aus dem Barcode - teil zwei zum ModelForm""" + """Extrahiere die Veranstaltungsdaten aus dem Barcode teil zwei zum ModelForm""" barcode_decode = Veranstaltung.decode_barcode(self.barcode) verst_obj = Veranstaltung.objects.get(pk=barcode_decode['veranstaltung']) self.veranstaltung = verst_obj self.veranstaltung.log(self.scanner) - if (barcode_decode['tutorgroup'] >= 1): + if barcode_decode['tutorgroup'] >= 1: tutorgroup = Tutor.objects.get(veranstaltung=verst_obj, nummer=barcode_decode['tutorgroup']) self.tutorgroup = tutorgroup @@ -695,7 +776,7 @@ def save(self, *args, **kwargs): class Log(models.Model): - """Ein Logger für die Zustandsübergänge der Veranstaltungen.""" + """Repräsentiert einen Logger für die Zustandsübergänge von Veranstaltungen.""" FRONTEND = 'fe' SCANNER = 'bs' ADMIN = 'ad' diff --git a/src/feedback/tests/test_models.py b/src/feedback/tests/test_models.py index e8ffdb44..3e7e730a 100644 --- a/src/feedback/tests/test_models.py +++ b/src/feedback/tests/test_models.py @@ -8,7 +8,7 @@ from freezegun import freeze_time from feedback.models import get_model, Semester, Person, Veranstaltung, Einstellung, Mailvorlage -from feedback.models.base import AlternativVorname, Log, BarcodeScanner, Fachgebiet, FachgebietEmail +from feedback.models.base import AlternativVorname, Log, BarcodeScanner, Fachgebiet, FachgebietEmail, BarcodeAllowedState from feedback.models import past_semester_orders from feedback.models import ImportPerson, ImportCategory, ImportVeranstaltung, Kommentar from feedback.models import Fragebogen2008, Fragebogen2009, Ergebnis2008, Ergebnis2009 @@ -292,6 +292,30 @@ def test_person_admin_assign_fachgebiet(self): self.assertEqual(self.fb_p1.fachgebiet, self.fachgebiet1) +class BarcodeScanTest(TestCase): + def setUp(self): + self.barcode_scanner = BarcodeScanner.objects.create(token="LRh73Ds22", description="description1") + self.barcode_scanner2 = BarcodeScanner.objects.create(token="KHzz211d", description="description2") + + def test_equal_state_onscanners(self): + try: + # Gleicher Status auf zwei Barcodescanner möglich + BarcodeAllowedState.objects.create(barcode_scanner=self.barcode_scanner, + allow_state=Veranstaltung.STATUS_GEDRUCKT) + BarcodeAllowedState.objects.create(barcode_scanner=self.barcode_scanner2, + allow_state=Veranstaltung.STATUS_GEDRUCKT) + + except IntegrityError: + self.fail() + + def test_same_state_onscanner(self): + BarcodeAllowedState.objects.create(barcode_scanner=self.barcode_scanner, + allow_state=Veranstaltung.STATUS_GEDRUCKT) + with self.assertRaises(IntegrityError): + BarcodeAllowedState.objects.create(barcode_scanner=self.barcode_scanner, + allow_state=Veranstaltung.STATUS_GEDRUCKT) + + class VeranstaltungTest(TransactionTestCase): def setUp(self): self.s = [] diff --git a/src/feedback/tests/test_views_intern.py b/src/feedback/tests/test_views_intern.py index bf79f0d5..2ccd55bf 100644 --- a/src/feedback/tests/test_views_intern.py +++ b/src/feedback/tests/test_views_intern.py @@ -1,434 +1,552 @@ -# coding=utf-8 - -import os - -from StringIO import StringIO - -from django.conf import settings -from django.core import mail -from django.test import TestCase -from django.core.urlresolvers import reverse - -from feedback.forms import UploadFileForm -from feedback.models import Semester, Person, Veranstaltung, Fragebogen2009, Mailvorlage, Einstellung, \ - Fachgebiet, FachgebietEmail -from feedback.tests.tools import NonSuTestMixin, get_veranstaltung - -from feedback import tests - - -class InternMiscTest(NonSuTestMixin, TestCase): - def test_index(self): - path = tests.INDEX_END - self.do_non_su_test(path) - self.client.login(username='supers', password='pw') - - s = Semester.objects.create(semester=20110, fragebogen='2009', sichtbarkeit='ADM') - - response = self.client.get(path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.templates[0].name, 'intern/index.html') - self.assertEqual(response.context['cur_semester'], s) - - def test_fragebogensprache(self): - path = '/intern/fragebogensprache/' - self.do_non_su_test(path) - self.client.login(username='supers', password='pw') - - Semester.objects.create(semester=20110, fragebogen='2009', sichtbarkeit='ADM') - - response = self.client.get(path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.templates[0].name, 'intern/fragebogensprache.html') - - def test_export_veranstaltungen_get(self): - path = '/intern/export_veranstaltungen/' - self.do_non_su_test(path) - self.client.login(username='supers', password='pw') - - response = self.client.get(path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.templates[0].name, 'intern/export_veranstaltungen.html') - self.assertSequenceEqual(response.context['semester'], list(Semester.objects.all())) - - -class ExportVeranstaltungenTest(NonSuTestMixin, TestCase): - def test_export_veranstaltungen_post(self): - path = '/intern/export_veranstaltungen/' - self.client.login(username='supers', password='pw') - self.client.login(username='supers', password='pw') - - _, v1 = get_veranstaltung('v') - s, v2 = get_veranstaltung('vu') - empty_semester = Semester.objects.create(semester=20120, fragebogen='2009', sichtbarkeit='ADM') - - p = Person.objects.create(vorname='Je', nachname='Mand', email='je@ma.nd', geschlecht='w') - v1.veranstalter.add(p) - v2.veranstalter.add(p) - - v1.grundstudium = True - v1.sprache = 'en' - v1.verantwortlich = p - v1.save() - - # kein Semester angegeben - response = self.client.post(path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) - - # keine Bestellung vorhanden - response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) - - # niemand als Verantwortlicher eingetragen - v1.anzahl = 42 - v1.save() - v2.anzahl = 23 - v2.save() - response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) - - response = self.client.post(path, {'semester': empty_semester.semester, 'xml_ubung': True}, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) - - # keine Sprache angegeben - v2.verantwortlich = p - v2.save() - response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) - - # alles OK - v2.sprache = 'de' - v2.save() - response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) - self.assertRegexpMatches(response['Content-Disposition'], - r'^attachment; filename="[a-zA-Z0-9_-]+\.xml"$') - - self.assertXMLEqual(response.content, - ''' - - - - - -Stoning I -FB 20 -123v-SS11 -SS11 -Vorlesung -42 -Informatik - - - -lv-1 - - -FB20Vv1e -SS11 -coversheet -0 - - - - - -Stoning I -FB 20 -123vu-SS11 -SS11 -Vorlesung + Übung -23 -Informatik - - - -lv-2 - - -FB20Vv1 -SS11 -coversheet -0 - - -''') - response = self.client.post(path, {'semester': s.semester, 'xml_ubung': True}, **{'REMOTE_USER': 'super'}) - self.assertRegexpMatches(response['Content-Disposition'], - r'^attachment; filename="[a-zA-Z0-9_-]+\.xml"$') - - self.assertXMLEqual(response.content, ''' - - - - - -Stoning I -FB 20 -123vu-SS11 -SS11 -Vorlesung + Übung -23 -Informatik - - - -lv-2 - - -FB20\xc3\x9cv1 -SS11 -coversheet -0 - - -''') - - def test_export_veranstaltungen_post_primaerdozent(self): - path = '/intern/export_veranstaltungen/' - self.client.login(username='supers', password='pw') - - s, v = get_veranstaltung('v') - p1 = Person.objects.create(vorname='Je', nachname='Mand', email='je@ma.nd', geschlecht='w') - p2 = Person.objects.create(vorname='Prim', nachname='Ardozent', email='prim@ardoz.ent', geschlecht='m') - p3 = Person.objects.create(vorname='Je1', nachname='Mand1', email='je1@ma.nd', geschlecht='m') - - v.veranstalter.add(p1) - v.veranstalter.add(p2) - v.veranstalter.add(p3) - v.ergebnis_empfaenger.add(p1) - v.ergebnis_empfaenger.add(p2) - v.ergebnis_empfaenger.add(p3) - - v.grundstudium = True - v.sprache = 'en' - v.verantwortlich = p1 - v.primaerdozent = p2 - v.anzahl = 42 - v.save() - - response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) - self.assertRegexpMatches(response['Content-Disposition'], - r'^attachment; filename="[a-zA-Z0-9_-]+\.xml"$') - - self.assertXMLEqual(response.content, - ''' - - - - - - - - - - - - - -Stoning I -FB 20 -123v-SS11 -SS11 -Vorlesung -42 -Informatik - - - -lv-1 - - -FB20Vv1e -SS11 -coversheet -0 - - -Je -Mand -je@ma.nd -f -pe-1 - -Prim -Ardozent -prim@ardoz.ent -m -pe-2 - -Je1 -Mand1 -je1@ma.nd -m -pe-3 - - -''') - - -# -class ImportErgebnisseTest(NonSuTestMixin, TestCase): - def setUp(self): - super(ImportErgebnisseTest, self).setUp() - self.path = '/intern/import_ergebnisse/' - self.s = Semester.objects.create(semester=20110, fragebogen='2009', sichtbarkeit='ADM') - - def test_get(self): - self.do_non_su_test(self.path) - self.client.login(username='supers', password='pw') - - response = self.client.get(self.path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.templates[0].name, 'intern/import_ergebnisse.html') - self.assertSequenceEqual(response.context['semester'], [self.s]) - self.assertTrue(isinstance(response.context['form'], UploadFileForm)) - - def test_post(self): - self.client.login(username='supers', password='pw') - default_params = {'semester': self.s, 'grundstudium': False, 'evaluieren': True} - Veranstaltung.objects.create(name='Test I', lv_nr='1', **default_params) - - # kein Semester angegeben - response = self.client.post(self.path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/import_ergebnisse/')) - - # unvollständiges Formular - response = self.client.post(self.path, {'semester': self.s.semester, 'file': ''}, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.templates[0].name, 'intern/import_ergebnisse.html') - - # fehlerhafte Datei angegeben - f = StringIO('b;l;a;b;l;a;b;l;a') - f.name = 'test.csv' - response = self.client.post(self.path, {'semester': self.s.semester, 'file': f}, **{'REMOTE_USER': 'super'}) - f.close() - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) - - # alles OK - with open(settings.TESTDATA_PATH + 'ergebnis_test_20115.csv', 'r') as f: - response = self.client.post(self.path, {'semester': self.s.semester, 'file': f}, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) - - -class SyncErgebnisseTest(NonSuTestMixin, TestCase): - def setUp(self): - super(SyncErgebnisseTest, self).setUp() - self.path = '/intern/sync_ergebnisse/' - self.s, self.v = get_veranstaltung('v') - - def test_get(self): - self.do_non_su_test(self.path) - self.client.login(username='supers', password='pw') - - response = self.client.get(self.path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.templates[0].name, 'intern/sync_ergebnisse.html') - self.assertSequenceEqual(response.context['semester'], [self.s]) - - def test_post(self): - self.client.login(username='supers', password='pw') - - # kein Semester angegeben - response = self.client.post(self.path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) - - # keine Ergebnisse gefunden - response = self.client.post(self.path, {'semester': self.s.semester}, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) - - # alles OK - Fragebogen2009.objects.create(veranstaltung=self.v, ue_gesamt=1, - ue_e=2, ue_f=3, - ue_a=4, ue_b=5, ue_c=1, ue_d=2, - ue_g=3, ue_i=4, ue_j=5, ue_k=1) - response = self.client.post(self.path, {'semester': self.s.semester}, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) - - -class SendmailTest(NonSuTestMixin, TestCase): - path = '/intern/sendmail/' - - def test_get(self): - self.do_non_su_test(self.path) - self.client.login(username='supers', password='pw') - - response = self.client.get(self.path, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.templates[0].name, 'intern/sendmail.html') - - def test_post(self): - self.client.login(username='supers', password='pw') - get_veranstaltung('v') - s, v1 = get_veranstaltung('vu') - v1.anzahl = 42 - v1.sprache = 'de' - v1.save() - fb = Fachgebiet.objects.create(name="Fachgebiet1", kuerzel="FB1") - FachgebietEmail.objects.create(fachgebiet=fb, email_suffix="ul.bla", email_sekretaerin="sek@ul.bla") - p1 = Person.objects.create(vorname='Pe', nachname='Ter', email='pe@ter.bla') - p2 = Person.objects.create(vorname='Pa', nachname='Ul', email='pa@ul.bla', fachgebiet=fb) - - v1.veranstalter.add(p1) - v1.veranstalter.add(p2) - mv = Mailvorlage.objects.create(subject='Testmail', body='Dies ist eine Testmail.') - Einstellung.objects.create(name='bestellung_erlaubt', wert='0') - - params = {'uebernehmen': 'x', 'recipient': 'cur_sem_missing_order', 'subject': 'abc', 'body': 'xyz'} - - # kein Semester angegeben - response = self.client.post(self.path, params, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/sendmail/')) - - # Vorlage übernehmen; Vorlage nicht angegeben - params['semester'] = s.semester - response = self.client.post(self.path, params, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].endswith('/intern/sendmail/')) - - # Vorlage übernehmen; Vorlage ist angegeben - params['vorlage'] = mv.id - response = self.client.post(self.path, params, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.templates[0].name, 'intern/sendmail.html') - self.assertEqual(response.context['subject'], mv.subject) - self.assertEqual(response.context['body'], mv.body) - - # Vorschau; Empfänger ist auf Veranstalter mit fehlenden Bestellungen eingestellt - del params['uebernehmen'] - params['vorschau'] = 'x' - response = self.client.post(self.path, params, **{'REMOTE_USER': 'super'}) - self.assertIn('intern/sendmail_preview.html', (t.name for t in response.templates)) - self.assertTrue(response.context['vorschau']) - - # Vorschau; Empfänger ist auf Veranstaltungen mit Ergebnissen eingestellt - params['recipient'] = 'cur_sem_results' - response = self.client.post(self.path, params, **{'REMOTE_USER': 'super'}) - self.assertIn('intern/sendmail_preview.html', (t.name for t in response.templates)) - self.assertTrue(response.context['vorschau']) - - # Vorschau: Check if the replacements are highlighted - color_span = '{}' - self.assertEqual(color_span.format('Grundlagen der Agrarphilosophie I') , response.context['veranstaltung']) - link_veranstalter = 'https://www.fachschaft.informatik.tu-darmstadt.de%s' % reverse('veranstalter-login') - link_suffix_format = '?vid=%d&token=%s' - self.assertEqual(color_span.format(link_veranstalter + (link_suffix_format % (1337, '0123456789abcdef'))) , response.context['link_veranstalter']) - - # Senden - del params['vorschau'] - params['senden'] = 'x' - params['recipient'] = 'cur_sem_all' - del params['vorlage'] - response = self.client.post(self.path, params, **{'REMOTE_USER': 'super'}) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'], tests.LOGIN_URL) - # Hier wird in Eclipse ein Fehler angezeigt; mail.outbox gibt es während der Testläufe - # aber wirklich (siehe https://docs.djangoproject.com/en/1.4/topics/testing/#email-services) - self.assertEqual(len(mail.outbox), 2) - self.assertEqual(len(mail.outbox[0].to), 3) # an zwei veranstalter und sekretaerin +# coding=utf-8 + +import os + +from StringIO import StringIO + +from django.conf import settings +from django.core import mail +from django.test import TestCase +from django.core.urlresolvers import reverse + +from feedback.forms import UploadFileForm +from feedback.models import Semester, Person, Veranstaltung, Fragebogen2009, Mailvorlage, Einstellung, \ + Fachgebiet, FachgebietEmail, Tutor +from feedback.tests.tools import NonSuTestMixin, get_veranstaltung + +from feedback import tests + + +class CloseOrderTest(NonSuTestMixin, TestCase): + def setUp(self): + self.client.login(username='supers', password='pw') + self.s, self.v = get_veranstaltung('vu') + + def test_close_order_bestellung_liegt_vor_post(self): + path = '/intern/status_final/' + self.v.status = Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR + self.v.save() + + response = self.client.post(path, {'auswahl': 'ja', 'submit': 'Bestätigen'}, **{'REMOTE_USER': 'super'}) + + self.v.refresh_from_db() + self.assertEqual(response.status_code, 302) + self.assertEqual(self.v.status, Veranstaltung.STATUS_BESTELLUNG_WIRD_VERARBEITET) + + def test_close_order_keine_evaluation_post(self): + path = '/intern/status_final/' + self.v.status = Veranstaltung.STATUS_KEINE_EVALUATION + self.v.save() + + response = self.client.post(path, {'auswahl': 'ja', 'submit': 'Bestätigen'}, **{'REMOTE_USER': 'super'}) + + self.v.refresh_from_db() + self.assertEqual(response.status_code, 302) + self.assertEqual(self.v.status, Veranstaltung.STATUS_KEINE_EVALUATION_FINAL) + + def test_close_order_status_angelegt_post(self): + path = '/intern/status_final/' + self.v.status = Veranstaltung.STATUS_ANGELEGT + self.v.save() + + response = self.client.post(path, {'auswahl': 'ja', 'submit': 'Bestätigen'}, **{'REMOTE_USER': 'super'}) + + self.v.refresh_from_db() + self.assertEqual(response.status_code, 302) + self.assertEqual(self.v.status, Veranstaltung.STATUS_KEINE_EVALUATION_FINAL) + + def test_close_order_bestellung_geoeffnet_post(self): + path = '/intern/status_final/' + self.v.status = Veranstaltung.STATUS_BESTELLUNG_GEOEFFNET + self.v.save() + + response = self.client.post(path, {'auswahl': 'ja', 'submit': 'Bestätigen'}, **{'REMOTE_USER': 'super'}) + + self.v.refresh_from_db() + self.assertEqual(response.status_code, 302) + self.assertEqual(self.v.status, Veranstaltung.STATUS_KEINE_EVALUATION_FINAL) + + def test_close_order_refuse(self): + path = '/intern/status_final/' + self.v.status = Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR + self.v.save() + + response = self.client.post(path, {'auswahl': 'nein', 'submit': 'Bestätigen'}, **{'REMOTE_USER': 'super'}) + + self.v.refresh_from_db() + self.assertEqual(response.status_code, 302) + self.assertEqual(self.v.status, Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR) + + +class InternMiscTest(NonSuTestMixin, TestCase): + def test_index(self): + path = tests.INDEX_END + self.do_non_su_test(path) + self.client.login(username='supers', password='pw') + + s = Semester.objects.create(semester=20110, fragebogen='2009', sichtbarkeit='ADM') + + response = self.client.get(path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.templates[0].name, 'intern/index.html') + self.assertEqual(response.context['cur_semester'], s) + + def test_fragebogensprache(self): + path = '/intern/fragebogensprache/' + self.do_non_su_test(path) + self.client.login(username='supers', password='pw') + + Semester.objects.create(semester=20110, fragebogen='2009', sichtbarkeit='ADM') + + response = self.client.get(path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.templates[0].name, 'intern/fragebogensprache.html') + + def test_export_veranstaltungen_get(self): + path = '/intern/export_veranstaltungen/' + self.do_non_su_test(path) + self.client.login(username='supers', password='pw') + + response = self.client.get(path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.templates[0].name, 'intern/export_veranstaltungen.html') + self.assertSequenceEqual(response.context['semester'], list(Semester.objects.all())) + + +class ExportVeranstaltungenTest(NonSuTestMixin, TestCase): + def test_export_veranstaltungen_post(self): + path = '/intern/export_veranstaltungen/' + self.client.login(username='supers', password='pw') + self.client.login(username='supers', password='pw') + + _, v1 = get_veranstaltung('v') + s, v2 = get_veranstaltung('vu') + empty_semester = Semester.objects.create(semester=20120, fragebogen='2009', sichtbarkeit='ADM') + + p = Person.objects.create(vorname='Je', nachname='Mand', email='je@ma.nd', geschlecht='w') + v1.veranstalter.add(p) + v2.veranstalter.add(p) + + v1.grundstudium = True + v1.sprache = 'en' + v1.verantwortlich = p + v1.save() + + # kein Semester angegeben + response = self.client.post(path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) + + # keine Bestellung vorhanden + response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) + + # niemand als Verantwortlicher eingetragen + v1.anzahl = 42 + v1.save() + v2.anzahl = 23 + v2.save() + response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) + + response = self.client.post(path, {'semester': empty_semester.semester, 'xml_ubung': True}, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) + + # keine Sprache angegeben + v2.verantwortlich = p + v2.save() + response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/export_veranstaltungen/')) + + # alles OK + v2.sprache = 'de' + v2.save() + response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) + self.assertRegexpMatches(response['Content-Disposition'], + r'^attachment; filename="[a-zA-Z0-9_-]+\.xml"$') + + self.assertXMLEqual(response.content, + ''' + + + + + +Stoning I +FB 20 +123v-SS11 +SS11 +Vorlesung +42 +Informatik + + + +lv-1 + + +FB20Vv1e +SS11 +coversheet +0 + + + + + +Stoning I +FB 20 +123vu-SS11 +SS11 +Vorlesung + Übung +23 +Informatik + + + +lv-2 + + +FB20Vv1 +SS11 +coversheet +0 + + +''') + response = self.client.post(path, {'semester': s.semester, 'xml_ubung': True}, **{'REMOTE_USER': 'super'}) + self.assertRegexpMatches(response['Content-Disposition'], + r'^attachment; filename="[a-zA-Z0-9_-]+\.xml"$') + + self.assertXMLEqual(response.content, ''' + + + + + +Stoning I +FB 20 +123vu-SS11 +SS11 +Vorlesung + Übung +23 +Informatik + + + +lv-2 + + +FB20\xc3\x9cv1 +SS11 +coversheet +0 + + +''') + + def test_export_veranstaltungen_post_primaerdozent(self): + path = '/intern/export_veranstaltungen/' + self.client.login(username='supers', password='pw') + + s, v = get_veranstaltung('v') + p1 = Person.objects.create(vorname='Je', nachname='Mand', email='je@ma.nd', geschlecht='w') + p2 = Person.objects.create(vorname='Prim', nachname='Ardozent', email='prim@ardoz.ent', geschlecht='m') + p3 = Person.objects.create(vorname='Je1', nachname='Mand1', email='je1@ma.nd', geschlecht='m') + + v.veranstalter.add(p1) + v.veranstalter.add(p2) + v.veranstalter.add(p3) + v.ergebnis_empfaenger.add(p1) + v.ergebnis_empfaenger.add(p2) + v.ergebnis_empfaenger.add(p3) + + v.grundstudium = True + v.sprache = 'en' + v.verantwortlich = p1 + v.primaerdozent = p2 + v.anzahl = 42 + v.save() + + response = self.client.post(path, {'semester': s.semester}, **{'REMOTE_USER': 'super'}) + self.assertRegexpMatches(response['Content-Disposition'], + r'^attachment; filename="[a-zA-Z0-9_-]+\.xml"$') + + self.assertXMLEqual(response.content, + ''' + + + + + + + + + + + + + +Stoning I +FB 20 +123v-SS11 +SS11 +Vorlesung +42 +Informatik + + + +lv-1 + + +FB20Vv1e +SS11 +coversheet +0 + + +Je +Mand +je@ma.nd +f +pe-1 + +Prim +Ardozent +prim@ardoz.ent +m +pe-2 + +Je1 +Mand1 +je1@ma.nd +m +pe-3 + + +''') + + +# +class ImportErgebnisseTest(NonSuTestMixin, TestCase): + def setUp(self): + super(ImportErgebnisseTest, self).setUp() + self.path = '/intern/import_ergebnisse/' + self.s = Semester.objects.create(semester=20110, fragebogen='2009', sichtbarkeit='ADM') + + def test_get(self): + self.do_non_su_test(self.path) + self.client.login(username='supers', password='pw') + + response = self.client.get(self.path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.templates[0].name, 'intern/import_ergebnisse.html') + self.assertSequenceEqual(response.context['semester'], [self.s]) + self.assertTrue(isinstance(response.context['form'], UploadFileForm)) + + def test_post(self): + self.client.login(username='supers', password='pw') + default_params = {'semester': self.s, 'grundstudium': False, 'evaluieren': True} + Veranstaltung.objects.create(name='Test I', lv_nr='1', **default_params) + + # kein Semester angegeben + response = self.client.post(self.path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/import_ergebnisse/')) + + # unvollständiges Formular + response = self.client.post(self.path, {'semester': self.s.semester, 'file': ''}, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.templates[0].name, 'intern/import_ergebnisse.html') + + # fehlerhafte Datei angegeben + f = StringIO('b;l;a;b;l;a;b;l;a') + f.name = 'test.csv' + response = self.client.post(self.path, {'semester': self.s.semester, 'file': f}, **{'REMOTE_USER': 'super'}) + f.close() + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) + + # alles OK + with open(settings.TESTDATA_PATH + 'ergebnis_test_20115.csv', 'r') as f: + response = self.client.post(self.path, {'semester': self.s.semester, 'file': f}, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) + + +class SyncErgebnisseTest(NonSuTestMixin, TestCase): + def setUp(self): + super(SyncErgebnisseTest, self).setUp() + self.path = '/intern/sync_ergebnisse/' + self.s, self.v = get_veranstaltung('v') + + def test_get(self): + self.do_non_su_test(self.path) + self.client.login(username='supers', password='pw') + + response = self.client.get(self.path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.templates[0].name, 'intern/sync_ergebnisse.html') + self.assertSequenceEqual(response.context['semester'], [self.s]) + + def test_post(self): + self.client.login(username='supers', password='pw') + + # kein Semester angegeben + response = self.client.post(self.path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) + + # keine Ergebnisse gefunden + response = self.client.post(self.path, {'semester': self.s.semester}, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) + + # alles OK + Fragebogen2009.objects.create(veranstaltung=self.v, ue_gesamt=1, + ue_e=2, ue_f=3, + ue_a=4, ue_b=5, ue_c=1, ue_d=2, + ue_g=3, ue_i=4, ue_j=5, ue_k=1) + response = self.client.post(self.path, {'semester': self.s.semester}, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/sync_ergebnisse/')) + + +class SendmailTest(NonSuTestMixin, TestCase): + path = '/intern/sendmail/' + + def test_get(self): + self.do_non_su_test(self.path) + self.client.login(username='supers', password='pw') + + response = self.client.get(self.path, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.templates[0].name, 'intern/sendmail.html') + + def test_post(self): + self.client.login(username='supers', password='pw') + + s, v1 = get_veranstaltung('vu') + v1.anzahl = 42 + v1.sprache = 'de' + v1.save() + + default_params = { + 'semester': s, 'status': Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR, 'grundstudium': False, + 'evaluieren': True, 'sprache': 'de', 'anzahl': 44, 'lv_nr': '234vu' + } + v2 = Veranstaltung.objects.create(typ='vu', name='Stoning III', **default_params) + v2.save() + + fg1 = Fachgebiet.objects.create(name="Fachgebiet1", kuerzel="FB1") + fg2 = Fachgebiet.objects.create(name="Fachgebiet2", kuerzel="FB2") + FachgebietEmail.objects.create(fachgebiet=fg1, email_suffix="fg1.com", email_sekretaerin="sek@fg1.com") + FachgebietEmail.objects.create(fachgebiet=fg2, email_suffix="fg2.com", email_sekretaerin="sek@fg2.com") + + p1 = Person.objects.create(vorname='Peter', nachname='Pan', email='peter@fg1.com', fachgebiet=fg1) + p2 = Person.objects.create(vorname='Pan', nachname='Peter', email='pan@fg2.com', fachgebiet=fg2) + + v1.veranstalter.add(p1) + v2.veranstalter.add(p2) + + mv = Mailvorlage.objects.create(subject='Testmail', body='Dies ist eine Testmail.') + Einstellung.objects.create(name='bestellung_erlaubt', wert='0') + Tutor.objects.create(nummer=1, vorname='Max', nachname='Mux', email='max@fg1.com', anmerkung='', + veranstaltung=v1) + + post_data = { + 'uebernehmen': 'x', + 'recipient': [Veranstaltung.STATUS_BESTELLUNG_GEOEFFNET], + 'tutoren': 'False', + 'subject': 'abc', + 'body': 'xyz' + } + + # ----- kein Semester angegeben ----- # + response = self.client.post(self.path, post_data, **{'REMOTE_USER': 'super'}) + + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/sendmail/')) + + # ----- Vorlage übernehmen; Vorlage nicht angegeben ----- # + post_data['semester'] = s.semester + + response = self.client.post(self.path, post_data, **{'REMOTE_USER': 'super'}) + + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith('/intern/sendmail/')) + + # ----- Vorlage übernehmen; Vorlage ist angegeben ----- # + post_data['vorlage'] = mv.id + + response = self.client.post(self.path, post_data, **{'REMOTE_USER': 'super'}) + + self.assertEqual(response.templates[0].name, 'intern/sendmail.html') + self.assertEqual(response.context['subject'], mv.subject) + self.assertEqual(response.context['body'], mv.body) + + # ----- Vorschau; Empfänger ist auf Veranstalter mit fehlenden Bestellungen eingestellt ----- # + del post_data['uebernehmen'] + post_data['vorschau'] = 'x' + + response = self.client.post(self.path, post_data, **{'REMOTE_USER': 'super'}) + + self.assertIn('intern/sendmail_preview.html', (t.name for t in response.templates)) + self.assertTrue(response.context['vorschau']) + + # ----- Vorschau; Empfänger ist auf Veranstaltungen mit Ergebnissen eingestellt ----- # + post_data['recipient'] = [Veranstaltung.STATUS_ERGEBNISSE_VERSANDT] + + response = self.client.post(self.path, post_data, **{'REMOTE_USER': 'super'}) + + self.assertIn('intern/sendmail_preview.html', (t.name for t in response.templates)) + self.assertTrue(response.context['vorschau']) + + # ----- Vorschau: Check if the replacements are highlighted ----- # + color_span = '{}' + self.assertEqual(color_span.format('Grundlagen der Agrarphilosophie I'), response.context['veranstaltung']) + link_veranstalter = 'https://www.fachschaft.informatik.tu-darmstadt.de%s' % reverse('veranstalter-login') + link_suffix_format = '?vid=%d&token=%s' + self.assertEqual(color_span.format(link_veranstalter + (link_suffix_format % (1337, '0123456789abcdef'))), + response.context['link_veranstalter']) + + # ----- Senden an alle Veranstaltungen ohne Tutoren ----- # + del post_data['vorschau'] + post_data['senden'] = 'x' + post_data['recipient'] = [0] # 0 ist hierbei der Code für alle Veranstaltungen + del post_data['vorlage'] + + response = self.client.post(self.path, post_data, **{'REMOTE_USER': 'super'}) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'], tests.LOGIN_URL) + + # Hier wird in Eclipse ein Fehler angezeigt; mail.outbox gibt es während der Testläufe + # aber wirklich (siehe https://docs.djangoproject.com/en/1.4/topics/testing/#email-services) + self.assertEqual(len(mail.outbox), 3) # an 2 Veranstalter und Kopie an Feedback-Team + self.assertEqual(len(mail.outbox[0].to), 2) # an Veranstalter und Sekretaerin + self.assertEqual(len(mail.outbox[1].to), 2) + + # ----- Senden an eine bestimmte Veranstaltung ohne Tutoren ----- # + del mail.outbox[:] + post_data['recipient'] = Veranstaltung.STATUS_BESTELLUNG_GEOEFFNET + + response = self.client.post(self.path, post_data, **{'REMOTE_USER': 'super'}) + + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'], tests.LOGIN_URL) + self.assertEqual(len(mail.outbox), 2) # an 1 Veranstalter und Kopie an Feedback-Team + self.assertEqual(len(mail.outbox[0].to), 2) # an Veranstalter und Sekretaerin + + # ----- Senden an eine bestimmte Veranstaltung mit Tutoren ==> ohne Sekretaerin ----- # + del mail.outbox[:] + post_data['recipient'] = Veranstaltung.STATUS_BESTELLUNG_GEOEFFNET + post_data['tutoren'] = 'True' + + response = self.client.post(self.path, post_data, **{'REMOTE_USER': 'super'}) + + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'], tests.LOGIN_URL) + self.assertEqual(len(mail.outbox), 2) # an 1 Veranstalter und Kopie an Feedback-Team + self.assertEqual(len(mail.outbox[0].to), 2) # an Veranstalter und Tutor + self.assertEqual(mail.outbox[0].to[1], 'max@fg1.com') # E-Mail Adresse des Tutors diff --git a/src/feedback/tests/test_views_veranstalter.py b/src/feedback/tests/test_views_veranstalter.py index 94a62473..8cea87c0 100644 --- a/src/feedback/tests/test_views_veranstalter.py +++ b/src/feedback/tests/test_views_veranstalter.py @@ -60,7 +60,15 @@ def setUp(self): def test_unauth(self): response = self.client.get('/veranstalter/') self.assertEqual(response.templates[0].name, 'veranstalter/not_authenticated.html') - + + def test_invalid_state(self): + Einstellung.objects.create(name='bestellung_erlaubt', wert='0') + c = login_veranstalter(self.v) + self.v.status = Veranstaltung.STATUS_GEDRUCKT + self.v.save() + response = c.get('/veranstalter/bestellung') + self.assertEqual(302, response.status_code) + def test_nothing(self): Einstellung.objects.create(name='bestellung_erlaubt', wert='0') c = login_veranstalter(self.v) diff --git a/src/feedback/tools.py b/src/feedback/tools.py index 9f340167..a283c051 100644 --- a/src/feedback/tools.py +++ b/src/feedback/tools.py @@ -3,7 +3,7 @@ from django.template import TemplateSyntaxError, Template -### Durchschnittsberechnung für das Ranking ################################### +# ------------------------------ Durchschnittsberechnung für das Ranking ------------------------------ # def get_average(ergebnis, fb_list, attr): """Berechnet das gewichtete Mittel über das Attribut attr für die Fragebogenliste fb_list.""" @@ -47,12 +47,11 @@ def get_average(ergebnis, fb_list, attr): if fb_count > 0: average = weighted_sum / float(weighted_count) return average, fb_count - else: return None, 0 -### E-Mail-Handling ########################################################### +# ------------------------------ E-Mail-Handling ------------------------------ # def render_email(template, context): try: @@ -64,12 +63,14 @@ def render_email(template, context): def ean_checksum_calc(number): """ Berechne die Checksumme eines EAN Barcodes""" offset = 0 + # convert a int to a list of ints x = [int(i) for i in str(number)] length = len(x) if length == 8 or length == 13: offset = 1 - # nehme jedes 2 element beginned beim letzten element und gehe nach vorne zum ersten element, + + # nehme jedes 2 element beginned beim letzten element und gehe nach vorne zum ersten element, return (-(sum(x[-(1 + offset)::-2]) * 3 + sum(x[-(2 + offset)::-2]))) % 10 diff --git a/src/feedback/views/intern/__init__.py b/src/feedback/views/intern/__init__.py index 74d3bc3c..4829eca5 100644 --- a/src/feedback/views/intern/__init__.py +++ b/src/feedback/views/intern/__init__.py @@ -1,6 +1,5 @@ # coding=utf-8 - -import csv +import ast import os import subprocess @@ -9,18 +8,23 @@ from django.contrib.auth.decorators import user_passes_test from django.core.mail import send_mass_mail from django.core.urlresolvers import reverse +from django.db.models import Q from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.template import RequestContext from django.utils.encoding import smart_str from django.views.decorators.http import require_safe, require_http_methods +from django.contrib.auth.mixins import UserPassesTestMixin +from django.views.generic import FormView from feedback import tools -from feedback.parser.ergebnisse import parse_ergebnisse -from feedback.models import Veranstaltung, Semester, Einstellung, Mailvorlage, get_model, long_not_ordert, FachgebietEmail +from feedback.forms import CloseOrderForm from feedback.forms import UploadFileForm +from feedback.parser.ergebnisse import parse_ergebnisse from feedback.views import public -from django.db.models import Q +from feedback.models import Veranstaltung, Semester, Einstellung, Mailvorlage, get_model, long_not_ordert, \ + FachgebietEmail, Tutor + @user_passes_test(lambda u: u.is_superuser) @require_safe @@ -28,15 +32,15 @@ def index(request): cur_semester = Semester.current() all_veranst = Veranstaltung.objects.filter(semester=cur_semester) - #Veranstaltung für die es Rückmeldungen gibt - ruck_veranst = all_veranst.filter(Q(anzahl__gt=0)|Q(evaluieren=False)) + # Veranstaltung für die es Rückmeldungen gibt + ruck_veranst = all_veranst.filter(Q(anzahl__gt=0) | Q(evaluieren=False)) num_all_veranst = all_veranst.count() num_ruck_veranst = ruck_veranst.count() relativ_result = 0 - if (num_all_veranst >= 1): + if num_all_veranst >= 1: relativ_result = (100/float(num_all_veranst)) * num_ruck_veranst width_progressbar = 500 @@ -49,11 +53,13 @@ def index(request): 'width_progressbar': width_progressbar, 'width_progressbar_success': width_progressbar_success,}) + @user_passes_test(lambda u: u.is_superuser) @require_safe def lange_ohne_evaluation(request): return render(request, 'intern/lange_ohne_evaluation.html', {'veranstaltungen': long_not_ordert()}) + @user_passes_test(lambda u: u.is_superuser) @require_safe def fragebogensprache(request): @@ -64,6 +70,7 @@ def fragebogensprache(request): data = {'veranstaltungen': veranstaltungen} return render(request, 'intern/fragebogensprache.html', data) + @user_passes_test(lambda u: u.is_superuser) @require_http_methods(('HEAD', 'GET', 'POST')) def export_veranstaltungen(request): @@ -111,10 +118,11 @@ def export_veranstaltungen(request): person_set = set() - data = {} + data = { + 'veranst': veranst, + 'ubung_export': ubung_export + } - data['veranst'] = veranst - data['ubung_export'] = ubung_export for ver in veranst: for cur_empf in ver.ergebnis_empfaenger.all(): person_set.add(cur_empf) @@ -135,24 +143,28 @@ def export_veranstaltungen(request): def translate_to_latex(text): - dic = {'&':'\&', - '%':'\%', - '$':'\$', - '#':'\#', - '_':'\_', - '"':'"{}', - '~':'\~{}', - '^':'\\textasciicircum', + dic = { + '&': '\&', + '%': '\%', + '$': '\$', + '#': '\#', + '_': '\_', + '"': '"{}', + '~': '\~{}', + '^': '\\textasciicircum', } + for i, j in dic.iteritems(): text = text.replace(i, j) return text + @user_passes_test(lambda u: u.is_superuser) @require_http_methods(('HEAD', 'GET', 'POST')) def generate_letters(request): - data = {} - data['semester'] = Semester.objects.all() + data = { + 'semester': Semester.objects.all() + } datefilename = settings.LATEX_PATH + 'erhebungswoche.inc' @@ -184,7 +196,7 @@ def generate_letters(request): templatename = 'aufkleber' # aus Sicherheitsgründen TeX-Befehle in Abgabedatum-String deaktivieren - #TODO: Kalender-Widget einführen, nur noch dessen Format akzeptieren + # TODO: Kalender-Widget einführen, nur noch dessen Format akzeptieren try: abgabedatum = request.POST['erhebungswoche'].replace('\\', '') except KeyError: @@ -194,6 +206,7 @@ def generate_letters(request): response = HttpResponse(content_type='application/pdf') response['Content-Disposition'] = 'attachment; filename=%s.pdf' % (templatename) + if vorlage != 'Aufkleber': veranst = Veranstaltung.objects.filter(semester=semester, evaluieren=True, anzahl__gt=0).order_by('sprache','anzahl') elif 'anzahlaufkleber' in request.POST and request.POST['anzahlaufkleber'].isdigit(): @@ -201,20 +214,22 @@ def generate_letters(request): anzahl = int(anzahl) veranst = Veranstaltung.objects.filter(semester=semester, evaluieren=True, anzahl__gt=anzahl).order_by('sprache','anzahl') else: - veranst = Veranstaltung.objects.filter(semester=semester, evaluieren=True, anzahl__gt=0).order_by('sprache','anzahl') + veranst = Veranstaltung.objects.filter(semester=semester, evaluieren=True, anzahl__gt=0).order_by('sprache', 'anzahl') + if not veranst.count(): - messages.error(request, 'Für das ausgewählte Semester (%s) liegen keine Bestellungen vor oder die Mindesteilnehmeranzahl ist zu hoch!' % semester) + messages.error(request, 'Für das ausgewählte Semester (%s) liegen ' + 'keine Bestellungen vor oder die Mindesteilnehmeranzahl ist zu hoch!' % semester) return HttpResponseRedirect(reverse('generate_letters')) lines = [] for v in veranst: - eva_id=v.get_barcode_number() + eva_id = v.get_barcode_number() empfaenger = unicode(v.verantwortlich.full_name()) line = u'\\adrentry{%s}{%s}{%s}{%s}{%s}{%s}{%s}{%s}{%s}\n' % ( translate_to_latex(v.verantwortlich.full_name()), translate_to_latex(v.verantwortlich.anschrift), translate_to_latex(v.name), v.anzahl, v.sprache, v.get_typ_display(), eva_id, v.freiefrage1.strip(), v.freiefrage2.strip()) lines.append(smart_str(line)) - #TODO: prüfen, ob nötige Dateien schreibbar sind (abgabedatum.inc, anschreiben.{log,aux,pdf}, veranstalter.adr) + # TODO: prüfen, ob nötige Dateien schreibbar sind (abgabedatum.inc, anschreiben.{log,aux,pdf}, veranstalter.adr) with open(latexpath + 'veranstalter.adr', 'w') as f: f.writelines(lines) @@ -223,7 +238,7 @@ def generate_letters(request): with open(os.devnull, 'w') as devnull: # PDF via LaTeX erzeugen ret = subprocess.call(['/usr/bin/pdflatex', '-interaction', 'batchmode', '-halt-on-error', - templatename+'.tex'], cwd=latexpath, stdout=devnull, stderr=devnull) + templatename+'.tex'], cwd=latexpath, stdout=devnull, stderr=devnull) if ret or hasattr(settings, 'TEST_LATEX_ERROR'): with open(latexpath + templatename + '.log', 'r') as f: @@ -234,42 +249,113 @@ def generate_letters(request): response.write(f.read()) return response + +def get_relevant_veranstaltungen(chosen_status_list, semester): + """ + Gibt die relevanten Veranstaltungen für die ausgewählten Status zurück. + :param chosen_status_list: List + :param semester: Semester + :return: List + """ + veranstaltungen = [] + for status in chosen_status_list: + if status == 0: + for veranstaltung in Veranstaltung.objects.filter(semester=semester): + veranstaltungen.append(veranstaltung) + else: + for veranstaltung in Veranstaltung.objects.filter(semester=semester, status=status): + veranstaltungen.append(veranstaltung) + return veranstaltungen + + +def process_status_post_data_from(post_list): + """ + Da Django POST Daten in Unicode wrapped, casten wir die Statuscodes aus dem POST-Request zu Integers. + :param post_list: List + :return: List + """ + processed_data = [] + for data in post_list: + processed_data.append(int(data)) + return processed_data + + +def get_demo_context(request): + """ + Setzt ein paar Variablen, die für einen Demo Context gebraucht werden. + :param request: POST + :return: RequestContext, String, String + """ + color_span = '{}' + link_veranstalter = 'https://www.fachschaft.informatik.tu-darmstadt.de%s' % reverse('veranstalter-login') + link_suffix_format = '?vid=%d&token=%s' + demo_context = RequestContext(request, { + 'veranstaltung': color_span.format('Grundlagen der Agrarphilosophie I'), + 'link_veranstalter': color_span.format(link_veranstalter + (link_suffix_format % (1337, '0123456789abcdef'))), + }) + return demo_context, link_suffix_format, link_veranstalter + + +def set_up_choices(): + """ + Setzt die Auswahlmöglichkeiten für die View. + :return: List, List + """ + tutoren_choices = [(False, 'Nein'), (True, 'Ja')] + status_choices = [(0, 'Alle Veranstaltungen')] + for choice_key, choice in Veranstaltung.STATUS_CHOICES: + status_choices.append((choice_key, choice)) + return status_choices, tutoren_choices + + +def add_sekretaerin_mail(recipients, veranstaltung): + """ + Fügt die E-Mail Adresse der Sekretärin in die Empfängerlist hinzu. + :param recipients: List + :param veranstaltung: Veranstaltung + """ + for person in veranstaltung.veranstalter.all(): + fachgebiet = person.fachgebiet + if fachgebiet is not None: + mails = FachgebietEmail.objects.filter(fachgebiet=fachgebiet) + for mail in mails: + if (mail.email_sekretaerin is not None) and (mail.email_sekretaerin not in recipients): + recipients.append(mail.email_sekretaerin) + + @user_passes_test(lambda u: u.is_superuser) @require_http_methods(('HEAD', 'GET', 'POST')) def sendmail(request): - data = {} - data['semester'] = Semester.objects.order_by('-semester') - data['vorlagen'] = Mailvorlage.objects.all() + """Die View-Funktion für den Mailversand.""" + data = { + 'semester': Semester.objects.order_by('-semester'), + 'vorlagen': Mailvorlage.objects.all(), + } + + status_choices, tutoren_choices = set_up_choices() + data['veranstaltung_status_choices'] = status_choices + data['tutoren_choices'] = tutoren_choices if request.method == 'POST': try: semester = Semester.objects.get(semester=request.POST['semester']) - data['recipient'] = request.POST['recipient'] data['subject'] = request.POST['subject'] data['body'] = request.POST['body'] + data['tutoren'] = request.POST['tutoren'] + + if 'recipient' in request.POST.keys(): + data['recipient'] = process_status_post_data_from(request.POST.getlist('recipient')) + elif 'status_values' in request.POST.keys(): + data['recipient'] = ast.literal_eval(request.POST.get('status_values')) + except (Semester.DoesNotExist, KeyError): return HttpResponseRedirect(reverse('sendmail')) data['semester_selected'] = semester data['subject_rendered'] = "Evaluation: %s" % data['subject'] - veranstaltungen = Veranstaltung.objects.filter(semester=semester) - if data['recipient'] == 'cur_sem_missing_order': - veranstaltungen = veranstaltungen.filter(anzahl=None, evaluieren=True) - elif data['recipient'] == 'cur_sem_ordert': - veranstaltungen = veranstaltungen.filter(evaluieren=True, anzahl__gt=0) - elif data['recipient'] == 'cur_sem_results': - # Veranstaltungen ohne Ergebnisse ausfiltern - flt = {str('ergebnis'+data['semester_selected'].fragebogen): None} - veranstaltungen = veranstaltungen.exclude(**flt) - - color_span = '{}' - link_veranstalter = 'https://www.fachschaft.informatik.tu-darmstadt.de%s' % reverse('veranstalter-login') - link_suffix_format = '?vid=%d&token=%s' - demo_context = RequestContext(request, { - 'veranstaltung': color_span.format('Grundlagen der Agrarphilosophie I'), - 'link_veranstalter': color_span.format(link_veranstalter + (link_suffix_format % (1337, '0123456789abcdef'))), - }) + veranstaltungen = get_relevant_veranstaltungen(data['recipient'], semester) + demo_context, link_suffix_format, link_veranstalter = get_demo_context(request) if 'uebernehmen' in request.POST: try: @@ -282,21 +368,25 @@ def sendmail(request): elif 'vorschau' in request.POST: data['vorschau'] = True data['from'] = settings.DEFAULT_FROM_EMAIL - data['to'] = "Veranstalter von %d Veranstaltungen" % veranstaltungen.count() + data['to'] = "Veranstalter von %d Veranstaltungen" % len(veranstaltungen) + data['is_tutoren'] = "und den Tutoren dieser Veranstaltungen" data['body_rendered'] = tools.render_email(data['body'], demo_context) - if data['recipient'] == 'cur_sem_missing_order': - if Einstellung.get('bestellung_erlaubt') == '0': - messages.warning(request, u'Bestellungen sind aktuell nicht erlaubt! Bist du ' + - u'sicher, dass du trotzdem die Dozenten anschreiben willst, ' + - u'die noch nicht bestellt haben?') - elif data['recipient'] == 'cur_sem_results': - if semester.sichtbarkeit != 'VER': - messages.warning(request, u'Die Sichtbarkeit der Ergebnisse des ausgewählten ' + - u'Semesters ist aktuell nicht auf "Veranstalter" ' + - u'eingestellt! Bist du sicher, dass du trotzdem die ' + - u'Dozenten anschreiben willst, für deren Veranstaltungen ' - u'Ergebnisse vorliegen?') + for status in data['recipient']: + if status <= Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR: + if Einstellung.get('bestellung_erlaubt') == '0': + messages.warning(request, + u'Bestellungen sind aktuell nicht erlaubt! Bist du ' + + u'sicher, dass du trotzdem die Dozenten anschreiben willst, ' + + u'die noch nicht bestellt haben?') + elif status == Veranstaltung.STATUS_ERGEBNISSE_VERSANDT: + if semester.sichtbarkeit != 'VER': + messages.warning(request, + u'Die Sichtbarkeit der Ergebnisse des ausgewählten ' + + u'Semesters ist aktuell nicht auf "Veranstalter" ' + + u'eingestellt! Bist du sicher, dass du trotzdem die ' + + u'Dozenten anschreiben willst, für deren Veranstaltungen ' + u'Ergebnisse vorliegen?') return render(request, 'intern/sendmail_preview.html', data) @@ -308,25 +398,24 @@ def sendmail(request): subject = data['subject'] context = RequestContext(request, { 'veranstaltung': v.name, - 'link_veranstalter': link_veranstalter + (link_suffix_format % - (v.id, v.access_token)), + 'link_veranstalter': link_veranstalter + (link_suffix_format % (v.id, v.access_token)), }) body = tools.render_email(data['body'], context) - recipients = [p.email for p in v.veranstalter.all() if p.email] + recipients = [person.email for person in v.veranstalter.all() if person.email] - for p in v.veranstalter.all(): - fg = p.fachgebiet - if fg is not None: - fg_mails = FachgebietEmail.objects.filter(fachgebiet=fg) - for fg_mail in fg_mails: - if (fg_mail.email_sekretaerin is not None) \ - and (fg_mail.email_sekretaerin not in recipients): - recipients.append(fg_mail.email_sekretaerin) + if data['tutoren'] == 'True': + emails = Tutor.objects.filter(veranstaltung=v).values('email') + for dic in emails: + recipients.append(dic['email']) + else: + add_sekretaerin_mail(recipients, v) if not recipients: - messages.warning(request, (u'An die Veranstalter von "%s" wurde keine Mail ' + - u'verschickt, da keine Adressen hinterlegt waren.') % v.name) + messages.warning(request, + (u'An die Veranstalter von "%s" wurde keine Mail ' + + u'verschickt, da keine Adressen hinterlegt waren.') % v.name) continue + mails.append((subject, body, settings.DEFAULT_FROM_EMAIL, recipients)) # Kopie für das Feedback-Team @@ -336,7 +425,12 @@ def sendmail(request): # Mails senden send_mass_mail(mails) - messages.success(request, '%d E-Mails wurden erfolgreich versandt!' % (len(mails)-1)) + + if data['tutoren'] == 'True': + messages.success(request, + '%d Veranstaltungen wurden erfolgreich, samt Tutoren, benachrichtigt.' % (len(mails)-1)) + else: + messages.success(request, '%d Veranstaltungen wurden erfolgreich benachrichtigt.' % (len(mails) - 1)) return HttpResponseRedirect(reverse('intern-index')) return render(request, 'intern/sendmail.html', data) @@ -357,9 +451,10 @@ def import_ergebnisse(request): if form.is_valid(): warnings, errors, vcount, fbcount = parse_ergebnisse(semester, request.FILES['file']) if fbcount: - messages.success(request, - u'%u Veranstaltungen mit insgesamt %u Fragebögen wurden erfolgreich importiert.' % - (vcount, fbcount)) + messages.success( + request, + u'%u Veranstaltungen mit insgesamt %u Fragebögen wurden erfolgreich importiert.' % (vcount, fbcount) + ) else: warnings.append(u'Es konnten keine Fragebögen importiert werden.') @@ -376,6 +471,7 @@ def import_ergebnisse(request): return render(request, 'intern/import_ergebnisse.html', data) + @user_passes_test(lambda u: u.is_superuser) @require_http_methods(('HEAD', 'GET', 'POST')) def sync_ergebnisse(request): @@ -388,21 +484,21 @@ def sync_ergebnisse(request): except (Semester.DoesNotExist, KeyError): return HttpResponseRedirect(reverse('sync_ergebnisse')) - Fragebogen = get_model('Fragebogen', semester) - Ergebnis = get_model('Ergebnis', semester) - Ergebnis.objects.filter(veranstaltung__semester=semester).delete() + fragebogen = get_model('Fragebogen', semester) + ergebnis = get_model('Ergebnis', semester) + ergebnis.objects.filter(veranstaltung__semester=semester).delete() found_something = False for v in Veranstaltung.objects.filter(semester=semester): - fbs = Fragebogen.objects.filter(veranstaltung=v) + fbs = fragebogen.objects.filter(veranstaltung=v) if len(fbs): found_something = True data = {'veranstaltung': v, 'anzahl': len(fbs)} - for part in Ergebnis.parts + Ergebnis.hidden_parts: - result, count = tools.get_average(Ergebnis, fbs, part[0]) + for part in ergebnis.parts + ergebnis.hidden_parts: + result, count = tools.get_average(ergebnis, fbs, part[0]) data[part[0]] = result data[part[0]+'_count'] = count - Ergebnis.objects.create(**data) + ergebnis.objects.create(**data) if not found_something: messages.warning(request, u'Für das %s liegen keine Ergebnisse vor.' % semester) @@ -410,6 +506,60 @@ def sync_ergebnisse(request): messages.success(request, u'Das Ranking für das %s wurde erfolgreich berechnet.' % semester) return HttpResponseRedirect(reverse('sync_ergebnisse')) + @user_passes_test(lambda u: u.is_superuser) def ergebnisse(request): return public.index(request) + + +def is_no_evaluation_final(status): + return status == Veranstaltung.STATUS_KEINE_EVALUATION or status == Veranstaltung.STATUS_ANGELEGT or \ + status == Veranstaltung.STATUS_BESTELLUNG_GEOEFFNET + + +def update_veranstaltungen_status(veranstaltungen): + for v in veranstaltungen: + if is_no_evaluation_final(v.status): + v.status = Veranstaltung.STATUS_KEINE_EVALUATION_FINAL + v.save() + elif v.status == Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR: + v.status = Veranstaltung.STATUS_BESTELLUNG_WIRD_VERARBEITET + v.save() + + +class CloseOrderFormView(UserPassesTestMixin, FormView): + """Definiert die View für das Beenden der Bestellphase.""" + template_name = 'intern/status_final.html' + form_class = CloseOrderForm + + def post(self, request, *args, **kwargs): + form_class = self.get_form_class() + form = self.get_form(form_class) + if form.is_valid: + choice = self.get_form_kwargs().get('data').get('auswahl') + if choice == 'ja': + return self.form_valid(form) + else: + return self.form_invalid(form) + + def form_valid(self, form): + update_veranstaltungen_status(self.get_queryset()) + messages.success(self.request, u'Alle Status wurden erfolgreich aktualisiert.') + return super(CloseOrderFormView, self).form_valid(form) + + def form_invalid(self, form): + return HttpResponseRedirect(reverse('intern-index')) + + def get_queryset(self): + try: + veranstaltungen = Veranstaltung.objects.filter(semester=Semester.current()) + return veranstaltungen + except (Veranstaltung.DoesNotExist, KeyError): + messages.warning(self.request, u'Keine passenden Veranstaltungen für das aktuelle Semester gefunden.') + return HttpResponseRedirect(reverse('intern-index')) + + def get_success_url(self): + return reverse('intern-index') + + def test_func(self): + return self.request.user.is_superuser diff --git a/src/feedback/views/intern/auth.py b/src/feedback/views/intern/auth.py index e9e2f1ab..1ca29bba 100644 --- a/src/feedback/views/intern/auth.py +++ b/src/feedback/views/intern/auth.py @@ -30,12 +30,8 @@ def rechte_uebernehmen(request): request.session['vid'] = v request.session['veranstaltung'] = unicode(veranst) - if veranst.status == Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR or \ - veranst.status == Veranstaltung.STATUS_BESTELLUNG_GEOEFFNET: - return HttpResponseRedirect(reverse('veranstalter-index')) - else: - messages.warning(request, u'Fehler beim übernehmen der Rechte. ' - u'Der Status der Veranstaltung ist nicht berechtigt.') + return HttpResponseRedirect(reverse('veranstalter-index')) + except KeyError: pass diff --git a/src/feedback/views/intern/vv.py b/src/feedback/views/intern/vv.py index e5686891..09f8c6ff 100644 --- a/src/feedback/views/intern/vv.py +++ b/src/feedback/views/intern/vv.py @@ -22,6 +22,7 @@ @user_passes_test(lambda u: u.is_superuser) @require_http_methods(('HEAD', 'GET', 'POST')) def import_vv(request): + """Zuständig für den Import des Vorlesungsverzeichnisses durch eine XML.""" if request.method == 'POST': form = UploadFileForm(request.POST, request.FILES) if form.is_valid(): @@ -38,15 +39,18 @@ def import_vv(request): @user_passes_test(lambda u: u.is_superuser) @require_http_methods(('HEAD', 'GET', 'POST')) def import_vv_edit(request): + """Zuständig für die Bearbeitung des importierten XMLs.""" data = {} if request.method in ('HEAD', 'GET'): # VV zur Auswahl von Vorlesungen anzeigen data['semester'] = Semester.objects.all() - category_tree = ImportCategory.objects.all().prefetch_related('ivs') - if category_tree: # prufen, ob die Liste leer ist - data['vv'] = category_tree[1:] # erste root-Kategorie ignorieren + + # prüfen, ob die Liste leer ist + if category_tree: + # erste root-Kategorie ignorieren + data['vv'] = category_tree[1:] remaining_close_tags = ImportCategory.objects.all().aggregate(sum_lvl=Sum('rel_level')) if remaining_close_tags['sum_lvl'] is None: @@ -54,19 +58,22 @@ def import_vv_edit(request): else: data['remaining_close_tags'] = remaining_close_tags['sum_lvl'] return render(request, 'intern/import_vv_edit.html', data) + else: messages.error(request, 'Bevor zu importierende Veranstaltungen ausgewählt werden ' + 'können, muss zunächst eine VV-XML-Datei hochgeladen werden.') + return HttpResponseRedirect(reverse('import_vv')) else: # gewählte Veranstaltungen übernehmen und Personen zuordnen - # Liste der ausgewählten Veranstaltungen holen v_str = [ele[1] for ele in request.POST.lists() if ele[0] == 'v'] if not len(v_str): messages.warning(request, u'Es wurden keine Veranstaltungen für den Import ausgewählt!') return HttpResponseRedirect(reverse('import_vv_edit')) - v_ids = [int(ele) for ele in v_str[0]] # IDs von unicode nach int konvertieren + + # IDs von unicode nach int konvertieren + v_ids = [int(ele) for ele in v_str[0]] # ausgewähltes Semester holen try: @@ -78,11 +85,10 @@ def import_vv_edit(request): data['v'] = [] for iv in ImportVeranstaltung.objects.filter(id__in=v_ids): try: - v = Veranstaltung.objects.create(typ=iv.typ, name=iv.name, status=Veranstaltung.STATUS_ANGELEGT, semester=semester, - lv_nr=iv.lv_nr, grundstudium=False, evaluieren=True) + v = Veranstaltung.objects.create(typ=iv.typ, name=iv.name, status=Veranstaltung.STATUS_ANGELEGT, + semester=semester, lv_nr=iv.lv_nr, grundstudium=False, evaluieren=True) except IntegrityError: - # Veranstaltung wurde bereits importiert (kann vorkommen, wenn sie im VV in - # mehreren Kategorien vorkommt) + # Veranstaltung wurde bereits importiert (kann vorkommen, wenn sie in mehreren Kategorien auftaucht.) continue # Accounts für Veranstalter erstellen, falls nötig @@ -96,6 +102,7 @@ def import_vv_edit(request): class PersonFormView(UserPassesTestMixin, ListView): + """Definiert die View für die Anzeige aller zu bearbeitenden Personen.""" model = Person template_name = 'intern/import_vv_edit_users.html' context_object_name = 'persons' @@ -108,6 +115,7 @@ def test_func(self): class PersonFormUpdateView(UserPassesTestMixin, UpdateView): + """Definiert die View für die Bearbeitung von der Personen.""" model = Person form_class = PersonForm template_name = 'intern/import_vv_edit_users_update.html' @@ -133,7 +141,8 @@ def form_valid(self, form): messages.success(self.request, u'Benutzerdatensätze wurden erfolgreich gespeichert.') if p.fachgebiet is not None: - messages.success(self.request, u' '.join((p.full_name(), ' wurde dem Fachbereich ', str(p.fachgebiet), ' zugewiesen.')).encode('utf-8')) + messages.success(self.request, u' '.join((p.full_name(), ' wurde dem Fachbereich ', + str(p.fachgebiet), ' zugewiesen.')).encode('utf-8')) return super(PersonFormUpdateView, self).form_valid(form) @@ -164,6 +173,7 @@ def has_similar_name(self): class SimilarNamesView(UserPassesTestMixin, DetailView): + """Definiert die View für die Anzeige von ähnlichen Namen von Personen.""" model = Person template_name = 'intern/import_vv_edit_users_namecheck.html' context_object_name = 'person_new' diff --git a/src/feedback/views/veranstalter.py b/src/feedback/views/veranstalter.py index 70f30565..10a732af 100644 --- a/src/feedback/views/veranstalter.py +++ b/src/feedback/views/veranstalter.py @@ -36,6 +36,7 @@ def login(request): def veranstalter_dashboard(request): + """Definiert den Dashboard für die Veranstalter-View.""" if request.user.username != settings.USERNAME_VERANSTALTER: return render(request, 'veranstalter/not_authenticated.html') @@ -44,10 +45,10 @@ def veranstalter_dashboard(request): data["veranstaltung"] = veranst data["logs"] = Log.objects.filter(veranstaltung=veranst).order_by('timestamp') + data["allow_order"] = veranst.allow_order() - if veranst.status >= Veranstaltung.STATUS_BESTELLUNG_GEOEFFNET: - bestellung = [] - bestellung.append(("Evaluieren", veranst.get_evaluieren_display)) + if veranst.status >= Veranstaltung.STATUS_BESTELLUNG_LIEGT_VOR: + bestellung = [("Evaluieren", veranst.get_evaluieren_display)] if veranst.evaluieren: bestellung.append(("Typ", veranst.get_typ_display)) bestellung.append(("Anazhl", veranst.anzahl)) @@ -76,8 +77,9 @@ def veranstalter_dashboard(request): return render(request, 'veranstalter/dashboard.html', data) -# # # WIZARD # # # +# ---------------------------------------- START WIZARD ---------------------------------------- # +# Alle Templates, die vom Wizard gebraucht werden. VERANSTALTER_VIEW_TEMPLATES = { "evaluation": "formtools/wizard/evaluation.html", "basisdaten": "formtools/wizard/basisdaten.html", @@ -88,6 +90,8 @@ def veranstalter_dashboard(request): "veroeffentlichen": "formtools/wizard/veroeffentlichen.html", "zusammenfassung": "formtools/wizard/zusammenfassung.html" } + +# Alle Schritte, die vom Wizard gebraucht werden. VERANSTALTER_WIZARD_STEPS = { "evaluation": "Evaluation", "basisdaten": "Basisdaten", @@ -118,6 +122,7 @@ def perform_evalution(wizard): def show_primaerdozent_form(wizard): + """Bestimmt, ob man die Form für den Primärdozenten anzeigt.""" show_summary_form = perform_evalution(wizard) if show_summary_form: cleaned_data = wizard.get_cleaned_basisdaten() @@ -130,6 +135,7 @@ def show_primaerdozent_form(wizard): def show_tutor_form(wizard): + """Bestimmt, ob man die Form für die Tutoren anzeigt.""" show_summary_form = perform_evalution(wizard) if show_summary_form: cleaned_data = wizard.get_cleaned_basisdaten() @@ -139,6 +145,7 @@ def show_tutor_form(wizard): def swap(collection, i, j): + """Einfache Swap-Funktion, die für die Darstellung von Daten in der Zusammenfassung gebraucht wird.""" # swap elements of summary data and ignore IndexError of no evaluation try: collection[i], collection[j] = collection[j], collection[i] @@ -147,6 +154,7 @@ def swap(collection, i, j): class VeranstalterWizard(SessionWizardView): + """Definiert den Wizard für den Bestellprozess.""" form_list = [ ('evaluation', VeranstaltungEvaluationForm), ('basisdaten', VeranstaltungBasisdatenForm), @@ -192,7 +200,11 @@ def get_cleaned_basisdaten(self): def get(self, request, *args, **kwargs): if self.request.user.username != settings.USERNAME_VERANSTALTER: return render(self.request, 'veranstalter/not_authenticated.html') - return super(VeranstalterWizard, self).get(request, *args, **kwargs) + veranstaltung = self.get_instance() + if veranstaltung.allow_order(): + return super(VeranstalterWizard, self).get(request, *args, **kwargs) + else: + return HttpResponseRedirect(reverse('veranstalter-index')) def get_context_data(self, form, **kwargs): context = super(VeranstalterWizard, self).get_context_data(form=form, **kwargs) @@ -305,7 +317,10 @@ def done(self, form_list, **kwargs): def send_mail_to_verantwortliche(ergebnis_empfaenger, context, veranstaltung): """ - Sendet eine Email an die Ergebnis-Empfaenger mit der Zusammenfassung der Bestellung + Sendet eine Email an die Ergebnis-Empfaenger mit der Zusammenfassung der Bestellung. + :param ergebnis_empfaenger: Empfänger der Ergebnisse + :param context: E-Mail Inhalt + :param veranstaltung: Veranstaltung """ if context.get('tutoren_csv', None) is not None: tutoren = Tutor.objects.filter(veranstaltung=veranstaltung) @@ -328,7 +343,10 @@ def send_mail_to_verantwortliche(ergebnis_empfaenger, context, veranstaltung): def save_to_db(request, instance, form_list): """ Speichert alle eingegebenen Daten des Wizards auf das Modell - und setzt den Status einer Veranstaltung auf den nächsten validen Zustand + und setzt den Status einer Veranstaltung auf den nächsten validen Zustand. + :param request: aktueller Request + :param instance: die aktuelle Instanz + :param form_list: Liste aller Forms """ for form in form_list: for key, val in form.cleaned_data.iteritems(): diff --git a/src/templates/formtools/wizard/bestellung_done.html b/src/templates/formtools/wizard/bestellung_done.html index 42ea61af..109cb63a 100644 --- a/src/templates/formtools/wizard/bestellung_done.html +++ b/src/templates/formtools/wizard/bestellung_done.html @@ -2,4 +2,6 @@ {% block content %}

          Die Bestellung wurde entgegengenommen

          + +           Ausloggen {% endblock %} \ No newline at end of file diff --git a/src/templates/intern/index.html b/src/templates/intern/index.html index 2dc7d4b3..1757eed2 100644 --- a/src/templates/intern/index.html +++ b/src/templates/intern/index.html @@ -1,35 +1,43 @@ -{% extends "bestellung_base.html" %} {% block title %}Interner Bereich{% endblock %} {% block content %} -

          Interner Bereich

          - -

          Status der Rückmeldungen durch die Veranstalter

          -

          Aktuell haben wir {{ruck_veranst}} Rückmeldungen von {{all_veranst}} Veranstaltungen.

          -
          -
          -

          {{relativ_result|floatformat:-2}}%

          +{% extends "bestellung_base.html" %} +{% load static %} +{% block title %} + Interner Bereich +{% endblock %} + +{% block content %} +

          Interner Bereich

          + +

          Status der Rückmeldungen durch die Veranstalter

          +

          Aktuell haben wir {{ruck_veranst}} Rückmeldungen von {{all_veranst}} Veranstaltungen.

          +
          +
          +

          {{relativ_result|floatformat:-2}}%

          +
          -
          -

          Ablauf

          -

          Dies sind nicht alle nötigen Schritte; siehe Ablauf im Trac.

          -
            -
          1. neues Semester anlegen (aktuell: - {% if cur_semester %}{{cur_semester.short}}{% else %}nicht Vorhanden{% endif %})
            2. -
          2. Veranstaltungen aus VV importieren (vor Bestellphase)
            3. -
          3. Fehlende Personendaten nachtragen (vor Bestellphase)
            4. -
          4. Anschreiben für Veranstalter erzeugen (nach Bestellphase)
            5. -
          5. Veranstaltungen für EvaSys exportieren (vor dem Scannen)
            6. -
          6. Ergebnisse aus EvaSys importieren (nach dem Scannen)
            7. -
          7. Rankings berechnen (nach dem Ergebnis-Import)
            8. - {% if cur_semester %} -
          8. Ergebnisse veröffentlichen (aktuell: sichtbar für {{cur_semester.get_sichtbarkeit_display}})
            9. - {% endif %} -
          +

          Ablauf

          +

          Dies sind nicht alle nötigen Schritte; siehe Ablauf im Trac.

          + +
            +
          1. neues Semester anlegen (aktuell: + {% if cur_semester %}{{cur_semester.short}}{% else %}nicht Vorhanden{% endif %})
            2. +
          2. Veranstaltungen aus VV importieren (vor Bestellphase)
            3. +
          3. Fehlende Personendaten nachtragen (vor Bestellphase)
            4. +
          4. Bestellphase abschließen (nach Bestellphase)
            5. +
          5. Anschreiben für Veranstalter erzeugen (nach Bestellphase)
            6. +
          6. Veranstaltungen für EvaSys exportieren (vor dem Scannen)
            7. +
          7. Ergebnisse aus EvaSys importieren (nach dem Scannen)
            8. +
          8. Rankings berechnen (nach dem Ergebnis-Import)
            9. + {% if cur_semester %} +
          9. Ergebnisse veröffentlichen (aktuell: sichtbar für {{cur_semester.get_sichtbarkeit_display}})
            10. + {% endif %} +
          {% endblock %} {% block backlink %}{% endblock %} diff --git a/src/templates/intern/sendmail.html b/src/templates/intern/sendmail.html index 9635b912..767f56a2 100644 --- a/src/templates/intern/sendmail.html +++ b/src/templates/intern/sendmail.html @@ -1,51 +1,78 @@ -{% extends "bestellung_base.html" %} +{% extends "bestellung_base.html" %}{% load static %} {% block title %}Mail versenden{% endblock %} +{% block extra_header %} + + + + +{% endblock %} + +{% block javascript_block %} + +{% endblock %} + {% block content %}

          Mail an Veranstalter versenden

          {% csrf_token %} -

          {% include 'includes/semesterauswahl.html' %}

          -

          -Mail senden an...
          - -
          - -
          - -
          - -
          -

          +

          {% include 'includes/semesterauswahl.html' %}

          +

          + +

          -

          -
          - - -

          +

          + +

          -

          -
          - -

          -

          -
          - -

          -

          - -

          +

          +
          + + +

          + +

          +
          + +

          + +

          +
          + +

          + +

          + +

          Verfügbare Variablen

          -

            -
          • {{ veranstaltung }} - Name der Veranstaltung
            • -
          • {{ link_veranstalter }} - Link zum Veranstalterbereich
            • -

          +

          +

            +
          • {{ veranstaltung }} - Name der Veranstaltung
            • +
          • {{ link_veranstalter }} - Link zum Veranstalterbereich
            • +
          +

          {% endblock %} \ No newline at end of file diff --git a/src/templates/intern/sendmail_preview.html b/src/templates/intern/sendmail_preview.html index 788eb58f..ba525eed 100644 --- a/src/templates/intern/sendmail_preview.html +++ b/src/templates/intern/sendmail_preview.html @@ -3,30 +3,36 @@ {% block title %}Mail versenden{% endblock %} {% block content %} -

          Mail an Veranstalter versenden

          - -
          {% csrf_token %} -

          Vorschau (Ersetzte Begriffe sind blau markiert)

          -

          -Absender: {{ from }}
          -Empfänger: {{ to }} -{% if recipient == "cur_sem_all" %}(alle Veranstalter){% endif %} -{% if recipient == "cur_sem_missing_order" %}(alle Veranstalter von Veranstaltungen, für die noch keine Bögen bestellt wurden){% endif %} -{% if recipient == "cur_sem_results" %}(alle Veranstalter von Veranstaltungen, für die Ergebnisse vorliegen){% endif %} -aus dem {{ semester_selected }} - -

          -Betreff: {{ subject_rendered }}
-
-{{ body_rendered|wordwrap:100 }}
-

          - - - - - - - - -
          +

          Mail an Veranstalter versenden

          + +
          + {% csrf_token %} +

          Vorschau (Ersetzte Begriffe sind blau markiert)

          +

          + + {{ from }} + +
          + + + {{ to }} aus dem {{ semester_selected }} + {% if tutoren == 'True' %} + {{ is_tutoren }} + {% endif %} +

          + + 
          +            Betreff: {{ subject_rendered }}
+            {{ body_rendered|wordwrap:100 }}
+
          + + + + + + + + + +
          {% endblock %} diff --git a/src/templates/intern/status_final.html b/src/templates/intern/status_final.html new file mode 100644 index 00000000..026d7390 --- /dev/null +++ b/src/templates/intern/status_final.html @@ -0,0 +1,15 @@ +{% extends "bestellung_base.html" %} +{% load static %} +{% block title %} + Interner Bereich +{% endblock %} + +{% block content %} +

          Bestellphase abschließen?

          +

          Sie sind dabei die Bestellphase zu beenden. Möchten Sie das wirklich tun?

          +
          + {% csrf_token %} + {{ form.as_p }} +   +
          +{% endblock %} \ No newline at end of file diff --git a/src/templates/veranstalter/dashboard.html b/src/templates/veranstalter/dashboard.html index 78075ae1..886dcb48 100644 --- a/src/templates/veranstalter/dashboard.html +++ b/src/templates/veranstalter/dashboard.html @@ -55,7 +55,12 @@ {% block content %} -

          {{ veranstaltung.name }} - Dashboard

          +

          + {{ veranstaltung.name }} - + Dashboard +

          + + Ausloggen

          Status

          {{ veranstaltung.get_status_display }} @@ -77,7 +82,9 @@

          {{ veranstaltung.name }} - Dashboard

          Aktuelle Bestellung - + {% if allow_order %} + + {% endif %}
          @@ -116,7 +123,9 @@

          {{ veranstaltung.name }} - Dashboard

          {% else %} - + {% if allow_order %} + + {% endif %} {% endif %} diff --git a/src/templates/veranstalter/logout.html b/src/templates/veranstalter/logout.html new file mode 100644 index 00000000..ee483e5e --- /dev/null +++ b/src/templates/veranstalter/logout.html @@ -0,0 +1,8 @@ +{% extends "bestellung_base.html" %} +{% block title %} + Logout +{% endblock %} + +{% block content %} +

          Sie sind ausgeloggt

          +{% endblock %} diff --git a/src/urls.py b/src/urls.py index 966a4b02..34f9d724 100644 --- a/src/urls.py +++ b/src/urls.py @@ -52,6 +52,11 @@ # Veranstalter-Views urlpatterns += [ url(r'^veranstalter/login/$', feedback.views.veranstalter.login, name='veranstalter-login'), + url(r'^veranstalter/logout/$', + django.contrib.auth.views.logout, + {'template_name': "veranstalter/logout.html"}, + name='veranstalter-logout'), + url(r'^veranstalter/bestellung', VeranstalterWizard.as_view(), name='veranstalter-bestellung'), url(r'^veranstalter/', feedback.views.veranstalter.veranstalter_dashboard, name='veranstalter-index') ] @@ -63,6 +68,7 @@ url(r'^intern/export_veranstaltungen/$', feedback.views.intern.export_veranstaltungen, name='export_veranstaltungen'), url(r'^intern/generate_letters/$', feedback.views.intern.generate_letters, name='generate_letters'), url(r'^intern/import_ergebnisse/$', feedback.views.intern.import_ergebnisse, name='import_ergebnisse'), + url(r'^intern/status_final/$', feedback.views.intern.CloseOrderFormView.as_view(), name='status_final'), url(r'^intern/sync_ergebnisse/$', feedback.views.intern.sync_ergebnisse, name='sync_ergebnisse'), url(r'^intern/fragebogensprache/$', feedback.views.intern.fragebogensprache, name='fragebogensprache'), url(r'^intern/lange_ohne_evaluation/$', feedback.views.intern.lange_ohne_evaluation, name='lange_ohne_evaluation'), @@ -100,8 +106,7 @@ # Ausschließlich in der Entwicklung nötig, damit statische Dateien (JS, CSS, Bilder...) # angezeigt werden. Im Server-Betrieb kümmert sich Apache darum. urlpatterns += [ - url(r'^d120de/(?P.*)$', feedback.views.redirect, - {'redirect_to': 'http://www.d120.de/d120de/'}), + url(r'^d120de/(?P.*)$', feedback.views.redirect, {'redirect_to': 'http://www.d120.de/d120de/'}), ] import debug_toolbar