From 05fed2441479b59612d0fbf2f84f3dbbf68b5ce7 Mon Sep 17 00:00:00 2001 From: cscristian Date: Wed, 21 Jun 2023 20:00:22 -0300 Subject: [PATCH 01/23] Readme modificado - CM --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 126220d..03f886a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # Java-2023 Repositorio del programa de formación gratuita en desarrollo de software y oficios digitales [Java Full Stack] + +- Cristian! \ No newline at end of file From 86df51e463546d071e2173db6f9a7e029612863c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Nu=C3=B1ez?= Date: Wed, 21 Jun 2023 20:17:56 -0300 Subject: [PATCH 02/23] #-descripcionDeLaIncidencia --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 126220d..cae563d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,7 @@ # Java-2023 Repositorio del programa de formación gratuita en desarrollo de software y oficios digitales [Java Full Stack] + + +@autores: + +JLN From 6f66b395d4559e50d7e95cea55661dd7e0d48936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Agust=C3=ADn=20Enrico?= <91215@sistemas.frc.utn.edu.ar> Date: Wed, 21 Jun 2023 20:19:58 -0300 Subject: [PATCH 03/23] readme actualizado --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cae563d..e7dcf52 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ Repositorio del programa de formación gratuita en desarrollo de software y ofic @autores: JLN +NE From 589016c0ee8afe8a1841ba842cf78a57cf1663b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Agust=C3=ADn=20Enrico?= <91215@sistemas.frc.utn.edu.ar> Date: Wed, 21 Jun 2023 20:25:03 -0300 Subject: [PATCH 04/23] eliminado --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7dcf52..cbc0057 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ Repositorio del programa de formación gratuita en desarrollo de software y ofic @autores: JLN -NE + From 1020ca61184bba31cb056af3bd7cffc985c189ce Mon Sep 17 00:00:00 2001 From: nicodevp <116216103+nicodevp@users.noreply.github.com> Date: Wed, 21 Jun 2023 20:29:40 -0300 Subject: [PATCH 05/23] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cbc0057..f105ed6 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,5 @@ Repositorio del programa de formación gratuita en desarrollo de software y ofic @autores: JLN +NAD From 8e88059073145e0c499721577b5b4e7703425645 Mon Sep 17 00:00:00 2001 From: nicodevp <116216103+nicodevp@users.noreply.github.com> Date: Wed, 21 Jun 2023 20:30:34 -0300 Subject: [PATCH 06/23] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f105ed6..c04337e 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,6 @@ Repositorio del programa de formación gratuita en desarrollo de software y ofic @autores: JLN + NAD From 6af1bdd993d40e715d6569770f2c820643c1f570 Mon Sep 17 00:00:00 2001 From: marianela gamarra Date: Wed, 21 Jun 2023 20:33:42 -0300 Subject: [PATCH 07/23] modificando README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e7dcf52..ce42cf9 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,5 @@ Repositorio del programa de formación gratuita en desarrollo de software y ofic JLN NE + +MG From 9f30a0caeedfd22c2519dd69e4e88455d006a646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Agust=C3=ADn=20Enrico?= <91215@sistemas.frc.utn.edu.ar> Date: Wed, 21 Jun 2023 20:54:25 -0300 Subject: [PATCH 08/23] merge develop y rama 11-ejercicioclase05ne --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7d9df7..c68894d 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,4 @@ Repositorio del programa de formación gratuita en desarrollo de software y ofic JLN NAD - +NE From f179fdfb96eba5726e4c7891ccb53657227be18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Agust=C3=ADn=20Enrico?= <91215@sistemas.frc.utn.edu.ar> Date: Wed, 21 Jun 2023 20:57:42 -0300 Subject: [PATCH 09/23] readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c68894d..cf69454 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,5 @@ Repositorio del programa de formación gratuita en desarrollo de software y ofic JLN NAD + NE From c60287ecada8b050ae9b2e518f574dd2ac26f058 Mon Sep 17 00:00:00 2001 From: 0800Tanner Date: Wed, 21 Jun 2023 21:12:40 -0300 Subject: [PATCH 10/23] agrego iniciales README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6373f2d..2458601 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,5 @@ NAD NE MG + +JMT \ No newline at end of file From 50cc9a489649e8478179ca5ee6d27e6f32c8ad87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20N=C3=BA=C3=B1ez?= Date: Mon, 3 Jul 2023 18:56:11 -0300 Subject: [PATCH 11/23] Clase08 --- Clase08/Clase08.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Clase08/Clase08.md diff --git a/Clase08/Clase08.md b/Clase08/Clase08.md new file mode 100644 index 0000000..e69de29 From fe87cd10cf377f9a1ad213d9ef83a62dcf3042c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20N=C3=BA=C3=B1ez?= <136550616+joslnunez@users.noreply.github.com> Date: Mon, 3 Jul 2023 18:57:01 -0300 Subject: [PATCH 12/23] Update README.md --- README.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/README.md b/README.md index 2458601..126220d 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,2 @@ # Java-2023 Repositorio del programa de formación gratuita en desarrollo de software y oficios digitales [Java Full Stack] - -- Cristian! - -@autores: - -JLN - -NAD - -NE - -MG - -JMT \ No newline at end of file From 9a7a50698a63d648d34d18e18d68dfa644b1d319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20N=C3=BA=C3=B1ez?= Date: Mon, 3 Jul 2023 19:30:34 -0300 Subject: [PATCH 13/23] Clase07 --- Clase07/Clase07.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Clase07/Clase07.md diff --git a/Clase07/Clase07.md b/Clase07/Clase07.md new file mode 100644 index 0000000..e69de29 From 228c02418c42dfbaeac1be4919071c1ea9709215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20N=C3=BA=C3=B1ez?= Date: Mon, 3 Jul 2023 21:10:15 -0300 Subject: [PATCH 14/23] Commit Inicial --- Clase08/UniversidadApp/.idea/.gitignore | 8 ++++++++ Clase08/UniversidadApp/.idea/description.html | 1 + Clase08/UniversidadApp/.idea/encodings.xml | 6 ++++++ Clase08/UniversidadApp/.idea/misc.xml | 9 +++++++++ Clase08/UniversidadApp/.idea/modules.xml | 8 ++++++++ Clase08/UniversidadApp/.idea/project-template.xml | 3 +++ Clase08/UniversidadApp/.idea/runConfigurations.xml | 10 ++++++++++ Clase08/UniversidadApp/UniversidadApp.iml | 11 +++++++++++ .../src/ar/digitalers/UniversidaApp.java | 8 ++++++++ .../src/ar/digitalers/domain/Estudiante.java | 4 ++++ .../src/ar/digitalers/domain/Persona.java | 4 ++++ 11 files changed, 72 insertions(+) create mode 100644 Clase08/UniversidadApp/.idea/.gitignore create mode 100644 Clase08/UniversidadApp/.idea/description.html create mode 100644 Clase08/UniversidadApp/.idea/encodings.xml create mode 100644 Clase08/UniversidadApp/.idea/misc.xml create mode 100644 Clase08/UniversidadApp/.idea/modules.xml create mode 100644 Clase08/UniversidadApp/.idea/project-template.xml create mode 100644 Clase08/UniversidadApp/.idea/runConfigurations.xml create mode 100644 Clase08/UniversidadApp/UniversidadApp.iml create mode 100644 Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java create mode 100644 Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java create mode 100644 Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java diff --git a/Clase08/UniversidadApp/.idea/.gitignore b/Clase08/UniversidadApp/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/Clase08/UniversidadApp/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/Clase08/UniversidadApp/.idea/description.html b/Clase08/UniversidadApp/.idea/description.html new file mode 100644 index 0000000..db5f129 --- /dev/null +++ b/Clase08/UniversidadApp/.idea/description.html @@ -0,0 +1 @@ +Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/Clase08/UniversidadApp/.idea/encodings.xml b/Clase08/UniversidadApp/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/Clase08/UniversidadApp/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Clase08/UniversidadApp/.idea/misc.xml b/Clase08/UniversidadApp/.idea/misc.xml new file mode 100644 index 0000000..9327b18 --- /dev/null +++ b/Clase08/UniversidadApp/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/Clase08/UniversidadApp/.idea/modules.xml b/Clase08/UniversidadApp/.idea/modules.xml new file mode 100644 index 0000000..d5b77f3 --- /dev/null +++ b/Clase08/UniversidadApp/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Clase08/UniversidadApp/.idea/project-template.xml b/Clase08/UniversidadApp/.idea/project-template.xml new file mode 100644 index 0000000..1f08b88 --- /dev/null +++ b/Clase08/UniversidadApp/.idea/project-template.xml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/Clase08/UniversidadApp/.idea/runConfigurations.xml b/Clase08/UniversidadApp/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/Clase08/UniversidadApp/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/Clase08/UniversidadApp/UniversidadApp.iml b/Clase08/UniversidadApp/UniversidadApp.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/Clase08/UniversidadApp/UniversidadApp.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java b/Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java new file mode 100644 index 0000000..85988d8 --- /dev/null +++ b/Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java @@ -0,0 +1,8 @@ +package ar.digitalers; + +class UniversidadApp { + + public static void main(String[] args) { + // write your code here + } +} diff --git a/Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java b/Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java new file mode 100644 index 0000000..4a3be1d --- /dev/null +++ b/Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java @@ -0,0 +1,4 @@ +package ar.digitalers.domain; + +public class Estudiante { +} diff --git a/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java b/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java new file mode 100644 index 0000000..a88defa --- /dev/null +++ b/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java @@ -0,0 +1,4 @@ +package ar.digitalers.domain; + +public abstract class Persona { +} From 5eb7189a0bb90b36eef2dd31fcf3b6de808b47ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Agust=C3=ADn=20Enrico?= <91215@sistemas.frc.utn.edu.ar> Date: Mon, 3 Jul 2023 21:24:16 -0300 Subject: [PATCH 15/23] matricula y asignatura --- .idea/misc.xml | 6 ++ .idea/workspace.xml | 100 ++++++++++++++++++ .../src/ar/digitalers/UniversidaApp.java | 2 +- .../src/ar/digitalers/domain/Asignatura.java | 58 ++++++++++ .../src/ar/digitalers/domain/Matricula.java | 59 +++++++++++ .../src/ar/digitalers/domain/Persona.java | 2 +- out/production/Java-2023/.idea/workspace.xml | 90 ++++++++++++++++ 7 files changed, 315 insertions(+), 2 deletions(-) create mode 100644 .idea/misc.xml create mode 100644 .idea/workspace.xml create mode 100644 Clase08/UniversidadApp/src/ar/digitalers/domain/Asignatura.java create mode 100644 Clase08/UniversidadApp/src/ar/digitalers/domain/Matricula.java create mode 100644 out/production/Java-2023/.idea/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..cc6eae0 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..f3e5f4e --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle", + "vue.rearranger.settings.migration": "true" + } +} + + + + + + + + + + + + + + + + + 1687826740529 + + + + + + \ No newline at end of file diff --git a/Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java b/Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java index 85988d8..bc362ab 100644 --- a/Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java +++ b/Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java @@ -1,6 +1,6 @@ package ar.digitalers; -class UniversidadApp { +public class UniversidadApp { public static void main(String[] args) { // write your code here diff --git a/Clase08/UniversidadApp/src/ar/digitalers/domain/Asignatura.java b/Clase08/UniversidadApp/src/ar/digitalers/domain/Asignatura.java new file mode 100644 index 0000000..4cf6be6 --- /dev/null +++ b/Clase08/UniversidadApp/src/ar/digitalers/domain/Asignatura.java @@ -0,0 +1,58 @@ +package ar.digitalers.domain; + +public class Asignatura { + String nombre; + Profesor profesor; + String descripcion; + int idAsignatura; + String estado; + + + public Asignatura(String nombre, Profesor profesor, String descripcion, int idAsignatura, String estado) { + this.nombre = nombre; + this.profesor = profesor; + this.descripcion = descripcion; + this.idAsignatura = idAsignatura; + this.estado = estado; + } + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + + public Profesor getProfesor() { + return profesor; + } + + public void setProfesor(Profesor profesor) { + this.profesor = profesor; + } + + public String getDescripcion() { + return descripcion; + } + + public void setDescripcion(String descripcion) { + this.descripcion = descripcion; + } + + public int getIdAsignatura() { + return idAsignatura; + } + + public void setIdAsignatura(int idAsignatura) { + this.idAsignatura = idAsignatura; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } +} \ No newline at end of file diff --git a/Clase08/UniversidadApp/src/ar/digitalers/domain/Matricula.java b/Clase08/UniversidadApp/src/ar/digitalers/domain/Matricula.java new file mode 100644 index 0000000..1a55ba7 --- /dev/null +++ b/Clase08/UniversidadApp/src/ar/digitalers/domain/Matricula.java @@ -0,0 +1,59 @@ +package ar.digitalers.domain; + +import java.util.ArrayList; + +public class Matricula { + int idMatricula; + String estado; + String nombreInstituto; + Estudiante estudiante; + ArrayList asignaturasIns; + + public Matricula(int idMatricula, String estado, String nombreInstituto, Estudiante estudiante, ArrayList asignaturasIns) { + this.idMatricula = idMatricula; + this.estado = estado; + this.nombreInstituto = nombreInstituto; + this.estudiante = estudiante; + this.asignaturasIns = asignaturasIns; + } + + public int getIdMatricula() { + return idMatricula; + } + + public void setIdMatricula(int idMatricula) { + this.idMatricula = idMatricula; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public String getNombreInstituto() { + return nombreInstituto; + } + + public void setNombreInstituto(String nombreInstituto) { + this.nombreInstituto = nombreInstituto; + } + + public Estudiante getEstudiante() { + return estudiante; + } + + public void setEstudiante(Estudiante estudiante) { + this.estudiante = estudiante; + } + + public ArrayList getAsignaturasIns() { + return asignaturasIns; + } + + public void setAsignaturasIns(ArrayList asignaturasIns) { + this.asignaturasIns = asignaturasIns; + } +} \ No newline at end of file diff --git a/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java b/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java index a88defa..663c124 100644 --- a/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java +++ b/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java @@ -1,4 +1,4 @@ package ar.digitalers.domain; -public abstract class Persona { +public class Persona { } diff --git a/out/production/Java-2023/.idea/workspace.xml b/out/production/Java-2023/.idea/workspace.xml new file mode 100644 index 0000000..1755844 --- /dev/null +++ b/out/production/Java-2023/.idea/workspace.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1687826740529 + + + + + + \ No newline at end of file From ce4994bd7e845203a623c4ab9a680749e5b1fd22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20N=C3=BA=C3=B1ez?= Date: Mon, 3 Jul 2023 21:36:38 -0300 Subject: [PATCH 16/23] Update Persona --- .../UniversidadApp/src/ar/digitalers/domain/Persona.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java b/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java index 663c124..95b7a47 100644 --- a/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java +++ b/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java @@ -1,4 +1,9 @@ package ar.digitalers.domain; -public class Persona { +public abstract class Persona { + + String nombre; + String apellido; + String dni; + String correoElectronico; } From b4bec0d7c944bd4324fd8be17733c1378cece020 Mon Sep 17 00:00:00 2001 From: Lucas Gaston Ferreyra Date: Mon, 3 Jul 2023 21:42:12 -0300 Subject: [PATCH 17/23] clases Persona y Estudiante --- .../src/ar/digitalers/domain/Estudiante.java | 65 ++++++++++++++++++- .../src/ar/digitalers/domain/Persona.java | 46 +++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java b/Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java index 4a3be1d..54cb240 100644 --- a/Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java +++ b/Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java @@ -1,4 +1,67 @@ package ar.digitalers.domain; -public class Estudiante { +public class Estudiante extends Persona { + private int idEstudiante; + private Carrera carrera; + private float promedio; + private float porcentajeAprobado; + private Date FechaIngreso; + private String universidad; + private String estado; + + public int getIdEstudiante() { + return idEstudiante; + } + + public void setIdEstudiante(int idEstudiante) { + this.idEstudiante = idEstudiante; + } + + public Carrera getCarrera() { + return carrera; + } + + public void setCarrera(Carrera carrera) { + this.carrera = carrera; + } + + public float getPromedio() { + return promedio; + } + + public void setPromedio(float promedio) { + this.promedio = promedio; + } + + public float getPorcentajeAprobado() { + return porcentajeAprobado; + } + + public void setPorcentajeAprobado(float porcentajeAprobado) { + this.porcentajeAprobado = porcentajeAprobado; + } + + public Date getFechaIngreso() { + return FechaIngreso; + } + + public void setFechaIngreso(Date fechaIngreso) { + FechaIngreso = fechaIngreso; + } + + public String getUniversidad() { + return universidad; + } + + public void setUniversidad(String universidad) { + this.universidad = universidad; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } } diff --git a/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java b/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java index 663c124..d489997 100644 --- a/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java +++ b/Clase08/UniversidadApp/src/ar/digitalers/domain/Persona.java @@ -1,4 +1,50 @@ package ar.digitalers.domain; + public class Persona { + private String nombre; + private String apellido; + private int dni; + private String direccion; + private String telefono; + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + + public String getApellido() { + return apellido; + } + + public void setApellido(String apellido) { + this.apellido = apellido; + } + + public int getDni() { + return dni; + } + + public void setDni(int dni) { + this.dni = dni; + } + + public String getDireccion() { + return direccion; + } + + public void setDireccion(String direccion) { + this.direccion = direccion; + } + + public String getTelefono() { + return telefono; + } + + public void setTelefono(String telefono) { + this.telefono = telefono; + } } From 83e5f48fed76e5a366c6f8491e7a681ed53eaf36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20N=C3=BA=C3=B1ez?= Date: Mon, 3 Jul 2023 21:50:40 -0300 Subject: [PATCH 18/23] add UniversidadClassDiagram.drawio.svg --- Clase08/UniversidadClassDiagram.drawio.svg | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Clase08/UniversidadClassDiagram.drawio.svg diff --git a/Clase08/UniversidadClassDiagram.drawio.svg b/Clase08/UniversidadClassDiagram.drawio.svg new file mode 100644 index 0000000..6395b1a --- /dev/null +++ b/Clase08/UniversidadClassDiagram.drawio.svg @@ -0,0 +1,4 @@ + + + +
PlanEstudios
PlanEstudios
+ IdPlanEstudios: Integer
+ IdPlanEstudios: Integ...
- materias: ArrayList<Asignatura> : 
- materias: ArrayList<A...
+ matricula: String
+ matricula: String
+ horario: Date
+ horario: Date
+ modalidad: Boolean
+ modalidad: Boolean
+ creditos: Integer
+ creditos: Integer
+ estado: Boolean
+ estado: Boolean
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
Persona
Persona
- nombre: String
- nombre: String
- apellido: String
- apellido: String
- dni: int
- dni: int
- direccion: String
- direccion: String
- telefono: String
- telefono: String
- telefono: String
- telefono: String
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
Asignatura
Asignatura
- nombre: String
- nombre: String
- profesor: Profesor
- profesor: Profesor
- descripcion: String
- descripcion: String
- idAsignatura: Entero
- idAsignatura: Entero
- estado: String
- estado: String
+ field: type
+ field: type
+ field: type
+ field: type
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
Estudiante
Estudiante
- idEstudiante int
- idEstudiante int
- carrera: Carrera
- carrera: Carrera
- promedio: float
- promedio: float
- porcentajeAprobado: float
- porcentajeAprobado: float
- fechaIngreso: Date
- fechaIngreso: Date
- universidad: String
- universidad: String
- estado: String
- estado: String
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
Profesor
Profesor
- idProfesor: int
- idProfesor: int
- asignatura: Asignatura
- asignatura: Asigna...
- departamento: String
- departamento: Stri...
- estado: Boolean
- estado: Boolean
- nombre: String
- nombre: String
- legajo: Integer
- legajo: Integer
- horarioInicio: Date
- horarioInicio: Date
- horarioSalida: Date
- horarioSalida: Date
+ method(type): type
+ method(type): type
Matricula
Matricula
- idMatricula: Integer
- idMatricula: Integer
- estado: String
- estado: String
- nombreInstituto: String
- nombreInstituto: String
- estudiante: Estudiante
- estudiante: Estudiante
-asignaturaIns:ArrayList<Asignatura>
-asignaturaIns:ArrayList<Asign...

  1. Estudiante
  2. Asignatura
  3. Profesor
  4. Carrera
  5. Matricula
  6. PlanEstudios
  7. Persona

