Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1579 → Rev 1580

/branches/v3/impl/conf/berserk/sd.xml
3154,6 → 3154,19
</service>
 
<service>
<name>UpdateReportGroup</name>
<implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosReportsService</implementationClass>
<description>Salvar Grupo de Reports Tipo</description>
<isTransactional>true</isTransactional>
<defaultMethod>updateReportGroup</defaultMethod>
<filterChains>
<chain name="Logger"/>
<chain name="Session"/>
<chain name="AdminsOrQuestionarioAdmins"/>
</filterChains>
</service>
 
<service>
<name>SaveQuestionarioReportParameters</name>
<implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosReportsService</implementationClass>
<description>Salvar Grupo de Reports Tipo</description>
/branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/QuestionariosReportsService.java
34,10 → 34,16
AbstractDao.getCurrentSession().save(reportFileGroup);
}
 
public QuestionarioReportFileGroupImpl runJobGenerate(long reportGroupId, UserSession session) throws NotAuthorizedException, ClassNotFoundException {
public void updateReportGroup(long reportGroupId, String title, UserSession userSession) throws ClassNotFoundException, IllegalAccessException, InstantiationException
{
QuestionarioReportFileGroupImpl reportGroup = (QuestionarioReportFileGroupImpl) DaoFactory.getQuestionarioReportFileGroupDaoImpl().load(reportGroupId);
reportGroup.setTitle(title);
}
 
public QuestionarioReportFileGroupImpl runJobGenerate(long reportGroupId,String title, UserSession session) throws NotAuthorizedException, ClassNotFoundException {
 
QuestionarioReportFileGroupImpl reportGroup = (QuestionarioReportFileGroupImpl) DaoFactory.getQuestionarioReportFileGroupDaoImpl().load(reportGroupId);
 
reportGroup.setTitle(title);
Set<JobServiceTaskParameter> paramsJob = new HashSet<JobServiceTaskParameter>();
 
JobServiceTaskParameterImpl paramJob = DomainObjectFactory.createJobServiceTaskParameterImpl();
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/questionarios/reports/QuestionarioReportsController.java
32,6 → 32,23
private static final Logger logger = Logger.getLogger(QuestionarioReportsController.class);
 
 
public ActionForward saveReportTitle(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
throws Throwable
{
 
QuestionarioReportGroupForm frm = (QuestionarioReportGroupForm) form;
IServiceManager sm = ServiceManager.getInstance();
String[] names = {};
Object[] args = {frm.getQuestionarioReportFileGroup().getId(),frm.getQuestionarioReportFileGroup().getTitle()};
 
sm.execute(RequestUtils.getRequester(request, response),"UpdateReportGroup",args,names);
 
return mapping.findForward("reportAdmin");
}
 
public ActionForward saveReportGroup(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
/branches/v3/impl/src/web/user/questionarios/reports/adminReport.jsp
75,7 → 75,6
</div>
</div>
<script>
 
//DECLARACAO DA APLICACAO LOCAL EM ANGULAR
var reportParameterInputsApp = angular.module('reportParameterInputsApp', []);
GLOBAL_BacoAngularAppDependencies.push('reportParameterInputsApp');
86,14 → 85,10
 
function reloadInputs()
{
 
widgetCallWithParameters("reloadInputs",
 
{ "questionarioReportFileGroup.id" : ${group.id} },
 
$("#reportParameterInputsApp form")[0], //tem d ser com [0] para obter o JavaScript Object original e nao o prototype do JQUERY
// apenas para uso do div web-messages
 
function(response)
{
angular.element($("#reportParameterInputsApp")).scope().inputsJson = response.jsonInputs;
110,40 → 105,48
</a>
</div>
 
</div>
<div class="form-group">
<div class="col-md-2">
 
</div>
<div class="col-md-10">
<button type="button" class="btn btn-success" onclick="set(form,'saveReportTitle'),form.submit();">Salvar</button>
<a class="btn btn-danger" href="<%=request.getContextPath()%>/user/listQuestionariosReports.do">Sair</a>
</div>
</div>
 
<div class="col-sm-12">
<%
if(job != null)
<div class="col-md-12">
<%
if(job != null)
{
SchedulleTasksForm schedulleTasksForm = new SchedulleTasksForm();
schedulleTasksForm.setJobServiceTask(job);
schedulleTasksForm.setId(job.getId());
request.setAttribute("SchedulleTasksForm",schedulleTasksForm);
if(job.getStatusEnum() == JobServiceTaskImpl.JobStatus.FAILED ||
job.getStatusEnum() == JobServiceTaskImpl.JobStatus.UNKNOWN_ERROR ||
job.getStatusEnum() == JobServiceTaskImpl.JobStatus.FINISHED_ERRORS )
{
SchedulleTasksForm schedulleTasksForm = new SchedulleTasksForm();
schedulleTasksForm.setJobServiceTask(job);
schedulleTasksForm.setId(job.getId());
request.setAttribute("SchedulleTasksForm",schedulleTasksForm);
if(job.getStatusEnum() == JobServiceTaskImpl.JobStatus.FAILED ||
job.getStatusEnum() == JobServiceTaskImpl.JobStatus.UNKNOWN_ERROR ||
job.getStatusEnum() == JobServiceTaskImpl.JobStatus.FINISHED_ERRORS )
{
%>
<div class="alert alert-danger"><%=MessageResources.getInstance(request).getMessage("job.status."+job.getStatus())%>, Consulte o Log</div>
<%
}
%>
<div class="task-log task-log-xs" data-href="<%=request.getContextPath()%>/user/startAdminQuestionariosReportsGroup.do?questionarioReportFileGroup.id=${group.id}">
<jsp:include page="/admin/configuration/taskLog.jsp"/>
</div>
<%
%>
<div class="alert alert-danger"><%=MessageResources.getInstance(request).getMessage("job.status."+job.getStatus())%>, Consulte o Log</div>
<%
}
else
{
%>
<div class="alert alert-danger">O sistema não conseguiu encontrar a tarefa de atribuição nas tarefas agendadas, por favor verifique em todos os logs de tarefas <html:link action="/user/configurationJobTasks">Aqui</html:link> </div>
<%
}
%>
</div>
%>
<div class="task-log task-log-xs" data-href="<%=request.getContextPath()%>/user/startAdminQuestionariosReportsGroup.do?questionarioReportFileGroup.id=${group.id}">
<jsp:include page="/admin/configuration/taskLog.jsp"/>
</div>
<%
}
else
{
%>
<div class="alert alert-danger">O sistema não conseguiu encontrar a tarefa de atribuição nas tarefas agendadas, por favor verifique em todos os logs de tarefas <html:link action="/user/configurationJobTasks">Aqui</html:link> </div>
<%
}
%>
</div>
 
</div>
<button type="button" class="btn btn-warning" onclick="set(form,'runJobGenerate'),form.submit();">Gerar Relatórios</button>
</html:form>
</div>