Merge lp:~adamringhede/lenasys/branch into lp:~lenasysimpl1/lenasys/GammaBear

[Adam Ringhede]

Fixes bugs

[Victor Nagy (galaxyabstractor)]

review: Approve

=== added file 'DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.js'
--- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.js	1970-01-01 00:00:00 +0000
+++ DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.js	2013-04-12 14:42:25 +0000
@@ -0,0 +1,235 @@
+var account="<?php echo $accountname ?>";		
+var duggaNr="<?php echo $duggaNr ?>";		
+var courseName="<?php echo $courseName ?>";		
+var courseOccasion="<?php echo $courseOccasion ?>";	
+
+$(document).ready(function() {
+	fetchQuiz();
+	fetchQuizObject("ObjDesc");
+});
+
+/* login, courseName, courseOccasion, quizNr */
+function fetchQuiz(){
+	console.log("post fetchQuiz ");
+	$.post("../quizAjax/getQuiz.php", 
+		   {loginName: account, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr }, 
+			fetchQuizCallBack,
+			"json"
+	);
+}
+
+function fetchQuizCallBack(data){
+	console.log(data);
+	if (typeof data.Error != 'undefined') {
+		$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
+	} else {
+		$("#result").append("<br/>Dugga nr:"+data.quizNr);
+		$("#result").append("<br/>Kursnamn:"+data.quizCourseName);
+		$("#result").append("<br/>Lista över dugga-objekt:"+data.quizObjectIDs);
+		$("#result").append("<br/>Data:"+data.quizData);
+	}
+}
+
+/* Evaluate the submited answer
+ * (Alternativly, it just saves it if the dugga does not correct it self. )
+ */
+function checkAnswer(submitstr){
+	$.post("../quizAjax/answerQuiz.php", 
+		{loginName: account, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr, quizAnswer: submitstr}, 
+		checkAnswerCallBack,
+		"json"
+	);
+}
+
+function checkAnswerCallBack(data){
+	console.log("checkAnswerCallBack:");
+	console.log(data);
+	if (typeof data.Error != 'undefined') {
+		$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
+	} else {
+		for (var key in data) {
+		  $("#result").append("<br />"+data[key]);
+		}
+	}
+}
+
+/* Get a dugga object (object id's are fetched from the list with object ids which comes with the dugga)
+ * Parameters: (POST) objectID, courseName, courseOccasion, quizNr, loginName
+ */
+function fetchQuizObject(objectName){
+	console.log("post fetchQuizObject");
+	$.post("../quizAjax/getQuizObject.php", 
+		   {objectID: objectName, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr, loginName: account}, 
+			fetchQuizObjectCallBack,
+			"json"
+	);
+}
+
+function fetchQuizObjectCallBack(data){
+	if (typeof data.Error != 'undefined') {
+		$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
+	} else {
+		$("#result").append(data.objectData);
+	}
+}
+
+function newbutton() {
+	var funclist;
+	var oplist;
+	
+	funclist = document.getElementById('function');
+	oplist = document.getElementById('operations');
+	
+	oplist.innerHTML+="<option value='"+funclist.options[funclist.selectedIndex].value+"'>"+funclist.options[funclist.selectedIndex].text+"</option>";
+}
+
+function deletebutton() {
+	var elSel = document.getElementById('operations');
+	var i=0;
+	for (i = elSel.length-1; i >= 0; i--) {
+		if (elSel.options[i].selected) {
+			elSel.remove(i);
+		}
+	}
+}
+
+function moveupbutton() {
+	var elSel = document.getElementById('operations');
+	var ind=elSel.selectedIndex;
+	var val;
+	var tex;
+	
+	if( elSel.selectedIndex>0) {
+		
+		val=elSel.options[ind].value;
+		tex=elSel.options[ind].text;
+	
+		elSel.options[ind].value=elSel.options[ind-1].value;
+		elSel.options[ind].text=elSel.options[ind-1].text;
+		
+		elSel.options[ind-1].value=val;
+		tex=elSel.options[ind-1].text=tex;
+			
+		elSel.selectedIndex--;				
+	}
+}
+
+function movedownbutton() {
+	var elSel = document.getElementById('operations');
+	var ind=elSel.selectedIndex;
+	var val;
+	var tex;
+	
+	if(elSel.selectedIndex < elSel.length-1){
+		
+		val=elSel.options[ind].value;
+		tex=elSel.options[ind].text;
+	
+		elSel.options[ind].value=elSel.options[ind+1].value;
+		elSel.options[ind].text=elSel.options[ind+1].text;
+		
+		elSel.options[ind+1].value=val;
+		tex=elSel.options[ind+1].text=tex;
+			
+		elSel.selectedIndex++;				
+	}
+}
+
+function submbutton() {
+	var submitstr="";
+	
+	var elSel = document.getElementById('operations');
+	var i=0;
+	
+	for (i=elSel.length-1; i >= 0;i--) {
+	submitstr+=elSel.options[i].value; 
+	}				
+	
+	alert(submitstr);
+	checkAnswer(submitstr);
+}
+
+function handler_mouseup() {
+	clickstate=0;
+}
+
+function handler_mousedown() {
+	clickstate=1;
+}
+
+function handler_mousemove (cx,cy) {
+// Make use of cx and cy... right now no use as this app does not use clicks
+}
+
+var v=0;
+
+function foo() {
+	acanvas.width = acanvas.width;				
+	
+	v+=0.1;
+	
+	context.translate(300,300);
+	context.save(); 
+				
+	var elSel = document.getElementById('operations');
+	var i=0;
+	for (i=0;i<=elSel.length-1;i++) {
+		if (elSel.options[i].value == "T1") {
+			context.translate(100,0);
+		}
+		if (elSel.options[i].value == "T2") {
+			context.translate(150,0);
+		}
+		if (elSel.options[i].value == "T3") {
+			context.translate(200,0);
+		}
+		if (elSel.options[i].value == "RP") {
+			context.rotate(v);
+		}
+		if (elSel.options[i].value == "RN") {
+			context.rotate(-v);
+		}
+		if (elSel.options[i].value == "S1") {
+			context.scale(0.25,0.25);
+		}
+		if (elSel.options[i].value == "S2") {
+			context.scale(0.5,0.5);
+		}
+		if (elSel.options[i].value == "S3") {
+			context.scale(0.75,0.75);
+		}
+		if (elSel.options[i].value == "S4") {
+			context.scale(1.5,1.5);
+		}
+		if (elSel.options[i].value == "D1") {
+			drawball(0,0,40,30,10,"#f84",45.0,22.5);
+		}
+		if (elSel.options[i].value == "D2") {
+			drawball(0,0,40,30,10,"#4f8",45.0,22.5);
+		}
+		if (elSel.options[i].value == "D3") {
+			drawball(0,0,40,30,10,"#84f",45.0,22.5);
+		}
+	}
+	
+	// Must count saves
+	// Restore equal amount of times
+	
+	/*
+	context.beginPath();
+	drawcircle(40,'#f0f');
+	
+	context.lineWidth   = 0.5;
+	
+	context.moveTo(0,0);
+	context.rect(0,0,30,30);
+	
+	context.stroke();
+	*/
+	context.restore();
+	context.globalAlpha = 0.5				
+	context.rotate(-v*0.6);								
+	drawsun();
+	
+	setTimeout("foo();",100);
+}
\ No newline at end of file

