Integracion final Alberto y Nico

nicomencia · Oct 18, 2020 · 479f009 · 479f009
1 parent f197249
commit 479f009
Show file tree

Hide file tree

Showing 101 changed files with 154 additions and 3,803 deletions.
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
diff --git a/...l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/...l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
diff --git a/...3_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/...3_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree
diff --git a/...rint1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/...rint1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
diff --git a/...t1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/...t1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
diff --git a/...33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/...33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
diff --git a/...Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs b/...Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs
diff --git a/...nt1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/...nt1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
diff --git a/...metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/...metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
diff --git a/.../.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/.../.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
diff --git a/...t1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/...t1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/...33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/...33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
diff --git a/...int1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/...int1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
diff --git a/....metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.15.0.20191217-1149.xml b/....metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.15.0.20191217-1149.xml
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.intro/introstate b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.intro/introstate
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
diff --git a/IPS_l33_Sprint1/bin/.gitignore b/IPS_l33_Sprint1/bin/.gitignore
@@ -1 +1,2 @@
+/img/
 /pgh/
diff --git a/IPS_l33_Sprint1/bin/pgh/business/cita/Cita.class b/IPS_l33_Sprint1/bin/pgh/business/cita/Cita.class
diff --git a/IPS_l33_Sprint1/bin/pgh/business/cita/FindAllCitas.class b/IPS_l33_Sprint1/bin/pgh/business/cita/FindAllCitas.class
diff --git a/IPS_l33_Sprint1/bin/pgh/business/cita/ListaCitas.class b/IPS_l33_Sprint1/bin/pgh/business/cita/ListaCitas.class
diff --git a/IPS_l33_Sprint1/bin/pgh/business/cita/crearCitas.class b/IPS_l33_Sprint1/bin/pgh/business/cita/crearCitas.class
diff --git a/IPS_l33_Sprint1/bin/pgh/business/medicamento/CrearMedicamento.class b/IPS_l33_Sprint1/bin/pgh/business/medicamento/CrearMedicamento.class
diff --git a/IPS_l33_Sprint1/bin/pgh/business/prescripcion/CrearPrescripcion.class b/IPS_l33_Sprint1/bin/pgh/business/prescripcion/CrearPrescripcion.class
diff --git a/IPS_l33_Sprint1/bin/pgh/business/prescripcion/Prescripcion.class b/IPS_l33_Sprint1/bin/pgh/business/prescripcion/Prescripcion.class
diff --git a/...l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/CrearPrescripcionCitaPaciente.class b/...l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/CrearPrescripcionCitaPaciente.class
diff --git a/...Sprint1/bin/pgh/business/prescripcioncitapaciente/FindAllPrescripcionesCitaPaciente.class b/...Sprint1/bin/pgh/business/prescripcioncitapaciente/FindAllPrescripcionesCitaPaciente.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/Main.class b/IPS_l33_Sprint1/bin/pgh/ui/Main.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$1.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$1.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$10.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$10.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$11.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$11.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$12.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$12.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$13.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$13.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$14.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$14.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$15.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$15.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$16.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$16.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$17.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$17.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$18.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$18.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$19.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$19.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$2.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$2.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$20.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$20.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$21.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$21.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$22.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$22.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$23.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$23.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$24.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$24.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$25.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$25.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$26.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$26.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$27.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$27.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$28.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$28.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$29.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$29.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$3.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$3.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$30.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$30.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$31.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$31.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$32.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$32.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$33.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$33.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$34.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$34.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$35.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$35.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$36.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$36.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$37.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$37.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$38.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$38.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$39.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$39.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$4.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$4.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$40.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$40.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$41.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$41.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$42.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$42.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$43.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$43.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$44.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$44.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$45.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$45.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$46.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$46.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$47.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$47.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$48.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$48.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$49.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$49.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$5.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$5.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$50.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$50.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$51.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$51.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$52.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$52.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$53.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$53.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$54.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$54.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$55.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$55.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$6.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$6.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$7.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$7.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$8.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$8.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$9.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$9.class
diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal.class
diff --git a/IPS_l33_Sprint1/src/pgh/business/cita/ListaCitas.java b/IPS_l33_Sprint1/src/pgh/business/cita/ListaCitas.java
@@ -18,21 +18,6 @@ public List<Cita> getCitas(){
 		return citas;
 	}
 
-
-		List<CitaDTO> result;
-
-		List<Cita> citas = new ArrayList<Cita>();
-
-
-		public ListaCitas () {
-			result = new FindAllCitas().execute();
-
-		}
-
-		public List<Cita> getCitas(){
-			return citas;
-		}
-
 
 		public void creaCitas() {
 
@@ -63,6 +48,6 @@ public void listarCitas() {
 
 
 
-
+	}
 
 }