release notes for 3.3.2

mattimaier · May 12, 2018 · 741c126 · 741c126
1 parent 12c1914
commit 741c126
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 42 deletions.
diff --git a/BNote/src/presentation/modules/probenview.php b/BNote/src/presentation/modules/probenview.php
@@ -280,21 +280,21 @@ protected function editEntityForm($write=true) {
 	}
 
 	function invitations() {
-		$contacts = $this->getData()->getRehearsalContacts($_GET["id"]);
-
-		// add a link to the data to remove the contact from the list
-		$contacts[0]["delete"] = "Löschen";
-		for($i = 1; $i < count($contacts); $i++) {
-			$delLink = $this->modePrefix() . "delContact&id=" . $_GET["id"] . "&cid=" . $contacts[$i]["id"] . "&tab=invitations";
-			$btn = new Link($delLink, "");
-			$btn->addIcon("remove");
-			$contacts[$i]["delete"] = $btn->toString();
-		}
-
-		$table = new Table($contacts);
+		$contacts = $this->getData()->getRehearsalContacts($_GET["id"]);
+
+		// add a link to the data to remove the contact from the list
+		$contacts[0]["delete"] = "Löschen";
+		for($i = 1; $i < count($contacts); $i++) {
+			$delLink = $this->modePrefix() . "delContact&id=" . $_GET["id"] . "&cid=" . $contacts[$i]["id"] . "&tab=invitations";
+			$btn = new Link($delLink, "");
+			$btn->addIcon("remove");
+			$contacts[$i]["delete"] = $btn->toString();
+		}
+
+		$table = new Table($contacts);
 		$table->removeColumn("id");
-		$table->removeColumn("instrumentid");
-		$table->renameHeader("mobile", "Handynummer");
+		$table->removeColumn("instrumentid");
+		$table->renameHeader("mobile", "Handynummer");
 		$table->write();
 	}
 
@@ -396,10 +396,10 @@ function participants() {
 	}
 
 	function participantsOptions() {
-		if(!$this->isReadOnlyView()) {
-			// back button
-			$this->backToViewButton($_GET["id"]);
-			$this->verticalSpace();
+		if(!$this->isReadOnlyView()) {
+			// back button
+			$this->backToViewButton($_GET["id"]);
+			$this->verticalSpace();
 		}
 	}
 
@@ -544,15 +544,15 @@ function view() {
 		}
 		else {
 			// title
-			$pdate = $this->getData()->getRehearsalBegin($_GET["id"]);
+			$pdate = $this->getData()->getRehearsalBegin($_GET["id"]);
 			Writing::h2("Probe am $pdate Uhr");
 
 			// tabs
 			$tabs = array(
 				"details" => "Details",
 				"invitations" => "Einladungen",
 				"participants" => "Teilnehmer",
-				"practise" => "Stücke zum Üben"
+				"practise" => "Stücke zum Üben"
 			);
 			echo "<div class=\"view_tabs\">\n";
 			foreach($tabs as $tabid => $label) {
@@ -587,31 +587,31 @@ function view() {
 
 	function viewOptions() {
 		if($this->isReadOnlyView()) {
-			$back = new Link($this->modePrefix() . "history&year=" . $_GET["year"], Lang::txt("back"));
-			$back->addIcon("arrow_left");
+			$back = new Link($this->modePrefix() . "history&year=" . $_GET["year"], Lang::txt("back"));
+			$back->addIcon("arrow_left");
 			$back->write();
 		}
 		else if(!isset($_GET["tab"]) || $_GET["tab"] == "details") {
 			parent::viewOptions();
-
-			// show a button to send a reminder to all about this rehearsal
-			$remHref = "?mod=" . $this->getData()->getSysdata()->getModuleId("Kommunikation") . "&mode=rehearsalMail&preselect=" . $_GET["id"];
-
-			$reminder = new Link($remHref, "Benachrichtigung senden");
-			$reminder->addIcon("email");
+
+			// show a button to send a reminder to all about this rehearsal
+			$remHref = "?mod=" . $this->getData()->getSysdata()->getModuleId("Kommunikation") . "&mode=rehearsalMail&preselect=" . $_GET["id"];
+
+			$reminder = new Link($remHref, "Benachrichtigung senden");
+			$reminder->addIcon("email");
 			$reminder->write();
 		}
 		else if(isset($_GET["tab"]) && ($_GET["tab"] == "invitations" || $_GET["tab"] == "participants")) {
 			$this->backToStart();
 			$this->buttonSpace();
 
-			$addContact = new Link($this->modePrefix() . "addContact&id=" . $_GET["id"], "Einladung hinzufügen");
-			$addContact->addIcon("plus");
-			$addContact->write();
-			$this->buttonSpace();
-
-			$printPartlist = new Link($this->modePrefix() . "printPartlist&id=" . $_GET["id"], "Teilnehmerliste drucken");
-			$printPartlist->addIcon("printer");
+			$addContact = new Link($this->modePrefix() . "addContact&id=" . $_GET["id"], "Einladung hinzufügen");
+			$addContact->addIcon("plus");
+			$addContact->write();
+			$this->buttonSpace();
+
+			$printPartlist = new Link($this->modePrefix() . "printPartlist&id=" . $_GET["id"], "Teilnehmerliste drucken");
+			$printPartlist->addIcon("printer");
 			$printPartlist->write();
 		}
 		else {

diff --git a/release_notes.txt b/release_notes.txt
@@ -1,10 +1,12 @@
 #############################################
-# Changes to BNote in comparison with 3.3.0 #
+# Changes to BNote in comparison with 3.3.1 #
 #############################################
 
-#295 Missing information about a gig is in calendar, ics export and start now
-#296 Recursive memory overflow bug for files in songs solved
-#301 Removing files is added again
-#302 Changing a rehearsal bug fixed
-
-In addition the support for PHP 7.2.1 is improved.
+#303 Folders are sorted alphanumerically
+#306 Sorting reheasal invites by instruments possible again
+#307 Multiday reservations are displayed as such
+#308 Navigating upwards is not shown with a trash option
+#309 Meeting times for gigs are displayed in mobile app
+#310 Sorting in reporting was shown wrong
+#311 Votes are displayed properly now in main view and archive
+#312 Trigger server is fixed