=== modified file 'DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.php'
--- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.php	2013-04-04 11:30:02 +0000
+++ DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/johan_dugga_datorgrafik_1_transforms.php	2013-04-12 14:42:25 +0000
@@ -9,250 +9,9 @@
 <html>
 	<head>
 		<meta charset="UTF-8"/>			
-		<script type="text/javascript" src="../../../../js/jquery.js"></script>	
-		<script lang='Javascript'>
-			var account="<?php echo $accountname ?>";		
-					var duggaNr="<?php echo $duggaNr ?>";		
-					var courseName="<?php echo $courseName ?>";		
-					var courseOccasion="<?php echo $courseOccasion ?>";	
-					
-					$(document).ready(function() {
-						fetchQuiz();
-						fetchQuizObject("ObjDesc");
-					});
-					
-					//login, courseName, courseOccasion, quizNr
-					function fetchQuiz(){
-						console.log("post fetchQuiz ");
-						$.post("../quizAjax/getQuiz.php", 
-							   {loginName: account, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr }, 
-								fetchQuizCallBack,
-								"json"
-						);
-					}
-					
-					function fetchQuizCallBack(data){
-						console.log(data);
-						if (typeof data.Error != 'undefined') {
-							$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
-						} else {
-							$("#result").append("<br/>Dugga nr:"+data.quizNr);
-							$("#result").append("<br/>Kursnamn:"+data.quizCourseName);
-							$("#result").append("<br/>Lista över dugga-objekt:"+data.quizObjectIDs);
-							$("#result").append("<br/>Data:"+data.quizData);
-						}
-					}
-					
-					//Kontrollera om inskickat svar är rätt (alternativt bara spara det om duggan inte rättas automatiskt) 
-					function checkAnswer(submitstr){
-						$.post("../quizAjax/answerQuiz.php", 
-							{loginName: account, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr, quizAnswer: submitstr}, 
-							checkAnswerCallBack,
-							"json"
-						);
-					}
-					
-					function checkAnswerCallBack(data){
-						console.log("checkAnswerCallBack:");
-						console.log(data);
-						if (typeof data.Error != 'undefined') {
-							$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
-						} else {
-							for (var key in data) {
-							  $("#result").append("<br />"+data[key]);
-							}
-						}
-					}
-					
-					//Hämta ett dugga objekt (objekt id:n hämtas från listan med objekt id:n som kommer med duggan)
-					//////Parameters: (POST) objectID, courseName, courseOccasion, quizNr, loginName
-					function fetchQuizObject(objectName){
-						console.log("post fetchQuizObject");
-						$.post("../quizAjax/getQuizObject.php", 
-							   {objectID: objectName, courseName: courseName, courseOccasion: courseOccasion, quizNr: duggaNr, loginName: account}, 
-								fetchQuizObjectCallBack,
-								"json"
-						);
-					}
-
-					function fetchQuizObjectCallBack(data){
-						if (typeof data.Error != 'undefined') {
-							$("#result").append("<br/><h3>Error:"+data.Error+"</h3>");
-						} else {
-							$("#result").append(data.objectData);
-						}
-					}
-		</script>
-	
+		<script type="text/javascript" src="../../../../js/jquery.js"></script>
 		<script type="text/javascript" src="../../../../js/dugga.js"></script>	
