WebSVN - bacoAlunos - Diff - Rev 1837 and 1841 - /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java

 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.CourseUnitEvaluationImpl;
 import pt.estgp.estgweb.domain.CourseUnitImpl;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
 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;
     public ReportCourseDocument 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
+    {
         ReportCourseDocument reportCourseDocument = new ReportCourseDocument();
         reportCourseDocument.init();
-        List<CourseUnit> units = DaoFactory.getCourseUnitDaoImpl().loadByCourseSiges(courseCode, 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, units);
+        List<DocumentSection> courseUnitSections = updateCleanCourseUnitSections(courseCode, year, reportCourseDocument);
         //A tabela de resultados globais não vai ser utilizada
+        //PARA CORRER ESTE SERVICO A PARTIR DA INTERFACE É PRECISO
+        //PERCEBER QUE DEPENDE DO SERVICO DE UPDATE DAS SECOES DAS COURSEUNITS
         UnitsLearningResultsTable unitsLearningResultsTable = updateCleanLearningResultsFromCourseUnitsSections(reportCourseDocument);
         //Atualiza no DOC a tabela de analise DTP
         UnitsDtpTable unitsDtpTable = updateDtpStatsTable4Course(reportCourseDocument, courseCode, year);
     /**
      * Este serviço atualiza a tabela de resultados de aprendizagem com base nas courseunitssections
      * @param reportCourseDocument
      * @return UnitsLearningResultsTable
      */
-    public UnitsLearningResultsTable updateCleanLearningResultsFromCourseUnitsSections(ReportCourseDocument reportCourseDocument) {
+    public UnitsLearningResultsTable updateCleanLearningResultsFromCourseUnitsSections(ReportCourseDocument reportCourseDocument)
+    {
         CourseUnitsReportsSection unitReportsSection = (CourseUnitsReportsSection) reportCourseDocument.findDocumentSection(CourseUnitsReportsSection.class);
         LearningResultsSection learningResultsSection = (LearningResultsSection) reportCourseDocument.findDocumentSection(LearningResultsSection.class);
         UnitsLearningResultsTable learningResultsTable = (UnitsLearningResultsTable) learningResultsSection.findDocComponent(UnitsLearningResultsTable.class);
             uc.setPeriod(semestreCode);
             uc.setName(unitSection.getName());
             uc.setSigesCode(unitSection.getSigesCode());
             if(unitSection.getCourseUnitEvaluation() != null)
+            {
-                uc.setAlunosInscritos(1.5.0/docs/api/java/lang/Integer.html">Integer.parseInt(unitSection.getCourseUnitEvaluation().getNumAlunosInscritos()));
+                uc.setAlunosInscritos(unitSection.getCourseUnitEvaluation().getNumAlunosInscritos());
                 uc.setAprovados1013(unitSection.getCourseUnitEvaluation().getNumAlunosAprov1013());
                 uc.setAprovados1416(unitSection.getCourseUnitEvaluation().getNumAlunosAprov1416());
                 uc.setAprovados1720(unitSection.getCourseUnitEvaluation().getNumAlunosAprov1720());
                 uc.setSemElementos(unitSection.getCourseUnitEvaluation().getNumAlunosSemElementosAvaliacao());
                     return o1.getSemestre().compareTo(o2.getSemestre());
+                }
             });
+        }
+        //UPDATE TOTAIS DE SEMESTRES E DE ANOS
         float totalCumProgPercentGlobal = 0;
         int totalInscritosGlobal = 0;
         float totalReprovadosPercentGlobal = 0;
         float totalAprovadosPercentGlobal = 0;
         float totalSemElementosPercentGlobal = 0;
      * Update course unit sections with reports, this method dows not change learning results table
      * values from learning results stays in unit but does not change learning results Table
      * @param courseCode
      * @param year
      * @param reportCourseDocument
-     * @param units
      * @throws JSONException
      * @throws IOException
      * @return a list of CourseUnitSection
      */
-    public List<DocumentSection> updateCleanCourseUnitSections(1.5.0/docs/api/java/lang/String.html">String courseCode, 1.5.0/docs/api/java/lang/String.html">String year, ReportCourseDocument reportCourseDocument, List<CourseUnit> units) throws JSONException, 1.5.0/docs/api/java/io/IOException.html">IOException {
+    public List<DocumentSection> updateCleanCourseUnitSections(1.5.0/docs/api/java/lang/String.html">String courseCode, 1.5.0/docs/api/java/lang/String.html">String year, ReportCourseDocument reportCourseDocument) throws JSONException, 1.5.0/docs/api/java/io/IOException.html">IOException {
+        List<CourseUnit> units = DaoFactory.getCourseUnitDaoImpl().loadByCourseSiges(courseCode, year);
 .5.0/docs/api/java/lang/String.html">String courseUnitSectionsJson = loadCourseEvaluationSections(courseCode,year);
         JSONObject object = new JSONObject(courseUnitSectionsJson);
         JSONArray evaluations = object.getJSONArray("evaluations");
         CourseUnitSection[] courseUnitSections = CourseUnitSection.fromJsonArray(evaluations.toString());
             CourseUnitSection sectionFound = CourseReportUtils.findCourseUnitSection(courseUnitSections, (CourseUnitImpl) cu);
             if(sectionFound == null)
+            {
                 sectionFound = CourseReportUtils.createCourseUnitEvaluationSection((CourseUnitImpl) cu);
+            }
+            if(sectionFound.getCourseUnitEvaluation() == null)
+            {
+                CourseUnitEvaluationImpl courseUnitEvaluation = DomainObjectFactory.createCourseUnitEvaluationImpl();
+                courseUnitEvaluation.setAutoGeneratedCourseReport(true);
+                DaoFactory.getCourseUnitEvaluationDaoImpl().save(courseUnitEvaluation);
+                cu.setCourseUnitEvaluation(courseUnitEvaluation);
+                sectionFound.setCourseUnitEvaluation(courseUnitEvaluation);
+            }
             unitReportsSection.getSubSections().add(sectionFound);
+        }
         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 {
         AbstractDao.getCurrentSession().beginTransaction();
-        ReportCourseDocument reportCourseDocument = new CourseReportServices().createNewCourseReportDocument("9119","201516");
+        ReportCourseDocument reportCourseDocument = new CourseReportServices().createNewCourseReportDocument("9005","201516");
 .5.0/docs/api/java/lang/System.html">System.out.println(reportCourseDocument.toJson());
         AbstractDao.getCurrentSession().getTransaction().commit();
+    }
     /*

Subversion Repositories bacoAlunos

(root)/branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java @ 1841 - Rev 1837 → 1841