Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1974 → Rev 1992

/branches/grupo5/impl/conf/WEB-INF/struts/struts-courses.xml
174,7 → 174,7
parameter="dispatch"
validate="true"
input="page.widget.json.fail.validations">
<forward name="page" path="page.course.report.edit"/>
<forward name="editCourseReport" path="page.course.report.edit"/>
</action>
 
 
/branches/grupo5/impl/conf/berserk/sd.xml
4026,10 → 4026,32
</service>
 
 
 
<!-- SERVICOS DE GERACAO DE RELATORIO DE CURSO -->
 
 
<service>
<name>CourseReportGenerateGlobalLearningResultsChartYearImg</name>
<implementationClass>pt.estgp.estgweb.services.courses.CourseReportServices</implementationClass>
<description>
@reportCourseDocument documento course report em json
Serviço de suporte para gerar um grafico
Coloca o grafico no report documento
e salva o documento no curso
Devolve uma classe RepositoryFile4JsonView serializada em JSON
</description>
<isTransactional>true</isTransactional>
<defaultMethod>generateGlobalLearningResultsChartYearImg</defaultMethod>
<filterChains>
<chain name="Logger"/>
<chain name="Session"/>
</filterChains>
</service>
 
<!-- SERVICOS DE GERACAO DE RELATORIO DE CURSO -->
 
 
<service>
<name>CourseReportGenerateGlobalLearningResultsChartImg</name>
<implementationClass>pt.estgp.estgweb.services.courses.CourseReportServices</implementationClass>
<description>
4087,6 → 4109,7
<filterChains>
<chain name="Logger"/>
<chain name="Session"/>
<chain name="CourseCommissionByCourseCode"/>
</filterChains>
</service>
 
/branches/grupo5/impl/conf/berserk/fd.xml
299,6 → 299,14
<isTransactional>false</isTransactional>
</filter>
 
<filter>
<name>IsCoordinatorInCourseImpl</name>
<implementationClass>pt.estgp.estgweb.filters.filters.IsCoordinatorInCourseImpl</implementationClass>
<description>
Checks if the requester is teacher in course commission
</description>
<isTransactional>true</isTransactional>
</filter>
 
 
 
/branches/grupo5/impl/conf/berserk/fcd.xml
585,7 → 585,19
</filterChain>
 
 
<filterChain>
<name>CourseCommissionByCourseCode</name>
<expression>IsCoordinatorInCourseImpl("courseCode")</expression>
<description>Course Commission Filter</description>
<invocationTiming>1</invocationTiming>
<filterClass>pt.estgp.estgweb.filters.chains.LoadControlFilter</filterClass>
</filterChain>
 
 
 
 
 
 
 
 
</filterChainsDefinitions>
/branches/grupo5/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java
24,6 → 24,7
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.Document;
import pt.estgp.estgweb.utils.documentBuilder.DocumentSection;
import pt.estgp.estgweb.utils.documentBuilder.QuestionariosDataTableComponent;
import pt.estgp.estgweb.web.controllers.utils.FileUploaded;
448,11 → 449,43
return view.toJson();
}
 
