WebSVN - bacoAlunos - Diff - Rev 1862 and 1873 - /branches/grupo6/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java

 import jomm.utils.StreamsUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import pt.estgp.estgweb.domain.CourseUnit;
+import pt.estgp.estgweb.domain.*;
-import pt.estgp.estgweb.domain.CourseUnitEvaluationImpl;
-import pt.estgp.estgweb.domain.CourseUnitImpl;
-import pt.estgp.estgweb.domain.DomainObjectFactory;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
+import pt.estgp.estgweb.filters.chains.ResourceAccessControlEnum;
 import pt.estgp.estgweb.services.courses.coursereport.CourseReportUtils;
 import pt.estgp.estgweb.services.courses.coursereport.documentmodel.*;
 import pt.estgp.estgweb.services.courses.coursereport.documentmodel.courseunitreport.CourseUnitSection;
-import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.components.UnitsLearningResultSemester;
-import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.components.UnitsLearningResultUc;
+import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.LearningGlobalAnalysisSection;
-import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.components.UnitsLearningResultYear;
+import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.components.*;
-import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.components.UnitsLearningResultsTable;
 import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.CourseUnitDtpStat;
 import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.UnitDtpSemester;
 import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.UnitsDtpTable;
 import pt.estgp.estgweb.services.courses.coursereport.documentmodel.surveys.SurveysResultsSection;
+import pt.estgp.estgweb.services.data.RepositoryFile4JsonView;
+import pt.estgp.estgweb.services.data.RepositoryService;
 import pt.estgp.estgweb.services.questionarios.QuestionariosReportsService;
 import pt.estgp.estgweb.services.questionarios.pedagogico.reportprocessors.utils.DataTable;
 import pt.estgp.estgweb.utils.Globals;
 import pt.estgp.estgweb.utils.documentBuilder.DocumentSection;
 import pt.estgp.estgweb.utils.documentBuilder.QuestionariosDataTableComponent;
+import pt.estgp.estgweb.web.controllers.utils.FileUploaded;
 import pt.utl.ist.berserk.logic.serviceManager.IService;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
      * @throws IOException
      * @throws JSONException
      */
     public CourseReportDocument createNewCourseReportDocument(1.5.0/docs/api/java/lang/String.html">String courseCode,1.5.0/docs/api/java/lang/String.html">String year) throws 1.5.0/docs/api/java/io/IOException.html">IOException, JSONException
+    {
+        Course course = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode);
         CourseReportDocument reportCourseDocument = new CourseReportDocument();
-        reportCourseDocument.init();
+        reportCourseDocument.init(course,year);
         //FIRST SERVICE TO CALL TO OBTAIN UNITS AND EVALUATIONS
         //THIS IS THE BASE FOR THE REMAIN SERVICE CALLS
         List<DocumentSection> courseUnitSections = updateCleanCourseUnitSections(courseCode, year, reportCourseDocument);
                 uc.setAprovados1013(unitSection.getCourseUnitEvaluation().getNumAlunosAprov1013());
                 uc.setAprovados1416(unitSection.getCourseUnitEvaluation().getNumAlunosAprov1416());
                 uc.setAprovados1720(unitSection.getCourseUnitEvaluation().getNumAlunosAprov1720());
                 uc.setSemElementos(unitSection.getCourseUnitEvaluation().getNumAlunosSemElementosAvaliacao());
                 uc.setAprovados(unitSection.getCourseUnitEvaluation().getNumAlunosAprovTotal());
-                uc.setReprovados(unitSection.getCourseUnitEvaluation().getNumAlunosReprovados());
+                uc.setReprovados(unitSection.getCourseUnitEvaluation().getNumAlunosInscritos() - unitSection.getCourseUnitEvaluation().getNumAlunosAprovTotal() - unitSection.getCourseUnitEvaluation().getNumAlunosSemElementosAvaliacao());
                 if(uc.getAlunosInscritos() > 0)
