| /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/StudiesPlanImporter.java |
|---|
| 445,10 → 445,10 |
| unidade.setSiges("" + line.cod); |
| unidade.setTotalHoras(Integer.parseInt(line.totalHoras)); |
| unidade.setHorasContacto(new UnidadeType.HorasContacto()); |
| unidade.getHorasContacto().setT(Integer.parseInt(line.teorica)); |
| unidade.getHorasContacto().setTP(Integer.parseInt(line.teoricoPratica)); |
| unidade.getHorasContacto().setT(Integer.parseInt(line.pratica)); |
| unidade.getHorasContacto().setT(Integer.parseInt(line.teorica)); |
| unidade.getHorasContacto().setT(line.teorica); |
| unidade.getHorasContacto().setTP(line.teoricoPratica); |
| unidade.getHorasContacto().setT(line.pratica); |
| unidade.getHorasContacto().setT(line.teorica); |
| if(!line.troncoComum) |
| { |
| /branches/v3/impl/src/java/pt/estgp/estgweb/services/authenticate/AuthenticateService.java |
|---|
| 317,7 → 317,7 |
| logger.warn(u.getId() + " " + u.getUsername() + " " + u.getEmail()); |
| msg += " ( " + u.getId() + " " + u.getUsername() + " " + u.getEmail() + " )"; |
| } |
| new SendEmailService().sendNotificationAdmin(msg,"Ao tentar recuperar password idenficamos mais de um caso com o mesmo identificador:" + msg); |
| new SendEmailService().sendNotificationAdmin(msg,"Ao tentar recuperar password idenficamos mais de um caso com o mesmo identificador { " + identifier + " }:" + msg); |
| return null; |
| } |
| else |
| /branches/v3/impl/src/java/pt/estgp/estgweb/services/ServiceFinder.java |
|---|
| 123,11 → 123,11 |
| public static void main(String[] args) throws IOException, JSONException { |
| //String classesDir = args[0]; |
| //String srcDir = args[1]; |
| String classesDir = args[0]; |
| String srcDir = args[1]; |
| String classesDir = "/Volumes/Home/jorgemachado/Documents/workspace/baco/impl/build/ant/classes/"; |
| String srcDir = "/Volumes/Home/jorgemachado/Documents/workspace/baco/impl/src/java/"; |
| //String classesDir = "/Volumes/Home/jorgemachado/Documents/workspace/baco/impl/build/ant/classes/"; |
| //String srcDir = "/Volumes/Home/jorgemachado/Documents/workspace/baco/impl/src/java/"; |
| Class<ServiceFinder> toMatch = ServiceFinder.class; |
| /branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseDepartmentImpl.java |
|---|
| 21,7 → 21,9 |
| public String getSchoolFromInstitutionalCode() |
| { |
| return ConfigProperties.getProperty("institution.code.prefix." + getCourseSchool().getInstitutionalCode()); |
| if(getCourseSchool() != null) |
| return ConfigProperties.getProperty("institution.code.prefix." + getCourseSchool().getInstitutionalCode()); |
| return null; |
| } |
| public void setSchoolFromInstitutionalCode(String garbage) |
| /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/configuration/UserRolesController.java |
|---|
| 121,7 → 121,9 |
| ur.setDirty(false); |
| UserRoleProxy.setDirty(); |
| ur.setId(replaceRoleResult.updatedUserRoleConfig.getId()); |
| if(evaluateUpdateRoleResult(this,request, replaceRoleResult)) |
| { |
| addMessage(request, "configuration.role.saved",ur.getValue()); |
| /branches/v3/impl/src/web/admin/courses/course.jsp |
|---|
| 9,6 → 9,7 |
| <%@ page import="java.util.ArrayList" %> |
| <%@ page import="java.util.Collection" %> |
| <%@ page import="java.util.List" %> |
| <%@ page import="pt.estgp.estgweb.domain.UserSession" %> |
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> |
| <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
| <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %> |
| 17,6 → 18,7 |
| <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
| <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
| <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
| <jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/> |
| <jsp:useBean id="CourseView" type="pt.estgp.estgweb.domain.views.CourseView" scope="request"/> |
| <script> |
| function alertPermissions() |
| 44,10 → 46,21 |
| <div class="panel panel-default"> |
| <div class="panel-body"> |
| <% |
| if(UserSession.getUser().isSuperuserOrAdmin() |
| || CourseView.getCode() == null |
| || CourseView.getCode().trim().length() == 0 |
| || CourseView.getCode().trim().equals("0")) |
| { |
| request.setAttribute("codeReadOnly",false); |
| } |
| else |
| request.setAttribute("codeReadOnly",true); |
| %> |
| <div class="form-group"> |
| <label class="control-label col-sm-2"><bean:message key="course.code"/></label> |
| <div class="col-sm-10"> |
| <html:text styleClass="form-control" property="courseView.code" size="20"/> |
| <html:text styleClass="form-control" readonly="${codeReadOnly}" property="courseView.code" size="20"/> |
| </div> |
| </div> |
| <div class="form-group"> |
| 262,6 → 275,7 |
| </div> |
| </div> |
| <%-- |
| <div class="form-group"> |
| <label class="control-label col-sm-2"><bean:message key="course.studies.plan"/>(VERSAO ANTIGA)</label> |
| <div class="col-sm-10"> |
| 280,7 → 294,7 |
| </logic:notPresent> |
| </div> |
| </div> |
| </div>--%> |
| /branches/v3/impl/src/web/user/courses/studiesPlansAdministrationEdit.jsp |
|---|
| 184,14 → 184,33 |
| </div> |
| <script> |
| function createSitesUrls() |
| { |
| createUrls("unidades"); |
| } |
| function createFichasUrls() |
| { |
| createUrls("fichas"); |
| } |
| function createUrls(type) |
| { |
| $("[data-unit-ficha-url-target-id]").each( |
| function() |
| { |
| var targetId = $(this).attr("data-unit-ficha-url-target-id"); |
| var targetId; |
| if(type == "fichas") |
| { |
| targetId = $(this).attr("data-unit-ficha-url-target-id"); |
| } |
| else if(type== "unidades") |
| { |
| targetId = $(this).attr("data-unit-site-url-target-id"); |
| } |
| var sigesUnit = $(this).attr("data-unit-siges-code"); |
| var sigesCourse = $(this).attr("data-course-siges-code"); |
| //var sigesCourse = $(this).attr("data-course-siges-code"); |
| var unitSemestre = $(this).attr("data-unit-semestre"); |
| var sigesUrlInput = $("#" + targetId); |
| var urlPattern = $("#urlPadraoFicha").val(); |
| 202,7 → 221,9 |
| urlPattern = urlPattern.replace("{SIGES_UNIT}",sigesUnit); |
| urlPattern = urlPattern.replace("{UNIT_SEMESTRE}",unitSemestre); |
| $("#" + targetId).val(urlPattern); |
| //var input = $("#" + targetId); |
| sigesUrlInput.val(urlPattern); |
| sigesUrlInput.trigger('change'); |
| } |
| } |
| ); |
| 237,7 → 258,13 |
| </button> |
| <button class="btn btn-warning" type="button" data-toggle="modal" onclick="createSitesUrls()"> |
| Gerar URL's de Páginas (USE UM PADRAO DIFERENTE) |
| </button> |
| exemplo ESTG: http://deptal.estgp.pt/startLoadCourseUnitSiges.do?unitCode={SIGES_UNIT}&courseCode={SIGES_CURSO}&semestre={UNIT_SEMESTRE} |
| </div> |
| </div> |
| 833,7 → 860,9 |
| <td ng-show="confView.S"><input type="text" style="width: 40px" ng-model="u.horasContacto.s"/></td> |
| <td ng-show="confView.TC"><input type="text" style="width: 40px" ng-model="u.horasContacto.tC"/></td> |
| <td ng-show="confView.O"><input type="text" style="width: 40px" ng-model="u.horasContacto.o"/></td> |
| <td ng-show="confView.URL_UNIDADE"><input type="text" ng-model="u.urlUnidadeCurricular" style="width:600px"/></td> |
| <td ng-show="confView.URL_UNIDADE"> |
| <input type="text" id="urlUnidadeCurricular{{s.id}}_{{u.siges}}" ng-model="u.urlUnidadeCurricular" style="width:600px"/> |
| </td> |
| <td ng-show="confView.FICHA_URL" data-unit-semestre="{{s.id}}" data-course-siges-code="${courseSigesCode}" data-unit-siges-code="{{u.siges}}" data-unit-ficha-url-target-id="urlFichaCurricular{{s.id}}_{{u.siges}}" data-unit-site-url-target-id="urlUnidadeCurricular{{s.id}}_{{u.siges}}"> |
| <input type="text" id="urlFichaCurricular{{s.id}}_{{u.siges}}" ng-model="u.urlFichaCurricular" style="width:600px"/> |
| </td> |