Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1315 → Rev 1317

/branches/v3/impl/src/web/admin/profile/menu.jsp
1,4 → 1,4
<%@ page import="pt.estgp.estgweb.domain.views.BlogView" %>
<%@ page import="pt.estgp.estgweb.domain.StudentImpl" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
23,7 → 23,7
%>
<jsp:useBean id="ProfileForm" type="pt.estgp.estgweb.web.form.profile.ProfileForm" scope="request"/>
<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSession" scope="request"/>
<div class="linkMenuBlock">
<div class="linkMenuBlock hidden-sm hidden-xs" style="margin-left:20px;">
<div class="linkMenuBlockTitle">Perfil</div>
<div class="linkLeftMenu">
<div class="listClean">
43,19 → 43,64
<baco:isModuleOn module="courseunits">
<%--Se for aluno so ve o link se forem as suas se for Admin mete-se o link do profileId em uso--%>
<baco:hasRole role="student">
<logic:equal value="${ProfileForm.userView.id}" name="UserSession" property="user.id">
<li>
<html:link action="/user/startProfileGrades"><bean:message key="profile.grades"/></html:link>
</li>
</logic:equal>
<logic:equal value="${ProfileForm.userView.id}" name="UserSession" property="user.id">
<li>
<html:link action="/user/startProfileGrades"><bean:message key="profile.grades"/></html:link>
</li>
</logic:equal>
</baco:hasRole>
<baco:hasRole role="admin,services">
<%
if(ProfileForm.getUserView().getUser() instanceof StudentImpl)
{
%>
<li>
<a href="<%=request.getContextPath()%>/user/profile.do?dispatch=grades&userView.id=${ProfileForm.userView.id}"><bean:message key="profile.grades"/></a>
</li>
<%
}
%>
</baco:hasRole>
</baco:isModuleOn>
</ul>
</div>
</div>
</div>
 
<div class="row menuTop visible-xs visible-sm">
<div class="container-fluid">
<div class="col-sm-4">
<html:link action="/user/startProfile"><bean:message key="profile.home"/></html:link>
</div>
<div class="col-sm-4">
<html:link action="/user/startChangeProfile"><bean:message key="profile.personal.data"/></html:link>
</div>
<baco:isModuleOn module="profile">
<div class="col-sm-4">
<html:link action="/user/startProfileCurriculum"><bean:message key="profile.curriculum"/></html:link>
</div>
</baco:isModuleOn>
<baco:isModuleOn module="courseunits">
<%--Se for aluno so ve o link se forem as suas se for Admin mete-se o link do profileId em uso--%>
<baco:hasRole role="student">
<logic:equal value="${ProfileForm.userView.id}" name="UserSession" property="user.id">
<div class="col-sm-4">
<html:link action="/user/startProfileGrades"><bean:message key="profile.grades"/></html:link>
</div>
</logic:equal>
</baco:hasRole>
<baco:hasRole role="admin,services">
<%
if(ProfileForm.getUserView().getUser() instanceof StudentImpl)
{
%>
<div class="col-sm-4">
<a href="<%=request.getContextPath()%>/user/profile.do?dispatch=grades&userView.id=${ProfileForm.userView.id}"><bean:message key="profile.grades"/></a>
</div>
<%
}
%>
</baco:hasRole>
</baco:isModuleOn>
</div>
</div>
/branches/v3/impl/src/web/admin/profile/profileCurriculum.jsp
24,133 → 24,145
 
//separator=${separator}
%>
<html:form action="/user/profile" enctype="multipart/form-data">
<input type="hidden" name="dispatch" value="createRecord">
<html:hidden property="recordView.id"/>
<table class="form">
<tr>
<th>
<bean:message key="profile.record.type"/>
</th>
<td>
<logic:greaterThan value="0" name="ProfileForm" property="recordView.id">
<bean:message key="profile.${ProfileForm.recordView.type}"/>
</logic:greaterThan>
<logic:lessEqual value="0" name="ProfileForm" property="recordView.id">
<html:select property="recordView.type">
<html:option value="RecordThesisImpl" key="profile.RecordThesisImpl"/>
<html:option value="RecordPaperImpl" key="profile.RecordPaperImpl"/>
<%--todo Falta Artigo de Opinião e falta meter artigo cientifico, revista, conferencia, workshop--%>
<html:option value="RecordJobImpl" key="profile.RecordJobImpl"/>
<html:option value="RecordEventOrganizationImpl" key="profile.RecordEventOrganizationImpl"/>
<html:option value="RecordProjectImpl" key="profile.RecordProjectImpl"/>
<html:option value="RecordOtherImpl" key="profile.RecordOtherImpl"/>
 
