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 deleted file mode 100644 index 25cb955..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index deleted file mode 100644 index ed9b514..0000000 Binary files a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and /dev/null differ diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version deleted file mode 100644 index 6b2aaa7..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file 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 deleted file mode 100644 index 8a1fc9e..0000000 Binary files a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree and /dev/null differ diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources deleted file mode 100644 index c353f6a..0000000 Binary files a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and /dev/null differ diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index dffc6b5..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -version=1 diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 90e2f95..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,7 +0,0 @@ -content_assist_proposals_background=255,255,255 -content_assist_proposals_foreground=0,0,0 -eclipse.preferences.version=1 -org.eclipse.jdt.ui.formatterprofiles.version=18 -spelling_locale_initialized=true -useAnnotationsPrefPage=true -useQuickDiffPrefPage=true diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs deleted file mode 100644 index d56c53f..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jsch.core.hasChangedDefaultWin32SshHome=true diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs deleted file mode 100644 index 67b1d96..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.m2e.discovery.pref.projects= diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs deleted file mode 100644 index 43e97e4..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -mylyn.attention.migrated=true diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs deleted file mode 100644 index 8d462a6..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 2b60c21..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -migrated.task.repositories.secure.store=true -org.eclipse.mylyn.tasks.ui.filters.nonmatching=true -org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true -org.eclipse.mylyn.tasks.ui.welcome.message=true diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs deleted file mode 100644 index 95e0b5b..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ /dev/null @@ -1,5 +0,0 @@ -PROBLEMS_FILTERS_MIGRATE=true -eclipse.preferences.version=1 -platformState=1590493065879 -quickStart=false -tipsAndTricks=false 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 deleted file mode 100644 index 08076f2..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -showIntro=false diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs deleted file mode 100644 index aa3dc02..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs +++ /dev/null @@ -1,3 +0,0 @@ -//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false -PLUGINS_NOT_ACTIVATED_ON_STARTUP=;org.eclipse.m2e.discovery; -eclipse.preferences.version=1 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 deleted file mode 100644 index 50dfc1e..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ /dev/null @@ -1,2504 +0,0 @@ - - - - activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration - ModelMigrationProcessor.001 - - - - - - - - topLevel - shellMaximized - - - - - persp.actionSet:org.eclipse.mylyn.doc.actionSet - persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation - persp.actionSet:org.eclipse.ui.cheatsheets.actionSet - persp.actionSet:org.eclipse.search.searchActionSet - persp.actionSet:org.eclipse.text.quicksearch.actionSet - persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo - persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet - persp.actionSet:org.eclipse.ui.actionSet.keyBindings - persp.actionSet:org.eclipse.ui.actionSet.openFiles - persp.actionSet:org.eclipse.wb.core.ui.actionset - persp.actionSet:org.eclipse.debug.ui.launchActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet - persp.actionSet:org.eclipse.ui.NavigateActionSet - persp.viewSC:org.eclipse.jdt.ui.PackageExplorer - persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy - persp.viewSC:org.eclipse.jdt.ui.SourceView - persp.viewSC:org.eclipse.jdt.ui.JavadocView - persp.viewSC:org.eclipse.search.ui.views.SearchView - persp.viewSC:org.eclipse.ui.console.ConsoleView - persp.viewSC:org.eclipse.ui.views.ContentOutline - persp.viewSC:org.eclipse.ui.views.ProblemView - persp.viewSC:org.eclipse.ui.views.ResourceNavigator - persp.viewSC:org.eclipse.ui.views.TaskList - persp.viewSC:org.eclipse.ui.views.ProgressView - persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.ui.texteditor.TemplatesView - persp.viewSC:org.eclipse.pde.runtime.LogView - persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard - persp.newWizSC:org.eclipse.ui.wizards.new.folder - persp.newWizSC:org.eclipse.ui.wizards.new.file - persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard - persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective - persp.perspSC:org.eclipse.debug.ui.DebugPerspective - persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks - persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task - persp.showIn:org.eclipse.jdt.ui.PackageExplorer - persp.showIn:org.eclipse.team.ui.GenericHistoryView - persp.showIn:org.eclipse.ui.navigator.ProjectExplorer - persp.actionSet:org.eclipse.debug.ui.breakpointActionSet - persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet - persp.actionSet:org.eclipse.eclemma.ui.CoverageActionSet - persp.showIn:org.eclipse.eclemma.ui.CoverageView - persp.viewSC:org.eclipse.wb.core.StructureView - persp.viewSC:org.eclipse.wb.core.PaletteView - persp.showIn:org.eclipse.egit.ui.RepositoriesView - persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard - persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet - persp.viewSC:org.eclipse.ant.ui.views.AntView - - - - org.eclipse.e4.primaryNavigationStack - active - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:General - - - View - categoryTag:WindowBuilder - - - View - categoryTag:WindowBuilder - - - View - categoryTag:Java - - - - - View - categoryTag:Git - - - - - - - - - - View - categoryTag:Mylyn - - - - org.eclipse.e4.secondaryNavigationStack - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:Ant - - - - - - org.eclipse.e4.secondaryDataStack - - View - categoryTag:General - - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - - - - - - - View - categoryTag:Help - - - View - categoryTag:General - - - View - categoryTag:Help - - - - - - - View - categoryTag:Help - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Help - - - - org.eclipse.e4.primaryDataStack - EditorStack - - - - - - - View - categoryTag:Java - active - activeOnClose - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - - View - categoryTag:Mylyn - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:WindowBuilder - - - - - View - categoryTag:WindowBuilder - - - - - View - categoryTag:Git - - - - - View - categoryTag:Java - - - - - View - categoryTag:Ant - - - - toolbarSeparator - - - - Draggable - - - - toolbarSeparator - - - - Draggable - - - toolbarSeparator - - - - Draggable - - - Draggable - - - Draggable - - - toolbarSeparator - - - - Draggable - - - - toolbarSeparator - - - - toolbarSeparator - - - - Draggable - - - stretch - SHOW_RESTORE_MENU - - - Draggable - HIDEABLE - SHOW_RESTORE_MENU - - - - - stretch - - - Draggable - - - Draggable - - - - - TrimStack - Draggable - - - - - - - - - - - - - - - - - - - - - - platform:win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - platform:win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Editor - removeOnHide - - - - - View - categoryTag:Ant - - - - - View - categoryTag:Gradle - - - - - View - categoryTag:Gradle - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:Help - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Maven - - - - - View - categoryTag:Maven - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Oomph - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:Team - - - - - View - categoryTag:Team - - - View - categoryTag:Help - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:Help - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:XML - - - - - View - categoryTag:XML - - - - - View - categoryTag:API Tools - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:WindowBuilder - - - - - View - categoryTag:WindowBuilder - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - NoRestore - - - - - View - categoryTag:Git - - - - - View - categoryTag:Mylyn - - - - glue - move_after:PerspectiveSpacer - SHOW_RESTORE_MENU - - - move_after:Spacer Glue - HIDEABLE - SHOW_RESTORE_MENU - - - glue - move_after:SearchField - SHOW_RESTORE_MENU - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache deleted file mode 100644 index 593f470..0000000 Binary files a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache and /dev/null differ diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache deleted file mode 100644 index 593f470..0000000 Binary files a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache and /dev/null differ diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache deleted file mode 100644 index 593f470..0000000 Binary files a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache and /dev/null differ 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 deleted file mode 100644 index 3de398e..0000000 Binary files a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat and /dev/null differ 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 deleted file mode 100644 index a4ee3cb..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - 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 deleted file mode 100644 index 9e390f5..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - 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 deleted file mode 100644 index b8fbb54..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml +++ /dev/null @@ -1,10 +0,0 @@ - -
-
- - - - - -
-
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 deleted file mode 100644 index 56f74df..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log +++ /dev/null @@ -1,2 +0,0 @@ -2020-10-16 10:06:59,147 [Worker-1: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. -2020-10-16 13:10:25,034 [Worker-0: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.15.0.20191217-1149.xml b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.15.0.20191217-1149.xml deleted file mode 100644 index e33758c..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.15.0.20191217-1149.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - %date [%thread] %-5level %logger{35} - %msg%n - - - OFF - - - - - ${org.eclipse.m2e.log.dir}/0.log - - ${org.eclipse.m2e.log.dir}/%i.log - 1 - 10 - - - 100MB - - - %date [%thread] %-5level %logger{35} - %msg%n - - - - - - WARN - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 1f73e14..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup +++ /dev/null @@ -1,6 +0,0 @@ - - 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 deleted file mode 100644 index f4f5abb..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Cached timestamps -#Fri Oct 16 13:10:31 CEST 2020 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 deleted file mode 100644 index 5ca0b77..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - -
-
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 deleted file mode 100644 index f5d5f8e..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - -
-
- - - - - - - - - - - -
-
diff --git a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.intro/introstate b/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.intro/introstate deleted file mode 100644 index 02f134f..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.intro/introstate +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file 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 deleted file mode 100644 index 5b583c4..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - -
-
-
-
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 deleted file mode 100644 index bae136e..0000000 --- a/IPS_l33_Sprint1/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/IPS_l33_Sprint1/bin/.gitignore b/IPS_l33_Sprint1/bin/.gitignore index 35e97ce..ef418e6 100644 --- 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 index 7852de8..17d1761 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/cita/Cita.class and b/IPS_l33_Sprint1/bin/pgh/business/cita/Cita.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/business/cita/FindAllCitas.class b/IPS_l33_Sprint1/bin/pgh/business/cita/FindAllCitas.class index 1f3cd4d..cc6627a 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/cita/FindAllCitas.class and b/IPS_l33_Sprint1/bin/pgh/business/cita/FindAllCitas.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/business/cita/ListaCitas.class b/IPS_l33_Sprint1/bin/pgh/business/cita/ListaCitas.class index a3a2e3d..51dc27b 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/cita/ListaCitas.class and b/IPS_l33_Sprint1/bin/pgh/business/cita/ListaCitas.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/business/cita/crearCitas.class b/IPS_l33_Sprint1/bin/pgh/business/cita/crearCitas.class index 770c2ab..75b33a2 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/cita/crearCitas.class and b/IPS_l33_Sprint1/bin/pgh/business/cita/crearCitas.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/business/medicamento/CrearMedicamento.class b/IPS_l33_Sprint1/bin/pgh/business/medicamento/CrearMedicamento.class index cbdd800..7db93dc 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/medicamento/CrearMedicamento.class and b/IPS_l33_Sprint1/bin/pgh/business/medicamento/CrearMedicamento.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/business/prescripcion/CrearPrescripcion.class b/IPS_l33_Sprint1/bin/pgh/business/prescripcion/CrearPrescripcion.class index e91af46..486efc2 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/prescripcion/CrearPrescripcion.class and b/IPS_l33_Sprint1/bin/pgh/business/prescripcion/CrearPrescripcion.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/business/prescripcion/Prescripcion.class b/IPS_l33_Sprint1/bin/pgh/business/prescripcion/Prescripcion.class index a641ac3..e851f79 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/prescripcion/Prescripcion.class and b/IPS_l33_Sprint1/bin/pgh/business/prescripcion/Prescripcion.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/CrearPrescripcionCitaPaciente.class b/IPS_l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/CrearPrescripcionCitaPaciente.class index 2bd7ccb..087b6fa 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/CrearPrescripcionCitaPaciente.class and b/IPS_l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/CrearPrescripcionCitaPaciente.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/FindAllPrescripcionesCitaPaciente.class b/IPS_l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/FindAllPrescripcionesCitaPaciente.class index 46a9e40..faac749 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/FindAllPrescripcionesCitaPaciente.class and b/IPS_l33_Sprint1/bin/pgh/business/prescripcioncitapaciente/FindAllPrescripcionesCitaPaciente.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/Main.class b/IPS_l33_Sprint1/bin/pgh/ui/Main.class index 8e8a14e..76e17ed 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/Main.class and b/IPS_l33_Sprint1/bin/pgh/ui/Main.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$1.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$1.class index b125e2e..bbdc50c 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$1.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$1.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$10.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$10.class index 4184d39..17c91eb 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$10.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$10.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$11.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$11.class index df1d4e5..36360e5 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$11.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$11.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$12.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$12.class index 23e08f0..aa89314 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$12.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$12.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$13.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$13.class index 59161d1..0815dd5 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$13.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$13.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$14.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$14.class index 27b281c..33099eb 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$14.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$14.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$15.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$15.class index 7ebb042..11a3b8b 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$15.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$15.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$16.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$16.class index 8737cab..a5468f3 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$16.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$16.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$17.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$17.class index 95f11c8..5b90978 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$17.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$17.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$18.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$18.class index a6f0880..1aadf15 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$18.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$18.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$19.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$19.class index 8fe1765..9a7df9a 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$19.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$19.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$2.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$2.class index 9ce6e46..013d164 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$2.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$2.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$20.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$20.class index 693b2d1..36cacb4 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$20.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$20.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$21.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$21.class index be6d4ff..0ae17a9 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$21.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$21.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$22.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$22.class index da45fe0..1446efd 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$22.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$22.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$23.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$23.class index 73d19f3..6041cdf 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$23.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$23.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$24.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$24.class index 1319bd1..62960f8 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$24.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$24.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$25.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$25.class index 43dafde..f065240 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$25.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$25.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$26.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$26.class index 3a4bd18..4b3c189 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$26.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$26.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$27.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$27.class index 7c4f4c3..416d347 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$27.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$27.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$28.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$28.class index 4914747..474cad3 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$28.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$28.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$29.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$29.class index c0caaa6..61fdf51 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$29.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$29.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$3.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$3.class index 49e37a0..642159d 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$3.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$3.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$30.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$30.class index 9bff3a5..73ee311 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$30.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$30.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$31.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$31.class index b04ea54..bf3df93 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$31.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$31.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$32.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$32.class index fd88aed..f4fbd55 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$32.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$32.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$33.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$33.class index 5ee58a3..68aba8b 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$33.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$33.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$34.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$34.class index 3f23972..2b7b0ca 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$34.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$34.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$35.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$35.class index 11ffc31..c7dd21c 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$35.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$35.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$36.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$36.class index 66b3468..513f42c 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$36.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$36.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$37.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$37.class index 622ae93..a154a35 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$37.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$37.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$38.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$38.class index dfc67f4..1db2380 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$38.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$38.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$39.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$39.class index 041764e..444e068 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$39.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$39.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$4.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$4.class index 1c8ad61..96e15a6 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$4.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$4.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$40.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$40.class index 543a5ee..b09185a 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$40.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$40.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$41.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$41.class index 6f427fc..68e1f78 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$41.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$41.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$42.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$42.class index 69bd74e..9d7e313 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$42.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$42.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$43.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$43.class index 2aff865..da010a9 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$43.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$43.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$44.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$44.class index e0ec4d1..5090696 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$44.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$44.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$45.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$45.class index bedddea..eb5f2c8 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$45.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$45.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$46.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$46.class index b0a6103..3a12387 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$46.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$46.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$47.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$47.class index 4d91924..c9bf7dc 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$47.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$47.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$48.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$48.class index f53777e..5ceccc6 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$48.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$48.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$49.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$49.class index 6614d90..892cc4f 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$49.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$49.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$5.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$5.class index 3a8baf4..96be8a2 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$5.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$5.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$50.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$50.class index 754ce97..b6b9f7d 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$50.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$50.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$51.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$51.class index c2c27ef..911a173 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$51.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$51.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$52.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$52.class index 1334cd0..76b879f 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$52.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$52.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$53.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$53.class index be9b23b..c6b54e1 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$53.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$53.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$54.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$54.class index 964420a..934e72c 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$54.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$54.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$55.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$55.class index 26949b7..135e53b 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$55.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$55.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$6.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$6.class index 102604d..894b0ce 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$6.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$6.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$7.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$7.class index 0a36e81..b7d7731 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$7.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$7.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$8.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$8.class index b747900..1ac4445 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$8.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$8.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$9.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$9.class index 4920358..29975d0 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$9.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal$9.class differ diff --git a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal.class b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal.class index ba38374..6d74e1c 100644 Binary files a/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal.class and b/IPS_l33_Sprint1/bin/pgh/ui/VentanaPrincipal.class differ diff --git a/IPS_l33_Sprint1/src/pgh/business/cita/ListaCitas.java b/IPS_l33_Sprint1/src/pgh/business/cita/ListaCitas.java index 89cc55e..667cdf2 100644 --- 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 getCitas(){ return citas; } - - List result; - - List citas = new ArrayList(); - - - public ListaCitas () { - result = new FindAllCitas().execute(); - - } - - public List getCitas(){ - return citas; - } - public void creaCitas() { @@ -63,6 +48,6 @@ public void listarCitas() { - + } } diff --git a/IPS_l33_Sprint1/src/pgh/ui/VentanaPrincipal.java b/IPS_l33_Sprint1/src/pgh/ui/VentanaPrincipal.java index 0bb4f2c..9a94787 100644 --- a/IPS_l33_Sprint1/src/pgh/ui/VentanaPrincipal.java +++ b/IPS_l33_Sprint1/src/pgh/ui/VentanaPrincipal.java @@ -152,125 +152,21 @@ public class VentanaPrincipal extends JFrame { private JLabel lblNewLabel_5_1_1; private JButton btnCrearJornadaMedico; private JButton btnCancelarJornadaMedico; - private JScrollPane scrollPane; - private JList listDias; - private JButton btnAñadirDiasJornada; - private JScrollPane scrollPaneDiasSeleccionados; - private JButton btnBorrarDiasSeleccionados; - private String dias = ""; - private boolean lunes = false, martes = false, miercoles = false, jueves = false, viernes = false, sabado = false, - domingo = false; - private JScrollPane scrollPaneMedicos; - private JButton btnAnadirMedicos; - private JList listMedicos; - private JScrollPane scrollPaneMedicosAnadidos; - private JList listMedicosAnadidos; - private DefaultListModel modeloListMedicos; - private DefaultListModel modeloListMedicosAnadidos; - private DefaultListModel modeloListPacientesCita; - private DefaultListModel modeloListPacienteCita; - private DefaultListModel modeloListDiasJornada; - private DefaultListModel modeloListDiasSeleccionadosJornadaMedico; - private DefaultListModel modeloListMedicosSeleccionadosJornada; - private DefaultListModel modeloListPrescripciones; - private JScrollPane scrollPane_1; - private JList listPacientesCita; - private CitaDTO citaDTO; - private Cita cita; - private CrearCitas crearCitas; - private JButton btnAnadirPacienteListaCita; - private JScrollPane scrollPanePacienteSeleccionado; - private JList listPacienteSeleccionado; private ListaMedicoCita listaMedicoCita; - private int contador; - private JList listDiasSeleccionadosJornadaMedico; - private JScrollPane scrollPaneSeleccionarMedicoJornada; - private JList listMedicosJornada; - private JButton btnAnadirMedicoJornadas; - private JScrollPane scrollPaneMedicoSeleccionadoJornada; - private JList listMedicosSeleccionadosJornada; - private JButton btnNewButton_1; - private JButton btnIndicarPrescripcion; - private JPanel panelPrescripcion; - private JButton btnAnadirNuevaPrescripcion; - private JScrollPane scrollPanePrescripciones; - private JButton btnAnadirPrescripcion; - private JScrollPane scrollPanePrescripcionSeleccionada; - private JButton btnBorrarPrescripcion; - private JList listPrescripciones; - private JList listPrescripcionSeleccionada; - private JButton btnAsignarPrescripcion; - private JButton btnCancelarPrescripcion; - private JPanel panelCrearPrescripcion; - private JPanel panelTipoPrescripcion; - private JRadioButton rdbtnMedicamento; - private JRadioButton rdbtnOtroTipo; - private JLabel lblNewLabel_7; - private JTextField textFieldInstrucciones; - private JPanel panelMedicamento; - private JLabel lblNewLabel_8; - private JTextField textFieldNombreMedicamento; - private JLabel lblNewLabel_8_1; - private JSpinner spinnerCantidadMedicamento; - private JLabel lblNewLabel_8_1_1; - private JLabel lblNewLabel_8_1_2; - private JComboBox comboBoxIntervalo; - private JLabel lblNewLabel_8_1_2_1; - private JSpinner spinnerDiasSemanas; private JRadioButton rdbtnDiasPrescripcion; private JRadioButton rdbtnSemanasPrescripcion; private JRadioButton rdbtnMesesPrescripcion; private JRadioButton rdbtnAnosPrescripcion; - private JLabel lblNewLabel_8_1_2_1_1; - private JTextField textFieldNotasAdicionalesPrescripcion; - private JButton btnCrearPrescripcionNueva; - private JButton btnCancelarCrearPrescripcionNueva; - private JLabel lblNewLabel_9; - private JLabel lblNewLabel_9_1; - private ListaPrescripciones listaPrescripciones; - private JSpinner spinnerHoraAsignacion; - private JSpinner spinnerMinutosAsignacion; - private JSpinner spinnerSegundosAsignacion; - private JLabel lblNewLabel_10; - private JLabel lblNewLabel_10_1; private JDateChooser dateChooserPrescripcion; - private JLabel lblNewLabel_11; private JLabel lblNewLabel_12; - private DefaultListModel modeloListPrescripcionesSeleccionada; - private PrescripcionDTO prescripcionDTO; - private Prescripcion prescripcion; - private MedicamentoDTO medicamentoDTO; - private Medicamento medicamento; - private CrearMedicamento crearMedicamento; - private JList listPacientesPrescripcion; - private DefaultListModel modeloListaPacientesPrescripcion; - private JPanel panelElegirCita; - private JButton btnEliminarCitaElegida; - private JButton btnTerminarProceso; - private JButton btnCancelarProceso; - private PrescripcionCitaPaciente prescripcionCitaPaciente; private PrescripcionCitaPacienteDTO prescripcionCitaPacienteDTO; private CrearPrescripcionCitaPaciente crearPrescripcionCitaPaciente; - - private MedicoCita medicoCita; - private MedicoCitaDTO medicoCitaDTO; - private CrearMedicoCita crearMedicoCita; - private JPanel panelLoginMedico; - private JScrollPane scrollPane_4; private CrearPrescripcion crearPrescripcion; private boolean fechaCambiada4; private boolean fechaCambiada3; - private DefaultListModel modeloListaMedicosLogin; - private DefaultListModel modeloListaMedicosLogueados; - private int id_medico; - private JList listMedicosLogin; - private JButton btnSeleccionarMedicoLogin; - private JScrollPane scrollPane_5; - private JList listMedicoLogueado; - private JButton btnEliminarMedicoLogueado; - private JButton btnSiguienteLogin; + private JScrollPane scrollPane_6; private JTextArea textAreaMedicinaInformacion; private JLabel lblNewLabel_13; @@ -318,7 +214,7 @@ public class VentanaPrincipal extends JFrame { private JButton btnCrearJornadaEnfermero; private JButton btnCancelarJornadaEnfermero; private JScrollPane scrollPane_8; - private JButton btnAñadirDiasJornadaEnfermero; + private JButton btnAnadirDiasJornadaEnfermero; private JScrollPane scrollPaneDiasSeleccionados_1; private JButton btnBorrarDiasSeleccionadosJornadaEnfermero; private JScrollPane scrollPaneSeleccionarEnfermero; @@ -354,7 +250,7 @@ public class VentanaPrincipal extends JFrame { private JComboBox comboBoxAnoFinJornadaMedico_1; private JScrollPane scrollPane; private JList listDias; - private JButton btnAñadirDiasJornada; + private JButton btnAnadirDiasJornada; private JScrollPane scrollPaneDiasSeleccionados; private JButton btnBorrarDiasSeleccionados; private String dias = ""; @@ -466,6 +362,10 @@ public class VentanaPrincipal extends JFrame { private JTextField txtFieldInfoContacto; private JLabel lblUrgente; private JCheckBox chckbxUrgente; + private JButton btnCancelar; + private JButton btnEliminarPacienteCita; + private JButton btnEliminarMedicoCita; + private JButton btnSalirPanelMedico; /** @@ -626,7 +526,7 @@ private JButton getBtnSalir() { btnSalir.setFocusable(false); btnSalir.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - System.exit(0); + cambiarPanel("panelPrincipal"); } }); btnSalir.setBackground(Color.RED); @@ -793,6 +693,7 @@ private JPanel getPanelMedico() { panelMedico.setBackground(Color.WHITE); panelMedico.setLayout(null); panelMedico.add(getBtnIndicarPrescripcion()); + panelMedico.add(getBtnSalirPanelMedico()); } return panelMedico; } @@ -827,7 +728,6 @@ private JPanel getPanelCitas() { panelCitas.setLayout(null); panelCitas.add(getLblMedicos()); panelCitas.add(getLblPaciente()); - panelCitas.add(getComboBoxAnoCita()); panelCitas.add(getLblFecha()); panelCitas.add(getLblHoraInicio()); panelCitas.add(getLblHoraFin()); @@ -854,6 +754,8 @@ private JPanel getPanelCitas() { panelCitas.add(getTxtFieldInfoContacto()); panelCitas.add(getLblUrgente()); panelCitas.add(getChckbxUrgente()); + panelCitas.add(getBtnEliminarPacienteCita()); + panelCitas.add(getBtnEliminarMedicoCita()); } return panelCitas; } @@ -876,19 +778,7 @@ private JLabel getLblPaciente() { return lblPaciente; } - private JComboBox getComboBoxAnoCita() { - if (comboBoxAnoCita == null) { - comboBoxAnoCita = new JComboBox(); - comboBoxAnoCita.setFocusable(false); - comboBoxAnoCita.setBounds(321, 330, 100, 22); - String[] listaAños = new String[5]; - for (int i = 0; i < listaAños.length; i++) { - listaAños[i] = String.valueOf(2021 + i); - } - comboBoxAnoCita.setModel(new DefaultComboBoxModel(listaAños)); - } - return comboBoxAnoCita; - } + private JLabel getLblFecha() { if (lblFecha == null) { @@ -1105,6 +995,7 @@ public void actionPerformed(ActionEvent e) { cita = new Cita(citaDTO); crearCitas.crearCita(cita); + cambiarPanel("panelAdministrativo"); for(int i=0; i= horaFin) { + if (minutos1Inicio >= minutos1Fin) { + if (minutos2Inicio >= minutos2Fin) { + JOptionPane.showMessageDialog(getBtnCrearJornadaEnfermero(),"La hora final de la jornada no puede ser anterior a la hora inicial"); + return false; } } - - } - }); - btnAñadirDiasJornada.setBounds(152, 434, 113, 23); - } - return btnAñadirDiasJornada; - } - private JScrollPane getScrollPaneDiasSeleccionados() { - if (scrollPaneDiasSeleccionados == null) { - scrollPaneDiasSeleccionados = new JScrollPane(); - scrollPaneDiasSeleccionados.setBounds(414, 401, 207, 86); - scrollPaneDiasSeleccionados.setViewportView(getListDiasSeleccionadosJornadaMedico()); + } } - return scrollPaneDiasSeleccionados; + + return true; + } - private JButton getBtnBorrarDiasSeleccionados() { - if (btnBorrarDiasSeleccionados == null) { - btnBorrarDiasSeleccionados = new JButton("Borrar dias"); - btnBorrarDiasSeleccionados.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - modeloListDiasSeleccionadosJornadaMedico.removeAllElements(); - - - } - }); - btnBorrarDiasSeleccionados.setBounds(631, 417, 126, 23); + private JLabel getLblNewLabel_14() { + if (lblNewLabel_14 == null) { + lblNewLabel_14 = new JLabel(""); + lblNewLabel_14.setIcon(new ImageIcon(VentanaPrincipal.class.getResource("/img/085e2efd9a10a1d20e259f487a17cf23-malet--n-medico-by-vexels.png"))); + lblNewLabel_14.setBounds(305, 0, 808, 561); } - return btnBorrarDiasSeleccionados; + return lblNewLabel_14; } - private JScrollPane getScrollPaneMedicos() { - if (scrollPaneMedicos == null) { - scrollPaneMedicos = new JScrollPane(); - scrollPaneMedicos.setBounds(323, 213, 287, 88); - scrollPaneMedicos.setViewportView(getListMedicos()); + private JLabel getLblNewLabel_15() { + if (lblNewLabel_15 == null) { + lblNewLabel_15 = new JLabel(""); + lblNewLabel_15.setIcon(new ImageIcon(VentanaPrincipal.class.getResource("/img/085e2efd9a10a1d20e259f487a17cf23-malet--n-medico-by-vexels.png"))); + lblNewLabel_15.setBounds(305, 0, 808, 561); } - return scrollPaneMedicos; + return lblNewLabel_15; } - private JButton getBtnAnadirMedicos() { - if (btnAnadirMedicos == null) { - btnAnadirMedicos = new JButton("A\u00F1adir Medico/s"); - btnAnadirMedicos.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - anadirMedicosSeleccinados(); - } - }); - btnAnadirMedicos.setBounds(630, 224, 149, 55); + private JLabel getLblNewLabel_16() { + if (lblNewLabel_16 == null) { + lblNewLabel_16 = new JLabel(""); + lblNewLabel_16.setIcon(new ImageIcon(VentanaPrincipal.class.getResource("/img/f1d0807f8ffad0197757d840bdc97d0b-icono-de-registro-medico-by-vexels.png"))); + lblNewLabel_16.setBounds(324, 0, 744, 550); } - return btnAnadirMedicos; + return lblNewLabel_16; } - - private void anadirMedicosSeleccinados() { - - for(Object o : listMedicos.getSelectedValuesList()) { - - if(!modeloListMedicosAnadidos.contains(o)) { - modeloListMedicosAnadidos.addElement((Medico)o); - } - + private JLabel getLblNewLabel_17() { + if (lblNewLabel_17 == null) { + lblNewLabel_17 = new JLabel(""); + lblNewLabel_17.setIcon(new ImageIcon(VentanaPrincipal.class.getResource("/img/f1d0807f8ffad0197757d840bdc97d0b-icono-de-registro-medico-by-vexels.png"))); + lblNewLabel_17.setBounds(313, 0, 800, 561); } - + return lblNewLabel_17; } - private JList getListMedicos() { - if (listMedicos == null) { - modeloListMedicos= new DefaultListModel(); - listMedicos = new JList(modeloListMedicos); - anadirMedicosALaLista(); + + private JLabel getLblInfocontacto() { + if (lblInfocontacto == null) { + lblInfocontacto = new JLabel("Informaci\u00F3n contacto :"); + lblInfocontacto.setFont(new Font("Tahoma", Font.PLAIN, 20)); + lblInfocontacto.setBounds(83, 430, 235, 22); } - return listMedicos; + return lblInfocontacto; } - - - private void anadirMedicosALaLista() { - - lm=new ListaMedicos(); - lm.creaListaMedicos(); - for(Medico m : lm.getMedicos()) { - modeloListMedicos.addElement((Medico)m); - } - - } - - private JScrollPane getScrollPaneMedicosAnadidos() { - if (scrollPaneMedicosAnadidos == null) { - scrollPaneMedicosAnadidos = new JScrollPane(); - scrollPaneMedicosAnadidos.setBounds(794, 213, 186, 88); - scrollPaneMedicosAnadidos.setViewportView(getListMedicosAnadidos()); - } - return scrollPaneMedicosAnadidos; - } - private JList getListMedicosAnadidos() { - if (listMedicosAnadidos == null) { - modeloListMedicosAnadidos= new DefaultListModel(); - listMedicosAnadidos = new JList(modeloListMedicosAnadidos); - } - return listMedicosAnadidos; - } - private JScrollPane getScrollPane_1() { - if (scrollPane_1 == null) { - scrollPane_1 = new JScrollPane(); - scrollPane_1.setBounds(321, 114, 289, 88); - scrollPane_1.setViewportView(getListPacientesCita()); - } - return scrollPane_1; - } - private JList getListPacientesCita() { - if (listPacientesCita == null) { - modeloListPacientesCita = new DefaultListModel(); - listPacientesCita = new JList(modeloListPacientesCita); - - anadirPacientesCitas(); - } - return listPacientesCita; - } - - private void anadirPacientesCitas() { - - lp= new ListaPacientes(); - lp.creaListaPacientes(); - - for(Paciente p : lp.getPacientes()) { - - modeloListPacientesCita.addElement((Paciente)p); - } - - } - private JButton getBtnAnadirPacienteListaCita() { - if (btnAnadirPacienteListaCita == null) { - btnAnadirPacienteListaCita = new JButton("A\u00F1adir Paciente"); - btnAnadirPacienteListaCita.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - anadirPacienteListaCita(); - } - }); - btnAnadirPacienteListaCita.setBounds(630, 126, 149, 55); - } - return btnAnadirPacienteListaCita; - } - - private void anadirPacienteListaCita() { - - for(Object o : listPacientesCita.getSelectedValuesList()) { - if(modeloListPacienteCita.getSize()<1) { - - if(!modeloListPacienteCita.contains(o)) { - Paciente paciente = (Paciente) o; - modeloListPacienteCita.addElement(paciente); - txtFieldInfoContacto.setText("Teléfono: " + paciente.getTelefono() + " email: " + paciente.getEmail()); - } - - } - } - - } - - private JScrollPane getScrollPanePacienteSeleccionado() { - if (scrollPanePacienteSeleccionado == null) { - scrollPanePacienteSeleccionado = new JScrollPane(); - scrollPanePacienteSeleccionado.setBounds(794, 114, 186, 88); - scrollPanePacienteSeleccionado.setViewportView(getListPacienteSeleccionado()); - } - return scrollPanePacienteSeleccionado; - } - private JList getListPacienteSeleccionado() { - if (listPacienteSeleccionado == null) { - modeloListPacienteCita = new DefaultListModel(); - listPacienteSeleccionado = new JList(modeloListPacienteCita); - - } - return listPacienteSeleccionado; - } - private JList getListDiasSeleccionadosJornadaMedico() { - if (listDiasSeleccionadosJornadaMedico == null) { - modeloListDiasSeleccionadosJornadaMedico= new DefaultListModel(); - listDiasSeleccionadosJornadaMedico = new JList(modeloListDiasSeleccionadosJornadaMedico); - } - return listDiasSeleccionadosJornadaMedico; - } - private JScrollPane getScrollPaneSeleccionarMedicoJornada() { - if (scrollPaneSeleccionarMedicoJornada == null) { - scrollPaneSeleccionarMedicoJornada = new JScrollPane(); - scrollPaneSeleccionarMedicoJornada.setBounds(229, 57, 261, 77); - scrollPaneSeleccionarMedicoJornada.setViewportView(getListMedicosJornada()); - } - return scrollPaneSeleccionarMedicoJornada; - } - private JList getListMedicosJornada() { - if (listMedicosJornada == null) { - modeloListMedicos= new DefaultListModel(); - listMedicosJornada = new JList(modeloListMedicos); - listMedicosJornada.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - anadirMedicosALaLista(); - - } - return listMedicosJornada; - } - private JButton getBtnAnadirMedicoJornadas() { - if (btnAnadirMedicoJornadas == null) { - btnAnadirMedicoJornadas = new JButton("A\u00F1adir"); - btnAnadirMedicoJornadas.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - if(modeloListMedicosSeleccionadosJornada.getSize()<1) { - if(!modeloListMedicosSeleccionadosJornada.contains((Medico) listMedicosJornada.getSelectedValue())) { - modeloListMedicosSeleccionadosJornada.addElement((Medico) listMedicosJornada.getSelectedValue()); - } - } - - } - }); - btnAnadirMedicoJornadas.setBounds(509, 86, 89, 23); - } - return btnAnadirMedicoJornadas; - } - private JScrollPane getScrollPaneMedicoSeleccionadoJornada() { - if (scrollPaneMedicoSeleccionadoJornada == null) { - scrollPaneMedicoSeleccionadoJornada = new JScrollPane(); - scrollPaneMedicoSeleccionadoJornada.setBounds(615, 57, 269, 77); - scrollPaneMedicoSeleccionadoJornada.setViewportView(getListMedicosSeleccionadosJornada()); + private JTextField getTxtFieldInfoContacto() { + if (txtFieldInfoContacto == null) { + txtFieldInfoContacto = new JTextField(); + txtFieldInfoContacto.setText("(A\u00F1adir paciente)"); + txtFieldInfoContacto.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtFieldInfoContacto.setBounds(321, 435, 346, 20); + txtFieldInfoContacto.setColumns(10); } - return scrollPaneMedicoSeleccionadoJornada; + return txtFieldInfoContacto; } - private JList getListMedicosSeleccionadosJornada() { - if (listMedicosSeleccionadosJornada == null) { - modeloListMedicosSeleccionadosJornada= new DefaultListModel(); - listMedicosSeleccionadosJornada = new JList(modeloListMedicosSeleccionadosJornada); + private JLabel getLblUrgente() { + if (lblUrgente == null) { + lblUrgente = new JLabel("Urgente :"); + lblUrgente.setFont(new Font("Tahoma", Font.PLAIN, 20)); + lblUrgente.setBounds(83, 478, 191, 29); } - return listMedicosSeleccionadosJornada; + return lblUrgente; } - private JButton getBtnNewButton_1() { - if (btnNewButton_1 == null) { - btnNewButton_1 = new JButton("Borrar Medico"); - btnNewButton_1.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - modeloListMedicosSeleccionadosJornada.removeAllElements(); - } - }); - btnNewButton_1.setBounds(894, 86, 115, 23); + private JCheckBox getChckbxUrgente() { + if (chckbxUrgente == null) { + chckbxUrgente = new JCheckBox("Si"); + chckbxUrgente.setBounds(321, 485, 41, 23); } - return btnNewButton_1; + return chckbxUrgente; } - private JButton getBtnIndicarPrescripcion() { - if (btnIndicarPrescripcion == null) { - btnIndicarPrescripcion = new JButton("Indicar prescripcion"); - btnIndicarPrescripcion.addActionListener(new ActionListener() { + private JButton getBtnCancelar() { + if (btnCancelar == null) { + btnCancelar = new JButton("Cancelar"); + btnCancelar.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - - cambiarPanel("panelPrescripcion"); + cambiarPanel("panelPrincipal"); } }); - btnIndicarPrescripcion.setBounds(78, 69, 151, 38); - } - return btnIndicarPrescripcion; - } - private JPanel getPanelPrescripcion() { - if (panelPrescripcion == null) { - panelPrescripcion = new JPanel(); - panelPrescripcion.setBackground(Color.WHITE); - panelPrescripcion.setLayout(null); - panelPrescripcion.add(getBtnAnadirNuevaPrescripcion()); - panelPrescripcion.add(getScrollPanePrescripciones()); - panelPrescripcion.add(getBtnAnadirPrescripcion()); - panelPrescripcion.add(getScrollPanePrescripcionSeleccionada()); - panelPrescripcion.add(getBtnBorrarPrescripcion()); - panelPrescripcion.add(getBtnAsignarPrescripcion()); - panelPrescripcion.add(getBtnCancelarPrescripcion()); - - JButton btnNewButton_2 = new JButton("Seleccionar Paciente"); - btnNewButton_2.setBounds(433, 306, 224, 47); - panelPrescripcion.add(btnNewButton_2); - - JScrollPane scrollPanePaciente = new JScrollPane(); - scrollPanePaciente.setBounds(716, 258, 328, 137); - panelPrescripcion.add(scrollPanePaciente); - scrollPanePaciente.setViewportView(getListPacientesPrescripcion()); + btnCancelar.setBounds(938, 503, 89, 23); } - return panelPrescripcion; + return btnCancelar; } - private JButton getBtnAnadirNuevaPrescripcion() { - if (btnAnadirNuevaPrescripcion == null) { - btnAnadirNuevaPrescripcion = new JButton("A\u00F1adir nueva prescripcion"); - btnAnadirNuevaPrescripcion.addActionListener(new ActionListener() { + private JButton getBtnEliminarPacienteCita() { + if (btnEliminarPacienteCita == null) { + btnEliminarPacienteCita = new JButton("Eliminar "); + btnEliminarPacienteCita.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - cambiarPanel("panelCrearPrescripcion"); + modeloListPacienteCita.removeAllElements(); + txtFieldInfoContacto.setText("(Añadir paciente)"); } }); - btnAnadirNuevaPrescripcion.setBounds(85, 484, 224, 47); - } - return btnAnadirNuevaPrescripcion; - } - private JScrollPane getScrollPanePrescripciones() { - if (scrollPanePrescripciones == null) { - scrollPanePrescripciones = new JScrollPane(); - scrollPanePrescripciones.setBounds(40, 50, 328, 401); - scrollPanePrescripciones.setViewportView(getListPrescripciones()); + btnEliminarPacienteCita.setBounds(1000, 145, 103, 23); } - return scrollPanePrescripciones; + return btnEliminarPacienteCita; } - private JButton getBtnAnadirPrescripcion() { - if (btnAnadirPrescripcion == null) { - btnAnadirPrescripcion = new JButton("A\u00F1adir Prescripcion se\u00F1alizada"); - btnAnadirPrescripcion.addActionListener(new ActionListener() { + private JButton getBtnEliminarMedicoCita() { + if (btnEliminarMedicoCita == null) { + btnEliminarMedicoCita = new JButton("Eliminar"); + btnEliminarMedicoCita.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - for(Object o : listPrescripciones.getSelectedValuesList()) { - if(!modeloListPrescripcionesSeleccionada.contains(o)) { - if(modeloListPrescripcionesSeleccionada.getSize()<1) { - modeloListPrescripcionesSeleccionada.addElement((Prescripcion) o); - } - } - } - + modeloListMedicosAnadidos.removeAllElements(); } }); - btnAnadirPrescripcion.setBounds(433, 50, 226, 47); - } - return btnAnadirPrescripcion; - } - private JScrollPane getScrollPanePrescripcionSeleccionada() { - if (scrollPanePrescripcionSeleccionada == null) { - scrollPanePrescripcionSeleccionada = new JScrollPane(); - scrollPanePrescripcionSeleccionada.setBounds(716, 50, 328, 103); - scrollPanePrescripcionSeleccionada.setViewportView(getListPrescripcionSeleccionada()); + btnEliminarMedicoCita.setBounds(1000, 240, 89, 23); } - return scrollPanePrescripcionSeleccionada; + return btnEliminarMedicoCita; } - private JButton getBtnBorrarPrescripcion() { - if (btnBorrarPrescripcion == null) { - btnBorrarPrescripcion = new JButton("Eliminar prescripcion"); - btnBorrarPrescripcion.addActionListener(new ActionListener() { + private JButton getBtnSalirPanelMedico() { + if (btnSalirPanelMedico == null) { + btnSalirPanelMedico = new JButton("Salir"); + btnSalirPanelMedico.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - modeloListPrescripcionesSeleccionada.removeAllElements(); + cambiarPanel("panelPrincipal"); } }); - btnBorrarPrescripcion.setForeground(Color.RED); - btnBorrarPrescripcion.setBounds(784, 176, 190, 40); - } - return btnBorrarPrescripcion; - } - private JList getListPrescripciones() { - if (listPrescripciones == null) { - modeloListPrescripciones = new DefaultListModel(); - listPrescripciones = new JList(modeloListPrescripciones); - listPrescripciones.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - mostrarPrescripciones(); - } - return listPrescripciones; - } - - private void mostrarPrescripciones() { - - listaPrescripciones = new ListaPrescripciones(); - - listaPrescripciones.creaListaPrescripciones(); - - for(Prescripcion p : listaPrescripciones.getPrescripciones()) { - - modeloListPrescripciones.addElement(p); - + btnSalirPanelMedico.setBounds(944, 504, 124, 46); } - - - - } - - private JList getListPrescripcionSeleccionada() { - if (listPrescripcionSeleccionada == null) { - modeloListPrescripcionesSeleccionada= new DefaultListModel(); - listPrescripcionSeleccionada = new JList(modeloListPrescripcionesSeleccionada); - } - return listPrescripcionSeleccionada; - } - private JButton getBtnAsignarPrescripcion() { - if (btnAsignarPrescripcion == null) { - btnAsignarPrescripcion = new JButton("Asignar Prescripcion"); - btnAsignarPrescripcion.setForeground(new Color(0, 128, 0)); - btnAsignarPrescripcion.setBounds(716, 487, 167, 41); - } - return btnAsignarPrescripcion; - } - private JButton getBtnCancelarPrescripcion() { - if (btnCancelarPrescripcion == null) { - btnCancelarPrescripcion = new JButton("Cancelar"); - btnCancelarPrescripcion.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - modeloListPrescripcionesSeleccionada.removeAllElements(); - cambiarPanel("panelMedico"); - } - }); - btnCancelarPrescripcion.setForeground(Color.RED); - btnCancelarPrescripcion.setBounds(906, 487, 156, 41); - } - return btnCancelarPrescripcion; - } - private JPanel getPanelCrearPrescripcion() { - if (panelCrearPrescripcion == null) { - panelCrearPrescripcion = new JPanel(); - panelCrearPrescripcion.setBackground(Color.WHITE); - panelCrearPrescripcion.setLayout(null); - panelCrearPrescripcion.add(getPanelTipoPrescripcion()); - panelCrearPrescripcion.add(getLblNewLabel_7()); - panelCrearPrescripcion.add(getTextFieldInstrucciones()); - panelCrearPrescripcion.add(getPanelMedicamento()); - panelCrearPrescripcion.add(getBtnCrearPrescripcionNueva()); - panelCrearPrescripcion.add(getBtnCancelarCrearPrescripcionNueva()); - panelCrearPrescripcion.add(getLblNewLabel_9()); - panelCrearPrescripcion.add(getLblNewLabel_9_1()); - panelCrearPrescripcion.add(getSpinnerHoraAsignacion()); - panelCrearPrescripcion.add(getSpinnerMinutosAsignacion()); - panelCrearPrescripcion.add(getSpinnerSegundosAsignacion()); - panelCrearPrescripcion.add(getLblNewLabel_10()); - panelCrearPrescripcion.add(getLblNewLabel_10_1()); - panelCrearPrescripcion.add(getLblNewLabel_11()); - } - return panelCrearPrescripcion; - } - private JPanel getPanelTipoPrescripcion() { - if (panelTipoPrescripcion == null) { - panelTipoPrescripcion = new JPanel(); - panelTipoPrescripcion.setBorder(new TitledBorder(null, "Elegir tipo de prescripcion", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelTipoPrescripcion.setForeground(Color.WHITE); - panelTipoPrescripcion.setBackground(new Color(135, 206, 235)); - panelTipoPrescripcion.setBounds(90, 44, 257, 100); - panelTipoPrescripcion.setLayout(null); - panelTipoPrescripcion.add(getRdbtnMedicamento()); - panelTipoPrescripcion.add(getRdbtnOtroTipo()); - } - return panelTipoPrescripcion; - } - private JRadioButton getRdbtnMedicamento() { - if (rdbtnMedicamento == null) { - rdbtnMedicamento = new JRadioButton("Medicamento"); - rdbtnMedicamento.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - comprobarMedicamentoSeleccionado(); - } - }); - rdbtnMedicamento.setForeground(new Color(0, 0, 0)); - rdbtnMedicamento.setFont(new Font("Tahoma", Font.BOLD, 11)); - rdbtnMedicamento.setBackground(new Color(135, 206, 235)); - rdbtnMedicamento.setBounds(28, 40, 109, 23); - - - - } - return rdbtnMedicamento; - } - - - private void comprobarMedicamentoSeleccionado() { - - if(rdbtnMedicamento.isSelected()==true) { - - rdbtnOtroTipo.setSelected(false); - textFieldNombreMedicamento.setEnabled(true); - spinnerCantidadMedicamento.setEnabled(true); - comboBoxIntervalo.setEnabled(true); - spinnerDiasSemanas.setEnabled(true); - textFieldNotasAdicionalesPrescripcion.setEnabled(true); - - - - } - - } - - private void comprobarOtroTipoSeleccionado() { - - if(rdbtnOtroTipo.isSelected()==true) { - - rdbtnMedicamento.setSelected(false); - textFieldNombreMedicamento.setEnabled(false); - spinnerCantidadMedicamento.setEnabled(false); - comboBoxIntervalo.setEnabled(false); - spinnerDiasSemanas.setEnabled(false); - textFieldNotasAdicionalesPrescripcion.setEnabled(false); - - - } - - } - - - private JRadioButton getRdbtnOtroTipo() { - if (rdbtnOtroTipo == null) { - rdbtnOtroTipo = new JRadioButton("Otro tipo"); - rdbtnOtroTipo.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - comprobarOtroTipoSeleccionado(); - } - }); - rdbtnOtroTipo.setSelected(true); - rdbtnOtroTipo.setFont(new Font("Tahoma", Font.BOLD, 11)); - rdbtnOtroTipo.setBackground(new Color(135, 206, 235)); - rdbtnOtroTipo.setBounds(139, 40, 88, 23); - - } - return rdbtnOtroTipo; - } - private JLabel getLblNewLabel_7() { - if (lblNewLabel_7 == null) { - lblNewLabel_7 = new JLabel("Instruccion/es :"); - lblNewLabel_7.setFont(new Font("Tahoma", Font.PLAIN, 18)); - lblNewLabel_7.setBounds(384, 44, 138, 25); - - } - return listDiasSemanaJornadaEnfermero; - } - private JList getListDiasSeleccionadosJornadaEnfermero() { - if (listDiasSeleccionadosJornadaEnfermero == null) { - modeloDiasSemanaSeleccionadosJornadaEnfermero= new DefaultListModel(); - listDiasSeleccionadosJornadaEnfermero = new JList(modeloDiasSemanaSeleccionadosJornadaEnfermero); - } - return listDiasSeleccionadosJornadaEnfermero; - } - -private boolean comprobarCorrecto2(int horaInicio,int horaFin,int minutos1Inicio,int minutos2Inicio ,int minutos1Fin, int minutos2Fin ) { - - if (fechaCambiada3 == true && fechaCambiada4 == false) { - JOptionPane.showMessageDialog(getBtnCrearJornadaEnfermero(),"La fecha final de la jornada no puede ser anterior a la fecha inicial"); - return false; - - } else { - if (dateChooserFechaInicioJornadaEnfermero.getDate().toString().contains(dateChooserFechaFinJornadaEnfermero.getDate().toString())) { - - if (horaInicio >= horaFin) { - if (minutos1Inicio >= minutos1Fin) { - if (minutos2Inicio >= minutos2Fin) { - JOptionPane.showMessageDialog(getBtnCrearJornadaEnfermero(),"La hora final de la jornada no puede ser anterior a la hora inicial"); - return false; - } - } - } - - } - } - - return true; - - } - private JLabel getLblNewLabel_14() { - if (lblNewLabel_14 == null) { - lblNewLabel_14 = new JLabel(""); - lblNewLabel_14.setIcon(new ImageIcon(VentanaPrincipal.class.getResource("/img/085e2efd9a10a1d20e259f487a17cf23-malet--n-medico-by-vexels.png"))); - lblNewLabel_14.setBounds(305, 0, 808, 561); - } - return lblNewLabel_14; - } - private JLabel getLblNewLabel_15() { - if (lblNewLabel_15 == null) { - lblNewLabel_15 = new JLabel(""); - lblNewLabel_15.setIcon(new ImageIcon(VentanaPrincipal.class.getResource("/img/085e2efd9a10a1d20e259f487a17cf23-malet--n-medico-by-vexels.png"))); - lblNewLabel_15.setBounds(305, 0, 808, 561); - } - return lblNewLabel_15; - } - private JLabel getLblNewLabel_16() { - if (lblNewLabel_16 == null) { - lblNewLabel_16 = new JLabel(""); - lblNewLabel_16.setIcon(new ImageIcon(VentanaPrincipal.class.getResource("/img/f1d0807f8ffad0197757d840bdc97d0b-icono-de-registro-medico-by-vexels.png"))); - lblNewLabel_16.setBounds(324, 0, 744, 550); - } - return lblNewLabel_16; - } - private JLabel getLblNewLabel_17() { - if (lblNewLabel_17 == null) { - lblNewLabel_17 = new JLabel(""); - lblNewLabel_17.setIcon(new ImageIcon(VentanaPrincipal.class.getResource("/img/f1d0807f8ffad0197757d840bdc97d0b-icono-de-registro-medico-by-vexels.png"))); - lblNewLabel_17.setBounds(313, 0, 800, 561); - } - return lblNewLabel_17; - } - private JTextField getTextFieldInstrucciones() { - if (textFieldInstrucciones == null) { - textFieldInstrucciones = new JTextField(); - textFieldInstrucciones.setBounds(517, 39, 332, 41); - textFieldInstrucciones.setColumns(10); - } - return textFieldInstrucciones; - } - private JPanel getPanelMedicamento() { - if (panelMedicamento == null) { - panelMedicamento = new JPanel(); - panelMedicamento.setBorder(new TitledBorder(null, "Medicamento", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelMedicamento.setBackground(new Color(135, 206, 250)); - panelMedicamento.setBounds(460, 209, 517, 250); - panelMedicamento.setLayout(null); - panelMedicamento.add(getLblNewLabel_8()); - panelMedicamento.add(getTextFieldNombreMedicamento()); - panelMedicamento.add(getLblNewLabel_8_1()); - panelMedicamento.add(getSpinnerCantidadMedicamento()); - panelMedicamento.add(getLblNewLabel_8_1_1()); - panelMedicamento.add(getLblNewLabel_8_1_2()); - panelMedicamento.add(getComboBoxIntervalo()); - panelMedicamento.add(getLblNewLabel_8_1_2_1()); - panelMedicamento.add(getSpinnerDiasSemanas()); - panelMedicamento.add(getLblNewLabel_8_1_2_1_1()); - panelMedicamento.add(getTextFieldNotasAdicionalesPrescripcion()); - } - return panelMedicamento; - } - private JLabel getLblNewLabel_8() { - if (lblNewLabel_8 == null) { - lblNewLabel_8 = new JLabel("Nombre :"); - lblNewLabel_8.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_8.setBounds(22, 33, 74, 25); - } - return lblNewLabel_8; - } - private JTextField getTextFieldNombreMedicamento() { - if (textFieldNombreMedicamento == null) { - textFieldNombreMedicamento = new JTextField(); - textFieldNombreMedicamento.setEnabled(false); - textFieldNombreMedicamento.setBounds(113, 35, 162, 20); - textFieldNombreMedicamento.setColumns(10); - } - return textFieldNombreMedicamento; - } - private JLabel getLblNewLabel_8_1() { - if (lblNewLabel_8_1 == null) { - lblNewLabel_8_1 = new JLabel("Cantidad :"); - lblNewLabel_8_1.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_8_1.setBounds(22, 67, 84, 25); - } - return lblNewLabel_8_1; - } - private JSpinner getSpinnerCantidadMedicamento() { - if (spinnerCantidadMedicamento == null) { - spinnerCantidadMedicamento = new JSpinner(); - spinnerCantidadMedicamento.setEnabled(false); - spinnerCantidadMedicamento.setModel(new SpinnerNumberModel(new Integer(1), new Integer(1), null, new Integer(1))); - spinnerCantidadMedicamento.setBounds(113, 69, 43, 20); - } - return spinnerCantidadMedicamento; - } - private JLabel getLblNewLabel_8_1_1() { - if (lblNewLabel_8_1_1 == null) { - lblNewLabel_8_1_1 = new JLabel("Unidades"); - lblNewLabel_8_1_1.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_8_1_1.setBounds(166, 69, 84, 25); - } - return lblNewLabel_8_1_1; - } - private JLabel getLblNewLabel_8_1_2() { - if (lblNewLabel_8_1_2 == null) { - lblNewLabel_8_1_2 = new JLabel("Intervalo :"); - lblNewLabel_8_1_2.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_8_1_2.setBounds(22, 104, 84, 25); - } - return lblNewLabel_8_1_2; - } - private JComboBox getComboBoxIntervalo() { - if (comboBoxIntervalo == null) { - comboBoxIntervalo = new JComboBox(); - comboBoxIntervalo.setEnabled(false); - comboBoxIntervalo.setModel(new DefaultComboBoxModel(new String[] {"Cada 4 horas", "Cada 8 horas", "Cada 12 horas", "Cada 24 horas", "Cada 2 dias", "Cada semana", "Cada dos semanas", "Cada mes"})); - comboBoxIntervalo.setBounds(113, 105, 162, 22); - } - return comboBoxIntervalo; - } - private JLabel getLblNewLabel_8_1_2_1() { - if (lblNewLabel_8_1_2_1 == null) { - lblNewLabel_8_1_2_1 = new JLabel("Duracion :"); - lblNewLabel_8_1_2_1.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_8_1_2_1.setBounds(22, 146, 84, 25); - } - return lblNewLabel_8_1_2_1; - } - private JSpinner getSpinnerDiasSemanas() { - if (spinnerDiasSemanas == null) { - spinnerDiasSemanas = new JSpinner(); - spinnerDiasSemanas.setModel(new SpinnerNumberModel(new Integer(1), new Integer(1), null, new Integer(1))); - spinnerDiasSemanas.setEnabled(false); - spinnerDiasSemanas.setBounds(113, 148, 30, 20); - } - return spinnerDiasSemanas; - } - private JLabel getLblNewLabel_8_1_2_1_1() { - if (lblNewLabel_8_1_2_1_1 == null) { - lblNewLabel_8_1_2_1_1 = new JLabel("Notaciones adicionales :"); - lblNewLabel_8_1_2_1_1.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_8_1_2_1_1.setBounds(22, 193, 145, 25); - } - return lblNewLabel_8_1_2_1_1; - } - private JTextField getTextFieldNotasAdicionalesPrescripcion() { - if (textFieldNotasAdicionalesPrescripcion == null) { - textFieldNotasAdicionalesPrescripcion = new JTextField(); - textFieldNotasAdicionalesPrescripcion.setEnabled(false); - textFieldNotasAdicionalesPrescripcion.setBounds(176, 195, 314, 20); - textFieldNotasAdicionalesPrescripcion.setColumns(10); - } - return textFieldNotasAdicionalesPrescripcion; - } - private JButton getBtnCrearPrescripcionNueva() { - if (btnCrearPrescripcionNueva == null) { - btnCrearPrescripcionNueva = new JButton("Crear"); - btnCrearPrescripcionNueva.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - prescripcionDTO = new PrescripcionDTO(); - - if(textFieldInstrucciones.getText()!="") { - prescripcionDTO.instruccion = textFieldInstrucciones.getText() ; - - } - else { - JOptionPane.showMessageDialog(textFieldInstrucciones, "El campo instrucciones no se puede dejar vacio"); - } - - - String hora = spinnerHoraAsignacion + ""; - String minutos = spinnerMinutosAsignacion + ""; - String segundos = spinnerSegundosAsignacion + ""; - - String horaAsignacion = hora +" : "+ minutos+ " : " + segundos; - - prescripcionDTO.horaAsignacion= horaAsignacion; - - - - - - } - }); - btnCrearPrescripcionNueva.setForeground(Color.GREEN); - btnCrearPrescripcionNueva.setBounds(701, 470, 130, 35); - } - return btnCrearPrescripcionNueva; - } - private JButton getBtnCancelarCrearPrescripcionNueva() { - if (btnCancelarCrearPrescripcionNueva == null) { - btnCancelarCrearPrescripcionNueva = new JButton("Cancelar"); - btnCancelarCrearPrescripcionNueva.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - cambiarPanel("panelPrescripcion"); - - } - }); - btnCancelarCrearPrescripcionNueva.setForeground(Color.RED); - btnCancelarCrearPrescripcionNueva.setBounds(847, 470, 130, 35); - } - return btnCancelarCrearPrescripcionNueva; - } - private JLabel getLblNewLabel_9() { - if (lblNewLabel_9 == null) { - lblNewLabel_9 = new JLabel("Dia de asignacion : "); - lblNewLabel_9.setFont(new Font("Tahoma", Font.BOLD, 13)); - lblNewLabel_9.setBounds(517, 91, 151, 24); - } - return lblNewLabel_9; - } - private JLabel getLblNewLabel_9_1() { - if (lblNewLabel_9_1 == null) { - lblNewLabel_9_1 = new JLabel("Hora de asignacion : "); - lblNewLabel_9_1.setFont(new Font("Tahoma", Font.BOLD, 13)); - lblNewLabel_9_1.setBounds(517, 142, 151, 24); - } - return lblNewLabel_9_1; - } - - - private JSpinner getSpinnerHoraAsignacion() { - if (spinnerHoraAsignacion == null) { - spinnerHoraAsignacion = new JSpinner(); - spinnerHoraAsignacion.setModel(new SpinnerNumberModel(0, 0, 24, 1)); - spinnerHoraAsignacion.setBounds(653, 145, 52, 20); - - } - return spinnerHoraAsignacion; - } - private JSpinner getSpinnerMinutosAsignacion() { - if (spinnerMinutosAsignacion == null) { - spinnerMinutosAsignacion = new JSpinner(); - spinnerMinutosAsignacion.setModel(new SpinnerNumberModel(0, 0, 59, 1)); - spinnerMinutosAsignacion.setBounds(725, 145, 52, 20); - - } - return spinnerMinutosAsignacion; - } - private JSpinner getSpinnerSegundosAsignacion() { - if (spinnerSegundosAsignacion == null) { - spinnerSegundosAsignacion = new JSpinner(); - spinnerSegundosAsignacion.setModel(new SpinnerNumberModel(0, 0, 59, 1)); - spinnerSegundosAsignacion.setBounds(797, 145, 52, 20); - - } - return spinnerSegundosAsignacion; - } - private JLabel getLblNewLabel_10() { - if (lblNewLabel_10 == null) { - lblNewLabel_10 = new JLabel(":"); - lblNewLabel_10.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_10.setForeground(new Color(0, 0, 0)); - lblNewLabel_10.setBounds(787, 148, 22, 14); - } - return lblNewLabel_10; - } - private JLabel getLblNewLabel_10_1() { - if (lblNewLabel_10_1 == null) { - lblNewLabel_10_1 = new JLabel(":"); - lblNewLabel_10_1.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_10_1.setBounds(715, 148, 22, 14); - } - return lblNewLabel_10_1; - } - - private JLabel getLblNewLabel_11() { - if (lblNewLabel_11 == null) { - lblNewLabel_11 = new JLabel("HH/mm/ss"); - lblNewLabel_11.setFont(new Font("Tahoma", Font.BOLD, 11)); - lblNewLabel_11.setBounds(874, 148, 85, 14); - } - return lblNewLabel_11; - } - - private JList getListPacientesPrescripcion() { - if (listPacientesPrescripcion == null) { - modeloListaPacientesPrescripcion = new DefaultListModel(); - listPacientesPrescripcion = new JList(modeloListaPacientesPrescripcion); - listPacientesPrescripcion.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - lp= new ListaPacientes(); - lp.creaListaPacientes(); - - for(Paciente p : lp.getPacientes()) { - - modeloListaPacientesPrescripcion.addElement(p); - } - - } - return listPacientesPrescripcion; - } - private JPanel getPanelElegirCita() { - if (panelElegirCita == null) { - panelElegirCita = new JPanel(); - panelElegirCita.setBackground(Color.WHITE); - panelElegirCita.setLayout(null); - - JScrollPane scrollPane_2 = new JScrollPane(); - scrollPane_2.setBounds(80, 91, 351, 395); - panelElegirCita.add(scrollPane_2); - - JScrollPane scrollPane_3 = new JScrollPane(); - scrollPane_3.setBounds(764, 181, 276, 173); - panelElegirCita.add(scrollPane_3); - - JButton btnElegirCita = new JButton("Elegir Cita"); - btnElegirCita.setBounds(510, 252, 160, 54); - panelElegirCita.add(btnElegirCita); - panelElegirCita.add(getBtnEliminarCitaElegida()); - panelElegirCita.add(getBtnTerminarProceso()); - panelElegirCita.add(getBtnCancelarProceso()); - } - return panelElegirCita; - } - private JButton getBtnEliminarCitaElegida() { - if (btnEliminarCitaElegida == null) { - btnEliminarCitaElegida = new JButton("Eliminar Cita Elegida"); - btnEliminarCitaElegida.setBounds(839, 383, 127, 23); - } - return btnEliminarCitaElegida; - } - private JButton getBtnTerminarProceso() { - if (btnTerminarProceso == null) { - btnTerminarProceso = new JButton("Terminar Proceso"); - btnTerminarProceso.setBounds(764, 477, 115, 42); - } - return btnTerminarProceso; - } - private JButton getBtnCancelarProceso() { - if (btnCancelarProceso == null) { - btnCancelarProceso = new JButton("CancelarProceso"); - btnCancelarProceso.setBounds(925, 477, 115, 42); - } - return btnCancelarProceso; - } - private JPanel getPanelLoginMedico() { - if (panelLoginMedico == null) { - panelLoginMedico = new JPanel(); - panelLoginMedico.setBackground(Color.WHITE); - panelLoginMedico.setLayout(null); - panelLoginMedico.add(getScrollPane_4()); - panelLoginMedico.add(getBtnSeleccionarMedicoLogin()); - panelLoginMedico.add(getScrollPane_5()); - panelLoginMedico.add(getBtnEliminarMedicoLogueado()); - panelLoginMedico.add(getBtnSiguienteLogin()); - - } - return panelLoginMedico; - } - private JScrollPane getScrollPane_4() { - if (scrollPane_4 == null) { - scrollPane_4 = new JScrollPane(); - scrollPane_4.setBounds(119, 152, 283, 263); - scrollPane_4.setViewportView(getListMedicosLogin()); - - - } - return scrollPane_4; - } - private JList getListMedicosLogin() { - if (listMedicosLogin == null) { - modeloListaMedicosLogin = new DefaultListModel(); - listMedicosLogin = new JList(modeloListaMedicosLogin); - listMedicosLogin.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - lm=new ListaMedicos(); - lm.creaListaMedicos(); - for(Medico m : lm.getMedicos()) { - modeloListaMedicosLogin.addElement((Medico)m); - } - - } - return listMedicosLogin; - } - private JButton getBtnSeleccionarMedicoLogin() { - if (btnSeleccionarMedicoLogin == null) { - btnSeleccionarMedicoLogin = new JButton("Seleccionar Medico"); - btnSeleccionarMedicoLogin.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - for(Object o :listMedicosLogin.getSelectedValuesList()) { - if(!modeloListaMedicosLogueados.contains(o)) { - if(modeloListaMedicosLogueados.getSize()<1){ - - modeloListaMedicosLogueados.addElement((Medico) o); - - } - } - } - } - }); - btnSeleccionarMedicoLogin.setBounds(462, 249, 166, 39); - - } - return btnSeleccionarMedicoLogin; - } - private JScrollPane getScrollPane_5() { - if (scrollPane_5 == null) { - scrollPane_5 = new JScrollPane(); - scrollPane_5.setBounds(678, 167, 338, 184); - scrollPane_5.setViewportView(getListMedicoLogueado()); - } - return scrollPane_5; - } - private JList getListMedicoLogueado() { - if (listMedicoLogueado == null) { - modeloListaMedicosLogueados= new DefaultListModel(); - listMedicoLogueado = new JList(modeloListaMedicosLogueados); - } - return listMedicoLogueado; - } - private JButton getBtnEliminarMedicoLogueado() { - if (btnEliminarMedicoLogueado == null) { - btnEliminarMedicoLogueado = new JButton("Eliminar"); - btnEliminarMedicoLogueado.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - modeloListaMedicosLogueados.removeAllElements(); - } - }); - btnEliminarMedicoLogueado.setBounds(807, 373, 89, 23); - } - return btnEliminarMedicoLogueado; - } - private JButton getBtnSiguienteLogin() { - if (btnSiguienteLogin == null) { - btnSiguienteLogin = new JButton("Siguiente"); - btnSiguienteLogin.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - id_medico = modeloListaMedicosLogueados.getElementAt(0).getIdMedico(); - cambiarPanel("panelMedico"); - } - }); - btnSiguienteLogin.setBounds(889, 502, 89, 23); - } - return btnSiguienteLogin; - } - private JLabel getLblInfocontacto() { - if (lblInfocontacto == null) { - lblInfocontacto = new JLabel("Informaci\u00F3n contacto :"); - lblInfocontacto.setFont(new Font("Tahoma", Font.PLAIN, 20)); - lblInfocontacto.setBounds(83, 430, 235, 22); - } - return lblInfocontacto; - } - private JTextField getTxtFieldInfoContacto() { - if (txtFieldInfoContacto == null) { - txtFieldInfoContacto = new JTextField(); - txtFieldInfoContacto.setText("(A\u00F1adir paciente)"); - txtFieldInfoContacto.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtFieldInfoContacto.setBounds(321, 435, 346, 20); - txtFieldInfoContacto.setColumns(10); - } - return txtFieldInfoContacto; - } - private JLabel getLblUrgente() { - if (lblUrgente == null) { - lblUrgente = new JLabel("Urgente :"); - lblUrgente.setFont(new Font("Tahoma", Font.PLAIN, 20)); - lblUrgente.setBounds(83, 478, 191, 29); - } - return lblUrgente; - } - private JCheckBox getChckbxUrgente() { - if (chckbxUrgente == null) { - chckbxUrgente = new JCheckBox("Si"); - chckbxUrgente.setBounds(321, 485, 41, 23); - } - return chckbxUrgente; + return btnSalirPanelMedico; } }