EstudianteAsignaturaProfesorCarreraM...
Carrera
Carrera
- id: Integer
- id: Integer
- nombre: String
- nombre: String
- inicio: Date
- inicio: Date
- final: Date
- final: Date
- titulo: String
- titulo: String
- asignaturas: PlanEstudios
- asignaturas: PlanEstudios
- area: String 
- area: String 
- InscripcionInicio: Date 
- InscripcionInicio: Date 
- InscripcionFinal: Date 
- InscripcionFinal: Date 
+ method(type): type
+ method(type): type
+ method(type): type
+ method(type): type
Text is not SVG - cannot display
\ No newline at end of file From 01e46cbabce750e33cd7145c0184a9852a51d51a Mon Sep 17 00:00:00 2001 From: Lucas Gaston Ferreyra Date: Mon, 3 Jul 2023 22:14:38 -0300 Subject: [PATCH 19/23] clases persona y estudiante --- .idea/UniversidadAPP.iml | 9 +++++++++ .idea/misc.xml | 6 ------ .idea/workspace.xml | 16 +++++++++++++++- Clase08/UniversidadApp/.idea/.name | 1 + .../UniversidadApp/.idea/codeStyles/Project.xml | 7 +++++++ .../.idea/codeStyles/codeStyleConfig.xml | 5 +++++ .../UniversidadApp/.idea/runConfigurations.xml | 10 ---------- Clase08/UniversidadApp/.idea/vcs.xml | 6 ++++++ 8 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 .idea/UniversidadAPP.iml delete mode 100644 .idea/misc.xml create mode 100644 Clase08/UniversidadApp/.idea/.name create mode 100644 Clase08/UniversidadApp/.idea/codeStyles/Project.xml create mode 100644 Clase08/UniversidadApp/.idea/codeStyles/codeStyleConfig.xml delete mode 100644 Clase08/UniversidadApp/.idea/runConfigurations.xml create mode 100644 Clase08/UniversidadApp/.idea/vcs.xml diff --git a/.idea/UniversidadAPP.iml b/.idea/UniversidadAPP.iml new file mode 100644 index 0000000..85f286a --- /dev/null +++ b/.idea/UniversidadAPP.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index cc6eae0..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f3e5f4e..0cd3ceb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,12 +4,23 @@