WebSVN - bacoAlunos - Diff - Rev 1862 and 1873 - /branches/grupo6/impl/src/web/user/courses/courseReportEdit.jsp

 </script>
 <%
     String courseCode = request.getParameter("courseCode");
+    String year = request.getParameter("year");
     AbstractDao.getCurrentSession().beginTransaction();
     CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode);
     request.setAttribute("course",courseImpl);
     CourseReportDocument courseReport = null;
     try {
-        courseReport = new CourseReportServices().createNewCourseReportDocument("44", "201617");
+        courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year);
     } catch (Throwable e) {
         System.out.println(e);
         e.printStackTrace();
+    }
     String courseReportJson = courseReport.toJson();
 %>
 <%--<a href="javascript:demoFromHTML()" class="button">Run Code</a>--%>
 <div class="container-fluid">
-    <style>
+<style>
-        .separatorSection
+    .separatorSection
-        {
+    {
-            border: 1px solid #ddd;
+        border: 1px solid #ddd;
-        }
+    }
-    </style>
+</style>
-    <!-- Apresentacao da Unidade -->
+<!-- Apresentacao da Unidade -->
-    <div class="panel panel-default">
+<div class="panel panel-default">
-        <div class="panel-heading">
+<div class="panel-heading">
-             Relatório Anual do curso: ${course.name}
+    Relatório Anual do curso: ${course.name}
-        </div>
+</div>
-        <div class="panel-body">
+<div class="panel-body">
-            <p><b class="label-info">Tipo de Curso:</b> <bean:message key="course.${course.degree}"/></p>
+<p><b class="label-info">Tipo de Curso:</b> <bean:message key="course.${course.degree}"/></p>
-            <p><b class="label-info">Ano Lectivo:</b> ${course.importYear}</p>
+<p><b class="label-info">Ano Lectivo:</b> ${course.importYear}</p>
-            <p><b class="label-info">Departamento:</b> ${course.department.name}</p>
+<p><b class="label-info">Departamento:</b> ${course.department.name}</p>
-            <p><b class="label-info">Escola:</b> ${course.department.courseSchool.name}</p>
+<p><b class="label-info">Escola:</b> ${course.department.courseSchool.name}</p>
-            <script>
+<script>
-                //Especifico da aplicacao
+    //Especifico da aplicacao
-                var courseReportApp = angular.module('courseReportApp', []);
+    var courseReportApp = angular.module('courseReportApp', ['ui.tree']);
-                GLOBAL_BacoAngularAppDependencies.push('courseReportApp');
+    GLOBAL_BacoAngularAppDependencies.push('courseReportApp');
-                courseReportApp.directive('resizable', function () {
+    courseReportApp.directive('resizable', function () {
-                    return {
+        return {
-                        restrict: 'A',
+            restrict: 'A',
-                        scope: {
+            scope: {
-                            callback: '&onResize'
+                callback: '&onResize'
-                        },
+            },
-                        link: function postLink(scope, elem, attrs) {
+            link: function postLink(scope, elem, attrs) {
-                            elem.resizable();
+                elem.resizable();
-                            elem.on('resize', function (evt, ui, comp) {
+                elem.on('resize', function (evt, ui, comp) {
-                                scope.$apply(function() {
+                    scope.$apply(function() {
-                                    if (scope.callback) {
+                        if (scope.callback) {
-                                        scope.callback({$evt: evt, $ui: ui, $comp: comp });
+                            scope.callback({$evt: evt, $ui: ui, $comp: comp });
-                                    }
-                                })
-                            });
+                        }
-                    };
+                    })
                 });
+            }
+        };
+    });
-                courseReportApp.controller('courseReportAppController', function($scope)
+    courseReportApp.controller('courseReportAppController', function($scope)
+    {
+        $scope.docAppSelector = "#courseReportApp";
+        $scope.report = <%=courseReportJson%>
+                $scope.resize = function(evt,ui,comp) {
+                    //console.log (evt,ui);
+                    comp.width = ui.size.width;
+                    comp.height = ui.size.height;
+                }
+        /**
+         * @classe class to match
+         * @superClasses array of strings
+         * */
+        $scope.contains = function(obj,classe)
+        {
+            if(obj['@class'] && obj['@class'] == classe)
+                return true;
+            if(obj.allSuperClasses)
+            {
+                for(var i in obj.allSuperClasses)
+                {
+                    if(classe == obj.allSuperClasses[i])
+                        return true;
+                }
+            }
+            return false;
+        }
-                    $scope.docAppSelector = "#courseReportApp";
+        $scope.showSep = function(section,subSection)
+        {
-                    $scope.report = <%=courseReportJson%>
+            var s;
-                    $scope.resize = function(evt,ui,comp) {
+            for(s in section.sections)
+            {
-                        //console.log (evt,ui);
+                section.sections[s].active = false;
+            }
-                        comp.width = ui.size.width;
+            /*$(".separatorSectionNav").each(function()
+             {
-                        comp.height = ui.size.height;
+             angular.element($(this)).scope().section.active = false;
-                    }
+             });*/
+            subSection.active = true;
+        }
+        /**
+         * Este metodo devolve o template mais profundo na hierarquia de classes
+         * permitindo emular o override, quanto mais especifica for a classe
+         * e caso exista template é esse o template devolvido
+         * procura um script com o id da classe e se nao existir
+         * vai subindo nas super classes
+         * @param obj
-                    /**
+         * @returns {*}
+         */
+        $scope.class2id = function(obj)
+        {
+            var objClassId = obj["@class"].replaceAll(".","_");
+            if($("script#" + objClassId).length > 0)
+            {
-                     * @classe class to match
+                return objClassId;
+            }
-                     * @superClasses array of strings
+            if(obj.allSuperClasses)
+            {
-                     * */
+                var s;
+                for(s in obj.allSuperClasses)
+                {
-                    $scope.contains = function(obj,classe)
+                    var superClass = obj.allSuperClasses[s];
+                    var superClassId = superClass.replaceAll(".","_");
+                    if($("script#" + superClassId).length > 0)
+                    {
-                        if(obj['@class'] && obj['@class'] == classe)
-                            return true;
-                        if(obj.allSuperClasses)
-                        {
-                            for(var i in obj.allSuperClasses)
-                            {
-                                if(classe == obj.allSuperClasses[i])
-                                    return true;
-                            }
-                        }
-                        return false;
+                        return superClassId;
+                    }
+                }
+            }
+            return obj["@class"].replaceAll(".","_");
+        }
-                    $scope.showSep = function(section)
+        $scope.addText = function(parentCustomPane)
-                    {
+        {
-                        $(".separatorSectionNav").each(function()
-                        {
-                            angular.element($(this)).scope().section.active = false;
+            $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.TextComponent")
-                        });
-                        section.active = true;
-                    }
+        }
-                    $scope.class2id = function(obj)
+        $scope.addImage = function(parentCustomPane)
-                    {
+        {
-                        return obj["@class"].replaceAll(".","_");
+            $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.ImageComponent")
-                    }
+        }
-                    $scope.addText = function(parentCustomPane)
+        $scope.addSimpleDocComponent = function(parentCustomPane,classComponent)
+        {
+            if(!parentCustomPane.components)
+            {
+                parentCustomPane.components = [];
+            }
+            parentCustomPane.components.push(
+                    {
-                        $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.TextComponent")
+                        "@class" : classComponent
+                    }
+            );
+        }
+        $scope.removeComponent = function(index,array)
+        {
+            array.splice(index,1);
+        }
-                    $scope.addImage = function(parentCustomPane)
+        $scope.callbackUploadedFiles = function(filesUploadResult,token,targetElement)
-                    {
+        {
-                        $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.ImageComponent")
+            var modelObject = BacoAngularUtils.getAngularElementModel(targetElement);
-                    }
-                    $scope.addSimpleDocComponent = function(parentCustomPane,classComponent)
+            if(modelObject.image && modelObject.image.identifier)
-                    {
+            {
+                widgetCallWithActionParameters(
+                        "<%=request.getContextPath()%>/user/json/repository.do",
-                        if(!parentCustomPane.components)
+                        "replaceRepositoryFileFromTempPrivateDomain",
+                        {
-                            parentCustomPane.components = [];
+                            "identifier" : modelObject.image.identifier,
-                        }
-                        parentCustomPane.components.push(
-                                {
-                                    "@class" : classComponent
+                            "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
-                                }
-                        );
+                        },
-                    }
-                    $scope.removeComponent = function(index,array)
-                    {
-                        array.splice(index,1);
+                        "#courseReportApp",
-                    }
-                    $scope.callbackUploadedFiles = function(filesUploadResult,token,targetElement)
-                    {
-                        var modelObject = BacoAngularUtils.getAngularElementModel(targetElement);
-                        modelObject.filesUploadResult = filesUploadResult;
+                        function(repositoryFile4JsonView)
-                        if(modelObject.image && modelObject.image.identifier)
+                        {
-                            widgetCallWithActionParameters(
-                                    "<%=request.getContextPath()%>/user/json/repository.do",
-                                    "replaceRepositoryFileFromTempPrivateDomain",
-                                    {
-                                        "identifier" : modelObject.image.identifier,
-                                        "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
-                                    },
-                                    "#courseReportApp",
-                                    function(repositoryFile4JsonView)
+                            modelObject.image = repositoryFile4JsonView;
-                                    {
-                                        modelObject.image = repositoryFile4JsonView;
+                            //image URL is generated on reimport just to avoid caching
-                                        modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
+                            modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
-                                        delete modelObject.filesUploadResult;
-                                        angular.element($("#courseReportApp")).scope().$apply();
+                            angular.element($("#courseReportApp")).scope().$apply();
-                                    },
+                        },
-                                    function(){}
+                        function(){}
-                            );
+                );
-                        }
+            }
-                        else
+            else
+            {
+                widgetCallWithActionParameters(
+                        "<%=request.getContextPath()%>/user/json/repository.do",
+                        "saveRepositoryFileFromTempPrivateDomain",
+                        {
-                            widgetCallWithActionParameters(
-                                    "<%=request.getContextPath()%>/user/json/repository.do",
-                                    "saveRepositoryFileFromTempPrivateDomain",
-                                    {
-                                        "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
+                            "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
-                                    },
+                        },
-                                    "#courseReportApp",
+                        "#courseReportApp",
-                                    function(repositoryFile4JsonView)
+                        function(repositoryFile4JsonView)
-                                    {
+                        {
-                                        modelObject.image = repositoryFile4JsonView;
+                            modelObject.image = repositoryFile4JsonView;
-                                        modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
+                            modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
-                                        delete modelObject.filesUploadResult;
-                                        angular.element($("#courseReportApp")).scope().$apply();
+                            angular.element($("#courseReportApp")).scope().$apply();
-                                    },
-                                    function(){}
-                            );
+                        },
-                        }
+                        function(){}
-                    }
+                );
-                });
+            }
-            </script>
+        }
-            <!--TEMPLATES FOR DOCUMENT BUILDER-->
-            <jsp:include page="../utils/documentsBuilder.jsp"/>
-            <div class="form-vertical">
-                <div id="courseReportApp" ng-app="courseReportApp" ng-controller="courseReportAppController">
-                    <ul class="nav nav-tabs">
-                        <li ng-model="section" class="separatorSectionNav" ng-class="{ active: section.active}" ng-repeat="section in report.sections">
-                            <a ng-click="showSep(section)">{{section.title}}</a>
-                        </li>
-                    </ul>
+    });
+</script>
+<!--TEMPLATES FOR DOCUMENT BUILDER-->
-                    <!--DocumentSection-->
+<jsp:include page="../utils/documentsBuilder.jsp"/>
-                    <div ng-model="section" ng-class="{ hidden: !section.active}" ng-repeat="section in report.sections" class="separatorSection clearfix">
+<jsp:include page="coursereport/templates.jsp"/>
+<div class="form-vertical">
-                       <div ng-repeat="comp in section.components" ng-include="class2id(comp)">
+    <div id="courseReportApp" ng-app="courseReportApp" ng-controller="courseReportAppController">
-                        </div>
+        <div ng-init="section=report;" ng-include="'pt_estgp_estgweb_utils_documentBuilder_DocumentSection'">
+        </div>
-                    </div>
-                    <!--/DocumentSection-->
+        <!-- <pre class="code">{{ report | json }}</pre>-->
-<%--
-                    <pre class="code">{{ report | json }}</pre>
---%>
-                </div><!--App-->
+    </div><!--App-->
-            </div> <!--form-->
+</div> <!--form-->
-        </div><!--Panel Body-->
+</div><!--Panel Body-->
-    </div><!--Panel-->
+</div><!--Panel-->
 </div><!--container-fluid-->
 <%
     AbstractDao.getCurrentSession().getTransaction().commit();

Subversion Repositories bacoAlunos

(root)/branches/grupo6/impl/src/web/user/courses/courseReportEdit.jsp @ 1873 - Rev 1862 → 1873