sorting added

janhavi13 · Mar 31, 2016 · f1d01bb · f1d01bb
1 parent 67071e1
commit f1d01bb
Show file tree

Hide file tree

Showing 52 changed files with 14,621 additions and 186 deletions.
diff --git a/public/assignment/client/app.js b/public/assignment/client/app.js
@@ -1,5 +1,5 @@
 (function() {
     "use strict";
     angular
-        .module("FormBuilderApp", ["ngRoute"]);
+        .module("FormBuilderApp", ["ngRoute","jgaSortable","ui.bootstrap"]);
 })();
diff --git a/public/assignment/client/config.js b/public/assignment/client/config.js
@@ -6,7 +6,9 @@
     function Configure($routeProvider) {
         $routeProvider
             .when("/home", {
-                templateUrl: "views/home/home.view.html"
+                templateUrl: "views/home/home.view.html",
+                controller:"HomeController",
+                controllerAs:"model"
             })
 
             .when("/admin", {

diff --git a/public/assignment/client/directives/jgaSortable.js b/public/assignment/client/directives/jgaSortable.js
@@ -0,0 +1,31 @@
+(function(){
+    "use strict";
+    angular
+        .module("jgaSortable", [])
+        .directive("jgaSortable", jgaSortable);
+
+    function jgaSortable() {
+        var start = null,
+            end = null;
+
+        function link(scope, element, attributes) {
+            var jgaAxis = attributes.jgaAxis;
+            $(element).sortable({
+                axis: jgaAxis,
+                start: function(event, ui) {
+                    start = ui.item.index();
+                },
+                stop: function(event, ui) {
+                    end = ui.item.index();
+
+                    scope.$apply(function(){
+                        scope.updateForm(start,end);
+                    })
+                }
+            });
+        }
+        return {
+            link: link
+        }
+    }
+})();
diff --git a/public/assignment/client/index.html b/public/assignment/client/index.html
@@ -9,28 +9,17 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Assignment Index Page</title>
+    <title>Form Maker</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
     <link href="../../css/dashboard.css" rel="stylesheet">
+    <link href="../../css/style.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css">
+
     <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.0-beta.0/angular.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.0-beta.0/angular-route.js"></script>
-
-    <script src="app.js"></script>
-    <script src="config.js"></script>
-    <script src="views/main/main.controller.js"></script>
-    <script src="views/header/header.controller.js"></script>
-    <script src="views/sidebar/sidebar.controller.js"></script>
-    <script src="views/users/login.controller.js"></script>
-    <script src="views/users/profile.controller.js"></script>
-    <script src="views/forms/forms.controller.js"></script>
-    <script src="views/forms/field.controller.js"></script>
-    <script src="views/users/register.controller.js"></script>
-
-    <script src="services/user.service.client.js"></script>
-    <script src="services/forms.service.client.js"></script>
-    <script src="services/field.service.client.js"></script>
+    <script src="directives/jgaSortable.js"></script>
 
 </head>
 
@@ -52,9 +41,33 @@
         <div ng-include="'views/sidebar/sidebar.view.html'">
         </div>
 
+    <!-------------------------  Loading other js files --------------------------------------------------------   -->
+
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.9/angular.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.9/angular-route.min.js"></script>
+    <script src="directives/jgaSortable.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/1.2.4/ui-bootstrap-tpls.min.js"></script>
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+
+    <script src="app.js"></script>
+    <script src="config.js"></script>
+
+    <script src="views/main/main.controller.js"></script>
+    <script src="views/header/header.controller.js"></script>
+    <script src="views/home/home.controller.js"></script>
+    <script src="views/sidebar/sidebar.controller.js"></script>
+    <script src="views/users/login.controller.js"></script>
+    <script src="views/users/profile.controller.js"></script>
+    <script src="views/forms/forms.controller.js"></script>
+    <script src="views/forms/field.controller.js"></script>
+    <script src="views/users/register.controller.js"></script>
+
+    <script src="services/user.service.client.js"></script>
+    <script src="services/forms.service.client.js"></script>
+    <script src="services/field.service.client.js"></script>
 
 </body>
 

diff --git a/public/assignment/client/services/field.service.client.js b/public/assignment/client/services/field.service.client.js
@@ -12,13 +12,14 @@
             getFieldsForForm:getFieldsForForm,
             getFieldForForm:getFieldForForm,
             deleteFieldFromForm:deleteFieldFromForm,
-            updateField:updateField
+            updateField:updateField,
+            cloneField:cloneField
         }
         return model;
 
 
         function createFieldForForm(formId,field){
-
+            console.log("am in field service");
             return $http.post("/api/assignment/form/"+formId+"/field",field);
         }
 
@@ -31,12 +32,16 @@
         }
 
         function deleteFieldFromForm(formId,fieldId){
-
+            console.log("in clien service",formId,fieldId);
             return $http.delete("/api/assignment/form/"+formId+"/field/"+fieldId);
         }
 
         function updateField(formId,fieldId,field){
             return $http.put("/api/assignment/form/"+formId+"/field/"+fieldId, field);
         }
+
+        function cloneField(formId,field){
+            return $http.post("/api/assignment/form/" +formId+ "/field", field);
+        }
     }
 })();
diff --git a/public/assignment/client/services/forms.service.client.js b/public/assignment/client/services/forms.service.client.js
@@ -9,7 +9,8 @@
             findFormByTitle:findFormByTitle,
             deleteForm:deleteForm,
             addForm:addForm,
-            updateForm:updateForm
+            updateForm:updateForm,
+            findFormById:findFormById
         }
         return model;
 
@@ -31,5 +32,8 @@
         function updateForm(formToBeUpdatedId,form){
             return $http.put("/api/assignment/form/"+formToBeUpdatedId,form);
         }
+        function findFormById(formId){
+            return $http.get("/api/assignment/findFormById/"+formId);
+        }
     }
 })();
diff --git a/public/assignment/client/services/user.service.client.js b/public/assignment/client/services/user.service.client.js
@@ -10,6 +10,7 @@
 
             setCurrentUser : setCurrentUser,
             updateUser : updateUser,
+          //  deleteUserById : deleteUserById,
             findAllUsers : findAllUsers,
             findUserByCredentials:findUserByCredentials,
             register: register,
@@ -20,11 +21,19 @@
         return model;
 
         function setCurrentUser(user){
-
+            console.log("setting the current user",user);
             $rootScope.currentUser=user;
         }
 
 
+       /* function deleteUserById(userId, callback){
+            for(var u in model.users) {
+                if (model.users[u]._id == userId) {
+                    model.users.splice(u, 1);
+                }
+            }
+            callback(model.users);
+        }*/
 
         function findAllUsers(callback) {
             callback(users);