public String generateGlobalLearningResultsChartYearImg(String reportDocumentJson,UserSession session) throws IOException {
 
CourseReportDocument reportDocument = CourseReportDocument.fromJson(reportDocumentJson);
LearningResultsSection learningResultsSection = (LearningResultsSection) reportDocument.findDocumentSection(LearningResultsSection.class);
LearningGlobalAnalysisSection learningGlobalAnalysisSection = (LearningGlobalAnalysisSection) learningResultsSection.findSection(LearningGlobalAnalysisSection.class);
GlobalLearningResultsChartYearImg chartImg = (GlobalLearningResultsChartYearImg) learningGlobalAnalysisSection.findDocComponent(GlobalLearningResultsChartYearImg.class);
 
 
UnitsLearningResultsTable table = (UnitsLearningResultsTable) learningResultsSection.findDocComponent(UnitsLearningResultsTable.class);
 
 
FileUploaded fileUploaded = chartImg.generateChart2tmp(table,reportDocument);
 
RepositoryService repositoryService = new RepositoryService();
 
boolean imageInitialized = chartImg.getImage() != null
&&
chartImg.getImage().getIdentifier() != null;
 
RepositoryFile4JsonView view;
if(imageInitialized)
{
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();
}
 
 
 
 
/****************************************************************************/
/*
 
519,10 → 552,14
}
}
 
 
public String saveCourseReportDocument (String reportDocumentJson, UserSession session) throws IOException, JSONException
{
CourseReportDocument courseReportDocument = CourseReportDocument.fromJson(reportDocumentJson);
 
System.out.println(reportDocumentJson);
System.out.println("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111");
CourseReportDocument courseReportDocument = Document.fromJson(reportDocumentJson);
System.out.println("222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222");
//CourseReportDocument courseReportDocument = CourseReportDocument.fromJson(reportDocumentJson);
Course course = DaoFactory.getCourseDaoImpl().findCourseByCode(courseReportDocument.getCourseCode());
List<CourseYear> courseYear = DaoFactory.getCourseYearDaoImpl().findCourseYear(courseReportDocument.getCourseCode(), courseReportDocument.getYear());
 
540,33 → 577,46
return courseReportDocument.toJson();
}
 
public String loadCourseReportDocument (String courseCode,String year,UserSession session) throws IOException, JSONException
/**
*
* @param courseCode
* @param year
* @param session
* @return
* @throws IOException
* @throws JSONException
*/
public String loadCourseReportDocument(String courseCode,String year,UserSession session) throws IOException, JSONException
{
 
//Vai buscar (conjunto de anos??) à BaseDados (porquê uma lista)
List<CourseYear> courseYear = DaoFactory.getCourseYearDaoImpl().findCourseYear(courseCode, year);
String courseReport = null;
String courseReportJson = null;
 
if(courseYear.isEmpty())
if(courseYear!= null && !courseYear.isEmpty())
{
courseReportJson = courseYear.get(0).getCourseReportDocument();
}
else
{
try {
CourseReportDocument courseReport = createNewCourseReportDocument(courseCode, year);
courseReportJson = courseReport.toJson();
//System.out.println(courseReportJson);
//System.out.println("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU");
saveCourseReportDocument(courseReportJson, session);
 
//System.out.println("OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO");
courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year).toJson();
//System.out.println(courseReport);
//courseReportJson = new CourseReportServices().createNewCourseReportDocument(courseCode, year).toJson();
//System.out.println(courseReportJson);
//System.out.println("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU");
courseReport = saveCourseReportDocument(courseReport,session);
 
//courseReport = saveCourseReportDocument(courseReport,session);
//courseReport = loadCourseReportDocument(courseCode, year,session);
} catch (Throwable e) {
System.out.println(e);
e.printStackTrace();
}
}
else
{
courseReport = courseYear.get(0).getCourseReportDocument();
}
 
return courseReport;
return courseReportJson;
}
/**
*
/branches/grupo5/impl/src/java/pt/estgp/estgweb/services/courses/coursereport/documentmodel/learningresults/components/GlobalLearningResultsChartImg.java
59,7 → 59,7
plot.setSectionPaint(0, new Color(255, 0, 0));
plot.setSectionPaint(1, new Color(15, 218, 10));
plot.setSectionPaint(2, new Color(200, 200, 200));
plot.setBackgroundPaint(new Color(240, 240, 240));
plot.setBackgroundPaint(new Color(249, 231, 236));
plot.setOutlineVisible(true);
 
 
/branches/grupo5/impl/src/java/pt/estgp/estgweb/services/courses/coursereport/documentmodel/learningresults/components/GlobalLearningResultsChartYearImg.java
1,10 → 1,107
package pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.components;
 
import pt.estgp.estgweb.utils.documentBuilder.AutoImageWraperComponent;
//import pt.estgp.estgweb.utils.documentBuilder.AutoImageWraperComponent;
 
import jomm.utils.BytesUtils;
import jomm.utils.MimeTypeGuesser;
import org.apache.log4j.Category;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.ChartFrame;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.NumberAxis;
import org.jfree.chart.axis.ValueAxis;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PiePlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.plot.RingPlot;
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.general.DefaultPieDataset;
import pt.estgp.estgweb.services.courses.coursereport.documentmodel.CourseReportDocument;
import pt.estgp.estgweb.utils.Globals;
import pt.estgp.estgweb.utils.documentBuilder.ImageComponent;
import pt.estgp.estgweb.web.controllers.utils.FileUploaded;
 
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.FileOutputStream;
import java.io.IOException;
 
/**
* Created by jorgemachado on 31/10/17.
*/
public class GlobalLearningResultsChartYearImg extends AutoImageWraperComponent
public class GlobalLearningResultsChartYearImg extends ImageComponent
{
public FileUploaded generateChart2tmp(UnitsLearningResultsTable results,CourseReportDocument courseReportDocument) throws IOException
{
float aprovados1013 = results.getAprovados();
float aprovados1416 = results.getAprovados();
float aprovados1720 = results.getAprovados();
double aprovadosPercent1013 = results.getAprovados();
double aprovadosPercent1416 = results.getAprovados();
double aprovadosPercent1720 = results.getAprovados();
 
DefaultCategoryDataset data = new DefaultCategoryDataset();
for (int i = 0; i < 3; i++)
{
UnitsLearningResult ola = results.years.get(i);
 
aprovados1013 = ola.getAprovados1013();
aprovados1416 = ola.getAprovados1416();
aprovados1720 = ola.getAprovados1720();
aprovadosPercent1013 = ((int)(ola.getAprovados1013Percent()*100.0))/100.0;
aprovadosPercent1416 = ((int)(ola.getAprovados1416Percent()*100.0))/100.0;
aprovadosPercent1720 = ((int)(ola.getAprovados1720Percent()*100.0))/100.0;
 
//if (aprovados1013> 0)
data.setValue(new Double(aprovadosPercent1013), "Aprovados1013 " ,(i + 1) + "º Ano " );
//if (aprovados1416> 0)
data.setValue(new Double(aprovadosPercent1416), "Aprovados1416 " ,(i + 1) + "º Ano " );
//if (aprovados1720> 0)
data.setValue(new Double(aprovadosPercent1720), "Aprovados1720 " ,(i + 1) + "º Ano " );
}
String tempName = BytesUtils.generateHexKey() + ".png";
 
//Grafico Barras
JFreeChart chart = ChartFactory.createStackedBarChart(null, null,null,data, PlotOrientation.VERTICAL, true,true,false);
 
chart.setBackgroundPaint(new Color(255, 231, 242));
 
CategoryPlot plot = chart.getCategoryPlot();
 
plot.setRangeGridlinePaint(Color.black);
 
//plot.setDrawingSupplier(new ChartBuilderUtil.ChartDrawingSupplier());
/*
plot.setSectionPaint(0, new Color(255, 0, 0));
plot.setSectionPaint(1, new Color(15, 218, 10));
plot.setSectionPaint(2, new Color(200, 200, 200));
plot.setBackgroundPaint(new Color(255, 255, 255));
plot.setOutlineVisible(false);
 
plot.setLabelFont(new Font(
"Helvetica", Font.PLAIN, 30));
*/
 
plot.getDomainAxis().setTickLabelFont(new Font("Helvetica", Font.PLAIN, 25));
 
plot.getRenderer().setSeriesPaint(0, new Color(255, 171, 28));
plot.getRenderer().setSeriesPaint(1, new Color(255, 253, 44));
plot.getRenderer().setSeriesPaint(2, new Color(0, 255, 0));
plot.setBackgroundPaint(new Color(249, 231, 236));
 
BufferedImage image = chart.createBufferedImage( 300*3, 200*3);
String pathGraficoTiposAlunos = Globals.TMP_DIR + java.io.File.separator + tempName;
java.io.File output = new java.io.File(pathGraficoTiposAlunos);
ImageIO.write(image, "png", new FileOutputStream(output));
 
FileUploaded fileUploaded = new FileUploaded();
fileUploaded.setTmpName(tempName);
fileUploaded.setTitle("Taxa global de aproveitamento");
fileUploaded.setDescription("Curso: " + courseReportDocument.getCourseName() + " (" + courseReportDocument.getCourseCode()+ ") ano " + courseReportDocument.getYear());
fileUploaded.setContentType(MimeTypeGuesser.getInstance().guessMimeType(output));
fileUploaded.setFileSize(output.length());
fileUploaded.setExtension("png");
return fileUploaded;
}
}
/branches/grupo5/impl/src/java/pt/estgp/estgweb/filters/filters/IsCoordinatorInCourseImpl.java
New file
0,0 → 1,52
package pt.estgp.estgweb.filters.filters;
 