+                {
                     uc.setAprovadosPercent((float) (uc.getAprovados() * 100.0 / uc.getAlunosInscritos()));
                     uc.setReprovadosPercent((float) (uc.getReprovados() * 100.0 / uc.getAlunosInscritos()));
+        }
         //UPDATE TOTAIS DE SEMESTRES E DE ANOS
         float totalCumProgPercentGlobal = 0;
-        int totalInscritosGlobal = 0;
+        float totalInscritosGlobal = 0;
         float totalReprovadosPercentGlobal = 0;
         float totalAprovadosPercentGlobal = 0;
         float totalSemElementosPercentGlobal = 0;
-        int totalAprovados1013PercentGlobal = 0;
+        float totalAprovados1013PercentGlobal = 0;
         float totalAprovados1416PercentGlobal = 0;
         float totalAprovados1720PercentGlobal = 0;
         for(UnitsLearningResultYear learningYearLine: learningResultsTable.getYears())
+        {
             float totalCumProgPercentAno = 0;
-            int totalInscritosAno = 0;
+            float totalInscritosAno = 0;
             float totalReprovadosPercentAno = 0;
             float totalAprovadosPercentAno = 0;
             float totalSemElementosPercentAno = 0;
-            int totalAprovados1013PercentAno = 0;
+            float totalAprovados1013PercentAno = 0;
             float totalAprovados1416PercentAno = 0;
             float totalAprovados1720PercentAno = 0;
             for(UnitsLearningResultSemester semester: learningYearLine.getSemesters())
+            {
                 float totalCumProgPercent = 0;
-                int totalInscritos = 0;
+                float totalInscritos = 0;
                 float totalReprovadosPercent = 0;
                 float totalAprovadosPercent = 0;
                 float totalSemElementosPercent = 0;
-                int totalAprovados1013Percent = 0;
+                float totalAprovados1013Percent = 0;
                 float totalAprovados1416Percent = 0;
                 float totalAprovados1720Percent = 0;
                 for(UnitsLearningResultUc uc: semester.getUcs())
+                {
                     totalCumProgPercent += uc.getCumprimentoProgramaPercent();
+                }
                 //media de inscritos
                 if(semester.getUcs().size() > 0)
+                {
                     semester.setCumprimentoProgramaPercent( totalCumProgPercent / ((float)semester.getUcs().size()));
-                    semester.setAlunosInscritos( totalInscritos  / (semester.getUcs().size()));
+                    semester.setAlunosInscritos( totalInscritos  / ((float)semester.getUcs().size()));
                     semester.setAprovadosPercent( totalAprovadosPercent  / ((float)semester.getUcs().size()));
                     semester.setReprovadosPercent( totalReprovadosPercent  / ((float)semester.getUcs().size()));
                     semester.setSemElementosPercent( totalSemElementosPercent / ((float)semester.getUcs().size()));
                     semester.setAprovados1013Percent( totalAprovados1013Percent / ((float)semester.getUcs().size()));
                     semester.setAprovados1416Percent( totalAprovados1416Percent / ((float)semester.getUcs().size()));
+            }
             //media de inscritos
             if(learningYearLine.getSemesters().size() > 0)
+            {
                 learningYearLine.setCumprimentoProgramaPercent( totalCumProgPercentAno / ((float)learningYearLine.getSemesters().size()));
-                learningYearLine.setAlunosInscritos( totalInscritosAno  / (learningYearLine.getSemesters().size()));
+                learningYearLine.setAlunosInscritos( totalInscritosAno  / ((float)learningYearLine.getSemesters().size()));
                 learningYearLine.setAprovadosPercent( totalAprovadosPercentAno  / ((float)learningYearLine.getSemesters().size()));
                 learningYearLine.setReprovadosPercent( totalReprovadosPercentAno  / ((float)learningYearLine.getSemesters().size()));
                 learningYearLine.setSemElementosPercent( totalSemElementosPercentAno / ((float)learningYearLine.getSemesters().size()));
                 learningYearLine.setAprovados1013Percent( totalAprovados1013PercentAno / ((float)learningYearLine.getSemesters().size()));
                 learningYearLine.setAprovados1416Percent( totalAprovados1416PercentAno / ((float)learningYearLine.getSemesters().size()));
             learningResultsTable.setSemElementosPercent( totalSemElementosPercentGlobal / ((float)learningResultsTable.getYears().size()));
             learningResultsTable.setAprovados1013Percent( totalAprovados1013PercentGlobal / ((float)learningResultsTable.getYears().size()));
             learningResultsTable.setAprovados1416Percent( totalAprovados1416PercentGlobal / ((float)learningResultsTable.getYears().size()));
             learningResultsTable.setAprovados1720Percent( totalAprovados1720PercentGlobal / ((float)learningResultsTable.getYears().size()));
+        }
         return learningResultsTable;
-        //CRIAR A TABELA DE RESUTLADOS GLOBAIS GERAIS COMO UM RESUMO DA ANTERIOR
-        /*for(UnitsLearningResultYear learningYearLine: learningResultsTable.getYears())
-        {
-        }*/
+    }
     /**
      * Gera uma tabela de estatisticas dos DTP recorrendo ao servico WS de
             logger.error(e,e);
             courseUnitSections = new CourseUnitSection[0];
+        }
-        List<DocumentSection> subSections = new ArrayList<DocumentSection>();
+        ArrayList<DocumentSection> subSections = new ArrayList<DocumentSection>();
         unitReportsSection.setSections(subSections);
         for(CourseUnit cu :units)
+        {
             CourseUnitSection sectionFound = CourseReportUtils.findCourseUnitSection(courseUnitSections, (CourseUnitImpl) cu);
             if(sectionFound == null)
         return subSections;
+    }
+    /**
-    public static void main(1.5.0/docs/api/java/lang/String.html">String[] args) throws 1.5.0/docs/api/java/io/IOException.html">IOException, JSONException {
+     * Este servico gera um grafico com a taxa global de aproveitamento e grava-o no repositorio digital
-        AbstractDao.getCurrentSession().beginTransaction();
+     * devolvendo o respectivo RepositoryFile4JsonView em json para poder ser anexado ao objecto imagem do
-        CourseReportDocument reportCourseDocument = new CourseReportServices().createNewCourseReportDocument("44","201617");
+     * widget do grafico
-.5.0/docs/api/java/lang/System.html">System.out.println(reportCourseDocument.toJson());
+     * @param reportDocumentJson
+     * @param session
+     * @return
+     * @throws IOException
+     */
-        AbstractDao.getCurrentSession().getTransaction().commit();
+    public 1.5.0/docs/api/java/lang/String.html">String generateGlobalLearningResultsChartImg(1.5.0/docs/api/java/lang/String.html">String reportDocumentJson,UserSession session) throws 1.5.0/docs/api/java/io/IOException.html">IOException {
-        //System.setProperty("javax.net.ssl.trustStore", "/JORGE/COPIAS/.keystore");
+        CourseReportDocument reportDocument =  CourseReportDocument.fromJson(reportDocumentJson);
-        //System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
+        LearningResultsSection learningResultsSection = (LearningResultsSection) reportDocument.findDocumentSection(LearningResultsSection.class);
+        LearningGlobalAnalysisSection learningGlobalAnalysisSection = (LearningGlobalAnalysisSection) learningResultsSection.findSection(LearningGlobalAnalysisSection.class);
+        GlobalLearningResultsChartImg chartImg = (GlobalLearningResultsChartImg) learningGlobalAnalysisSection.findDocComponent(GlobalLearningResultsChartImg.class);
-        /*URL url = new URL("http://pae.ipportalegre.pt/wsjson/api/app/ws-course-pedagogic-results-list?code=44&year=201617&period=S1");
+        UnitsLearningResultsTable table = (UnitsLearningResultsTable) learningResultsSection.findDocComponent(UnitsLearningResultsTable.class);
-        System.out.println(StreamsUtils.readString(url.openStream()));*/
+        FileUploaded fileUploaded = chartImg.generateChart2tmp(table,reportDocument);
-    }
-    /*
+        RepositoryService repositoryService = new RepositoryService();
-    public String loadUnitsAndCreateLearningResultsTables4Course(String courseCode, String year) throws IOException, JSONException
+        boolean imageInitialized = chartImg.getImage() != null
-    {
+                &&
+                chartImg.getImage().getIdentifier() != null;
+        RepositoryFile4JsonView view;
+        if(imageInitialized)
+        {
+.5.0/docs/api/java/lang/String.html">String identifier = chartImg.getImage().getIdentifier();
+            view = repositoryService.replaceRepositoryFileFromFileUpload(identifier, fileUploaded, ResourceAccessControlEnum.privateDomain, session);
+        }
+        else
+        {
+            view = repositoryService.storeRepositoryFileFromFileUpload(fileUploaded,ResourceAccessControlEnum.privateDomain,session);
+        }
+        chartImg.setImage(view);
+        //TODO FALTA GUARDAR O JSON NO CURSO
+        return view.toJson();
+    }
-    */
-    //TODO loadUnitsAndCreateLearningResultsTables4Course
-    //HIPOTESE DEVOLVER DOIS OBJECTOS
-    //SERVICO DE ARRANQUE
-    //DEVOLVE UM REPORT DOCUMENT E O CHAMADOR USA O QUE QUISER
-    //A GERACAO DE GRAFICOS FAZ-SE APENAS A PEDIDO
-    // SE ELE PEDIR PARA ATUALIZAR TUDO CARREGA-SE UNIDADES E TABELAS NU DOC NOVO
-    // E NO BROWSER SUBSTITUI-SE ESSES ELEMENTOS NOS ANTIGOS a seccao das unidades
-    // e as as tabelas
+    /****************************************************************************/
+    /*
+                                    SERVICOS WS-API
-    /****************************************************************************/
-    /* SERVICOS WS-API
+     */
     /****************************************************************************/
     /**
      * This service loads a list of course units given course code and year
+            {
                 logger.error("Connecting " + serviceUrl,e);
                 return json;
+            }
             JSONObject jsonObject = new JSONObject(json);
+            if(jsonObject.get("service").equals("ok"))
-            return jsonObject.get("response").toString();
+                return jsonObject.get("response").toString();
+            else
+                return json;
+        }
+    }
             JSONArray array = new JSONArray();
             List<CourseUnit> units = DaoFactory.getCourseUnitDaoImpl().loadByCourseSiges(courseCode, year);
             for(CourseUnit cu: units)
+            {
                 CourseUnitSection courseUnitSection = CourseReportUtils.createCourseUnitEvaluationSection((CourseUnitImpl) cu);
+                if(courseUnitSection.getAnoPlano() < 0)
+                {
+                    logger.info("Ano do Plano not available from courseUnitsEvaluation Service, will read from API loadPlanYearForCourseUnitCode");
+                    try{
+.5.0/docs/api/java/lang/String.html">String json = loadPlanYearForCourseUnitCode(courseCode,cu.getCode(),cu.getSemestre());
+                        int ano = new JSONObject(json).getInt("year");
+                        courseUnitSection.setAnoPlano(ano);
+                    }catch(1.5.0/docs/api/java/lang/Throwable.html">Throwable e )
+                    {
+                        logger.error("Nao conseguiu obter o ano do plano da API: " + e.toString(),e);
+                    }
+                }
                 array.put(courseUnitSection.toJsonObject());
+            }
             JSONObject obj = new JSONObject();
             obj.put("evaluations",array);
                 logger.error("Connecting " + serviceUrl,e);
                 return json;
+            }
             JSONObject jsonObject = new JSONObject(json);
+            if(jsonObject.get("service").equals("ok"))
-            return jsonObject.get("response").toString();
+                return jsonObject.get("response").toString();
+            else
+                return json;
+        }
+    }
+    /**
+     *
+     *
+     * @param courseCode codigo Siges na base de dados
+     * @param unitCode
+     * @return Json com o ano do plano exemplo: { year : 1 }
+     * ou -1 se não for encontrado
+     */
+    public 1.5.0/docs/api/java/lang/String.html">String loadPlanYearForCourseUnitCode(1.5.0/docs/api/java/lang/String.html">String courseCode,1.5.0/docs/api/java/lang/String.html">String unitCode,1.5.0/docs/api/java/lang/String.html">String period) throws JSONException, 1.5.0/docs/api/java/io/IOException.html">IOException {
+        if(Globals.SYSTEM_WSJSON_SERVICE_COURSE_UNIT_PLAN_YEAR.indexOf("localhost")>=0)
+        {
+            CourseImpl c = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode);
+            int year = c.getUnidadeAnoPlano(period,unitCode);
+            return "{ year : " + year + " }";
+        }
+        else
+        {
+.5.0/docs/api/java/lang/String.html">String json = "{ year : -1 }";
+.5.0/docs/api/java/lang/String.html">String serviceUrl = Globals.SYSTEM_WSJSON_SERVICE_COURSE_UNIT_PLAN_YEAR + "?courseCode=" + courseCode  + "&unitCode=" + unitCode + "&period=" + period;
+            try{
+.5.0/docs/api/java/net/URL.html">URL url = new 1.5.0/docs/api/java/net/URL.html">URL(serviceUrl);
+.5.0/docs/api/java/net/URLConnection.html">URLConnection conn = url.openConnection();
++0%2Fdocs%2Fapi+InputStream">InputStream is = conn.getInputStream();
+                json = StreamsUtils.readString(is);
+                is.close();
+            }catch(1.5.0/docs/api/java/lang/Throwable.html">Throwable e)
+            {
+                logger.error("Connecting " + serviceUrl,e);
+                return json;
+            }
+            JSONObject jsonObject = new JSONObject(json);
+            if(jsonObject.get("service").equals("ok"))
+                return jsonObject.get("response").toString();
+            else
+                return json;
+        }
+    }
+    public static void main(1.5.0/docs/api/java/lang/String.html">String[] args) throws 1.5.0/docs/api/java/io/IOException.html">IOException, JSONException {
+        AbstractDao.getCurrentSession().beginTransaction();
+        CourseReportDocument reportCourseDocument = new CourseReportServices().createNewCourseReportDocument("44","201617");
+.5.0/docs/api/java/lang/System.html">System.out.println(reportCourseDocument.toJson());
+        AbstractDao.getCurrentSession().getTransaction().commit();
+        //System.setProperty("javax.net.ssl.trustStore", "/JORGE/COPIAS/.keystore");
+        //System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
+        /*URL url = new URL("http://pae.ipportalegre.pt/wsjson/api/app/ws-course-pedagogic-results-list?code=44&year=201617&period=S1");
+        System.out.println(StreamsUtils.readString(url.openStream()));*/
+    }
+    /*
+    public String loadUnitsAndCreateLearningResultsTables4Course(String courseCode, String year) throws IOException, JSONException
+    {
+    }
+    */
+    //TODO loadUnitsAndCreateLearningResultsTables4Course
+    //HIPOTESE DEVOLVER DOIS OBJECTOS
+    //SERVICO DE ARRANQUE
+    //DEVOLVE UM REPORT DOCUMENT E O CHAMADOR USA O QUE QUISER
+    //A GERACAO DE GRAFICOS FAZ-SE APENAS A PEDIDO
+    // SE ELE PEDIR PARA ATUALIZAR TUDO CARREGA-SE UNIDADES E TABELAS NU DOC NOVO
+    // E NO BROWSER SUBSTITUI-SE ESSES ELEMENTOS NOS ANTIGOS a seccao das unidades
+    // e as as tabelas
+}

Subversion Repositories bacoAlunos

(root)/branches/grupo6/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java @ 1873 - Rev 1862 → 1873