diff --git a/backend/matefun.war b/backend/matefun.war new file mode 100644 index 0000000000000000000000000000000000000000..fe159d7f1e385a5a3bfafe3253c004a6247d6eb2 Binary files /dev/null and b/backend/matefun.war differ diff --git a/backend/matefun/src/main/java/edu/proygrado/ejb/CommandsBean.java b/backend/matefun/src/main/java/edu/proygrado/ejb/CommandsBean.java index 90299ec4f81f322edab8af34704b8bdef83c00b9..74bfbfbe8f3fc717f8155c38226a2c9748bc759d 100644 --- a/backend/matefun/src/main/java/edu/proygrado/ejb/CommandsBean.java +++ b/backend/matefun/src/main/java/edu/proygrado/ejb/CommandsBean.java @@ -92,7 +92,7 @@ public class CommandsBean { } if (comandoJson.containsKey("ping")) { - System.out.println(comandoJson.getString("ping")); +// System.out.println(comandoJson.getString("ping")); } else if (comandoJson.containsKey("comando")) { String comando = comandoJson.getString("comando"); diff --git a/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java b/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java index 8ce9ef0ff3fa7d3812b25beaabb8fd0b2f45ae50..9e601420f861a44502a671a14e9ebd8c573a3a9e 100644 --- a/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java +++ b/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java @@ -113,7 +113,9 @@ public class LoginEJB { for (MoodleRoleDTO role : coursesInfo.getRoles()) { if (role.getShortname().toLowerCase().equals("student")) { rol = "student"; - } else if (role.getShortname().toLowerCase().equals("teacher")) { + } else if (role.getShortname().toLowerCase().equals("teacher") + || role.getShortname().toLowerCase().equals("editingteacher") + || role.getShortname().toLowerCase().equals("manager")) { rol = "teacher"; } } diff --git a/backend/matefun/src/main/resources/META-INF/persistence.xml b/backend/matefun/src/main/resources/META-INF/persistence.xml index 790f6201ef9ffda74f7e9c1215a9d0b89f0d4c65..2eb2226f5dd2d74649816e3979e32f480cbaf6c4 100644 --- a/backend/matefun/src/main/resources/META-INF/persistence.xml +++ b/backend/matefun/src/main/resources/META-INF/persistence.xml @@ -4,42 +4,42 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd" version="2.1"> -<!-- <persistence-unit name="matefunDS" transaction-type="JTA"> --> -<!-- <jta-data-source>java:/matefun</jta-data-source> --> -<!-- <class>edu.proygrado.modelo.Alumno</class> --> -<!-- <class>edu.proygrado.modelo.Archivo</class> --> -<!-- <class>edu.proygrado.modelo.Configuracion</class> --> -<!-- <class>edu.proygrado.modelo.Docente</class> --> -<!-- <class>edu.proygrado.modelo.Evaluacion</class> --> -<!-- <class>edu.proygrado.modelo.Grupo</class> --> -<!-- <class>edu.proygrado.modelo.GrupoPK</class> --> -<!-- <class>edu.proygrado.modelo.Liceo</class> --> -<!-- <class>edu.proygrado.modelo.LiceoPK</class> --> -<!-- <class>edu.proygrado.modelo.Usuario</class> --> -<!-- <properties> --> -<!-- <property name="javax.persistence.schema-generation.database.action" value="drop-and-create" /> --> -<!-- </properties> --> -<!-- </persistence-unit> --> - <persistence-unit name="matefunDS" transaction-type="JTA"> - <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> - <jta-data-source>jdbc/azureDSjta</jta-data-source> - <class>edu.proygrado.modelo.Alumno</class> - <class>edu.proygrado.modelo.Archivo</class> - <class>edu.proygrado.modelo.Configuracion</class> - <class>edu.proygrado.modelo.Docente</class> - <class>edu.proygrado.modelo.Evaluacion</class> - <class>edu.proygrado.modelo.Grupo</class> - <class>edu.proygrado.modelo.GrupoPK</class> - <class>edu.proygrado.modelo.Liceo</class> - <class>edu.proygrado.modelo.LiceoPK</class> - <class>edu.proygrado.modelo.Usuario</class> - <properties> - <property name="javax.persistence.schema-generation.database.action" - value="none" /> - <property name="hibernate.transaction.jta.platform" value="org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform"/> - </properties> + <jta-data-source>java:/matefun</jta-data-source> + <class>edu.proygrado.modelo.Alumno</class> + <class>edu.proygrado.modelo.Archivo</class> + <class>edu.proygrado.modelo.Configuracion</class> + <class>edu.proygrado.modelo.Docente</class> + <class>edu.proygrado.modelo.Evaluacion</class> + <class>edu.proygrado.modelo.Grupo</class> + <class>edu.proygrado.modelo.GrupoPK</class> + <class>edu.proygrado.modelo.Liceo</class> + <class>edu.proygrado.modelo.LiceoPK</class> + <class>edu.proygrado.modelo.Usuario</class> + <properties> + <property name="javax.persistence.schema-generation.database.action" value="none" /> + </properties> </persistence-unit> +<!-- <persistence-unit name="matefunDS" transaction-type="JTA"> --> +<!-- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> --> +<!-- <jta-data-source>jdbc/azureDSjta</jta-data-source> --> +<!-- <class>edu.proygrado.modelo.Alumno</class> --> +<!-- <class>edu.proygrado.modelo.Archivo</class> --> +<!-- <class>edu.proygrado.modelo.Configuracion</class> --> +<!-- <class>edu.proygrado.modelo.Docente</class> --> +<!-- <class>edu.proygrado.modelo.Evaluacion</class> --> +<!-- <class>edu.proygrado.modelo.Grupo</class> --> +<!-- <class>edu.proygrado.modelo.GrupoPK</class> --> +<!-- <class>edu.proygrado.modelo.Liceo</class> --> +<!-- <class>edu.proygrado.modelo.LiceoPK</class> --> +<!-- <class>edu.proygrado.modelo.Usuario</class> --> +<!-- <properties> --> +<!-- <property name="javax.persistence.schema-generation.database.action" --> +<!-- value="none" /> --> +<!-- <property name="hibernate.transaction.jta.platform" value="org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform"/> --> +<!-- </properties> --> +<!-- </persistence-unit> --> + </persistence>