Skip to content

Commit

Permalink
Issue #71 fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Elmerluis0129 committed Apr 13, 2024
1 parent e926707 commit 447718a
Show file tree
Hide file tree
Showing 9 changed files with 100 additions and 63 deletions.
53 changes: 27 additions & 26 deletions Elmer/Daniel_JSON_Files_Elmer/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -1,8 +1,8 @@
[
{
"name": "Elmer",
"points": 2971,
"last_active": "2024-04-11 ; 15h:02m"
"points": 3000,
"last_active": "2024-04-13 ; 00h:12m"
},
{
"name": "Daniel",
Expand Down
10 changes: 2 additions & 8 deletions Elmer/Daniel_JSON_Files_Elmer/M4_LESSON_1_Lists/M4_L1_Main.py
Expand Up @@ -549,7 +549,7 @@ def init_ui(self):

self.button_layout = QHBoxLayout()
self.button_layout.addWidget(self.back_button)
self.button_layout.addWidget(self.btn_open_console)
#self.button_layout.addWidget(self.btn_open_console)
self.button_layout.addWidget(self.submit_button)
self.button_layout.addWidget(self.practice_button)
self.button_layout.addWidget(self.continue_button)
Expand Down Expand Up @@ -619,14 +619,8 @@ def SubmitAnswers(self, NoSeleciona, Correcto, Incorrecto):
f"color: {self.styles['incorrect_color']}; font-size: {self.styles['font_size_answers']}px")

def open_python_console(self):
self.SubmitHideContinueShow(True, False)
try:
# Crear una instancia de la ventana de práctica
self.ventana_practica = CMDP()

# Mostrar la instancia de la ventana de práctica
self.ventana_practica.show()

print("Hay que eliminar este boton con esta funcion")
except Exception as e:
print(f"Error al abrir la consola de práctica: {e}")

Expand Down
Expand Up @@ -556,7 +556,7 @@ def init_ui(self):

self.button_layout = QHBoxLayout()
self.button_layout.addWidget(self.back_button)
self.button_layout.addWidget(self.btn_open_console)
#self.button_layout.addWidget(self.btn_open_console)
self.button_layout.addWidget(self.submit_button)
self.button_layout.addWidget(self.practice_button)
self.button_layout.addWidget(self.continue_button)
Expand Down Expand Up @@ -626,17 +626,12 @@ def SubmitAnswers(self, NoSeleciona, Correcto, Incorrecto):
f"color: {self.styles['incorrect_color']}; font-size: {self.styles['font_size_answers']}px")

def open_python_console(self):
self.SubmitHideContinueShow(True, False)
try:
# Crear una instancia de la ventana de práctica
self.ventana_practica = CMDP()

# Mostrar la instancia de la ventana de práctica
self.ventana_practica.show()

print("Hay que eliminar este boton con esta funcion")
except Exception as e:
print(f"Error al abrir la consola de práctica: {e}")


def SubmitHideContinueShow(self, pedagogical, practica):
if pedagogical:
self.submit_button.hide(), self.practice_button.hide(), self.continue_button.show(), self.back_button.show(), self.btn_open_console.show()
Expand Down
Expand Up @@ -557,7 +557,7 @@ def init_ui(self):

self.button_layout = QHBoxLayout()
self.button_layout.addWidget(self.back_button)
self.button_layout.addWidget(self.btn_open_console)
#self.button_layout.addWidget(self.btn_open_console)
self.button_layout.addWidget(self.submit_button)
self.button_layout.addWidget(self.practice_button)
self.button_layout.addWidget(self.continue_button)
Expand Down Expand Up @@ -626,14 +626,8 @@ def SubmitAnswers(self, NoSeleciona, Correcto, Incorrecto):
f"color: {self.styles['incorrect_color']}; font-size: {self.styles['font_size_answers']}px")

def open_python_console(self):
self.SubmitHideContinueShow(True, False)
try:
# Crear una instancia de la ventana de práctica
self.ventana_practica = CMDP()

# Mostrar la instancia de la ventana de práctica
self.ventana_practica.show()

print("Hay que eliminar este boton con esta funcion")
except Exception as e:
print(f"Error al abrir la consola de práctica: {e}")

Expand Down
Expand Up @@ -602,8 +602,10 @@ def SubmitAnswers(self, NoSeleciona, Correcto, Incorrecto):
f"color: {self.styles['incorrect_color']}; font-size: {self.styles['font_size_answers']}px")