<div class="panel panel-default">
<div class="panel-body">
<html:form styleClass="form-horizontal" action="/user/profile" enctype="multipart/form-data">
<input type="hidden" name="dispatch" value="createRecord">
<html:hidden property="recordView.id"/>
 
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.type"/></label>
<div class="col-sm-10">
<logic:greaterThan value="0" name="ProfileForm" property="recordView.id">
<label class="form-control-static"><bean:message key="profile.${ProfileForm.recordView.type}"/></label>
</logic:greaterThan>
<logic:lessEqual value="0" name="ProfileForm" property="recordView.id">
<html:select styleClass="form-control" property="recordView.type">
<html:option value="RecordThesisImpl" key="profile.RecordThesisImpl"/>
<html:option value="RecordPaperImpl" key="profile.RecordPaperImpl"/>
<%--todo Falta Artigo de Opinião e falta meter artigo cientifico, revista, conferencia, workshop--%>
<html:option value="RecordJobImpl" key="profile.RecordJobImpl"/>
<html:option value="RecordEventOrganizationImpl" key="profile.RecordEventOrganizationImpl"/>
<html:option value="RecordProjectImpl" key="profile.RecordProjectImpl"/>
<html:option value="RecordOtherImpl" key="profile.RecordOtherImpl"/>
</html:select>
</logic:lessEqual>
</div>
</div>
 
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.subtype"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="recordView.subtype"/>
</div>
</div>
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.title"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="recordView.title"/>
</div>
</div>
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.subtitle"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="recordView.subtitle"/>
</div>
</div>
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.date"/></label>
<div class="col-sm-10">
<html:select styleClass="form-control" property="recordView.date">
<%
List<String> years = DatesUtils.getYears(30);
for(String year: years)
{
request.setAttribute("year",year);
%>
<html:option value="${year}">${year}</html:option>
<%
}
%>
</html:select>
</logic:lessEqual>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.record.subtype"/>
</th>
<td>
<html:text styleClass="text" property="recordView.subtype"/>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.record.title"/>
</th>
<td>
<html:text styleClass="text" property="recordView.title"/>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.record.subtitle"/>
</th>
<td>
<html:text styleClass="text" property="recordView.subtitle"/>
</td>
</tr>
</div>
</div>
 
<tr>
<th>
<bean:message key="profile.record.date"/>
</th>
<td>
<html:select property="recordView.date">
<%
List<String> years = DatesUtils.getYears(30);
for(String year: years)
{
request.setAttribute("year",year);
%>
<html:option value="${year}">${year}</html:option>
<%
}
%>
</html:select>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.record.identifier"/>
</th>
<td>
<html:text styleClass="text" property="recordView.identifier"/>
</td>
</tr>
<tr>
<th>
<logic:equal value="RecordPaperImpl" name="ProfileForm" property="recordView.type">
<bean:message key="profile.record.publisher.paper"/>
</logic:equal>
<logic:notEqual value="RecordPaperImpl" name="ProfileForm" property="recordView.type">
<bean:message key="profile.record.publisher.all"/>
</logic:notEqual>
</th>
<td>
<html:text styleClass="text" property="recordView.publisher"/>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.record.description"/>
</th>
<td>
<html:textarea styleClass="textarea" property="recordView.description"/>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.record.file"/>
</th>
<td>
<html:file property="uploadFile"/>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.record.file.access"/>
</th>
<td>
<html:select property="recordView.fileAccess">
<html:option value="resource.access.publicDomain" key="resource.access.publicDomain"/>
<html:option value="resource.access.privateDomain" key="resource.access.privateDomain"/>
<html:option value="resource.access.authenticatedDomain" key="resource.access.authenticatedDomain"/>
</html:select>
</td>
</tr>
 
<tr class="buttons">
<td colspan="2">
<input type="button"
onclick="set(this.form,'createRecord');this.form.submit()"
value="<bean:message key="confirm"/>"/>
</td>
</tr>
</table>
</html:form>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.identifier"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="recordView.identifier"/>
</div>
</div>
 
 
 
 
<div class="form-group">
<label class="control-label col-sm-2" >
<logic:equal value="RecordPaperImpl" name="ProfileForm" property="recordView.type">
<bean:message key="profile.record.publisher.paper"/>
</logic:equal>
<logic:notEqual value="RecordPaperImpl" name="ProfileForm" property="recordView.type">
<bean:message key="profile.record.publisher.all"/>
</logic:notEqual>
</label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="recordView.publisher"/>
</div>
</div>
 
 
 
 
 
 
 
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.description"/></label>
<div class="col-sm-10">
<html:textarea styleClass="form-control" property="recordView.description"/>
</div>
</div>
 
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.file"/></label>
<div class="col-sm-10">
<html:file styleClass="form-control" property="uploadFile"/>
</div>
</div>
 
 
 
 
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.record.file.access"/></label>
<div class="col-sm-10">
<html:select styleClass="form-control" property="recordView.fileAccess">
<html:option value="resource.access.publicDomain" key="resource.access.publicDomain"/>
<html:option value="resource.access.privateDomain" key="resource.access.privateDomain"/>
<html:option value="resource.access.authenticatedDomain" key="resource.access.authenticatedDomain"/>
</html:select>
 
</div>
</div>
 
 
 
<button type="button" class="btn btn-default" onclick="set(this.form,'createRecord');this.form.submit()"><bean:message key="confirm"/></button>
<button type="button" class="btn btn-danger" onclick="window.history.back()"><bean:message key="cancel"/></button>
 
