WebSVN - bacoAlunos - Diff - Rev 1859 and 1879 - /branches/grupo3/impl/src/web/user/courses/courseReportEdit.jsp

             width: 522
         };
         // all coords and widths are in jsPDF instance's declared units
         // 'inches' in this case
         pdf.fromHTML(
-                source, // HTML string or DOM elem ref.
+            source, // HTML string or DOM elem ref.
-                margins.left, // x coord
+            margins.left, // x coord
-                margins.top, { // y coord
+            margins.top, { // y coord
-                    'width': margins.width, // max width of content on PDF
+                'width': margins.width, // max width of content on PDF
-                    'elementHandlers': specialElementHandlers
+                'elementHandlers': specialElementHandlers
-                },
+            },
-                function (dispose) {
+            function (dispose) {
-                    // dispose: object with X, Y of the last line add to the PDF
+                // dispose: object with X, Y of the last line add to the PDF
-                    //          this allow the insertion of new lines after html
+                //          this allow the insertion of new lines after html
-                    //var pdfDocument =  pdf.save('Test.pdf');
+                //var pdfDocument =  pdf.save('Test.pdf');
-                    var pdfDocument = pdf.output();
+                var pdfDocument = pdf.output();
-                    var boundary = '---------------------------';
+                var boundary = '---------------------------';
-                    boundary += Math.floor(Math.random()*32768);
+                boundary += Math.floor(Math.random()*32768);
-                    boundary += Math.floor(Math.random()*32768);
+                boundary += Math.floor(Math.random()*32768);
-                    boundary += Math.floor(Math.random()*32768);
+                boundary += Math.floor(Math.random()*32768);
-                    var body = '';
+                var body = '';
-                    body += '--' + boundary + '\r\n' +
+                body += '--' + boundary + '\r\n' +
-                            'Content-Disposition: form-data; name="filesInputId-UPLOAD[]"; filename="20170530_210340.pdf"' + '\r\n';
+                    'Content-Disposition: form-data; name="filesInputId-UPLOAD[]"; filename="20170530_210340.pdf"' + '\r\n';
-                    body += 'Content-Type: application/pdf';
+                body += 'Content-Type: application/pdf';
-                    body += '\r\n\r\n';
+                body += '\r\n\r\n';
-                    body += pdfDocument;
+                body += pdfDocument;
-                    body += '\r\n'
+                body += '\r\n'
-                    body += '--' + boundary + '--';
+                body += '--' + boundary + '--';
-                    $.ajax({
+                $.ajax({
-                        type: "POST",
+                    type: "POST",
-                        cache: false,
+                    cache: false,
-                        url: "<%=request.getContextPath()%>/filesUpload",
+                    url: "<%=request.getContextPath()%>/filesUpload",
-                        data: body ,
+                    data: body ,
-                        processData: false,
+                    processData: false,
-                        contentType : 'multipart/form-data; boundary=' + boundary,
+                    contentType : 'multipart/form-data; boundary=' + boundary,
-                        success: function (data) {
+                    success: function (data) {
-                            alert('success');
+                        alert('success');
-                            return false;
+                        return false;
-                        }
+                    }
-                    });
+                });
-                }, margins
+            }, margins
         );
+    }
 </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();
     <!-- Apresentacao da Unidade -->
     <div class="panel panel-default">
         <div class="panel-heading">
-             Relatório Anual do curso: ${course.name}
+            Relatório Anual do curso: ${course.name}
         </div>
         <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">Ano Lectivo:</b> ${course.importYear}</p>
             <script>
                 //Especifico da aplicacao