import pt.estgp.estgweb.domain.CourseImpl;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.filters.chains.LoadControlFilter;
import pt.estgp.estgweb.filters.exceptions.NeedAuthenticationException;
import pt.estgp.estgweb.filters.exceptions.AccessDeniedOperationException;
import pt.estgp.estgweb.filters.filters.utils.LoadObjectFromParameters;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.domain.CourseUnit;
import pt.estgp.estgweb.domain.UserImpl;
import pt.estgp.estgweb.services.courses.coursereport.documentmodel.CourseReportDocument;
import pt.estgp.estgweb.utils.Globals;
import pt.utl.ist.berserk.ServiceRequest;
import pt.utl.ist.berserk.ServiceResponse;
import pt.utl.ist.berserk.logic.filterManager.FilterParameters;
import pt.utl.ist.berserk.logic.filterManager.exceptions.FilterException;
import org.apache.log4j.Logger;
import pt.utl.ist.berserk.logic.serviceManager.ServiceParameters;
 
public class IsCoordinatorInCourseImpl extends LoadControlFilter
{
private static final Logger logger = Logger.getLogger(IsCoordinatorInCourseImpl.class);
 
public void execute(ServiceRequest request, ServiceResponse response, FilterParameters filterParameters) throws FilterException, Exception
{
UserSession userSession = (UserSession) request.getServiceParameters().getParameter(Globals.USER_SESSION_KEY);
 
if (userSession == null)
{
logger.info("try access restricted area:" + request.getRequester());
throw new NeedAuthenticationException();
}
 
if (userSession.getUser().isSuperuser())
return;
 
//request.getServiceParameters().getParameter((String) filterParameters.getParameter(0));//Returns NULL atm
 
 
String courseCode;
courseCode = "44";
 
CourseImpl course = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode);
if(!course.isFromCourseCommission(userSession.getUser()))
{
logger.warn(userSession.getUser().getUsername() + ":try access restricted area");
throw new AccessDeniedOperationException("fail.owner");//Lamentamos o incómodo, mas não tem permissões sobre o objecto ao qual tentou aceder.
}
}
 
}
/branches/grupo5/impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesServicesController.java
1,9 → 1,12
package pt.estgp.estgweb.web.controllers.courses;
 