</html:form>
</div>
</div>
 
</div>
</div>
/branches/v3/impl/src/web/admin/profile/profilePersonalData.jsp
1,9 → 1,4
<%@ page import="pt.estgp.estgweb.web.form.profile.ProfileForm" %>
<%@ page import="pt.estgp.estgweb.domain.StudentImpl" %>
<%@ page import="pt.estgp.estgweb.domain.TeacherImpl" %>
<%@ page import="jomm.utils.ConfigProperties" %>
<%@ page import="pt.estgp.estgweb.Globals" %>
<%@ page import="pt.estgp.estgweb.services.authenticate.AuthenticateService" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
14,6 → 9,7
<div id="contentIntranet">
<div id="contentPane">
 
 
<jomm:messages/>
<html:errors/>
<%--<jsp:useBean id="ProfileForm" class="pt.estgp.estgweb.web.form.profile.ProfileForm"/>--%>
34,12 → 30,13
 
<div class="panel panel-default">
<div class="panel-heading">
<bean:message key="configuration.task"/>
<bean:message key="profile"/>
</div>
<div class="panel-body">
 
 
<html:form action="/user/profile${fromAction}?${from}">
<html:form styleClass="form-horizontal" action="/user/profile${fromAction}?${from}">
<jsp:useBean id="ProfileForm" type="pt.estgp.estgweb.web.form.profile.ProfileForm" scope="request"/>
<input type="hidden" name="dispatch" value="editUser">
<html:hidden property="userView.id"/>
<html:hidden property="role"/>
50,200 → 47,189
 
<baco:isAdmin>
<div class="form-group">
<label for="tipoUtilizador">TIPO DE UTILIZADOR:</label>
<span id="tipoUtilizador">
<%
<label class="control-label col-sm-2" for="tipoUtilizador">TIPO DE UTILIZADOR:</label>
 
pt.estgp.estgweb.web.form.profile.ProfileForm pf = (pt.estgp.estgweb.web.form.profile.ProfileForm) request.getAttribute("ProfileForm");
if(pf.getUserView().getUser() instanceof pt.estgp.estgweb.domain.StudentImpl)
{
%>
CLASSE ESTUDANTE
<%
}
else if(pf.getUserView().getUser() instanceof pt.estgp.estgweb.domain.TeacherImpl)
{
%>
CLASSE PROFESSOR
<%
}
else
{
regular = true;
%>
<label class="warning">CLASSE NORMAL</label>
<%
}
<label id="tipoUtilizador" class="form-control-static col-sm-10">
<%
 
%>
</span>
 
if(ProfileForm.getUserView().getUser() instanceof pt.estgp.estgweb.domain.StudentImpl)
{
%>
CLASSE ESTUDANTE
<%
}
else if(ProfileForm.getUserView().getUser() instanceof pt.estgp.estgweb.domain.TeacherImpl)
{
%>
CLASSE PROFESSOR
<%
}
else
{
regular = true;
%>
<label class="alert alert-warning">CLASSE NORMAL</label>
<%
}
%>
</label>
 
</div>
<div class="form-group">
<label for="profileAutoBlockMode"><bean:message key="profile.autoBlockMode"/></label>
<html:select styleId="profileAutoBlockMode" property="userView.autoBlockMode">
<html:option value="true" key="profile.autoBlockMode.true"/>
<html:option value="false" key="profile.autoBlockMode.false"/>
</html:select>
 
<div class="panel panel-default">
<div class="panel-body">
<div class="form-group">
<label class="control-label col-sm-2" for="profileAutoBlockMode"><bean:message key="profile.autoBlockMode"/></label>
<div class="col-sm-10">
<html:select styleClass="form-control" styleId="profileAutoBlockMode" property="userView.autoBlockMode">
<html:option value="true" key="profile.autoBlockMode.true"/>
<html:option value="false" key="profile.autoBlockMode.false"/>
</html:select>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="profileAutoBlock"><bean:message key="profile.autoBlock"/></label>
<div class="col-sm-10">
<html:select styleClass="form-control" styleId="profileAutoBlock" property="userView.autoBlock">
<html:option value="true" key="profile.autoBlock.true"/>
<html:option value="false" key="profile.autoBlock.false"/>
</html:select>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="profileManualBlock"><bean:message key="profile.manualBlock"/></label>
<div class="col-sm-10">
<html:select styleClass="form-control" styleId="profileManualBlock" property="userView.manualBlock">
<html:option value="true" key="profile.manualBlock.true"/>
<html:option value="false" key="profile.manualBlock.false"/>
</html:select>
</div>
</div>
</div>
</div>
<div class="form-group">
<label for="profileAutoBlock"><bean:message key="profile.autoBlock"/></label>
<html:select styleId="profileAutoBlock" property="userView.autoBlock">
<html:option value="true" key="profile.autoBlock.true"/>
<html:option value="false" key="profile.autoBlock.false"/>
</html:select>
</div>
<div class="form-group">
<label for="profileManualBlock"><bean:message key="profile.manualBlock"/></label>
<html:select styleId="profileManualBlock" property="userView.manualBlock">
<html:option value="true" key="profile.manualBlock.true"/>
<html:option value="false" key="profile.manualBlock.false"/>
</html:select>
</div>
 
 
</baco:isAdmin>
<baco:isNotAdmin>
 
