Merge branch 'dev' into feature/FIBU-initial

CHANGELOG.md

@@ -76,4 +76,8 @@ Weitere Verbesserungen der vorangegeangen Versionen dieses Releases.
   + Einfachere Einbindung von React für REBUS
 
 ## 1.1.2 "Aebli"
-* Bugfix in der PWA (zuerst Netzwerk, dann Cache)
\ No newline at end of file
+* Bugfix in der PWA (zuerst Netzwerk, dann Cache)
+
+## 1.1.3 "Aebli"
+* Bugfix in REBUS (Submit wieder erlaubt) (#335)
+* Klassenlehrkräfte werden im Plan angezeigt (#334)
\ No newline at end of file

react/src/rebus.js

@@ -222,9 +222,7 @@ function getCategoryOfOption(option) {
 
 function getOption(option) {
     for (const category of BASIC_OPTIONS) {
-        // console.log(category);
         for (const opt of category.options) {
-            // console.log(opt);
             if (opt.id === option) {
                 return opt;
             }
@@ -388,7 +386,7 @@ class REBUSDynSelect extends React.Component {
                     <Input label={"Art des Problems"} icon={"bug_report"} show={sO === "printerIssue"}>
                         <Select onChange={this._onSetB}
                                 values={["Papierstau", "Toner leer", "Papier leer", "Drucker bekommt keine Daten"]}
-                                defaultValue={"Anderes Problem"} show={sO === "subMonitorIssue"}/>
+                                defaultValue={"Anderes Problem"} show={sO === "printerIssue"}/>
                     </Input>
 
                     {/* Section B – Substitution Monitor Issue */}
@@ -432,7 +430,7 @@ class REBUSDynSelect extends React.Component {
                     <Input label={"Ort des Druckers"} icon={"location_on"}
                            show={sO === "printerIssue" && step === 2}>
                         <Select onChange={this._onSetC} values={LOCATIONS}
-                                defaultValue={"Anderer Raum"} show={sO === "presentationDeviceIssue"}/>
+                                defaultValue={"Anderer Raum"} show={sO === "printerIssue"}/>
                     </Input>
 
                     {/* Section C – WLAN Issue */}

schoolapps/meta.py

@@ -10,7 +10,7 @@ with open(copyright_path, "r") as f:
 
 COPYRIGHT_SHORT = "© 2018–2019 Mitglieder der Computer-AG, Katharineum zu Lübeck"
 
-VERSION = '1.1.2 "Aebli"'
+VERSION = '1.1.3 "Aebli"'
 
 LICENSE_APACHE_2 = "Apache 2.0 License"
 LICENSE_BSD = "2-Clause BSD License"

schoolapps/static/js/dashboard.js

@@ -251,13 +251,13 @@ var Dashboard = function (_React$Component) {
                         {className: "col s12 m12 l6 xl4"},
                         React.createElement(
                             "div",
-                            { className: "card" },
+                            {className: "card"},
                             React.createElement(
                                 "div",
-                                { className: "card-content" },
+                                {className: "card-content"},
                                 React.createElement(
                                     "span",
-                                    { className: "card-title" },
+                                    {className: "card-title"},
                                     "Plan ",
                                     this.state.plan.type === 2 ? "der" : "für",
                                     " ",
@@ -354,10 +354,10 @@ var Dashboard = function (_React$Component) {
                             {className: "card "},
                             React.createElement(
                                 "div",
-                                { className: "card-content" },
+                                {className: "card-content"},
                                 React.createElement(
                                     "span",
-                                    { className: "card-title" },
+                                    {className: "card-title"},
                                     "Aktuelle Termine"
                                 ),
                                 this.state.current_events.map(function (event) {

schoolapps/static/js/react/prop-types.production.min.js

+!function(f){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=f();else if("function"==typeof define&&define.amd)define([],f);else{var g;g="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,g.PropTypes=f()}}(function(){return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a="function"==typeof require&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}for(var i="function"==typeof require&&require,o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module){"use strict";function emptyFunction(){}var ReactPropTypesSecret=require(3);module.exports=function(){function e(e,r,t,o,n,p){if(p!==ReactPropTypesSecret){var c=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw c.name="Invariant Violation",c}}function r(){return e}e.isRequired=e;var t={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:r,element:e,instanceOf:r,node:e,objectOf:r,oneOf:r,oneOfType:r,shape:r,exact:r};return t.checkPropTypes=emptyFunction,t.PropTypes=t,t}},{3:3}],2:[function(require,module){module.exports=require(1)()},{1:1}],3:[function(require,module){"use strict";var ReactPropTypesSecret="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";module.exports=ReactPropTypesSecret},{}]},{},[2])(2)});
\ No newline at end of file

schoolapps/support/templates/support/rebus.html

@@ -30,7 +30,8 @@
             <div class="input-field col s12 support-input-mobile">
                 <i class="material-icons prefix">mode_edit</i>
                 <textarea id="{{ form.long_description.id_for_label }}" name="{{ form.long_description.html_name }}"
-                          class="materialize-textarea"></textarea>
+                          class="materialize-textarea">
+                </textarea>
 
                 <label for="{{ form.long_description.id_for_label }}">Bitte beschreibe dein Problem
                     <strong>genauer</strong> (optional)