import jomm.dao.impl.AbstractDao;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.json.JSONObject;
import pt.estgp.estgweb.domain.Course;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.web.controllers.utils.AbstractWidgetAjaxController;
import pt.estgp.estgweb.web.utils.RequestUtils;
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
78,23 → 81,20
return new JSONObject(json);
}*/
 
public JSONObject loadCourseReportDocument(ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Throwable {
String courseReportDocument = request.getParameter("courseReportDocument");
 
IServiceManager sm = ServiceManager.getInstance();
String json = (String) sm.execute(RequestUtils.getRequester(request, response),
"LoadCourseReportDocument",
new Object[]{courseReportDocument});
return new JSONObject(json);
}
public ActionForward startEdit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Throwable, ServletException
{
String courseCode = request.getParameter("courseCode");
String year = request.getParameter("year");
 
public ActionForward startEdit(
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
throws Throwable, ServletException
{
return mapping.findForward("page");
IServiceManager sm = ServiceManager.getInstance();
String json = (String) sm.execute(RequestUtils.getRequester(request, response),
"LoadCourseReportDocument",
new Object[]{courseCode,year});
 
request.setAttribute("courseReportJson", json);
//request.setAttribute("courseCode", courseCode);
 
return mapping.findForward("editCourseReport");
}
}
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/GenericUser.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="superuser" type="boolean"/>
<property name="username" type="string" unique="true" length="50" index="usernameIndex"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Record.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="title" type="string" index="titleIndex"/>
<property name="type" type="string" index="typeIndex"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/SruSource.hbm.xml
12,7 → 12,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="collectionField" column="collection_field" type="string"/>
34,7 → 34,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="collection" type="string"/>
<property name="admitedRoles" type="string" column="admited_roles"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Survey.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="title" type="string"/>
<property name="saveDate" type="timestamp"/>
<property name="startDate" type="timestamp"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/UrlStat.hbm.xml
11,7 → 11,7
<generator class="assigned"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="text"/>
<property name="description" type="text"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Course.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="nameEn" type="string"/>
73,7 → 73,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="importYear" type="string" index="importYearIndex"/>
<property name="separatedTurmas" type="boolean">
94,7 → 94,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="version" type="int"/>
<property name="versionDescription" type="string"/>
118,7 → 118,7
<generator class="assigned"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<!--Este deixa de existir procurar todos os sitios onde isto está
podemos ainda reimplementar o método para ir buscar à escola-->
150,7 → 150,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="institutionalCode" type="string"/>
<property name="initials" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/IdentifiersManagement.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="sequenceNumber" type="long"/>
<property name="description" type="text"/>
27,7 → 27,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="sequenceNumber" type="long"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/UrlStatMonth.hbm.xml
16,7 → 16,7
</key-many-to-one>
</composite-id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="date" type="date"/>
<property name="totalClicks" type="integer"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/SessionObject.hbm.xml
16,7 → 16,7
</key-many-to-one>
</composite-id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="type" type="string"/>
<property name="object" type="java.io.Serializable">
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Process.hbm.xml
14,7 → 14,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="possibleTargets" type="text" />
41,7 → 41,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="openDate" type="timestamp"/>
<property name="lastChangeDate" type="timestamp"/>
<property name="closeDate" type="timestamp"/>
66,7 → 66,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="openDate" type="timestamp"/>
<property name="acceptedDate" type="timestamp"/>
<property name="dispatchedDate" type="timestamp"/>
111,7 → 111,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
 
<property name="name" type="string"/>
<property name="fileAccessLevel" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/UrlStatYear.hbm.xml
13,7 → 13,7
<key-many-to-one name="urlStat" class="pt.estgp.estgweb.domain.UrlStat" column="relativePath"/>
</composite-id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="totalClicks" type="integer"/>
<set name="months" order-by="month asc" lazy="true" cascade="all" inverse="true">
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/RepositoryFile.hbm.xml
13,7 → 13,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<many-to-one name="owner" class="pt.estgp.estgweb.domain.GenericUser" outer-join="true" lazy="proxy"/>
<many-to-one name="lastVersion" class="pt.estgp.estgweb.domain.RepositoryFileVersion" outer-join="true" lazy="false"/>
68,7 → 68,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="visible" type="boolean"/>
<property name="internalIdentifier" type="string"/>
114,7 → 114,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="visible" type="boolean"/>
<property name="sortField" type="string">
145,7 → 145,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="visible" type="boolean"/>
<property name="title" type="string">
173,7 → 173,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="visible" type="boolean"/>
<property name="slug" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/DigitalDelivery.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="openDate" type="timestamp"/>
<property name="closeDate" type="timestamp"/>
35,7 → 35,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="name" type="string"/>
<property name="description" type="text"/>
<many-to-one name="parent" class="pt.estgp.estgweb.domain.DigitalDeliveryCategory" lazy="false" outer-join="true" column="parent_id"/>
54,7 → 54,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="repositoryStream" type="string"/>
<property name="notesReader" type="text"/>
<property name="notesOwner" type="text"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Image.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="contentType" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Blog.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string" unique="true" index="nameIndex"/>
<property name="title" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/ComunicationFolder.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string" index="nameIndex"/>
<property name="code" type="string" index="codeIndex"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Teste.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="morada" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Assessment.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="title" type="string"/>
<property name="type" type="string"/>
<property name="year" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/BlogPost.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="month" type="int"/>
<property name="year" type="int"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Announcement.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="startDate" type="timestamp"/>
<property name="expireDate" type="timestamp"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/CourseUserAssociation.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="role" type="string"/>
<many-to-one name="user" class="pt.estgp.estgweb.domain.User" outer-join="true" column="user_id"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/UrlStatDay.hbm.xml
17,7 → 17,7
</key-many-to-one>
</composite-id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="date" type="date"/>
<property name="totalClicks" type="integer"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/CourseUnit.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="lastImportDate" type="timestamp"/>
<property name="semestre" type="string" index="semestreIndex"/>
182,7 → 182,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="question" type="text"/>
<property name="answer" type="text"/>
199,7 → 199,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="deliverDate" type="timestamp"/>
<property name="deliverType" type="string"/>
223,7 → 223,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="deliverDate" type="timestamp"/>
<property name="grade" type="string"/>
245,7 → 245,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="publishDate" type="timestamp"/>
<property name="grade" type="int" index="gradeIndex"/>
268,7 → 268,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="dataAula" type="timestamp"/>
<property name="cdTipoOcupacao" type="int"/>
297,7 → 297,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="bibliografia" type="text"/>
<property name="bibliografiaComplementar" type="text"/>
331,7 → 331,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="objectivos" type="text"/>
<property name="conteudos" type="text"/>
354,7 → 354,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="autoGeneratedCourseReport" type="boolean">
<!-- Autogenerated Evaluations should be writable in CourseReport Evaluation -->
409,7 → 409,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="turma" type="string"/>
<many-to-one name="courseUnit" class="pt.estgp.estgweb.domain.CourseUnit" lazy="proxy" outer-join="true">
438,7 → 438,7
<!--<generator class="native"/>-->
<!--</id>-->
<!--<discriminator column="discrimitator"/>-->
<!--<timestamp source="db" name="updateDate" unsaved-value="null"/>-->
<!--<timestamp name="updateDate" unsaved-value="null"/>-->
<!--<property name="saveDate" type="timestamp"/>-->
<!--<property name="deliverDate" type="timestamp"/>-->
<!--<property name="deliverType" type="string"/>-->
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Events.hbm.xml
12,7 → 12,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="description" type="string">
36,7 → 36,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
 
<!--Controlo-->
141,7 → 141,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="email" type="string"/>
<property name="password" type="string"/> <!-- MD5 um user afeta a password sempre que se inscreve mas o email é a ponte para todos os seus registos -->
184,7 → 184,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/> <!-- devem apagados registos sem confirmacao de email após 48 horas -->
<timestamp name="updateDate" unsaved-value="null"/> <!-- devem apagados registos sem confirmacao de email após 48 horas -->
<property name="saveDate" type="timestamp"/>
<property name="password" type="string"/> <!-- MD5 um user afeta a password sempre que se inscreve mas o email é a ponte para todos os seus registos -->
 
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Questionarios.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="description" type="string"/>
<property name="logStates" type="text">
726,7 → 726,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="codeName" type="string" unique="true"/>
<property name="description" type="string"/>
968,7 → 968,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="cdDocente" type="string"/>
<property name="cdTurma" type="string"/>
992,7 → 992,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
 
<property name="tipoAlunoFoiExtraido" type="boolean">
1043,7 → 1043,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="codigoInstituicao" type="string"/>
<property name="nomeInstituicao" type="string"/>
1081,7 → 1081,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="lastTipologiasUpdateDate" type="timestamp"/>
<property name="codigoUnidade" type="string" index="codigoUnidadeIndex"/>
1150,7 → 1150,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="title" type="string"/>
<property name="active" type="boolean"/>
1214,7 → 1214,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="active" type="boolean"/>
<property name="entityName" type="string"/><!--opcional use-->
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Reminder.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="startDate" type="timestamp"/>
<property name="expireDate" type="timestamp"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Configuration.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="interfaceImportYear" type="string"/>
 
53,7 → 53,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<set name="epocasAvaliacao" order-by="codigoEpoca asc" lazy="true">
<key column="confGrade"/>
74,7 → 74,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="codigoEpoca" type="string"/>
<property name="codigoMomento" type="string"/>
91,7 → 91,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="status" type="string"/>
<property name="descricao" type="string"/>
107,7 → 107,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="idDir" type="string"/>
<property name="xml" type="text">
128,7 → 128,7
</id>
 
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="role" type="string" unique="true"/>
<property name="value" type="string"/>
151,7 → 151,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
 
<property name="name" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/PageContent.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="title" type="string"/>
<property name="code" type="string" unique="true"/>
25,7 → 25,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="systemAuxiliaryCode" type="string"/>
<property name="title" type="string"/>
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/BpmnFramework.hbm.xml
14,7 → 14,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="active" type="boolean"/>
<property name="name" type="string"/>
56,7 → 56,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="description" type="text"/>
80,7 → 80,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="description" type="text"/>
102,7 → 102,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<subclass name="pt.estgp.estgweb.domain.BpmnAbstractActorSelectorImpl" abstract="true">
<meta attribute="scope-class">public abstract</meta>
146,7 → 146,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="title" type="string"/>
<property name="description" type="text"/>
232,7 → 232,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="keyValue" type="string"/>
<property name="nameConnection" type="string"/>
265,7 → 265,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="instanceName" type="string"/>
<property name="instanceDescription" type="text"/>
346,7 → 346,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<many-to-one name="actorPool" class="pt.estgp.estgweb.domain.BpmnActorPoolImpl" lazy="no-proxy" outer-join="true"/>
<many-to-one name="actorSelector" class="pt.estgp.estgweb.domain.BpmnActorSelectorImpl" lazy="false" outer-join="true"/>
364,7 → 364,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="userProxy" type="pt.estgp.estgweb.domain.typesgen.EnhancedUserProxy" index="userProxyIndex">
<meta attribute="property-type">pt.estgp.estgweb.domain.typesgen.UserProxy</meta>
393,7 → 393,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="entryDate" type="timestamp"/>
<property name="tokenDate" type="timestamp"/>
480,7 → 480,7
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="visible" type="boolean"/>
<property name="title" type="string">
/branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Job.hbm.xml
11,7 → 11,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="startDate" type="timestamp" index="startDateIndex"/>
<property name="description" type="string"/>
56,7 → 56,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="lastScheduleDate" type="timestamp"/>
<property name="description" type="string"/>
96,7 → 96,7
<generator class="native"/>
</id>
<discriminator column="discrimitator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<timestamp name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="name" type="string"/>
<property name="description" type="string"/>
/branches/grupo5/impl/src/web/user/home/teacher.jsp
200,9 → 200,9
</div>
<!-- Autoria Daniel Marmelo nº17656-->
<logic:iterate id="idCourse" name="tLoggedIn" property="coordinatorCourses" type="pt.estgp.estgweb.domain.Course">
<div class="list-group-item">
<html:link action="/user/editCourseReport.do?courseCode=${idCourse.code}&year=${UserSession.nowConfiguration.courseReportImportYear}">Editar o relatório de Curso do ano (${UserSession.nowConfiguration.courseReportImportYear})</html:link>
</div>
<div class="list-group-item">
<html:link action="/user/editCourseReport.do?courseCode=${idCourse.code}&year=${UserSession.nowConfiguration. courseReportImportYear}">Editar o relatório de Curso do ano (${UserSession.nowConfiguration.courseReportImportYear})</html:link>
</div>
</logic:iterate>
</div>
<!--</li>
/branches/grupo5/impl/src/web/user/utils/reportEdit.jsp
9,6 → 9,8
<%@ page import="org.json.JSONException" %>
<%@ page import="pt.estgp.estgweb.services.sigesimports.ImportCourseService" %>
<%@ page import="pt.estgp.estgweb.domain.UserSession" %>
<%@ page import="pt.estgp.estgweb.domain.Course" %>
<%@ page import="pt.estgp.estgweb.utils.documentBuilder.Document" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
18,6 → 20,8
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
 
<jsp:useBean id="courseReportJson" type="java.lang.String" scope="request"/>
 
<link rel="stylesheet" href="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.css">
<script src="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script>
<link rel="stylesheet" href="<%=request.getContextPath()%>/css/flora-commons/flora.resizable.css">
96,7 → 100,20
</script>
 
<%
AbstractDao.getCurrentSession().beginTransaction();
 
CourseReportDocument courseReportJson1;
courseReportJson1 = Document.fromJson(courseReportJson);
 
CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseReportJson1.getCourseCode());
request.setAttribute("course",courseImpl);
 
 
/*String courseCode = request.getParameter("courseCode");
AbstractDao.getCurrentSession().beginTransaction();
CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode);
request.setAttribute("course",courseImpl);*/
/*
String courseCode = request.getParameter("courseCode");
String year = request.getParameter("year");
 
106,8 → 123,8
 
CourseReportDocument courseReportDocument = new CourseReportDocument();
 
String auxCourseReportDocument;
auxCourseReportDocument = new CourseReportServices().loadCourseReportDocument(courseCode,year,UserSession);
//String auxCourseReportDocument;
//auxCourseReportDocument = new CourseReportServices().loadCourseReportDocument(courseCode,year,UserSession);
 
try {
//courseReportDocument = courseReportDocument.fromJson(auxCourseReportDocument);
117,6 → 134,9
e.printStackTrace();
}
 
String courseReportJson = courseReportDocument.toJson();
request.setAttribute("courseDocumentJson",courseReportJson);
request.setAttribute("courseDocument",courseReportDocument);
 
/*try {
 
125,12 → 145,10
System.out.println(e);
e.printStackTrace();
}*/
%>
 
String courseReportJson = courseReportDocument.toJson();
request.setAttribute("courseDocumentJson",courseReportJson);
request.setAttribute("courseDocument",courseReportDocument);
 
%>
 
<%--<a href="javascript:demoFromHTML()" class="button">Run Code</a>--%>
 
<div class="container-fluid">
190,7 → 208,7
{
 
$scope.docAppSelector = "#courseReportApp";
$scope.report = <%=courseReportJson%>
$scope.report = ${courseReportJson}
 
$scope.resize = function(evt,ui,comp) {
//console.log (evt,ui);
379,5 → 397,5
</div><!--container-fluid-->
 
<%
AbstractDao.getCurrentSession().getTransaction().commit();
 
%>