<div class="form-group">
<label for="code"><bean:message key="profile.siges.code"/></label>
<html:text styleId="code" styleClass="text" property="userView.code" maxlength="250" readonly="true"/>
<label class="control-label col-sm-2" for="code"><bean:message key="profile.siges.code"/></label>
<div class="col-sm-10">
<html:text styleId="code" styleClass="form-control" property="userView.code" maxlength="250" readonly="true"/>
</div>
</div>
 
<div class="form-group">
<label for="username"> <bean:message key="username"/></label>
<html:text styleId="username" property="userView.username" maxlength="250" readonly="true" styleClass="readOnly text"/>
</div>
<label class="control-label col-sm-2" for="username"><bean:message key="username"/></label>
<div class="col-sm-10">
<html:text styleClass="readOnly form-control" styleId="username" property="userView.username" maxlength="250" readonly="true" />
</div>
 
<div class="form-group">
<label for=""></label>
 
</div>
 
<tr>
<th>
 
</th>
<td>
 
</td>
</tr>
 
 
<%
if(!Globals.USE_LDAP)
{
%>
<logic:equal name="ProfileForm" property="userView.passwordLocal" value="true">
<tr>
<th>
<bean:message key="password"/>
</th>
<td>
<html:password styleClass="password" property="userView.password" maxlength="250"/>
</td>
</tr>
<tr>
<th>
<bean:message key="password.again"/>
</th>
<td>
<html:password styleClass="password" property="userView.passwordAgain" maxlength="250"/>
</td>
</tr>
<div class="form-group">
<label class="control-label col-sm-2"><bean:message key="password"/></label>
<div class="col-sm-10">
<html:password styleClass="form-control" property="userView.password" maxlength="250"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2"><bean:message key="password.again"/></label>
<div class="col-sm-10">
<html:password styleClass="form-control" property="userView.passwordAgain" maxlength="250"/>
</div>
</div>
 
 
</logic:equal>
<%
}
else
{
%>
<tr>
<th colspan="2">Sistema de autenticação externo (Rede) em uso, não é possivel modificar password. Use a sua password de Rede</th>
</tr>
<tr>
<th>
<bean:message key="password"/>
</th>
<td>
<html:password styleClass="password" property="userView.password" maxlength="250" readonly="true"/>
 
</td>
</tr>
<tr>
<th>
<bean:message key="password.again"/>
</th>
<td>
<html:password styleClass="password" property="userView.passwordAgain" maxlength="250" readonly="true"/>
</td>
</tr>
<div class="form-group">
<label class="label label-info">Sistema de autenticação externo (Rede) em uso, não é possivel modificar password. Use a sua password de Rede</label>
<label class="control-label col-sm-2" ><bean:message key="password"/></label>
<div class="col-sm-10">
<html:password styleClass="form-control" property="userView.password" maxlength="250" readonly="true"/>
</div>
</div>
<div class="form-group">
 
<label class="control-label col-sm-2" ><bean:message key="password.again"/></label>
<div class="col-sm-10">
<html:password styleClass="form-control" property="userView.passwordAgain" maxlength="250" readonly="true"/>
</div>
</div>
<%
}
%>
 
</baco:isNotAdmin>
<baco:isAdmin>
<tr>
<th>
<bean:message key="profile.siges.code"/>
</th>
<td>
<div class="form-group">
<label class="control-label col-sm-2"><bean:message key="profile.siges.code"/></label>
<div class="col-sm-10">
<%
if(regular)
{
%>
<html:text styleClass="text" property="userView.code" maxlength="250" readonly="true"/> <br/>ESTE UTILIZADOR É NORMAL NAO TEM CODIGO SIGES
<%
}
else
{
%>
<html:text styleClass="text" property="userView.code" maxlength="250"/>
<%
}
%>
if(regular)
{
%>
<html:text styleClass="form-control" property="userView.code" maxlength="250" readonly="true"/> <br/>ESTE UTILIZADOR É NORMAL NAO TEM CODIGO SIGES
<%
}
else
{
%>
<html:text styleClass="form-control" property="userView.code" maxlength="250"/>
<%
}
%>
 
</div>
</div>
 
</td>
</tr>
<%
 
