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
cfbf29f7
Commit
cfbf29f7
authored
Jul 24, 2019
by
Marcos Viera
Browse files
funciona con matefun 0.7
parent
c3539512
Changes
11
Hide whitespace changes
Inline
Side-by-side
Frontend Angular 4/src/app/shared/config.ts
View file @
cfbf29f7
...
...
@@ -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 @
cfbf29f7
...
...
@@ -27,6 +27,7 @@ export class GHCIService {
private
waitingForWarning
:
boolean
=
false
;
private
waitingForWarning2
:
boolean
=
false
;
private
warningText
:
string
=
""
;
private
errorText
:
string
=
""
;
private
lastError
:
number
=
-
1
;
private
lastWarning
:
number
=
-
1
;
translateService
:
any
;
...
...
@@ -135,12 +136,17 @@ export class GHCIService {
var
line
=
-
1
;
if
(
this
.
waitingForError
){
var
line
=
this
.
lastError
;
var
columna
=
this
.
errorText
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.column
'
).
value
}
:`
)[
1
].
split
(
"
}
"
)[
0
];
var
ErrorTextToShow
=
JSON
.
parse
(
text
).
resultado
.
split
(
"
OUT
"
)[
1
].
trim
();
var
ErrorFinalText
=
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.inColumn
'
).
value
}
`
+
columna
+
"
:
"
+
ErrorTextToShow
;
if
(
this
.
codemirrorRef
!==
null
){
var
makeMarker
=
function
()
{
var
marker
=
document
.
createElement
(
"
div
"
);
marker
.
id
=
"
error_
"
+
line
.
toString
();
marker
.
style
.
width
=
"
15px
"
;
marker
.
title
=
JSON
.
parse
(
text
).
resultado
.
split
(
"
OUT
"
)[
1
].
trim
()
;
marker
.
title
=
ErrorFinalText
;
marker
.
style
.
height
=
"
15px
"
;
marker
.
style
.
marginLeft
=
"
-5px
"
;
marker
.
style
.
cursor
=
"
pointer
"
;
...
...
@@ -154,11 +160,16 @@ export class GHCIService {
}
}
else
{
try
{
var
lineTxt
=
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.inLine
'
).
value
}
`
;
var
line
=
Number
(
JSON
.
parse
(
text
).
resultado
.
split
(
lineTxt
)[
1
].
split
(
"
,
"
)[
0
].
trim
())
-
1
;
var
m
=
JSON
.
parse
(
text
);
var
line
=
m
.
resultado
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.outError
'
).
value
}
:`
)[
1
]
.
trim
()
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.line
'
).
value
}
:`
)[
1
]
.
split
(
"
"
)[
1
]
-
1
;
this
.
waitingForError
=
true
;
this
.
lastError
=
line
;
this
.
errorText
=
m
.
resultado
.
split
(
`
${
this
.
translateService
.
get
(
'
i18n.codemirror.command.outError
'
).
value
}
:`
)[
1
].
trim
();
}
catch
(
err
){
}
...
...
Frontend Angular 4/src/assets/i18n/en.json
View file @
cfbf29f7
...
...
@@ -65,7 +65,8 @@
"column"
:
"column"
,
"inColumn"
:
"In column"
,
"line"
:
"line"
,
"outWarning"
:
"OUTWarning"
"outWarning"
:
"OUTWarning"
,
"outError"
:
"OUTError"
}
},
"msg"
:
{
...
...
Frontend Angular 4/src/assets/i18n/es.json
View file @
cfbf29f7
...
...
@@ -62,16 +62,17 @@
"codemirror"
:
{
"command"
:
{
"inLine"
:
"en linea"
,
"column"
:
"column"
,
"column"
:
"column
a
"
,
"inColumn"
:
"En columna"
,
"line"
:
"line"
,
"outWarning"
:
"OUTWarning"
"line"
:
"linea"
,
"outWarning"
:
"OUTAdvertencia"
,
"outError"
:
"OUTError"
}
},
"msg"
:
{
"404"
:
{
"title"
:
"Página no encontrada"
,
"descrp"
:
"Lo sentimos, esta páina no existe."
,
"descrp"
:
"Lo sentimos, esta pá
g
ina no existe."
,
"return"
:
"Volver"
},
"codemirror"
:
{
...
...
Servidor JEE/WebContent/index.html
View file @
cfbf29f7
<!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.5c62427195e11ca1e3fb.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.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
Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun
View file @
cfbf29f7
No preview for this file type
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po
View file @
cfbf29f7
...
...
@@ -7,17 +7,17 @@ msgstr ""
"PO-Revision-Date: 2009-01-13 06:05-0800\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/MateFun/ReservedNames.hs:20
msgid "3D Figure"
msgstr "3D Figure"
#: src/MateFun.hs:3
59
#: src/MateFun.hs:3
60
msgid "3D Figures"
msgstr "3D Figures"
...
...
@@ -73,7 +73,7 @@ msgstr "Circular inclusion"
msgid "Color"
msgstr "Color"
#: src/MateFun.hs:36
0
#: src/MateFun.hs:36
1
msgid "Colors"
msgstr "Colors"
...
...
@@ -121,9 +121,9 @@ msgstr "Enables function usage warnings"
msgid "Enables verbose mode"
msgstr "Enables verbose mode"
#: src/MateFun.hs:
322
msgid "Error
in line
"
msgstr "Error
in line
"
#: src/MateFun
/TypeCheck
.hs:
51
msgid "Error"
msgstr "Error"
#: src/MateFun.hs:126
msgid "Error reading command to interpretate."
...
...
@@ -145,7 +145,7 @@ msgstr "FILE"
msgid "Figure"
msgstr "Figure"
#: src/MateFun.hs:35
8
#: src/MateFun.hs:35
9
msgid "Figures"
msgstr "Figures"
...
...
@@ -157,7 +157,7 @@ msgstr "Found"
msgid "Function"
msgstr "Function"
#: src/MateFun.hs:37
3
#: src/MateFun.hs:37
4
msgid "Graph"
msgstr "Graph"
...
...
@@ -169,11 +169,16 @@ msgstr "Gray"
msgid "Green"
msgstr "Green"
#: src/MateFun.hs:35
6
#: src/MateFun.hs:35
7
msgid "Integer"
msgstr "Integer"
#: src/MateFun.hs:340
#: src/MateFun/TypeCheck.hs:88
#, fuzzy
msgid "Interpreter"
msgstr "Interpreter Commands:"
#: src/MateFun.hs:341
msgid "Interpreter Commands:"
msgstr "Interpreter Commands:"
...
...
@@ -217,7 +222,7 @@ msgstr "PATH"
msgid "Please report this error with code"
msgstr "Please report this error with code"
#: src/MateFun.hs:35
7
#: src/MateFun.hs:35
8
msgid "Real"
msgstr "Real"
...
...
@@ -265,6 +270,10 @@ msgstr "Value"
msgid "Variable"
msgstr "Variable"
#: src/MateFun/Warning.hs:23
msgid "Warning"
msgstr "Warning"
#: src/MateFun.hs:57
msgid "Web Mode"
msgstr "Web Mode"
...
...
@@ -313,7 +322,7 @@ msgstr "color"
msgid "color3D"
msgstr "color3D"
#: src/MateFun.hs:
322
#: src/MateFun
/TypeCheck
.hs:
90
msgid "column"
msgstr "column"
...
...
@@ -357,7 +366,7 @@ msgstr "exit"
msgid "expression"
msgstr "expression"
#: src/MateFun.hs:175 src/MateFun/Parser.hs:217
#: src/MateFun.hs:175 src/MateFun/Parser.hs:217
src/MateFun/TypeCheck.hs:89
msgid "file"
msgstr "file"
...
...
@@ -413,7 +422,7 @@ msgstr "join"
msgid "join3D"
msgstr "join3D"
#: src/MateFun/ReservedNames.hs:34
#: src/MateFun/ReservedNames.hs:34
src/MateFun/TypeCheck.hs:89
msgid "line"
msgstr "line"
...
...
@@ -465,7 +474,7 @@ msgstr "plot a function R -> R"
msgid "poli"
msgstr "poli"
#: src/MateFun.hs:36
0
#: src/MateFun.hs:36
1
msgid "predefined"
msgstr "predefined"
...
...
@@ -572,3 +581,6 @@ msgstr "vars"
#: src/MateFun/ReservedNames.hs:96
msgid "was defined more than once. Defined in:"
msgstr "was defined more than once. Defined in:"
#~ msgid "Error in line"
#~ msgstr "Error in line"
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en/LC_MESSAGES/mate-fun.mo
View file @
cfbf29f7
No preview for this file type
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po
View file @
cfbf29f7
...
...
@@ -7,17 +7,17 @@ msgstr ""
"PO-Revision-Date: 2009-01-13 06:05-0800\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/MateFun/ReservedNames.hs:20
msgid "3D Figure"
msgstr "Figura 3D"
#: src/MateFun.hs:3
59
#: src/MateFun.hs:3
60
msgid "3D Figures"
msgstr "Figuras 3D"
...
...
@@ -73,7 +73,7 @@ msgstr "Inclusion Circular"
msgid "Color"
msgstr "Color"
#: src/MateFun.hs:36
0
#: src/MateFun.hs:36
1
msgid "Colors"
msgstr "Colors"
...
...
@@ -111,8 +111,7 @@ msgstr "Habilita las advertencias de uso de funciones aritmeticas"
#: src/MateFun.hs:59
msgid "Enables domain intersection check on functions to load"
msgstr ""
"Habilita chequeo de interseccion de dominios en las funciones a ser cargadas"
msgstr "Habilita chequeo de interseccion de dominios en las funciones a ser cargadas"
#: src/MateFun.hs:53
msgid "Enables function usage warnings"
...
...
@@ -122,9 +121,9 @@ msgstr "Habilita las advertencias de uso de funciones"
msgid "Enables verbose mode"
msgstr "Habilita modo verboso"
#: src/MateFun.hs:
322
msgid "Error
in line
"
msgstr "Error
en linea
"
#: src/MateFun
/TypeCheck
.hs:
51
msgid "Error"
msgstr "Error"
#: src/MateFun.hs:126
msgid "Error reading command to interpretate."
...
...
@@ -146,7 +145,7 @@ msgstr "ARCHIVO"
msgid "Figure"
msgstr "Figura"
#: src/MateFun.hs:35
8
#: src/MateFun.hs:35
9
msgid "Figures"
msgstr "Figuras"
...
...
@@ -158,7 +157,7 @@ msgstr "Se encontro"
msgid "Function"
msgstr "Funcion"
#: src/MateFun.hs:37
3
#: src/MateFun.hs:37
4
msgid "Graph"
msgstr "Grafica"
...
...
@@ -170,11 +169,16 @@ msgstr "Gris"
msgid "Green"
msgstr "Verde"
#: src/MateFun.hs:35
6
#: src/MateFun.hs:35
7
msgid "Integer"
msgstr "Enteros"
#: src/MateFun.hs:340
#: src/MateFun/TypeCheck.hs:88
#, fuzzy
msgid "Interpreter"
msgstr "Comandos del Interprete"
#: src/MateFun.hs:341
msgid "Interpreter Commands:"
msgstr "Comandos del Interprete"
...
...
@@ -218,7 +222,7 @@ msgstr "RUTA"
msgid "Please report this error with code"
msgstr "Por favor avisar de este error con codigo"
#: src/MateFun.hs:35
7
#: src/MateFun.hs:35
8
msgid "Real"
msgstr "Reales"
...
...
@@ -266,6 +270,10 @@ msgstr "Valor"
msgid "Variable"
msgstr "Variable"
#: src/MateFun/Warning.hs:23
msgid "Warning"
msgstr "Advertencia"
#: src/MateFun.hs:57
msgid "Web Mode"
msgstr "Modo Web"
...
...
@@ -314,7 +322,7 @@ msgstr "color"
msgid "color3D"
msgstr "color3D"
#: src/MateFun.hs:
322
#: src/MateFun
/TypeCheck
.hs:
90
msgid "column"
msgstr "columna"
...
...
@@ -358,7 +366,7 @@ msgstr "salir"
msgid "expression"
msgstr "expresion"
#: src/MateFun.hs:175 src/MateFun/Parser.hs:217
#: src/MateFun.hs:175 src/MateFun/Parser.hs:217
src/MateFun/TypeCheck.hs:89
msgid "file"
msgstr "archivo"
...
...
@@ -414,7 +422,7 @@ msgstr "juntar"
msgid "join3D"
msgstr "juntar3D"
#: src/MateFun/ReservedNames.hs:34
#: src/MateFun/ReservedNames.hs:34
src/MateFun/TypeCheck.hs:89
msgid "line"
msgstr "linea"
...
...
@@ -466,7 +474,7 @@ msgstr "grafica una funcion de R -> R"
msgid "poli"
msgstr "poli"
#: src/MateFun.hs:36
0
#: src/MateFun.hs:36
1
msgid "predefined"
msgstr "predefinidos"
...
...
@@ -573,3 +581,6 @@ msgstr "vars"
#: src/MateFun/ReservedNames.hs:96
msgid "was defined more than once. Defined in:"
msgstr "se definio mas de una vez. Definida en"
#~ msgid "Error in line"
#~ msgstr "Error en linea"
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es/LC_MESSAGES/mate-fun.mo
View file @
cfbf29f7
No preview for this file type
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/messages.pot
View file @
cfbf29f7
...
...
@@ -17,7 +17,7 @@ msgstr ""
msgid "3D Figure"
msgstr ""
#: src/MateFun.hs:3
59
#: src/MateFun.hs:3
60
msgid "3D Figures"
msgstr ""
...
...
@@ -74,7 +74,7 @@ msgstr ""
msgid "Color"
msgstr ""
#: src/MateFun.hs:36
0
#: src/MateFun.hs:36
1
msgid "Colors"
msgstr ""
...
...
@@ -122,8 +122,8 @@ msgstr ""
msgid "Enables verbose mode"
msgstr ""
#: src/MateFun.hs:
322
msgid "Error
in line
"
#: src/MateFun
/TypeCheck
.hs:
51
msgid "Error"
msgstr ""
#: src/MateFun.hs:126
...
...
@@ -147,7 +147,7 @@ msgstr ""
msgid "Figure"
msgstr ""
#: src/MateFun.hs:35
8
#: src/MateFun.hs:35
9
msgid "Figures"
msgstr ""
...
...
@@ -160,7 +160,7 @@ msgstr ""
msgid "Function"
msgstr ""
#: src/MateFun.hs:37
3
#: src/MateFun.hs:37
4
msgid "Graph"
msgstr ""
...
...
@@ -172,11 +172,15 @@ msgstr ""
msgid "Green"
msgstr ""
#: src/MateFun.hs:35
6
#: src/MateFun.hs:35
7
msgid "Integer"
msgstr ""
#: src/MateFun.hs:340
#: src/MateFun/TypeCheck.hs:88
msgid "Interpreter"
msgstr ""
#: src/MateFun.hs:341
msgid "Interpreter Commands:"
msgstr ""
...
...
@@ -221,7 +225,7 @@ msgstr ""
msgid "Please report this error with code"
msgstr ""
#: src/MateFun.hs:35
7
#: src/MateFun.hs:35
8
msgid "Real"
msgstr ""
...
...
@@ -269,6 +273,10 @@ msgstr ""
msgid "Variable"
msgstr ""
#: src/MateFun/Warning.hs:23
msgid "Warning"
msgstr ""
#: src/MateFun.hs:57
msgid "Web Mode"
msgstr ""
...
...
@@ -317,7 +325,7 @@ msgstr ""
msgid "color3D"
msgstr ""
#: src/MateFun.hs:
322
#: src/MateFun
/TypeCheck
.hs:
90
msgid "column"
msgstr ""
...
...
@@ -364,6 +372,7 @@ msgstr ""
#: src/MateFun.hs:175
#: src/MateFun/Parser.hs:217
#: src/MateFun/TypeCheck.hs:89
msgid "file"
msgstr ""
...
...
@@ -421,6 +430,7 @@ msgid "join3D"
msgstr ""
#: src/MateFun/ReservedNames.hs:34
#: src/MateFun/TypeCheck.hs:89
msgid "line"
msgstr ""
...
...
@@ -472,7 +482,7 @@ msgstr ""
msgid "poli"
msgstr ""
#: src/MateFun.hs:36
0
#: src/MateFun.hs:36
1
msgid "predefined"
msgstr ""
...
...
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