Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
05fed24
Readme modificado - CM
cscristianmoreno Jun 21, 2023
86df51e
#-descripcionDeLaIncidencia
Jun 21, 2023
6f66b39
readme actualizado
nico457 Jun 21, 2023
589016c
eliminado
nico457 Jun 21, 2023
1020ca6
Update README.md
nicodevp Jun 21, 2023
8e88059
Update README.md
nicodevp Jun 21, 2023
6af1bdd
modificando README
nela-hub Jun 21, 2023
7c61322
Merge branch 'develop' of https://github.com/digitalers/Java-2023 int…
cscristianmoreno Jun 21, 2023
3f7f59c
Merge branch 'develop' into 11-ejercicioclase05ne
nico457 Jun 21, 2023
9f30a0c
merge develop y rama 11-ejercicioclase05ne
nico457 Jun 21, 2023
f179fdf
readme
nico457 Jun 21, 2023
2ead609
Merge branch 'rama-modif' into develop
nela-hub Jun 22, 2023
c60287e
agrego iniciales README.md
0800Tanner Jun 22, 2023
50cc9a4
Clase08
joslnunez Jul 3, 2023
fe87cd1
Update README.md
joslnunez Jul 3, 2023
9a7a506
Clase07
joslnunez Jul 3, 2023
e47205b
Merge branch 'develop' of https://github.com/digitalers/Java-2023 int…
joslnunez Jul 3, 2023
228c024
Commit Inicial
joslnunez Jul 4, 2023
5eb7189
matricula y asignatura
nico457 Jul 4, 2023
56a026b
Merge branch 'develop' of https://github.com/digitalers/Java-2023
LucasFerreyraB Jul 4, 2023
ce4994b
Update Persona
joslnunez Jul 4, 2023
b4bec0d
clases Persona y Estudiante
LucasFerreyraB Jul 4, 2023
83e5f48
add UniversidadClassDiagram.drawio.svg
joslnunez Jul 4, 2023
01e46cb
clases persona y estudiante
LucasFerreyraB Jul 4, 2023
257c569
Merge branch 'develop' of https://github.com/digitalers/Java-2023
LucasFerreyraB Jul 4, 2023
3658c9c
add Clase09.md
joslnunez Jul 5, 2023
acd5e7b
add UniversidadApp
joslnunez Jul 5, 2023
59d22ef
add UniversidadClassDiagram.drawio.svg
joslnunez Jul 5, 2023
4527364
Update Clase09.md
joslnunez Jul 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*
/.idea/modules.xml
/.idea/vcs.xml
9 changes: 9 additions & 0 deletions .idea/Java-2023.iml

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

9 changes: 9 additions & 0 deletions .idea/UniversidadAPP.iml

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

4 changes: 4 additions & 0 deletions .idea/misc.xml

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

120 changes: 120 additions & 0 deletions .idea/workspace.xml

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

Empty file added Clase07/Clase07.md
Empty file.
Empty file added Clase08/Clase08.md
Empty file.
8 changes: 8 additions & 0 deletions Clase08/UniversidadApp/.idea/.gitignore

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

1 change: 1 addition & 0 deletions Clase08/UniversidadApp/.idea/.name

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

7 changes: 7 additions & 0 deletions Clase08/UniversidadApp/.idea/codeStyles/Project.xml

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

5 changes: 5 additions & 0 deletions Clase08/UniversidadApp/.idea/codeStyles/codeStyleConfig.xml

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

1 change: 1 addition & 0 deletions Clase08/UniversidadApp/.idea/description.html

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

6 changes: 6 additions & 0 deletions Clase08/UniversidadApp/.idea/encodings.xml

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

9 changes: 9 additions & 0 deletions Clase08/UniversidadApp/.idea/misc.xml

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

8 changes: 8 additions & 0 deletions Clase08/UniversidadApp/.idea/modules.xml

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

3 changes: 3 additions & 0 deletions Clase08/UniversidadApp/.idea/project-template.xml

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

6 changes: 6 additions & 0 deletions Clase08/UniversidadApp/.idea/vcs.xml

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

11 changes: 11 additions & 0 deletions Clase08/UniversidadApp/UniversidadApp.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
8 changes: 8 additions & 0 deletions Clase08/UniversidadApp/src/ar/digitalers/UniversidaApp.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package ar.digitalers;

public class UniversidadApp {

public static void main(String[] args) {
// write your code here
}
}
58 changes: 58 additions & 0 deletions Clase08/UniversidadApp/src/ar/digitalers/domain/Asignatura.java
Original file line number Diff line number Diff line change
@@ -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;
}
}
67 changes: 67 additions & 0 deletions Clase08/UniversidadApp/src/ar/digitalers/domain/Estudiante.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package ar.digitalers.domain;

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;
}
}
Loading