pt.estgp.estgweb.web.form.profile.ProfileForm pf = (pt.estgp.estgweb.web.form.profile.ProfileForm) request.getAttribute("ProfileForm");
if(pf.getUserView().getUser() instanceof pt.estgp.estgweb.domain.StudentImpl)
if(ProfileForm.getUserView().getUser() instanceof pt.estgp.estgweb.domain.StudentImpl)
{
%>
<tr>
<th>
Propinas em Dia
</th>
<td>
<logic:equal value="true" name="ProfileForm" property="userView.propinasEmDia">Sim</logic:equal>
<logic:equal value="false" name="ProfileForm" property="userView.propinasEmDia">Não</logic:equal>
</td>
</tr>
<div class="form-group">
<label class="control-label col-sm-2">Propinas em Dia:</label>
 
<label class="form-control-static col-sm-10">
<logic:equal value="true" name="ProfileForm" property="userView.propinasEmDia"><bean:message key="yes"/></logic:equal>
<logic:equal value="false" name="ProfileForm" property="userView.propinasEmDia"><bean:message key="no"/><</logic:equal>
</label>
</div>
<%
}
%>
<tr>
<th>
<bean:message key="username"/>
</th>
<td>
<html:text styleClass="text" property="userView.username" maxlength="250"/>
</td>
</tr>
<tr>
<th>
<bean:message key="password"/>
</th>
<td>
<html:password styleClass="password" property="userView.password" maxlength="250"/>
</td>
</tr>
<tr>
<th>
<bean:message key="targets"/>
</th>
<td>
<html:select property="targetRolesStr">
<div class="form-group">
<label class="control-label col-sm-2"><bean:message key="username"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.username" maxlength="250"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2"><bean:message key="password"/></label>
<div class="col-sm-10">
<html:password styleClass="form-control" property="userView.password" maxlength="250"/>
</div>
</div>
 
 
 
<div class="form-group">
<label class="control-label col-sm-2"><bean:message key="targets"/></label>
<div class="col-sm-8">
<html:select styleClass="form-control" property="targetRolesStr">
<logic:present name="ProfileForm" property="targetRoles">
<logic:iterate id="item" name="ProfileForm" property="targetRoles">
<jomm:option itemName="item" comparableObjectName="ProfileForm"
251,36 → 237,34
<bean:message key="user.role.${item}"/>
</jomm:option>
</logic:iterate>
<input type="button" value="<bean:message key="add"/>"
onclick="set(this.form,'addRole');this.form.submit();">
</logic:present>
</html:select>
 
</div>
<div class="col-sm-2">
<button type="button" class="btn btn-default" onclick="set(this.form,'addRole');this.form.submit();"><span class="glyphicon glyphicon-plus"></span></button>
</div>
</div>
<div class="form-group">
<div class="control-label col-sm-2"> </div>
<div class="col-sm-6">
<logic:present name="ProfileForm" property="selectedRoles">
<logic:notEmpty name="ProfileForm" property="selectedRoles">
<table class="dataTable removeButton">
<div class="list-group">
<logic:iterate id="item" name="ProfileForm" property="selectedRoles">
<tr>
<th>
<bean:message key="user.role.${item}"/>
</th>
<td>
<input type="button" class="removeButton" value=""
onclick="ProfileForm.role.value='${item}';set(this.form,'removeRole');this.form.submit();">
</td>
</tr>
<div class="list-group-item">
<bean:message key="user.role.${item}"/>
<button type="button" class="btn btn-danger btn-xs pull-right" onclick="ProfileForm.role.value='${item}';set(this.form,'removeRole');this.form.submit();"><span class="glyphicon glyphicon-remove"/></button>
</div>
</logic:iterate>
</table>
</div>
</logic:notEmpty>
</logic:present>
</td>
</tr>
<tr>
<th>
<bean:message key="area"/>
</th>
<td>
<html:select property="userView.mainArea">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2"><bean:message key="area"/></label>
<div class="col-sm-10">
<html:select styleClass="form-control" property="userView.mainArea">
<option value=""></option>
<html:option value="td" key="area.td"/>
<html:option value="cesh" key="area.cesh"/>
289,100 → 273,106
<%--<html:option value="dg" key="area.dg"/>--%>
<%--<html:option value="eg" key="area.eg"/>--%>
</html:select>
</td>
</tr>
</div>
</div>
</baco:isAdmin>
 
<baco:hasNotRole role="teacher">
<tr>
<th>
<bean:message key="profile.scholar.degree"/>
</th>
<td>
<html:select property="userView.scholarDegree">
<html:option value="less"><bean:message key="profile.scholar.degree.less"/></html:option>
<html:option value="9"><bean:message key="profile.scholar.degree.9"/></html:option>
<html:option value="12"><bean:message key="profile.scholar.degree.12"/></html:option>
<html:option value="12.professional.course"><bean:message key="profile.scholar.degree.12.professional.course"/></html:option>
<html:option value="superior"><bean:message key="profile.scholar.degree.superior"/></html:option>
</html:select>
</td>
</tr>
</baco:hasNotRole>
 
