Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matefun
Frontend
Commits
973a8880
Commit
973a8880
authored
Jul 30, 2019
by
Marcos Viera
Browse files
fix de warnings y errores cuando se usa incluir
parent
8372d8e6
Changes
7
Hide whitespace changes
Inline
Side-by-side
Frontend Angular 4/package-lock.json
View file @
973a8880
...
...
@@ -1476,9 +1476,9 @@
}
},
"caniuse-lite"
:
{
"version"
:
"1.0.3000098
5
"
,
"resolved"
:
"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.3000098
5
.tgz"
,
"integrity"
:
"sha512-
1ngiwkgqAYPG0JSSUp3PUDGPKKY59EK7NrGGX+VOxaKCNzRbNc7uXMny+c3VJfZxtoK3wSImTvG9T9sXiTw2+w
=="
,
"version"
:
"1.0.3000098
6
"
,
"resolved"
:
"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.3000098
6
.tgz"
,
"integrity"
:
"sha512-
pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ
=="
,
"dev"
:
true
},
"capture-stack-trace"
:
{
...
...
@@ -2839,9 +2839,9 @@
"dev"
:
true
},
"electron-to-chromium"
:
{
"version"
:
"1.3.20
0
"
,
"resolved"
:
"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.20
0
.tgz"
,
"integrity"
:
"sha512-
PUurrpyDA74MuAjJRD+79ss5BqJlU3mdArRbuu4wO/dt6jc3Ic/6BDmFJxkdwbfq39cHf/XKm2vW98XSvut9Dg
=="
,
"version"
:
"1.3.20
1
"
,
"resolved"
:
"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.20
1
.tgz"
,
"integrity"
:
"sha512-
aCTPIfY1Jvuam5b6vuWRjt1F8i4kY7zX0Qtpu5SNd6l1zjuxU9fDNpbM4o6+oJsra+TMD2o7D20GnkSIgpTr9w
=="
,
"dev"
:
true
},
"elliptic"
:
{
...
...
Frontend Angular 4/src/app/layout/matefun/matefun.component.ts
View file @
973a8880
...
...
@@ -574,7 +574,7 @@ export class MateFunComponent {
idList
.
push
(
archivo
.
id
);
}
this
.
lockSaveButton
();
this
.
ghciService
.
loadFile
(
archivo
.
id
,
idList
);
this
.
ghciService
.
loadFile
(
archivo
.
id
,
archivo
.
nombre
,
idList
);
},
error
=>
{
this
.
notifService
.
error
(
error
);
...
...
@@ -588,7 +588,7 @@ export class MateFunComponent {
if
(
!
idList
.
some
(
id
=>
id
==
this
.
archivo
.
id
)){
idList
.
push
(
this
.
archivo
.
id
);
}
this
.
ghciService
.
loadFile
(
this
.
archivo
.
id
,
idList
);
this
.
ghciService
.
loadFile
(
this
.
archivo
.
id
,
this
.
archivo
.
nombre
,
idList
);
}
}
else
{
this
.
haskellService
.
crearArchivo
(
this
.
archivo
)
...
...
@@ -596,7 +596,7 @@ export class MateFunComponent {
archivo
=>
{
this
.
archivo
=
archivo
;
this
.
lockSaveButton
();
this
.
ghciService
.
loadFile
(
archivo
.
id
,[]);
this
.
ghciService
.
loadFile
(
archivo
.
id
,
archivo
.
nombre
,
[]);
},
error
=>
{
this
.
notifService
.
error
(
error
);
...
...
Frontend Angular 4/src/app/shared/config.ts
View file @
973a8880
...
...
@@ -25,10 +25,10 @@
// export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint';
// psico
export
const
SERVER
=
'
https://matefun.math.psico.edu.uy
'
;
export
const
GHCI_URL
=
'
wss://matefun.math.psico.edu.uy/endpoint
'
;
//
export const SERVER = 'https://matefun.math.psico.edu.uy';
//
export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint';
//diego docker
// export const SERVER = 'http://localhost:8080';
//export const GHCI_URL = 'ws://localhost:8080/endpoint';
\ No newline at end of file
export
const
SERVER
=
'
http://localhost:8080
'
;
export
const
GHCI_URL
=
'
ws://localhost:8080/endpoint
'
;
\ No newline at end of file
Frontend Angular 4/src/app/shared/services/ghci.service.ts
View file @
973a8880
...
...
@@ -29,7 +29,10 @@ export class GHCIService {
private
warningText
:
string
=
""
;
private
errorText
:
string
=
""
;
private
lastError
:
number
=
-
1
;
private
lastErrorFile
:
string
=
""
;
private
lastWarning
:
number
=
-
1
;
private
lastWarningFile
:
string
=
""
;
private
currentFile
:
string
=
""
;
translateService
:
any
;
private
console_error_class
:
string
=
"
jqconsole-asd
"
;
...
...
@@ -56,8 +59,9 @@ export class GHCIService {
return
this
.
warnings
;
}
loadFile
(
fileId
,
dependencias
)
{
loadFile
(
fileId
,
fileName
,
dependencias
)
{
this
.
waitingForWarning
=
true
;
this
.
currentFile
=
fileName
;
var
message
=
{
'
token
'
:
this
.
authService
.
getToken
(),
'
load
'
:
fileId
,
...
...
@@ -141,7 +145,7 @@ export class GHCIService {
var
ErrorFinalText
=
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.inColumn
'
).
value
}
`
+
columna
+
"
:
"
+
ErrorTextToShow
;
if
(
this
.
codemirrorRef
!==
null
){
if
((
this
.
currentFile
==
this
.
lastErrorFile
)
&&
(
this
.
codemirrorRef
!==
null
)
)
{
var
makeMarker
=
function
()
{
var
marker
=
document
.
createElement
(
"
div
"
);
marker
.
id
=
"
error_
"
+
line
.
toString
();
...
...
@@ -161,6 +165,12 @@ export class GHCIService {
}
else
{
try
{
var
m
=
JSON
.
parse
(
text
);
var
file
=
m
.
resultado
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.outError
'
).
value
}
:`
)[
1
]
.
trim
()
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.object.file
'
).
value
}
:`
)[
1
]
.
split
(
"
"
)[
1
];
var
line
=
m
.
resultado
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.outError
'
).
value
}
:`
)[
1
]
.
trim
()
...
...
@@ -169,8 +179,8 @@ export class GHCIService {
this
.
waitingForError
=
true
;
this
.
lastError
=
line
;
this
.
lastErrorFile
=
file
;
this
.
errorText
=
m
.
resultado
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.outError
'
).
value
}
:`
)[
1
].
trim
();
}
catch
(
err
){
}
return
false
;
...
...
@@ -204,7 +214,7 @@ export class GHCIService {
var
warningFinalText
=
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.inColumn
'
).
value
}
`
+
columna
+
"
:
"
+
warningTextToShow
;
if
(
this
.
codemirrorRef
!==
null
){
if
((
this
.
currentFile
==
this
.
lastWarningFile
)
&&
(
this
.
codemirrorRef
!==
null
)
)
{
var
makeMarker
=
function
()
{
var
marker
=
document
.
createElement
(
"
div
"
);
marker
.
style
.
width
=
"
15px
"
;
...
...
@@ -227,7 +237,15 @@ export class GHCIService {
if
(
this
.
warningStepReaded
===
0
){
try
{
try
{
var
file
=
m
.
resultado
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.outWarning
'
).
value
}
:`
)[
1
]
.
trim
()
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.object.file
'
).
value
}
:`
)[
1
]
.
split
(
"
"
)[
1
];
// retrive line of warning
var
line
=
m
.
resultado
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.outWarning
'
).
value
}
:`
)[
1
]
...
...
@@ -236,6 +254,7 @@ export class GHCIService {
.
split
(
"
"
)[
1
]
-
1
;
this
.
lastWarning
=
line
;
this
.
lastWarningFile
=
file
;
this
.
warnings
.
push
(
line
);
var
warningText
=
m
.
resultado
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.outWarning
'
).
value
}
:`
)[
1
].
trim
();
this
.
warningStepReaded
=
1
;
...
...
@@ -245,7 +264,6 @@ export class GHCIService {
this
.
outputConsole
(
`
${
this
.
translateService
.
get
(
'
i18n.msg.codemirror.consoleWarnings
'
).
value
}
\n`
);
this
.
waitingForWarning
=
false
;
}
}
catch
(
err
){
...
...
Servidor JEE/WebContent/3rdpartylicenses.txt
View file @
973a8880
...
...
@@ -2,7 +2,7 @@
MIT
MIT
codemirror@5.48.
0
codemirror@5.48.
2
MIT
MIT License
...
...
Servidor JEE/WebContent/index.html
View file @
973a8880
<!doctype html>
<html><head><meta
charset=
"utf-8"
><title>
Proyecto MateFun
</title><base
href=
"/"
><meta
name=
"viewport"
content=
"width=device-width,initial-scale=1"
><link
rel=
"icon"
type=
"image/x-icon"
href=
"favicon.ico"
>
<!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> -->
<script
src=
"https://code.jquery.com/jquery-3.1.1.slim.min.js"
integrity=
"sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n"
crossorigin=
"anonymous"
></script><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><script
src=
"https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"
crossorigin=
"anonymous"
></script>
<!--
<script src="https://wzrd.in/standalone/function-plot@1.18.1" crossorigin="anonymous"></script>
-->
<link
href=
"styles.8e9b76ce39821b2f5328.bundle.css"
rel=
"stylesheet"
/></head><body><app-root><div
class=
"loading"
><div
class=
"loading-bar"
></div><div
class=
"loading-bar"
></div><div
class=
"loading-bar"
></div><div
class=
"loading-bar"
></div><div
class=
"loading-bar"
></div></div></app-root><script
type=
"text/javascript"
src=
"inline.7b1a129376036326039f.bundle.js"
></script><script
type=
"text/javascript"
src=
"polyfills.d50ac7c762e2eb4097d9.bundle.js"
></script><script
type=
"text/javascript"
src=
"scripts.d01654a9119059a68b2b.bundle.js"
></script><script
type=
"text/javascript"
src=
"vendor.d3c1758890cc7548bc7b.bundle.js"
></script><script
type=
"text/javascript"
src=
"main.94941e96a5bd65bdeb71.bundle.js"
></script></body></html>
\ No newline at end of file
-->
<link
href=
"styles.8e9b76ce39821b2f5328.bundle.css"
rel=
"stylesheet"
/></head><body><app-root><div
class=
"loading"
><div
class=
"loading-bar"
></div><div
class=
"loading-bar"
></div><div
class=
"loading-bar"
></div><div
class=
"loading-bar"
></div><div
class=
"loading-bar"
></div></div></app-root><script
type=
"text/javascript"
src=
"inline.e4a1c4b538d0a92ac54f.bundle.js"
></script><script
type=
"text/javascript"
src=
"polyfills.d50ac7c762e2eb4097d9.bundle.js"
></script><script
type=
"text/javascript"
src=
"scripts.d01654a9119059a68b2b.bundle.js"
></script><script
type=
"text/javascript"
src=
"vendor.d3c1758890cc7548bc7b.bundle.js"
></script><script
type=
"text/javascript"
src=
"main.94941e96a5bd65bdeb71.bundle.js"
></script></body></html>
\ No newline at end of file
Servidor JEE/src/main/java/edu/proygrado/ejb/ArchivosEJB.java
View file @
973a8880
...
...
@@ -122,7 +122,7 @@ public class ArchivosEJB {
// no existe la copia. No se hace nada con esta excepcion.
}
if
(
archivo
==
null
)
{
throw
new
Exception
(
"No exite el archivo de id "
+
archivoId
);
throw
new
Exception
(
"No exi
s
te el archivo de id "
+
archivoId
);
}
Alumno
alumno
=
em
.
find
(
Alumno
.
class
,
cedula
);
...
...
@@ -172,7 +172,8 @@ public class ArchivosEJB {
public
void
eliminarArchivo
(
long
archivoId
)
throws
Exception
{
Archivo
archivo
=
em
.
find
(
Archivo
.
class
,
archivoId
);
if
(
archivo
!=
null
)
{
em
.
remove
(
archivo
);
//em.remove(archivo);
archivo
.
setEliminado
(
true
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment