Working on search

Author: JLiscom

OpenNote/index.html

@@ -49,11 +49,13 @@
 				<script src="openNote/controllers/folderController.js" type="text/javascript"></script>
 				<script src="openNote/controllers/noteController.js" type="text/javascript"></script>
 				<script src="openNote/controllers/listController.js" type="text/javascript"></script>
+				<script src="openNote/controllers/searchController.js" type="text/javascript"></script>
 
 			<!-- Services -->
 				<script src="openNote/services/userService.js" type="text/javascript"></script>
 				<script src="openNote/services/serverConfigService.js" type="text/javascript"></script>
-			
+				<script src="openNote/services/searchService.js" type="text/javascript"></script>
+				
 			<!-- Directives -->
 				<script src="openNote/directives/randomFadeInDirective.js" type="text/javascript"></script>
 

OpenNote/openNote/controllers/searchController.js

@@ -0,0 +1,9 @@
+
+openNote.controller("searchController", function($scope, $rootScope, searchService) {
+	
+	$scope.search = function(){
+		searchService.search($scope.searchRequest).then(function(data){
+			console.log(data);//TODO
+		});
+	}
+});

OpenNote/openNote/partials/searchPartial.html

@@ -3,28 +3,30 @@
 	<div id="search" class="box big search">
 		<form>
 			<div class="form-group">
-				<label>In</label>
-				<select class="form-control">
-					<option>All</option>
+				<label>Folders and notes</label>
+				<select ng-model = "searchRequest.type" class="form-control">
+					<option>Both</option>
 					<option>Notes</option>
 					<option>Folders</option>
 				</select>
 			</div>
 			<div class="form-group">
-				<label>Fields</label>
-				<select class="form-control">
-					<option>All</option>
+				<label>Title and body</label>
+				<select ng-model = "searchRequest.field" class="form-control">
+					<option>Both</option>
 					<option>Title</option>
 					<option>Body</option>
 				</select>
 			</div>
 			<div class="form-group">
-				<label>For</label>
-				<input type="text" class="form-control"/>
+				<label>Value</label>
+				<input ng-model = "searchRequest.search" type="text" class="form-control"/>
 			</div>
 
 			<div class="form-group">
-				<input type="submit" value="Search" class="form-control customButton" ng-click=""/>
+				<button class="form-control customButton" ng-click="search()">
+					Search
+				</button>
 			</div>
 		</form>
 	</div>

OpenNote/openNote/router.js

@@ -18,6 +18,7 @@ openNote.config(function($routeProvider){
             })
         .when("/search/:id?",
             {
+        		controller: "searchController",
                 templateUrl: "openNote/partials/searchPartial.html"
             })
 		.otherwise({ redirectTo: "/" });

OpenNote/openNote/services/searchService.js

@@ -0,0 +1,26 @@
+/**
+ * @author - Jake Liscom 
+ * @project - OpenNote
+ */
+
+/**
+ * Search service
+ */
+openNote.service("searchService", function ($http, config) {	
+	
+	/**
+	 * Search
+	 */
+	this.search = function(searchRequest){
+		return $http.post(config.servicePath() +"/search/", searchRequest).then(
+			function(response){//Successful
+				if(response.status==200)
+					return response.data;	
+				return null;
+			},
+			function(response){
+				return null;
+			});
+	};
+	
+});

OpenNote/openNote/services/userService.js

@@ -99,20 +99,20 @@ openNote.service("userService", function ($http, $q, config) {
 	this.register = function(userName, password){ 	
 		var self = this;
 		return $http.post(config.servicePath() +"/user/"+userName+"&"+password).then(
-		function(response){//Successful
-			if(response.status==200){
-				
-				if(response.data.token==null)
-					throw "Invalid responce from server";
-				
-				sessionStorage.apiToken=angular.toJson(response.data);
-				self.useAPITokenHeader();//used by the resources implicitly
-				return true;	
-			}
-		},
-		function(response){//non 200 response
-			return false;
-		});
+			function(response){//Successful
+				if(response.status==200){
+					
+					if(response.data.token==null)
+						throw "Invalid responce from server";
+					
+					sessionStorage.apiToken=angular.toJson(response.data);
+					self.useAPITokenHeader();//used by the resources implicitly
+					return true;	
+				}
+			},
+			function(response){//non 200 response
+				return false;
+			});
 	};
 
 });