<%
if(ProfileForm.getUserView().getUser() instanceof pt.estgp.estgweb.domain.TeacherImpl)
{
%>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.scholar.degree"/></label>
<div class="col-sm-10">
<html:select styleClass="form-control" property="userView.scholarDegree">
<html:option value="less"><bean:message key="profile.scholar.degree.less"/></html:option>
<html:option value="9"><bean:message key="profile.scholar.degree.9"/></html:option>
<html:option value="12"><bean:message key="profile.scholar.degree.12"/></html:option>
<html:option value="12.professional.course"><bean:message key="profile.scholar.degree.12.professional.course"/></html:option>
<html:option value="superior"><bean:message key="profile.scholar.degree.superior"/></html:option>
</html:select>
</div>
</div>
 
 
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.academic.degree"/></label>
<div class="col-sm-10">
<html:select styleClass="form-control" property="userView.academicDegree">
<html:option value="Bac"><bean:message key="profile.academic.degree.Bac"/></html:option>
<html:option value="Bac"><bean:message key="profile.academic.degree.BacEsp"/></html:option>
<html:option value="Lic"><bean:message key="profile.academic.degree.Lic"/></html:option>
<html:option value="LicEsp"><bean:message key="profile.academic.degree.LicEsp"/></html:option>
<html:option value="Mas"><bean:message key="profile.academic.degree.Mas"/></html:option>
<html:option value="MasEsp"><bean:message key="profile.academic.degree.MasEsp"/></html:option>
<html:option value="Phd"><bean:message key="profile.academic.degree.Phd"/></html:option>n>
<html:option value="PhdEsp"><bean:message key="profile.academic.degree.PhdEsp"/></html:option>
</html:select>
</div>
</div>
<%
}
%>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="bi"/></label>
<div class="col-sm-10">
<html:text styleClass="readOnly form-control" property="userView.bi" maxlength="250" readonly="true" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="birthday.date"/></label>
<div class="col-sm-10">
<html:text styleClass="readOnly form-control" property="birthDayDate" maxlength="100" readonly="true"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="name"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.name" maxlength="250" readonly="true" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="address"/></label>
<div class="col-sm-10">
<html:text property="userView.address" maxlength="250" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="zip"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.zip" maxlength="8" />
</div>
</div>
<baco:isAdmin>
<tr>
<th>
<bean:message key="profile.academic.degree"/>
</th>
<td>
<html:select property="userView.academicDegree">
<html:option value="Bac"><bean:message key="profile.academic.degree.Bac"/></html:option>
<html:option value="Lic"><bean:message key="profile.academic.degree.Lic"/></html:option>
<html:option value="Mas"><bean:message key="profile.academic.degree.Mas"/></html:option>
<html:option value="Phd"><bean:message key="profile.academic.degree.Phd"/></html:option>
</html:select>
</td>
</tr>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="office"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.office" maxlength="10" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" > EXT. (<bean:message key="phone.number"/>)</label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.ext" maxlength="10" />
</div>
</div>
</baco:isAdmin>
<tr>
<th>
<bean:message key="bi"/>
</th>
<td>
<html:text property="userView.bi" maxlength="250" readonly="true" styleClass="readOnly text"/>
</td>
</tr>
<tr>
<th>
<bean:message key="birthday.date"/>
</th>
<td>
<html:text property="birthDayDate" maxlength="100" readonly="true" styleClass="readOnly text"/>
</td>
</tr>
<tr>
<th>
<bean:message key="name"/>
</th>
<td>
<html:text styleClass="text" property="userView.name" maxlength="250"/>
</td>
</tr>
<tr>
<th>
<bean:message key="address"/>
</th>
<td>
<html:text styleClass="text" property="userView.address" maxlength="250"/>
</td>
</tr>
<tr>
<th>
<bean:message key="zip"/>
</th>
<td>
<html:text styleClass="text" property="userView.zip" maxlength="8"/>
</td>
</tr>
<baco:isAdmin>
<tr>
<th>
<bean:message key="office"/>
</th>
<td>
<html:text styleClass="text" property="userView.office" maxlength="10"/>
</td>
</tr>
<tr>
<th>
EXT. (<bean:message key="phone.number"/>)
</th>
<td>
<html:text styleClass="text" property="userView.ext" maxlength="10"/>
</td>
</tr>
</baco:isAdmin>
<%--<tr>--%>
<baco:isNotAdmin>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="office"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.office" maxlength="10" readonly="true" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" > EXT. (<bean:message key="phone.number"/>)</label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.ext" maxlength="10" readonly="true"/>
</div>
</div>
</baco:isNotAdmin>
<%-->--%>
<%--<th>--%>
<%--<bean:message key="country"/>--%>
<%--</th>--%>
390,16 → 380,16
<%--<html:text property="userView.country" maxlength="100" readonly="true" styleClass="readOnly"/>--%>
<%--</td>--%>
<%--</tr>--%>
<tr>
<th>
<bean:message key="phone.number"/>
</th>
<td>
<html:text styleClass="text" property="userView.phonenumber" maxlength="250"/>
</td>
</tr>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="phone.number"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.phonenumber" maxlength="250" />
</div>
</div>
 
<%--
 
 
<tr>
<th>
<bean:message key="profile.pop3server"/>
438,32 → 428,26
<html:password styleClass="password" property="userView.pop3passwordAgain" maxlength="250"/>
</td>
</tr>
--%>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.skype"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.skype" maxlength="250"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.gmail"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.gmail" maxlength="250"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="profile.msn"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.msn" maxlength="250"/>
</div>
</div>
 
