| /impl/importRoutines.xml |
|---|
| 60,6 → 60,12 |
| <!-- PONTUAIS --> |
| <target name="agendarImportacoes"> |
| <java classname="pt.estgp.estgweb.services.jobs.JobScheduleService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
| </java> |
| </target> |
| <target name="grades"> |
| <java classname="pt.estgp.estgweb.services.sigesimports.ImportGradesService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
| <arg value="200809"/> |
| /impl/conf/directories/utils.xsl |
|---|
| 31,8 → 31,11 |
| <xsl:attribute name="href"> |
| <xsl:choose> |
| <xsl:when test="string(@absolute)='true'"> |
| <xsl:value-of select="@url"/> |
| </xsl:when> |
| <xsl:value-of select="@url"/> |
| </xsl:when> |
| <xsl:when test="@proxy='local'"> |
| <xsl:value-of select="$contextPath"/><xsl:value-of select="@url"/> |
| </xsl:when> |
| <xsl:when test="@idPrefixSize"><xsl:value-of select="$dirStartPath"/><xsl:apply-templates select=".." mode="linkParent"/>/<xsl:value-of select="substring(@id,@idPrefixSize+1)"/></xsl:when> |
| <xsl:when test="@remoteExtensionRoot='true'"><xsl:value-of select="$dirStartPath"/><xsl:apply-templates select=".." mode="linkParent"/>/<xsl:value-of select="@id"/></xsl:when> |
| <xsl:otherwise><xsl:value-of select="$dirStartPath"/><xsl:apply-templates select=".." mode="linkParent"/>/<xsl:value-of select="@id"/><xsl:value-of select="@url"/></xsl:otherwise> |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/courseunitsummaries.fo.xsl |
|---|
| 88,7 → 88,7 |
| <fo:table-row> |
| <fo:table-cell padding-top="3pt"> |
| <fo:block > |
| Revisto a <xsl:value-of select="//updateDate"/> por <xsl:value-of select="$revisor"/> / Página <fo:page-number/> |
| Atualizado a <xsl:value-of select="//updateDate"/> / Página <fo:page-number/> |
| </fo:block> |
| <fo:block font-size="5pt"> |
| ESTG.SA.xxxx.1 |
| 114,6 → 114,7 |
| <xsl:template match="/courseUnit"> |
| <fo:table table-layout="fixed" border="0px solid black" margin="0.5em" font-size="8.5pt"> |
| <xsl:call-template name="gen_cols"/> |
| <fo:table-body text-align="left"> |
| 226,7 → 227,7 |
| </fo:table-row> |
| <xsl:if test="//summary"> |
| <xsl:if test="//summary[./numeroAula != '-1']"> |
| <fo:table-row background-color="#FFF" color="#000" padding="0"> |
| <fo:table-cell padding="0" number-columns-spanned="2" border-right="1px solid gray" border-bottom="1px solid gray" display-align="center" > |
| 242,9 → 243,9 |
| <fo:table-body> |
| <xsl:for-each select="//summary"> |
| <xsl:for-each select="//summary[./numeroAula != '-1']"> |
| <xsl:sort select="dataAula" case-order="lower-first"/> |
| <xsl:if test="./numeroAula != '-1'"> |
| <fo:table-row> |
| <fo:table-cell border-bottom="0.5px solid gray"> |
| <fo:block font-size="8pt"> |
| 305,7 → 306,7 |
| <fo:block ></fo:block> |
| </fo:table-cell> |
| </fo:table-row> |
| </xsl:if> |
| </xsl:for-each> |
| </fo:table-body> |
| </fo:table> |
| /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportSumariesJson.java |
|---|
| 79,6 → 79,7 |
| int countUnits = 0; |
| int countUnitsOk = 0; |
| int countUnitsZeroSummaries = 0; |
| int countUnitsZeroValidSummaries = 0; |
| List<String> unitsZeroSummaries = new ArrayList<String>(); |
| List<String> unitsFailed = new ArrayList<String>(); |
| 161,6 → 162,7 |
| JSONObject summariesJson = new JSONObject(); |
| JSONArray summaries = new JSONArray(); |
| summariesJson.put("summary",summaries); |
| int summariesValid = 0; |
| for(Aula aula: arrayOfAulas.getAula()) |
| { |
| 186,12 → 188,23 |
| s.setNumeroHoras("" + aula.getNumeroCelulas().intValue()); |
| summaries.put(s.getJson()); |
| courseUnitSummaries.add(s); |
| if(s.getNumeroAula() > 0) |
| summariesValid++; |
| } |
| if(courseUnitSummaries.size() == 0) |
| { |
| countUnitsZeroSummaries++; |
| unitsZeroSummaries.add(c.getCode()); |
| logger.info("ZERO SUMARIES unit:" + c.getCode() + " course: " + c.getCourseCode()); |
| serviceLogInfo("ZERO SUMARIES unit:" + c.getCode() + " course: " + c.getCourseCode()); |
| } |
| else if(summariesValid == 0) |
| { |
| countUnitsZeroValidSummaries++; |
| unitsZeroSummaries.add(c.getCode()); |
| logger.info("ZERO VALID SUMARIES unit:" + c.getCode() + " course: " + c.getCourseCode()); |
| serviceLogInfo("ZERO VALID SUMARIES unit:" + c.getCode() + " course: " + c.getCourseCode()); |
| } |
| else |
| { |
| countUnitsOk++; |
| 247,6 → 260,7 |
| serviceLogInfo("UNITS FAILED: " + (countUnits - countUnitsZeroSummaries - countUnitsOk)); |
| serviceLogInfo("UNITS IMPORT OK: " + countUnitsOk); |
| serviceLogInfo("UNITS ZERO SUMARIES: " + countUnitsZeroSummaries); |
| serviceLogInfo("UNITS ZERO VALID SUMARIES: " + countUnitsZeroValidSummaries); |
| serviceLogInfo("#######################################"); |
| logger.info("#######################################"); |
| 255,6 → 269,7 |
| logger.info("UNITS FAILED: " + (countUnits - countUnitsZeroSummaries - countUnitsOk)); |
| logger.info("UNITS IMPORT OK: " + countUnitsOk); |
| logger.info("UNITS ZERO SUMARIES: " + countUnitsZeroSummaries); |
| logger.info("UNITS ZERO VALID SUMARIES: " + countUnitsZeroValidSummaries); |
| logger.info("#######################################"); |
| return logMessages; |
| } |
| /impl/src/java/pt/estgp/estgweb/services/jobs/JobScheduleService.java |
|---|
| 107,6 → 107,9 |
| { |
| AbstractDao.getCurrentSession().beginTransaction(); |
| scheduleImportSummaries(); |
| scheduleImportTeachers(); |
| scheduleImportCourses(); |
| scheduleImportStudents(); |
| AbstractDao.getCurrentSession().getTransaction().commit(); |
| } |
| 181,10 → 184,10 |
| param2.setDescription("desc2"); |
| param3.setDescription("desc3"); |
| param4.setDescription("desc4"); |
| param1.setObject("201415"); |
| param1.setObject("201516"); |
| param2.setObject("S1"); |
| param3.setObject("false"); |
| param4.setObject("false"); |
| param4.setObject("true"); |
| Set<JobServiceTaskSchedulerParameter> params = new HashSet<JobServiceTaskSchedulerParameter>(); |
| params.add(param1); |
| params.add(param2); |
| 193,9 → 196,11 |
| jobServiceTaskScheduler.setServiceTaskSchedulerParameters(params); |
| jobServiceTaskScheduler.setDaily(true); |
| jobServiceTaskScheduler.setWeekly(false); |
| jobServiceTaskScheduler.setMonthly(false); |
| jobServiceTaskScheduler.setMonthday(1); |
| jobServiceTaskScheduler.setWeekday(GregorianCalendar.MONDAY); |
| jobServiceTaskScheduler.setHour(01); |
| jobServiceTaskScheduler.setHour(05); |
| jobServiceTaskScheduler.setMinute(0); |
| jobServiceTaskScheduler.setSecond(0); |
| jobServiceTaskScheduler.setTargetService(ImportSumariesJson.class.getName()); |
| 207,7 → 212,7 |
| } |
| }; |
| sess.setUser(u); |
| jobServiceTaskScheduler.setDescription("TESTE Sumaries"); |
| jobServiceTaskScheduler.setDescription("Sumarios"); |
| new JobScheduleService().createOrUpdateScheduleServiceTask(jobServiceTaskScheduler,sess); |
| } |
| 225,7 → 230,8 |
| params.add(param1); |
| jobServiceTaskScheduler.setServiceTaskSchedulerParameters(params); |
| jobServiceTaskScheduler.setMonthly(true); |
| jobServiceTaskScheduler.setDaily(true); |
| jobServiceTaskScheduler.setMonthly(false); |
| jobServiceTaskScheduler.setMonthday(1); |
| jobServiceTaskScheduler.setWeekday(GregorianCalendar.MONDAY); |
| jobServiceTaskScheduler.setHour(01); |
| 240,7 → 246,7 |
| } |
| }; |
| sess.setUser(u); |
| jobServiceTaskScheduler.setDescription("TESTE Courses"); |
| jobServiceTaskScheduler.setDescription("Cursos"); |
| new JobScheduleService().createOrUpdateScheduleServiceTask(jobServiceTaskScheduler,sess); |
| } |
| 261,9 → 267,11 |
| jobServiceTaskScheduler.setServiceTaskSchedulerParameters(params); |
| jobServiceTaskScheduler.setDaily(true); |
| jobServiceTaskScheduler.setMonthly(false); |
| jobServiceTaskScheduler.setWeekly(false); |
| jobServiceTaskScheduler.setMonthday(GregorianCalendar.NOVEMBER); |
| jobServiceTaskScheduler.setWeekday(GregorianCalendar.MONDAY); |
| jobServiceTaskScheduler.setHour(01); |
| jobServiceTaskScheduler.setHour(03); |
| jobServiceTaskScheduler.setMinute(0); |
| jobServiceTaskScheduler.setSecond(0); |
| jobServiceTaskScheduler.setTargetService(ImportStudentsService.class.getName()); |
| 275,7 → 283,7 |
| } |
| }; |
| sess.setUser(u); |
| jobServiceTaskScheduler.setDescription("TESTE Students"); |
| jobServiceTaskScheduler.setDescription("Estudantes"); |
| new JobScheduleService().createOrUpdateScheduleServiceTask(jobServiceTaskScheduler,sess); |
| } |
| 293,10 → 301,12 |
| params.add(param1); |
| jobServiceTaskScheduler.setServiceTaskSchedulerParameters(params); |
| jobServiceTaskScheduler.setWeekly(true); |
| jobServiceTaskScheduler.setDaily(true); |
| jobServiceTaskScheduler.setWeekly(false); |
| jobServiceTaskScheduler.setMonthly(false); |
| jobServiceTaskScheduler.setMonthday(GregorianCalendar.NOVEMBER); |
| jobServiceTaskScheduler.setWeekday(GregorianCalendar.MONDAY); |
| jobServiceTaskScheduler.setHour(01); |
| jobServiceTaskScheduler.setHour(02); |
| jobServiceTaskScheduler.setMinute(0); |
| jobServiceTaskScheduler.setSecond(0); |
| jobServiceTaskScheduler.setTargetService(ImportTeachersService.class.getName()); |
| 308,7 → 318,7 |
| } |
| }; |
| sess.setUser(u); |
| jobServiceTaskScheduler.setDescription("TESTE Teachers"); |
| jobServiceTaskScheduler.setDescription("Professores"); |
| new JobScheduleService().createOrUpdateScheduleServiceTask(jobServiceTaskScheduler,sess); |
| } |
| /impl/src/web/admin/configuration/taskLog.jsp |
|---|
| 172,7 → 172,7 |
| // point to your own server instead of mine ;) |
| // |
| var logs = { |
| 'Messages' : 'http://localhost/baco/logServiceStream/${SchedulleTasksForm.jobServiceTask.logFilePath}' |
| 'Messages' : '<%=request.getContextPath()%>/logServiceStream/${SchedulleTasksForm.jobServiceTask.logFilePath}' |
| }; |
| // |
| // for each one we create a log_handler() object, passed it a title, |
| /impl/src/web/admin/configuration/jobTasks.jsp |
|---|
| 29,13 → 29,13 |
| <div class="container-fluid"> |
| <div class="panel panel-default"> |
| <div class="panel-heading"> |
| <bean:message key="configuration.tasks"/> |
| <bean:message key="configuration.jobtasks"/> |
| </div> |
| <div class="panel-body"> |
| <table id="myTable" class="tablesorter"> |
| <thead> |
| <tr> |
| <th class="filter-true"><bean:message key="configuration.task"/></th> |
| <th class="filter-true"><bean:message key="configuration.jobtask"/></th> |
| <th class="filter-true">Data Inicio</th> |
| <th class="filter-true">Criador</th> |
| <th class="filter-true">Parametros</th> |
| /impl/src/web/layout/scripts.jsp |
|---|
| 2,11 → 2,11 |
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/menu/assets/skins/sam/menu.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/button/assets/skins/sam/button.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/fonts/fonts-min.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/container/assets/skins/sam/container.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/editor/assets/skins/sam/editor.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/menu/assets/skins/sam/menu.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/button/assets/skins/sam/button.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/fonts/fonts-min.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/container/assets/skins/sam/container.css" /> |
| <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/yui/build/editor/assets/skins/sam/editor.css" /> |
| <link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/style.css"/> |
| 16,7 → 16,6 |
| <!-- |
| <link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/js/jquery/style.css"/> |
| <script type="text/javascript" src="<%=request.getContextPath()%>/js/jquery-latest.js"></script> |
| <script type="text/javascript" src="<%=request.getContextPath()%>/js/jquery.tablesorter.js"></script> |
| --> |
| 30,22 → 29,22 |
| <% |
| } |
| %> |
| <!-- |
| <script type="text/javascript" language="JavaScript"> |
| var cal = new CalendarPopup(); |
| //TABLE SORTER |
| /* //TABLE SORTER |
| $(document).ready(function() |
| { |
| $("#myTable").tablesorter(); |
| } |
| ); |
| );*/ |
| </script> |
| --> |
| <script type="text/javascript" src="<%=request.getContextPath()%>/js/jquerytables/jquery-2.1.4.min.js"></script> |
| <script type="text/javascript" src="<%=request.getContextPath()%>/js/jquerytables/jquery.tablesorter.min.js"></script> |
| <script type="text/javascript" src="<%=request.getContextPath()%>/js/jquerytables/jquery.tablesorter.widgets.js"></script> |