css files concatenation order fix

Gruntfile.js

@@ -77,7 +77,7 @@ module.exports = function (grunt) {
                 dest: 'dist/bower_components/components.js'
             },
             css: {
-                src: ['app/app.css', 'app/bower_components/**/**/*.css'],
+                src: ['app/bower_components/**/**/*.css', 'app/app.css'],
                 dest: 'dist/app.css'
             }
         },

app/index.html

@@ -112,7 +112,7 @@
 
 <script src="components/auth/auth_controller.js"></script>
 <script src="components/auth/auth_service.js"></script>
-<script src="components/dashboard/dashboard.js"></script>
+<script src="components/dashboard/dashboard_controller.js"></script>
 <script src="components/staff/staff_controller.js"></script>
 <script src="components/student/student_controller.js"></script>
 <script src="components/dashboard/dashboard.js"></script>

app/zetalib/forms/form_service.js

@@ -5,24 +5,119 @@
  * (GPLv3).  See LICENSE.txt for details.
  */
 
-var form_generator = angular.module('formService', ['general']);
+var form_generator = angular.module('formService', ['general', 'ui.bootstrap']);
 
-form_generator.factory('Generator', function ($http, $q, $log, $timeout, RESTURL, FormDiff) {
+form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout, RESTURL, FormDiff) {
     var generator = {};
     generator.makeUrl = function (url) {
         return RESTURL.url + url;
     };
-    generator.generate = function (modelObject) {
-        return generator.group(modelObject);
+    generator.generate = function (scope, forms) {
+        for (var key in forms)
+            scope[key] = forms[key];
+        scope.initialModel = angular.copy(scope.model);
+        //debugger;
+        scope.form.push(
+            {
+                type: "submit",
+                title: "Save"
+            }
+        );
+        // if fieldset in form, make it collapsable with template
+        scope.listnodeform = {};
+        if ((scope.listnode && scope.listnodes[0]) || (scope.listnode && scope.nodes[0])) {
+            angular.forEach(scope.form, function (key, val) {
+                if (typeof key == "object" && key.type == "fieldset") {
+                    // change type to use shared template for form
+                    key.type = "template";
+                    key.templateUrl = "shared/templates/fieldset.html";
+                    // check if fieldset in listnodes
+                    if (scope.listnodes.indexOf(key.title) >= 0) {
+                        scope.listnodeform[key.title] = {};
+                        scope.listnodeform[key.title]["schema"] = {
+                            "title": angular.copy(key.title),
+                            "type": "object",
+                            "properties": {},
+                            "required": []
+                        };
+                        angular.forEach(scope.schema.properties, function(k, v){
+                            angular.forEach(key.items, function(item){
+                                if(item.key == v){
+                                    scope.listnodeform[key.title]["schema"]["properties"][v] = angular.copy(k);
+                                }
+                            });
+                        });
+                        key.setType = "ListNode";
+                        scope.listnodeform[key.title]["form"] = [angular.copy(key)];
+                        scope.listnodeform[key.title]["model"] = {};
+                        key.type = "list";
+                        debugger;
+                        delete key.templateUrl;
+                        delete key.items;
+                    }
+                }
+            });
+        }
+        scope.isCollapsed = true;
+        scope.object_id = scope.form_params['object_id'];
+        // open modal with given items and controller
+        scope.openmodal = function(listnode, nodeID){
+            var modalInstance = $modal.open({
+                animation: false,
+                templateUrl: 'shared/templates/listnodeModalContent.html',
+                controller: 'ListNodeModalCtrl',
+                size: 'lg',
+                resolve: {
+                    items: function () {
+                        if (nodeID){
+                            scope.listnodeform[listnode].model = 1;
+                        }
+                        return scope.listnodeform[listnode];
+                    }
+                }
+            });
+
+            modalInstance.result.then(function (childmodel, key) {
+
+                angular.forEach(childmodel, function(v, k){
+                    debugger;
+                    if (scope.model[k]){
+                        scope.model[k][v.idx] = v;
+                    } else {
+                        scope.model[k] = {};
+                        scope.model[k][v.idx] = v;
+                    }
+                    scope.$broadcast('schemaFormRedraw');
+                });
+                debugger;
+            });
+        };
+        return generator.group(scope);
+    };
+    generator.group = function (formObject) {
+        return formObject;
     };
-    generator.group = function (form_items) {
-        return form_items;
+    generator.get_form = function (scope) {
+        return $http
+            .post(generator.makeUrl(scope.url), scope.form_params)
+            .then(function (res) {
+                return generator.generate(scope, res.data.forms);
+                // todo: cover all other exceptions (4xx, 5xx)
+            });
     };
-    generator.get_form = function (url, getParams) {
+    generator.get_list = function (scope) {
         return $http
-            .post(generator.makeUrl(url), getParams)
-            .success(function (res) {
-                return generator.generate(res.data);
+            .post(generator.makeUrl(scope.url), scope.form_params)
+            .then(function (res) {
+                return res;
+                // todo: cover all other exceptions (4xx, 5xx)
+            });
+    };
+    generator.get_single_item = function (scope) {
+        return $http
+            .post(generator.makeUrl(scope.url), scope.form_params)
+            .then(function (res) {
+                return res;
                 // todo: cover all other exceptions (4xx, 5xx)
             });
     };
@@ -57,11 +152,55 @@ form_generator.factory('Generator', function ($http, $q, $log, $timeout, RESTURL
         }
         return $http
             .post(generator.makeUrl($scope.url), data)
-            //.then(function (res) {
-            //    // todo: for now fake rest api returns 'ok' no data to
-            //    // manipulate on ui. therefor used just a log
-            //    $log.info(res);
-            //});
+        //.then(function (res) {
+        //    // todo: for now fake rest api returns 'ok' no data to
+        //    // manipulate on ui. therefor used just a log
+        //    $log.info(res);
+        //});
     };
     return generator;
-});
+});
\ No newline at end of file
+
+/**
+ * ListNodeModalCtrl
+ * controller to use with openmodal function of Generator
+ * @params: $scope, $modalInstance, items
+ * @returns: return value used in openmodal's result function
+ */
+
+form_generator.controller('ListNodeModalCtrl', function ($scope, $modalInstance, items) {
+    for (var key in items)
+        $scope[key] = items[key];
+    $scope.onSubmit = function(form){
+        // send form to modalinstance result function
+        $modalInstance.close($scope.model, $scope.form.title);
+    };
+    $scope.cancel = function () {
+        $modalInstance.dismiss('cancel');
+    };
+});
+
+// todo: generic modal directive for all forms
+//form_generator.directive('openmodal', ['Generator', function (Generator, $modal) {
+//    return {
+//        link: function ($modal) {
+//            var modalInstance = $modal.open({
+//                animation: false,
+//                templateUrl: 'shared/templates/modalContent.html',
+//                controller: 'ModalInstanceCtrl',
+//                size: 'lg',
+//                resolve: {
+//                    items: function () {
+//                        return "";
+//                    }
+//                }
+//            });
+//
+//            modalInstance.result.then(function (selectedItem) {
+//                $scope.selected = selectedItem;
+//            }, function () {
+//                $log.info('Modal dismissed at: ' + new Date());
+//            });
+//        }
+//    }
+//}]);
\ No newline at end of file

index.html

@@ -103,6 +103,7 @@
 <script src="bower_components/angular-schema-form-datepicker/bootstrap-datepicker.js"></script>
 <script src="bower_components/angular-gettext/dist/angular-gettext.min.js"></script>
 <script src="shared/translations.js"></script>
+<script src="../tmp/templates.js"></script>
 
 <script src="app.js"></script>
 <script src="app_routes.js"></script>