-	
-	<script lang='Javascript'>
-				
-		function newbutton()
-		{
-				var funclist;
-				var oplist;
-				
-				funclist=document.getElementById('function');
-				oplist=document.getElementById('operations');
-				
-				oplist.innerHTML+="<option value='"+funclist.options[funclist.selectedIndex].value+"'>"+funclist.options[funclist.selectedIndex].text+"</option>";
-								
-		}
-		
-		function deletebutton()
-		{
-				var elSel = document.getElementById('operations');
-  			var i=0;
-  			for (i=elSel.length-1;i>=0;i--) {
-    				if (elSel.options[i].selected) {
-      				elSel.remove(i);
-    				}
-  			}
-		}
-		
-		function moveupbutton()
-		{
-				var elSel = document.getElementById('operations');
-				var ind=elSel.selectedIndex;
-				var val;
-				var tex;
-
-				if(elSel.selectedIndex>0){
-						
-						val=elSel.options[ind].value;
-						tex=elSel.options[ind].text;
-
-						elSel.options[ind].value=elSel.options[ind-1].value;
-						elSel.options[ind].text=elSel.options[ind-1].text;
-						
-						elSel.options[ind-1].value=val;
-						tex=elSel.options[ind-1].text=tex;
-							
-						elSel.selectedIndex--;				
-				}
-		}
-
-		function movedownbutton()
-		{
-				var elSel = document.getElementById('operations');
-				var ind=elSel.selectedIndex;
-				var val;
-				var tex;
-
-				if(elSel.selectedIndex<elSel.length-1){
-						
-						val=elSel.options[ind].value;
-						tex=elSel.options[ind].text;
-
-						elSel.options[ind].value=elSel.options[ind+1].value;
-						elSel.options[ind].text=elSel.options[ind+1].text;
-						
-						elSel.options[ind+1].value=val;
-						tex=elSel.options[ind+1].text=tex;
-							
-						elSel.selectedIndex++;				
-				}
-				
-		}
-
-		function submbutton()
-		{
-				var submitstr="";
-				
-				var elSel = document.getElementById('operations');
-  			var i=0;
-  			
-  			for (i=elSel.length-1;i>=0;i--) {
-    				submitstr+=elSel.options[i].value; 
-  			}				
-		
-				alert(submitstr);
-			checkAnswer(submitstr);
-		}
-
-		function handler_mouseup()
-		{
-				clickstate=0;
-		}
-		
-		function handler_mousedown()
-		{
-				clickstate=1;
-		}
-		
-		function handler_mousemove (cx,cy) 
-		{
-				// Make use of cx and cy... right now no use as this app does not use clicks
-		}
-				
-		var v=0;
-
-		function foo()
-		{
-				acanvas.width = acanvas.width;				
-				
-				v+=0.1;
-
-				context.translate(300,300);
-				context.save(); 
-				                
-				var elSel = document.getElementById('operations');
-  			var i=0;
-  			for (i=0;i<=elSel.length-1;i++) {
-						if(elSel.options[i].value=="T1"){
-									context.translate(100,0);
-						}if(elSel.options[i].value=="T2"){
-									context.translate(150,0);
-						}if(elSel.options[i].value=="T3"){
-									context.translate(200,0);
-						}if(elSel.options[i].value=="RP"){
-									context.rotate(v);
-						}if(elSel.options[i].value=="RN"){
-									context.rotate(-v);
-						}if(elSel.options[i].value=="S1"){
-									context.scale(0.25,0.25);
-						}if(elSel.options[i].value=="S2"){
-									context.scale(0.5,0.5);
-						}if(elSel.options[i].value=="S3"){
-									context.scale(0.75,0.75);
-						}if(elSel.options[i].value=="S4"){
-									context.scale(1.5,1.5);
-						}if(elSel.options[i].value=="D1"){
-								drawball(0,0,40,30,10,"#f84",45.0,22.5);
-						}if(elSel.options[i].value=="D2"){
-								drawball(0,0,40,30,10,"#4f8",45.0,22.5);
-						}if(elSel.options[i].value=="D3"){
-								drawball(0,0,40,30,10,"#84f",45.0,22.5);
-						}
-  			}
-
-  			
-
-				// Must count saves
-				// Restore equal amount of times
-				
-/*
-				context.beginPath();
-				drawcircle(40,'#f0f');
-				
-				context.lineWidth   = 0.5;
-
-				context.moveTo(0,0);
-				context.rect(0,0,30,30);
-
-				context.stroke();
-*/
-				context.restore();
-				context.globalAlpha = 0.5				
-				context.rotate(-v*0.6);								
-				drawsun();
-
-				setTimeout("foo();",100);
-				
-	  }	  
-					
-	</script>
+		<script type="text/javascript" src="johan_dugga_datorgrafik_1_transforms.js"></script>
 
 	</head>
 	<body onload="setupcanvas();">

