New Live Voting Version 4.3.3 - Changes see Changelog

CHANGELOG.md

@@ -1,4 +1,12 @@
 # Change Log
+## [4.3.3]
+- Fixed Bug PLLV-345 - do not present results in more than one column
+- Fixed issue with other plugins calling ilUtil::getImagePath - thx to mjansen / https://github.com/studer-raimann/LiveVoting/pull/24
+- Fixed Avoid errors with devision by 0 - thx to swiniker / https://github.com/studer-raimann/LiveVoting/pull/23/
+- Fix typo in function name - thx to Rillke / https://github.com/studer-raimann/LiveVoting/pull/22
+- Unbreak delete-an-option thx to Rillke / 
+https://github.com/studer-raimann/LiveVoting/pull/21
+- Fixed Bug Uncommented method to possibly fix a bug with number range inputs - thx to rsheer / https://github.com/studer-raimann/LiveVoting/pull/18
 
 ##  [4.3.2]
 - Fixed BUG SUPPORT-2161 Use of undefined constant IL_COOKIE_PATH (PHP7.2)"
@@ -73,6 +81,7 @@
 - Screen-Id-Component
 - PHP version checker
 - Improved PIN validation in pin.php
+- **Updates to RewriteRules might be required**
 - Improved FreeInput config validation
 
 ## [4.0.2] - 2018-07-11

classes/QuestionTypes/NumberRange/class.xlvoNumberRangeGUI.php

@@ -49,13 +49,10 @@ public function initJS($current = false) {
 	}
 
 
-	/* *
-	 *
-	 * /
 	protected function clear() {
 		$this->manager->unvoteAll();
 		$this->afterSubmit();
-	}*/
+	}
 
 	/**
 	 *

classes/Voting/class.xlvoVotingGUI.php

@@ -754,7 +754,7 @@ protected function import() {
 				$xlvoOptions[] = $xlvoOption;
 			}
 			$xlvoVoting->setVotingOptions($xlvoOptions);
-			$xlvoVoting->renegerateOptionSorting();
+			$xlvoVoting->regenerateOptionSorting();
 		}
 		$this->cancel();
 	}

plugin.php

@@ -3,7 +3,7 @@
 require_once __DIR__ . "/vendor/srag/dic/src/PHPVersionChecker.php";
 
 $id = 'xlvo';
-$version = '4.3.2';
+$version = '4.3.3';
 $ilias_min_version = '5.3.0';
 $ilias_max_version = '5.4.999';
 $responsible = 'studer + raimann ag - Team Custom 1';

sql/dbupdate.php

@@ -342,7 +342,7 @@
  * @var $xlvoVoting \LiveVoting\Voting\xlvoVoting
  */
 foreach (\LiveVoting\Voting\xlvoVoting::get() as $xlvoVoting) {
-	$xlvoVoting->renegerateOptionSorting();
+	$xlvoVoting->regenerateOptionSorting();
 }
 
 ?>

src/Context/Initialisation/Version/v53/xlvoStyleDefinition.php

@@ -37,6 +37,14 @@ public function __construct() {
 	public function getSkin() {
 		return $this->skin;
 	}
+
+	/**
+	 * @return string
+	 */
+	public function getImageDirectory($style_id)
+	{
+		return '';
+	}
 }
 
 /**

src/QuestionTypes/FreeOrder/xlvoFreeOrderSubFormGUI.php

@@ -129,7 +129,7 @@ protected function handleOptions() {
 			}
 		}
 		$this->getXlvoVoting()->setMultiFreeInput(true);
-		//$this->getXlvoVoting()->renegerateOptionSorting();
+		//$this->getXlvoVoting()->regenerateOptionSorting();
 		$this->getXlvoVoting()->store();
 	}
 }

src/QuestionTypes/NumberRange/xlvoNumberRangeSubFormGUI.php

@@ -40,7 +40,7 @@ class xlvoNumberRangeSubFormGUI extends xlvoSubFormGUI {
 	const START_RANGE_MAX = 1000000;
 	const END_RANGE_MIN = - 1000000;
 	const END_RANGE_MAX = 1000000;
-	//const STEP_RANGE_MIN = 0;
+	const STEP_RANGE_MIN = 1;
 	//const STEP_RANGE_MAX = 1000000;
 	const STEP_RANGE_DEFAULT_VALUE = 1;
 	const STEP_RANGE_INVALID_INFO = 'qtype_6_invalid_step_range';
@@ -89,7 +89,7 @@ protected function initFormElements() {
 		//create end range number input
 		$stepRange = new ilNumberInputGUI($this->txt(self::OPTION_RANGE_STEP), self::OPTION_RANGE_STEP);
 		$stepRange->setInfo($this->txt(self::OPTION_RANGE_STEP_INFO));
-		//$stepRange->setMinValue(self::STEP_RANGE_MIN);
+		$stepRange->setMinValue(self::STEP_RANGE_MIN);
 		//$stepRange->setMaxValue(self::STEP_RANGE_MAX);
 		$stepRange->setValue($this->getXlvoVoting()->getStepRange());
 

src/QuestionTypes/SingleVote/xlvoSingleVoteSubFormGUI.php

@@ -148,6 +148,7 @@ protected function handleOptions() {
 				$xlvoOption->delete();
 			}
 		}
-		$this->getXlvoVoting()->renegerateOptionSorting();
+        $this->getXlvoVoting()->setVotingOptions($this->options);
+		$this->getXlvoVoting()->regenerateOptionSorting();
 	}
 }

src/Voting/xlvoVoting.php

@@ -244,7 +244,7 @@ public function getComputedColums() {
 	/**
 	 *
 	 */
-	public function renegerateOptionSorting() {
+	public function regenerateOptionSorting() {
 		$i = 1;
 		foreach ($this->getVotingOptions() as $votingOption) {
 			$votingOption->setPosition($i);
@@ -284,7 +284,7 @@ public function fullClone($change_name = true, $clone_options = true) {
 				$votingOptionNew->setVotingId($newObj->getId());
 				$votingOptionNew->store();
 			}
-			$newObj->renegerateOptionSorting();
+			$newObj->regenerateOptionSorting();
 		}
 
 		return $newObj;

src/Voting/xlvoVotingManager2.php

@@ -141,7 +141,7 @@ public function vote($option = NULL) {
 	 *
 	 */
 	public function prepare() {
-		$this->getVoting()->renegerateOptionSorting();
+		$this->getVoting()->regenerateOptionSorting();
 		$this->getPlayer()->setStatus(xlvoPlayer::STAT_RUNNING);
 		$this->getPlayer()->freeze();
 	}
@@ -366,7 +366,7 @@ public function previous() {
 
 		$this->player->setActiveVoting($prev_id);
 		$this->player->store();
-		$this->getVoting()->renegerateOptionSorting();
+		$this->getVoting()->regenerateOptionSorting();
 	}
 
 
@@ -382,7 +382,7 @@ public function next() {
 		$this->handleQuestionSwitching();
 		$this->player->setActiveVoting($next_id);
 		$this->player->store();
-		$this->getVoting()->renegerateOptionSorting();
+		$this->getVoting()->regenerateOptionSorting();
 	}
 
 

templates/default/Display/Bar/tpl.bar_collection.html

@@ -1,7 +1,7 @@
 <br>
 <div id="bars" class="bars">
 	<!-- BEGIN bar -->
-	<div class="col-md-4">
+	<div class="col-md-12">
 		{BAR}
 	</div>
 	<!-- END bar -->