-                var courseReportApp = angular.module('courseReportApp', []);
+                var courseReportApp = angular.module('courseReportApp', ['ui.tree']);
                 GLOBAL_BacoAngularAppDependencies.push('courseReportApp');
                 courseReportApp.directive('resizable', function () {
                     return {
+                {
                     $scope.docAppSelector = "#courseReportApp";
                     $scope.report = <%=courseReportJson%>
-                    $scope.resize = function(evt,ui,comp) {
+                        $scope.resize = function(evt,ui,comp) {
-                        //console.log (evt,ui);
+                            //console.log (evt,ui);
-                        comp.width = ui.size.width;
+                            comp.width = ui.size.width;
-                        comp.height = ui.size.height;
+                            comp.height = ui.size.height;
-                    }
+                        }
                     /**
                      * @classe class to match
                      * @superClasses array of strings
                      * */
+                            }
+                        }
                         return false;
+                    }
-                    $scope.showSep = function(section)
+                    $scope.showSep = function(section,subSection)
+                    {
+                        var s;
-                        $(".separatorSectionNav").each(function()
+                        for(s in section.sections)
+                        {
+                            section.sections[s].active = false;
+                        }
+                        /*$(".separatorSectionNav").each(function()
+                         {
-                            angular.element($(this)).scope().section.active = false;
+                         angular.element($(this)).scope().section.active = false;
-                        });
+                         });*/
-                        section.active = true;
+                        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)
+                        {
+                            return objClassId;
+                        }
+                        if(obj.allSuperClasses)
+                        {
+                            var s;
+                            for(s in obj.allSuperClasses)
+                            {
+                                var superClass = obj.allSuperClasses[s];
+                                var superClassId = superClass.replaceAll(".","_");
+                                if($("script#" + superClassId).length > 0)
+                                {
+                                    return superClassId;
+                                }
+                            }
+                        }
                         return obj["@class"].replaceAll(".","_");
+                    }
                     $scope.addText = function(parentCustomPane)
+                    {
                         if(!parentCustomPane.components)
+                        {
                             parentCustomPane.components = [];
+                        }
                         parentCustomPane.components.push(
-                                {
+                            {
-                                    "@class" : classComponent
+                                "@class" : classComponent
-                                }
+                            }
                         );
+                    }
                     $scope.removeComponent = function(index,array)
+                    {
                         array.splice(index,1);
+                    }
                     $scope.callbackUploadedFiles = function(filesUploadResult,token,targetElement)
+                    {
                         var modelObject = BacoAngularUtils.getAngularElementModel(targetElement);
-                        modelObject.filesUploadResult = filesUploadResult;
                         if(modelObject.image && modelObject.image.identifier)
+                        {
                             widgetCallWithActionParameters(
-                                    "<%=request.getContextPath()%>/user/json/repository.do",
+                                "<%=request.getContextPath()%>/user/json/repository.do",
-                                    "replaceRepositoryFileFromTempPrivateDomain",
+                                "replaceRepositoryFileFromTempPrivateDomain",
-                                    {
+                                {
-                                        "identifier" : modelObject.image.identifier,
+                                    "identifier" : modelObject.image.identifier,
-                                        "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
+                                    "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
-                                    },
+                                },
-                                    "#courseReportApp",
+                                "#courseReportApp",
-                                    function(repositoryFile4JsonView)
+                                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
+                        {
                             widgetCallWithActionParameters(
-                                    "<%=request.getContextPath()%>/user/json/repository.do",
+                                "<%=request.getContextPath()%>/user/json/repository.do",
-                                    "saveRepositoryFileFromTempPrivateDomain",
+                                "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"/>
+            <jsp:include page="coursereport/templates.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">
+                    <div ng-init="section=report;" ng-include="'pt_estgp_estgweb_utils_documentBuilder_DocumentSection'">
-                            <a ng-click="showSep(section)">{{section.title}}</a>
-                        </li>
-                    </ul>
-                    <!--DocumentSection-->
-                    <div ng-model="section" ng-class="{ hidden: !section.active}" ng-repeat="section in report.sections" class="separatorSection clearfix">
-                       <div ng-repeat="comp in section.components" ng-include="class2id(comp)">
-                        </div>
                     </div>
-                    <!--/DocumentSection-->
-<%--
-                    <pre class="code">{{ report | json }}</pre>
+                    <!-- <pre class="code">{{ report | json }}</pre>-->
---%>
                 </div><!--App-->
             </div> <!--form-->

Subversion Repositories bacoAlunos

(root)/branches/grupo3/impl/src/web/user/courses/courseReportEdit.jsp - Rev 1859 → 1879