<tr>
<th>
<bean:message key="profile.skype"/>
</th>
<td>
<html:text styleClass="text" property="userView.skype" maxlength="250"/>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.gmail"/>
</th>
<td>
<html:text styleClass="text" property="userView.gmail" maxlength="250"/>
</td>
</tr>
<tr>
<th>
<bean:message key="profile.msn"/>
</th>
<td>
<html:text styleClass="text" property="userView.msn" maxlength="250"/>
</td>
</tr>
 
<%--<baco:isNotAdmin>--%>
<!--<tr>-->
<!--<th>-->
476,42 → 460,36
<!--</tr>-->
<%--</baco:isNotAdmin>--%>
<%--<baco:isAdmin>--%>
<tr>
<th>
<bean:message key="email.institucion2"/>
</th>
<td>
<html:text styleClass="text" property="userView.email" maxlength="250"/>
</td>
</tr>
<%--</baco:isAdmin>--%>
<tr>
<th>
<bean:message key="email.secundary"/>
</th>
<td>
<html:text styleClass="text" property="userView.outEmail" maxlength="250"/>
</td>
</tr>
<baco:isNotAdmin>
<tr>
<th>
 
<div class="form-group">
<baco:isNotAdmin>
<label class="label label-info">
<bean:message key="profile.email.change"/>
</th>
</tr>
</baco:isNotAdmin>
<tr class="buttons">
<td colspan="2">
<input type="button" onclick="set(this.form,'editUser');this.form.submit()"
value="<bean:message key="confirm"/>"/>
</td>
</tr>
</table>
</label>
</baco:isNotAdmin>
<label class="control-label col-sm-2" ><bean:message key="email.institucion2"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.email" maxlength="250" readonly="true"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" ><bean:message key="email.secundary"/></label>
<div class="col-sm-10">
<html:text styleClass="form-control" property="userView.outEmail" maxlength="250"/>
</div>
</div>
<%--</baco:isAdmin>--%>
 
 
<button type="button" class="btn btn-default" onclick="set(this.form,'editUser');this.form.submit()"><bean:message key="confirm"/></button>
<button type="button" class="btn btn-danger" onclick="window.history.back()"><bean:message key="cancel"/></button>
 
</html:form>
 
 
</div> <!--End panel-body-->
</div> <!--End panel-->
<%--
<logic:present name="ProfileForm" property="userView.courses">
<ul>
<logic:iterate id="course" name="ProfileForm" property="userView.courses">
527,6 → 505,6
</li>
</logic:iterate>
</ul>
</logic:present>
</logic:present>--%>
</div>
</div>
/branches/v3/impl/src/web/admin/courseunits/findCourseunit.jsp
1,6 → 1,3
<%@ page import="pt.estgp.estgweb.domain.StudentImpl" %>
<%@ page import="pt.estgp.estgweb.domain.TeacherImpl" %>
<%@ page import="pt.estgp.estgweb.domain.UserImpl" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
8,36 → 5,48
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
<jomm:messages/>
<html:form action="/user/courseUnitControllerAdminFromServiceZone?dispatch=search&from=ServiceZone">
<input type="hidden" name="dispatch" value="search">
<table class="form">
<tr>
<th>
<bean:message key="courseunit.search"/>
</th>
<td>
<html:text property="textToSearch" maxlength="50"/>
</td>
<td>
<input type="button" onclick="set(this.form,'search');this.form.submit()" value="<bean:message key="search"/>">
</td>
</tr>
<tr>
<td nowrap="nowrap" colspan="3">
<table>
<tr>
<td><html:radio property="searchType" value="search.type.all"/></td>
<td><bean:message key="search.type.all"/></td>
<td><html:radio property="searchType" value="search.type.any"/></td>
<td><bean:message key="search.type.any"/></td>
<td><html:radio property="searchType" value="search.type.phrase"/></td>
<td><bean:message key="search.type.phrase"/></td>
</tr>
</table>
</td>
</tr>
</table>
</html:form>
<html:errors/>
<div class="container-fluid">
<div class="panel">
<div class="panel-body">
<html:form styleClass="form-horizontal" action="/user/courseUnitControllerAdminFromServiceZone?dispatch=search&from=ServiceZone">
<input type="hidden" name="dispatch" value="search">
<form class="form-horizontal" role="form">
<div class="form-group">
<label class="control-label col-md-2" for="search"><bean:message key="courseunit.search"/></label>
<div class="col-md-8">
<html:text styleClass="form-control" styleId="search" property="textToSearch"/>
</div>
<div class="col-md-2">
<button type="button" class="btn btn-sm btn-default" onclick="set(this.form,'search');this.form.submit()"><bean:message key="search"/></button>
</div>
</div>
 