=== modified file 'Widget Library/sliderdemo.html'
--- Widget Library/sliderdemo.html	2013-04-03 14:29:36 +0000
+++ Widget Library/sliderdemo.html	2013-04-12 14:42:25 +0000
@@ -3,19 +3,9 @@
 	<head>
 		<title>Slider Demo</title>
 		<link rel="stylesheet" type="text/css" media="screen" href="sliders.css">
+		<script type="text/javascript" src="../etc/PIE/PIE.js"></script>
+		<script type="text/javascript" src="../js/jquery.js"></script>
 		<script type="text/javascript" src="sliders.js"></script>
-		<script>
-			function createDemoSliders() {
-				str = "";
-				str += makePanel(250, 200);
-				str += makeLabel("Slider");
-				str += makeSlider("slider", 1, 2, 7, 4.5, 160, 5);
-				str += makeLabel("Binary");
-				str += makeBinary("binary", 0);
-				str += makePanelEnd();
-				document.getElementById("container").innerHTML = str;
-			}
-		</script>
 	</head>
 	<body onload="createDemoSliders();" onmousedown="mbPress(event);" onmouseup="mbRelease(event);">
 		<div id="container">

=== modified file 'Widget Library/sliders.css'
--- Widget Library/sliders.css	2013-04-03 14:29:36 +0000
+++ Widget Library/sliders.css	2013-04-12 14:42:25 +0000
@@ -9,6 +9,7 @@
 	font-family: Arial;
 	background-color: #d0d0d4;
 	background: linear-gradient(to bottom, #f0f0e8 0%, #e8e8e8 1%, #b8b8b0 17%);
+	-pie-background: linear-gradient(top, #f0f0e8 0%, #e8e8e8 1%, #b8b8b0 17%);
 	border-radius: 10px;
 	padding:6px;
 }
@@ -79,4 +80,5 @@
 	border-width: 1px;
 	box-shadow: 2px 2px 2px #444;
 	background: linear-gradient(to bottom, #fff 0%,#e0e0d8 60%);
+	-pie-background: linear-gradient(top, #fff 0%,#e0e0d8 60%);
 }
\ No newline at end of file

=== modified file 'Widget Library/sliders.js'
--- Widget Library/sliders.js	2013-04-03 14:29:36 +0000
+++ Widget Library/sliders.js	2013-04-12 14:42:25 +0000
@@ -4,13 +4,34 @@
 
 */
 
+// Fixes css3 for IE
+function attachPIE() {
+	$('*').each(function() {
+		PIE.attach(this);
+	});
+}
+
+// Creates a demo
+function createDemoSliders() {
+	str = "";
+	str += makePanel(250, 200);
+	str += makeLabel("Slider");
+	str += makeSlider("slider", 1, 2, 7, 4.5, 160, 5);
+	str += makeLabel("Binary");
+	str += makeBinary("binary", 0);
+	str += makePanelEnd();
+	document.getElementById("container").innerHTML = str;
+	attachPIE();
+
+}
+
 // Recursive Pos of div in document - should work in most browsers
 function findPos(obj) {
 	var curLeft = curTop = 0;
-	if(obj.offsetParent) {
+	if (obj.offsetParent) {
 		curLeft = obj.offsetLeft
 		curTop = obj.offsetTop
-		while(obj = obj.offsetParent) {
+		while (obj = obj.offsetParent) {
 			curLeft += obj.offsetLeft
 			curTop += obj.offsetTop
 		}
@@ -29,7 +50,7 @@
 
 function readSlider(sliderId) {
 	var value = parseFloat(document.getElementById(sliderId + "box").value);
-	if(isNaN(value)) {
+	if (isNaN(value)) {
 		value = 0.0;
 	}
 	return value;
@@ -37,7 +58,7 @@
 
 function readBinary(binaryId) {
 	lf = document.getElementById(binaryId + "marker").style.left;
-	if(lf == "2px") {
+	if (lf == "2px") {
 		return 0;
 	} else {
 		return 1;
@@ -52,7 +73,7 @@
 
 // The idea is to have a few functions like this one and minimum javascript intervention		
 function updateBinary(event, binaryId) {
-	if(mb) {
+	if (mb) {
 		coords = findPos(event.currentTarget);
 		coords.x = event.clientX - coords.x;
 		coords.y = event.clientY - coords.y;
@@ -68,24 +89,24 @@
 
 // The idea is to have a few functions like this one and minimum javascript intervention		
 function updateSlider(event, kind, min, max, length, sliderId, boxId) {
-	if(mb) {
+	if (mb) {
 		coords = findPos(event.currentTarget);
 		coords.x = event.clientX - coords.x;
 		coords.y = event.clientY - coords.y;
 		cx = coords.x / length;
 		sd = max - min;
 		value = min + (sd * cx);	
-		if(value > max) value = max;
-		if(kind == 0) {
+		if (value > max) value = max;
+		if (kind == 0) {
 			value = Math.round(value);
 		}
-		if(kind == 1) {
+		if (kind == 1) {
 			value = Math.round(value * 10.0) / 10.0;
 		}
-		if(kind == 2) {
+		if (kind == 2) {
 			value = Math.round(value * 100.0) / 100.0;
 		}
-		if(kind == 3) {
+		if (kind == 3) {
 			value = Math.round(value * 1000.0) / 1000.0;
 		}
 		document.getElementById(boxId).value = value;				
@@ -94,10 +115,10 @@
 }
 		
 function sliderPosition(value, min, max, length) {
-		if(value < min) {
+		if (value < min) {
 			value = min;
 		}
-		if(value > max) {
+		if (value > max) {
 			value = max;
 		}
 		pos = Math.round(((value - min) / (max - min)) * length);
@@ -106,25 +127,25 @@
 
 function changeSlider(value, sliderId, kind, min, max, length) {
 		value = parseFloat(value);		
-		if(isNaN(value)) {
+		if (isNaN(value)) {
 			value = 0.0;
 		}
-		if(value < min) {
+		if (value < min) {
 			value = min;
 		}
-		if(value > max) {
+		if (value > max) {
 			value = max;
 		}
-		if(kind == 0) {
+		if (kind == 0) {
 			value = Math.round(value);
 		}
-		if(kind == 1) {
+		if (kind == 1) {
 			value = Math.round(value * 10.0) / 10.0;
 		}
-		if(kind == 2) {
+		if (kind == 2) {
 			value = Math.round(value * 100.0) / 100.0;
 		}
-		if(kind == 3) {
+		if (kind == 3) {
 			value = Math.round(value * 1000.0) / 1000.0;
 		}
 		pos = sliderPosition(value, min, max, length);
@@ -158,10 +179,10 @@
 function makeSlider(sliderId, kind, minValue, maxValue, midValue, sliderWidth, defaultValue) {
 	s = "";
 	defaultPosition = sliderPosition(defaultValue, minValue, maxValue, sliderWidth);
-	if(defaultValue < minValue) {
+	if (defaultValue < minValue) {
 		defaultValue = minValue;
 	}
-	if(defaultValue > maxValue) {
+	if (defaultValue > maxValue) {
 		defaultValue = maxValue;
 	}					
 	s += "<input id='" + sliderId + "box' value='" + defaultValue + "' type='text' class='sliderBox' onBlur='changeSlider(this.value,\"" + sliderId + "\"," + kind + "," + minValue + "," + maxValue + "," + sliderWidth + ");'>";
@@ -178,7 +199,7 @@
 
 function makeBinary(binaryId, defaultValue) {
 	s = "";
-	if(defaultValue == 1) {
+	if (defaultValue == 1) {
 		defaultPosition = 20;
 		defaultColor = "#ddd";
 	} else {