Added multiple upload files

carlosb1 · carlosb1 · commit 3e40a5ec40f4 · 2016-04-24T19:31:34.000+02:00
diff --git a/app/mod_photos/controllers.py b/app/mod_photos/controllers.py
@@ -9,7 +9,7 @@
 import uuid
 import os
 
-ALLOWED_EXTENSIONS=set(['jpg','jpeg','bmp','png'])
+ALLOWED_EXTENSIONS=set(['jpg','jpeg','bmp','png','JPG','JPEG','BMP','PNG'])
 
 mod_photos = Blueprint('photos',__name__,url_prefix='/photos/v1.0')
 
diff --git a/app/static/js/app.js b/app/static/js/app.js
@@ -2,11 +2,14 @@
 
 var app = angular.module('app',[]);
 
+
+/*
 app.config(['$interpolateProvider',
 	function($interpolateProvider) {
 		$interpolateProvider.startSymbol('[[');
 		$interpolateProvider.endSymbol(']]');
 	}]);
+*/
 
 
 app.directive('fileModel',['$parse', function($parse) {
@@ -26,7 +29,8 @@ app.directive('fileModel',['$parse', function($parse) {
 			
 		};
 		
-		}]);
+}]);
+
 
 
 app.service('fileUpload',['$http', 
@@ -51,11 +55,18 @@ app.service('fileUpload',['$http',
 app.controller('myController', ['$scope', 'fileUpload',
 		function($scope,fileUpload) {
 			$scope.uploadFile = function () {
-				var file = $scope.myFile;
+				var file1 = $scope.myFile1;
+				console.log('File is ');
+				console.dir(file1);
+				var uploadUrl = "/fileUpload";
+				fileUpload.uploadFileToUrl(file1);
+
+				var file2 = $scope.myFile2;
 				console.log('File is ');
-				console.dir(file);
+				console.dir(file2);
 				var uploadUrl = "/fileUpload";
-				fileUpload.uploadFileToUrl(file);
+				fileUpload.uploadFileToUrl(file2);
+
 			};
 		
-		}]);
+}]);
diff --git a/app/templates/index.html b/app/templates/index.html
@@ -14,13 +14,46 @@
 <script src="/static/lib/jquery/jquery.min.js"></script>
 <script src="/static/lib/bootstrap/bootstrap.min.js"></script>
 
+</head>
+
+	<script type="text/javascript">
+		function UploadImage1(){
+			var oFReader = new FileReader();
+			oFReader.readAsDataURL(document.getElementById("uploadImage1").files[0]);
+			oFReader.onload = function(oFREvent){
+				document.getElementById("image1").src = oFREvent.target.result;
+			};
+		};
+		
+		function UploadImage2(){
+			var oFReader = new FileReader();
+			oFReader.readAsDataURL(document.getElementById("uploadImage2").files[0]);
+			oFReader.onload = function(oFREvent){
+				document.getElementById("image2").src = oFREvent.target.result;
+			};
+		};
+	</script>
 <!--  <script type="text/javascript" src="angular.min.js"></script>-->
 
-</head>
 <body ng-app="app" ng-controller="myController"> 
+	<!--	<input type="file" ng-file-selected="onFileSelected($files)" ng-model="imageSrc" /> -->
+		<!--
+		-->
+		<!--<input type="file" ng-file-selected="onFileSelected($files)" file-model="myFile" ng-model="imageSrc" />
+	-->	
 		<form>
-		<input type="file" file-model="myFile" />
-		<button ng-click="uploadFile()"> upload me</button>
-		</form>
+		<input type="file" id="uploadImage1" onchange="UploadImage1();" file_model="myFile1">
+		<br><br>
+		<div class="image1">
+			<img id="image1">
+		</div>
+		<input type="file" id="uploadImage2" onchange="UploadImage2();" file_model="myFile2">
+		<br><br>
+		<div class="image2">
+			<img id="image2">
+		</div>
+		<button ng-click="uploadFile()"> upload me</button>	
+	</form>
+
 </body>
 </html/>