<div class="form-group">
<label class="control-label col-md-2">Tipo de Pesquisa</label>
<div class="col-md-3">
<label class="radio inline">
<html:radio property="searchType" value="search.type.all"/>
<bean:message key="search.type.all"/>
</label>
</div>
<div class="col-md-3">
<label class="radio inline">
<html:radio property="searchType" value="search.type.any"/>
<bean:message key="search.type.any"/>
</label>
</div>
<div class="col-md-3">
<label class="radio inline">
<html:radio property="searchType" value="search.type.phrase"/>
<bean:message key="search.type.phrase"/>
</label>
</div>
</div>
 
</html:form>
 
 
<logic:present name="ISearchResults" property="results">
<table class="tablesorter tablesorterfiltered">
<thead>
53,7 → 62,6
</tr>
</thead>
<tbody>
/user/startLoadCourseUnitFromHome.do?id=421
<logic:iterate id="courseunitresult" name="ISearchResults" property="results" type="pt.estgp.estgweb.services.courseunits.impl.CourseUnitViewResult" >
<tr>
<td style="text-align: right">${courseunitresult.object.code}</td>
64,7 → 72,6
<td>${courseunitresult.object.courseCode}</td>
<td><html:link styleClass="btn btn-warning" action="/user/startEditCourseUnitAdminFromServiceZone?id=${courseunitresult.object.id}"><bean:message key="edit"/><span class="glyphicon glyphicon-pencil"></span></html:link></td>
<td><html:link styleClass="btn btn-danger" action="/user/startDeleteCourseUnitAdminFromServiceZone?id=${courseunitresult.object.id}"><bean:message key="delete"/><span class="glyphicon glyphicon-remove"></span></html:link></td>
<td></td>
</tr>
</logic:iterate>
</tbody>
84,4 → 91,7
&gt;</a>
</logic:equal>
</p>
</logic:present>
</logic:present>
</div>
</div>
</div>
/branches/v3/impl/src/web/admin/questionarios/questionariosList.jsp
77,10 → 77,6
);
}
);
function alerta()
{
alert($('#editor').html());
}
 
function setText()
{
88,6 → 84,64
}
 
</script>
 
<style>
.dropable
{
border: 1px dashed blue;
}
.dropable .toDrop
{
border: 2px solid blue !important;
}
</style>
<!--
<div class="hidden">
<div id="template1">
<div class="panel panel-default meupanel">
<div class="panel-heading">
<p>Titulo do Painel</p>
</div>
<div class="panel-body dropable">
<p>Titulo do Painel</p>
</div>
</div>
</div>
<div id="template2">
<div class="row">
<div class="col-md-4 col-xs-12 dropable">
<p>Conteúdo</p>
</div>
<div class="col-md-4 col-xs-12 dropable">
<p>Conteúdo</p>
</div>
<div class="col-md-4 col-xs-12 dropable">
Conteúdo
</div>
</div>
</div>
<div id="template3">
<div class="row">
<div class="col-md-6 col-xs-12 dropable">
Conteúdo
</div>
<div class="col-md-6 col-xs-12 dropable">
Conteúdo
</div>
</div>
</div>
<div id="template4">
<div class="list-group">
<div class="list-group-item">
Elemento 1
</div>
<div class="list-group-item">
Elemento 2
</div>
</div>
</div>
</div>
-->
<input type="hidden" name="dispatch" value="newEdit">
<html:hidden property="questionario.id"/>
 
147,9 → 201,47
<a class="btn btn-default" data-edit="redo" title="Redo (Ctrl/Cmd+Y)"><i class="aweicon-repeat"></i></a>
</div>
 
<!--
<div class="btn-group">
<img style="width:20px" draggable="true" src="<%=request.getContextPath()%>/imgs/grafico.gif" class="bacoTemplate" template-target="template1"/>
<img style="width:20px" draggable="true" src="<%=request.getContextPath()%>/imgs/grafico.gif" class="bacoTemplate" template-target="template2"/>
<img style="width:20px" draggable="true" src="<%=request.getContextPath()%>/imgs/grafico.gif" class="bacoTemplate" template-target="template3"/>
<img style="width:20px" draggable="true" src="<%=request.getContextPath()%>/imgs/grafico.gif" class="bacoTemplate" template-target="template4"/>
</div>-->
<!-- <script>
var emEdicao;
function setupPalete()
{
$(".meupanel").click(
function(){
emEdicao = this;
$(emEdicao).css({border:"3px solid yellow"});
}
);
}
$(document).ready(function(){
 
$(".bacoTemplate").on("dragstart",
function(e){
e.originalEvent.dataTransfer.setData("template", $(e.target).attr("template-target"));
}
);
 
 
 
});
</script>-->
 
</div>
<div id="editor">
<bean:message key="submit.todo.email.content"/>&hellip;
<div>
 
<input type="radio" name="estilo" onclick="$(emEdicao).removeClass('panel-warning');$(emEdicao).addClass('panel-default')">Painel Normal</imput>
<input type="radio" name="estilo" onclick="$(emEdicao).removeClass('panel-default');$(emEdicao).addClass('panel-primary')">Painel Warning</imput>
</div>
<div id="editor" class="dropable">
<div class="dropable">
<bean:message key="submit.todo.email.content"/>&hellip;
</div>
</div>
 
</div>