Parcourir la source

remove canvas/diapos

David il y a 10 ans
Parent
commit
145ba31dc3
2 fichiers modifiés avec 6 ajouts et 81 suppressions
  1. 0 59
      front/controllers/uploadCtrl.js
  2. 6 22
      front/views/upload.html

+ 0 - 59
front/controllers/uploadCtrl.js

@@ -6,22 +6,6 @@ app.controller('uploadCtrl', function ($scope, $http,video,notify) {
 	$scope.diapos = [];
 	$scope.diapos = [];
 	$scope.profesores = [];
 	$scope.profesores = [];
 
 
-	var canvas = document.getElementById('c');
-	var container = canvas.parentNode;
-	var ctx = canvas.getContext('2d');
-	var dpr = window.devicePixelRatio || 1;
-	var img = new Image();
-	var diapos = [];
-
-	img.src="https://curso.especificosba.com.ar/diapo/EBA/1.png"; //Cargo la imagen inicial, a espera de informacion
-	img.onload=function(){ //Cuando una imagen carga en mi obj imagen, quiero que se dibuje en canvas
-		ctx.drawImage(img,0,0,canvas.width, canvas.height);
-	}
-	$scope.updateDiapos = function(d) {
-		diapos = JSON.parse(d);
-		parseMessage(diapos[0]);
-	}
-
 	function getProf(){
 	function getProf(){
 		$http.get("https://plataforma.especificosba.com.ar/back/getAllProfesores.php?auth_token=4b494d6c7ffc74d387d8cfdef8ca1691").then(
 		$http.get("https://plataforma.especificosba.com.ar/back/getAllProfesores.php?auth_token=4b494d6c7ffc74d387d8cfdef8ca1691").then(
 			function(data){
 			function(data){
@@ -31,49 +15,7 @@ app.controller('uploadCtrl', function ($scope, $http,video,notify) {
 			});
 			});
 	}
 	}
 
 
-	function respondCanvas(){
-		canvas.setAttribute('width', container.offsetWidth);
-		canvas.setAttribute('height', container.offsetWidth/4*3);
-	}
-	
 	getProf();
 	getProf();
-	respondCanvas();
-
-	if (!String.prototype.format) {
-		String.prototype.format = function() {
-		var args = arguments;
-		    return this.replace(/{(\d+)}/g, function(match, number) {
-		      return ( typeof args[number] != 'undefined' ? args[number] : match );
-		    });
-		};
-	}
-
-	function parseMessage(msg){
-		if (msg==undefined)
-			return;
-		switch(msg.type){
-			case "draw":
-				drawOnCanvas(msg.points,msg.color);
-				break;
-			case "clean":
-				ctx.drawImage(img,0,0,canvas.width, canvas.height);
-				break;
-			case "diapo":
-				img.src="https://curso.especificosba.com.ar/diapo/{0}/{1}.png".format(msg.PDF,msg.slide);
-				break;
-		}
-	}
-	function drawOnCanvas(points,color) {
-		if(points.length==0) return;
-		ctx.strokeStyle = color;
-		ctx.beginPath();
-		ctx.moveTo(points[0].x, points[0].y);
-		 
-		for(var i=1; i<points.length; i++) {
-			ctx.lineTo(points[i].x, points[i].y);
-		}
-		ctx.stroke();
-	}
 
 
 	$scope.post = function() {
 	$scope.post = function() {
 		var data = {
 		var data = {
@@ -92,4 +34,3 @@ app.controller('uploadCtrl', function ($scope, $http,video,notify) {
 		});
 		});
 	};
 	};
 });
 });
-

+ 6 - 22
front/views/upload.html

@@ -9,42 +9,26 @@
 				Error. Video no soportado
 				Error. Video no soportado
 			</video>
 			</video>
 		</div>
 		</div>
-		<div class="col-md-6">
+		<!-- <div class="col-md-6">
 			<canvas id="c" width="100%"></canvas>
 			<canvas id="c" width="100%"></canvas>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-6">
-		</div>
-		<div class="col-md-6">
-			<textarea ng-model="diapos" style="width:100%; display:block;"></textarea>
-			<input type="button" ng-click="updateDiapos(diapos)" value="Diapos"></input>
-		</div>
-	</div>
-	<div class="row">
+		</div> -->
+
 		<div class="col-md-6">
 		<div class="col-md-6">
 			<div class="form-group">
 			<div class="form-group">
 			    <label>Profesor</label>
 			    <label>Profesor</label>
 				<select class="form-control" ng-model="profesor" name="profesor" ng-options="p as (p.nombre + ' '+ p.apellido) for p in profesores" required >
 				<select class="form-control" ng-model="profesor" name="profesor" ng-options="p as (p.nombre + ' '+ p.apellido) for p in profesores" required >
 				</select>
 				</select>
 			</div>
 			</div>
-		</div>
-		<div class="col-md-6">
 			<div class="form-group">
 			<div class="form-group">
 			    <label>Texto1</label>
 			    <label>Texto1</label>
-			    <input type="text" class="form-control" ng-model="texto1">
+			    <input type="text" class="form-control" ng-model="texto1" maxlength="20">
 			</div>
 			</div>
-		</div>
-	</div>
-	
-	<div class="row">
-		<div class="col-md-6">
 			<div class="form-group">
 			<div class="form-group">
 			    <label>Texto2</label>
 			    <label>Texto2</label>
-			    <input type="text" class="form-control" ng-model="texto2">
+			    <input type="text" class="form-control" ng-model="texto2" maxlength="20">
 			</div>
 			</div>
 		</div>
 		</div>
 	</div>
 	</div>
 
 
-	<button ng-click="post()" class="btn btn-default btn-send">Enviar</button>
+	<button ng-click="post()" class="pull-right btn btn-default btn-send">Enviar</button>
 </div>
 </div>