diff --git a/MateFun/src/MateFun.hs b/MateFun/src/MateFun.hs
index f4570334f55e990cd978159c6eff3d6fa1b80965..22d2eb397a88d677b8cb759c71eebe50b96a019c 100644
--- a/MateFun/src/MateFun.hs
+++ b/MateFun/src/MateFun.hs
@@ -154,11 +154,16 @@ esSeEsperaba s = isPrefixOf ", pero se esperaba" s
eliminarRedundancia :: [String] -> [String]
eliminarRedundancia [] = []
eliminarRedundancia (x:[]) = (x:[])
-eliminarRedundancia (x:y:xs) = if((esSeEsperaba x) && (esSeEsperaba y) ) then
- [x] ++[" " ++ ((words y)!!4)] ++ eliminarRedundancia (xs)
+eliminarRedundancia (x:y:xs) = if((esSeEsperaba x) && (esSeEsperaba y)) then
+ "pero se esperaba " ++ (getSeEsperaba x:y:xs)
else
[x] ++ eliminarRedundancia (y:xs)
+getSeEsperaba :: [String] -> String
+getSeEsperaba [] = []
+getSeEsperaba (x:[]) = (words x)!!4
+getSeEsperaba (x:y:xs) = ((words x) !! 4) ++ " o " ++ (getSeEsperaba y:xs)
+
joinMessages :: [String] -> String
joinMessages [] = []
joinMessages (x:xs) = if (elem x xs || x=="") then
diff --git a/backend/matefun/WebContent/favicon.ico b/backend/matefun/WebContent/favicon.ico
deleted file mode 100644
index 444fdd4ab74564eb687272240ec077d93ead5269..0000000000000000000000000000000000000000
Binary files a/backend/matefun/WebContent/favicon.ico and /dev/null differ
diff --git a/backend/matefun/WebContent/index.html b/backend/matefun/WebContent/index.html
index 4422f86efc26ee88c4dcbae2f1a1d4f9059cbeb4..0cb6812bf17b77d3b71d9a3c3b1aadf21c5997d1 100644
--- a/backend/matefun/WebContent/index.html
+++ b/backend/matefun/WebContent/index.html
@@ -12,7 +12,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
-</head>
+<link href="styles.b1148277d66fc16e21e2.bundle.css" rel="stylesheet"/></head>
<body>
<app-root>
<div class="loading">
@@ -23,6 +23,6 @@
<div class="loading-bar"></div>
</div>
</app-root>
-<script type="text/javascript" src="inline.bundle.js"></script><script type="text/javascript" src="polyfills.bundle.js"></script><script type="text/javascript" src="scripts.bundle.js"></script><script type="text/javascript" src="styles.bundle.js"></script><script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="main.bundle.js"></script></body>
+<script type="text/javascript" src="inline.814d29c246037ce56a1a.bundle.js"></script><script type="text/javascript" src="polyfills.fea873d1973cf1b50182.bundle.js"></script><script type="text/javascript" src="scripts.dd03fe800ea834b08787.bundle.js"></script><script type="text/javascript" src="vendor.901ea4aab80b8257297b.bundle.js"></script><script type="text/javascript" src="main.83f666d7b3dd0127c272.bundle.js"></script></body>
</html>
diff --git a/backend/matefun/bin/target/classes/edu/proygrado/binarios/MateFun b/backend/matefun/bin/target/classes/edu/proygrado/binarios/MateFun
index 8f9285631d3492611a079eea12dba949b96cec8b..e926c642d4b2b8084a9a345b94b6313539e2b385 100755
Binary files a/backend/matefun/bin/target/classes/edu/proygrado/binarios/MateFun and b/backend/matefun/bin/target/classes/edu/proygrado/binarios/MateFun differ
diff --git a/backend/matefun/src/main/java/edu/proygrado/ejb/ArchivosEJB.java b/backend/matefun/src/main/java/edu/proygrado/ejb/ArchivosEJB.java
index ea401cf492f453811cb5ce30fcbd6f05c51edd3c..cf2819b8e9c97b0dead74af7c3d2d4e111d1a144 100644
--- a/backend/matefun/src/main/java/edu/proygrado/ejb/ArchivosEJB.java
+++ b/backend/matefun/src/main/java/edu/proygrado/ejb/ArchivosEJB.java
@@ -44,12 +44,13 @@ public class ArchivosEJB {
}
if (user instanceof Alumno) {
archivos = em.createQuery(
- "select ar from Alumno al join al.archivos ar where LOWER(al.cedula)=LOWER(:cedula) and ar.eliminado=0")
- .setParameter("cedula", cedula).getResultList();
+ "select ar from Alumno al join al.archivos ar where LOWER(al.cedula)=LOWER(:cedula) and ar.eliminado=:statusEliminado")
+ .setParameter("cedula", cedula).setParameter("statusEliminado", false).getResultList();
} else {
archivos = em.createQuery(
- "select ar from Docente d join d.archivos ar where LOWER(d.cedula)=LOWER(:cedula) and ar.eliminado=0")
- .setParameter("cedula", cedula).getResultList();
+ "select ar from Docente d join d.archivos ar where LOWER(d.cedula)=LOWER(:cedula) and ar.eliminado=:statusEliminado")
+ .setParameter("cedula", cedula).
+ setParameter("statusEliminado", false).getResultList();
}
List<ArchivoDTO> archivosDTO = new ArrayList<>();
archivos.stream().forEach((archivo) -> {
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 480fde538cec70533741cc6a1d2c7d4622a0ec38..a021a2f7768747f9a3a10d91547edc6e73320310 100644
--- a/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java
+++ b/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java
@@ -9,6 +9,7 @@ import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -28,6 +29,7 @@ import edu.proygrado.dto.MoodleUserInfoDTO;
import edu.proygrado.dto.UsuarioDTO;
import edu.proygrado.modelo.Alumno;
import edu.proygrado.modelo.Archivo;
+import edu.proygrado.modelo.Configuracion;
import edu.proygrado.modelo.Docente;
import edu.proygrado.modelo.EstadoArchivo;
import edu.proygrado.modelo.Grupo;
@@ -133,8 +135,18 @@ public class LoginEJB{
root.setNombre("root");
root.setFechaCreacion(new Date());
root.setEditable(true);
-
+ root.setEliminado(false);
root.setEstado(EstadoArchivo.Edicion);
+ List<Archivo> list = new ArrayList<>();
+ list.add(root);
+ ((Alumno)nuevoDesdeMoodle).setArchivos(list);
+ Configuracion conf = new Configuracion();
+ conf.setArgumentoF(false);
+ conf.setArgumentoI(false);
+ conf.setFontSizeEditor(12);
+ conf.setThemeEditor("dracula");
+ nuevoDesdeMoodle.setConfiguracion(conf);
+ em.persist(conf);
em.persist(root);
em.persist(nuevoDesdeMoodle);
String tokenAuth = generateToken();
diff --git a/frontendAngular4/src/app/login/login.component.html b/frontendAngular4/src/app/login/login.component.html
index b545c3a0771a014865de27618a778797adb99557..2ebaf5e80c389046f3c7b633dfd3725eecf2226a 100644
--- a/frontendAngular4/src/app/login/login.component.html
+++ b/frontendAngular4/src/app/login/login.component.html
@@ -1,4 +1,4 @@
-<div class="login-page" style="background: linear-gradient(#0085ff, #31dc7d);">
+<div class="login-page" style="background: linear-gradient(#0085ff, rgba(163, 56, 81, 0.94));">
<div class="row">
<div class="col-md-4 push-md-4" style="padding: 55px 35px;background: rgba(255,255,255,0.15);border-radius: 8px;">
<h1>MateFun</h1>
@@ -14,8 +14,8 @@
</div>
- <a class="btn rounded-btn" (click)=login()> Log in </a>
- <a class="btn rounded-btn" (click)=invitado()> Invitado </a>
+ <a class="btn rounded-btn" style="background: transparent;color: white;cursor: pointer;width: 159px;margin-right: 3px;" (click)=login()> Iniciar Sesión </a>
+ <a class="btn rounded-btn" style="background: transparent;color: white;cursor: pointer;width: 159px;margin-left: 3px;" (click)=invitado()> Invitado </a>
<div class="loading" *ngIf="loading">
<div class="loading-bar"></div>
diff --git a/frontendAngular4/src/app/shared/components/header/header.component.html b/frontendAngular4/src/app/shared/components/header/header.component.html
index 29f26cbf83bb0f3df3cc356329bc26e472b472d2..4269f58ead899d52309b5c0425da0a8793609748 100644
--- a/frontendAngular4/src/app/shared/components/header/header.component.html
+++ b/frontendAngular4/src/app/shared/components/header/header.component.html
@@ -1,5 +1,5 @@
<div class="pos-f-t fixed-top header" style="z-index: 1100;">
- <nav class="navbar navbar-inverse bg-inverse navbar-toggleable-md" style="background: linear-gradient(to right, #0085ff, rgb(49, 220, 193)) !important;">
+ <nav class="navbar navbar-inverse bg-inverse navbar-toggleable-md" style="background: linear-gradient(to right, #0085ff, rgb(95, 0, 0)) !important;">
<button class="navbar-toggler navbar-toggler-left" style="display: block;" (click)="toggleSidebar()">
<span class="navbar-toggler-icon"></span>
</button>
diff --git a/frontendAngular4/src/app/shared/components/header/header.component.scss b/frontendAngular4/src/app/shared/components/header/header.component.scss
index 0d36a4b544562ce09936353e4ec38c3827d23849..0be7ecea4e696e1d7b95c2da4f1bec6ccc24ed14 100644
--- a/frontendAngular4/src/app/shared/components/header/header.component.scss
+++ b/frontendAngular4/src/app/shared/components/header/header.component.scss
@@ -1,6 +1,7 @@
$topnav-background-color: #222;
.topnav {
background: linear-gradient(#0085ff, #31dc7d);
+ background: linear-gradient(to right, #0085ff, rgb(95, 0, 0)) !important;
border-radius: 0;
background-color: $topnav-background-color;
diff --git a/frontendAngular4/src/app/shared/components/sidebar/sidebar.component.html b/frontendAngular4/src/app/shared/components/sidebar/sidebar.component.html
index 850df37c4e49e51c28966f85302a5b60cb860d3d..1bc7501eb5f7cf856e5008840f90b4c70082ef38 100644
--- a/frontendAngular4/src/app/shared/components/sidebar/sidebar.component.html
+++ b/frontendAngular4/src/app/shared/components/sidebar/sidebar.component.html
@@ -1,4 +1,4 @@
-<nav class="sidebar" [ngClass]="{sidebarPushRight: isActive}" style="background: linear-gradient(#0085ff, rgb(49, 220, 193)) !important;">
+ <nav class="sidebar" [ngClass]="{sidebarPushRight: isActive}" style="background: linear-gradient(#0978e6, rgb(29, 3, 3)) !important;">
<ul class="list-group">
<a [routerLink]="['/matefun']" (click)=toggleSidebar() [routerLinkActive]="['router-link-active']" class="list-group-item"
style="background: transparent;color: white;">