def open_python_console(self):
self.SubmitHideContinueShow(True, False)
print("La consola no está disponible por el momento.")
try:
print("Hay que eliminar este boton con esta funcion")
except Exception as e:
print(f"Error al abrir la consola de práctica: {e}")

def SubmitHideContinueShow(self, pedagogical, practica):
if pedagogical:
Expand Down
Expand Up @@ -548,7 +548,7 @@ def init_ui(self):

self.button_layout = QHBoxLayout()
self.button_layout.addWidget(self.back_button)
self.button_layout.addWidget(self.btn_open_console)
#self.button_layout.addWidget(self.btn_open_console)
self.button_layout.addWidget(self.submit_button)
self.button_layout.addWidget(self.practice_button)
self.button_layout.addWidget(self.continue_button)
Expand Down Expand Up @@ -618,14 +618,8 @@ def SubmitAnswers(self, NoSeleciona, Correcto, Incorrecto):
f"color: {self.styles['incorrect_color']}; font-size: {self.styles['font_size_answers']}px")

def open_python_console(self):
self.SubmitHideContinueShow(True, False)
try:
# Crear una instancia de la ventana de práctica
self.ventana_practica = CMDP()

# Mostrar la instancia de la ventana de práctica
self.ventana_practica.show()

print("Hay que eliminar este boton con esta funcion")
except Exception as e:
print(f"Error al abrir la consola de práctica: {e}")

Expand Down
Expand Up @@ -35,3 +35,60 @@ Parte 6,15:03:14
Pedagogical Page Open Time,15:03:14
Pedagogical Page Close Time,15:03:15

"Modulo 4, Leccion 1",
Parte 1,23:51:33
Pedagogical Page Open Time,23:51:33
Playground Page Open,23:51:36
Playground Page Close,23:51:37
Pedagogical Page Close Time,23:51:38
Multiplechoice Page Open Time,23:51:38
Multiplechoice Page Close Time,23:51:42
Parte 2,23:51:42
Pedagogical Page Open Time,23:51:42
Pedagogical Page Close Time,23:51:42
Multiplechoice Page Open Time,23:51:42
Checkbox Selected: 4,23:51:42
Multiplechoice Page Close Time,23:51:45
Parte 3,23:51:45
Pedagogical Page Open Time,23:51:45
Checkbox Selected: 3,23:51:45
Pedagogical Page Close Time,23:51:46
Draganddrop Page Open Time,23:51:46
Correct Drop Event: [,23:51:50
Correct Drop Event: ],23:51:50
Draganddrop Page Close Time,23:51:51
Parte 4,23:51:51
Pedagogical Page Open Time,23:51:51
Pedagogical Page Close Time,23:51:58
Draganddrop Page Open Time,23:51:58
Incorrect Drop Event: [,23:52:09
Incorrect Drop Event: 7,23:52:09
Incorrect Drop Event: [,23:52:09
Incorrect Drop Event: 7,23:52:09
Correct Drop Event: [,23:52:17
Correct Drop Event: 2,23:52:17
Draganddrop Page Close Time,23:52:18
Parte 5,23:52:18
Pedagogical Page Open Time,23:52:18
Pedagogical Page Close Time,23:52:20
Multiplechoice Page Open Time,23:52:20
Checkbox Selected: 7,23:52:25
Checkbox Selected: 2,23:52:29
Multiplechoice Page Close Time,23:52:31
Parte 6,23:52:31
Pedagogical Page Open Time,23:52:31
Pedagogical Page Close Time,23:52:31
Multiplechoice Page Open Time,23:52:31
Checkbox Selected: 8,23:52:31
Checkbox Selected: yo,23:52:34
Multiplechoice Page Close Time,23:52:35
Parte 7,23:52:35
Pedagogical Page Open Time,23:52:35
Pedagogical Page Close Time,23:52:37
Pedagogical2 Page Open Time,23:52:37
Pedagogical2 Page Close Time,23:52:38
Parte 8,23:52:38
Multiplechoice Page Open Time,23:52:38
Checkbox Selected: o,23:52:41
Multiplechoice Page Close Time,23:52:42

2 changes: 1 addition & 1 deletion Elmer/Daniel_JSON_Files_Elmer/current_user.json
@@ -1 +1 @@
{"current_user": "Daniel"}
{"current_user": "Elmer"}

0 comments on commit 447718a

Please sign in to comment.