From 6ee43fc7904336fb065e08e906b6144160d841b4 Mon Sep 17 00:00:00 2001
From: AngelSuarez03 <Angnusa11@gmail.com>
Date: Thu, 2 May 2024 09:38:17 -0600
Subject: [PATCH] =?UTF-8?q?Restructuraci=C3=B3n=20del=20Proyecto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml                | 15 ++++++++++++++-
 app/src/main/AndroidManifest.xml                  |  2 +-
 .../DoctorDataBaseHelper.kt                       | 10 ++++++----
 .../medicalhealth => Adapters}/PacienteAdapter.kt |  3 ++-
 .../RecetaDataBaseHelper.kt                       |  3 ++-
 .../medicalhealth => Data}/Doctor.kt              |  2 +-
 .../medicalhealth => Data}/Paciente.kt            |  2 +-
 .../medicalhealth => Data}/Receta.kt              |  2 +-
 .../ConsultarPacientesActivity.kt                 |  7 ++++++-
 .../medicalhealth/AgregarActivity.kt              |  6 ++----
 .../medicalhealth/EliminarActivity.kt             | 10 +++-------
 .../terratenientes/medicalhealth/MainActivity.kt  |  4 +++-
 .../medicalhealth/ModificarActivity.kt            |  3 +++
 .../medicalhealth/RecetaActivity.kt               |  6 +++---
 .../medicalhealth/RegistrarDActivity.kt           |  7 +++----
 .../res/layout/activity_consultar_pacientes.xml   |  2 +-
 16 files changed, 52 insertions(+), 32 deletions(-)
 rename app/src/main/java/{com/terratenientes/medicalhealth => Adapters}/DoctorDataBaseHelper.kt (96%)
 rename app/src/main/java/{com/terratenientes/medicalhealth => Adapters}/PacienteAdapter.kt (96%)
 rename app/src/main/java/{com/terratenientes/medicalhealth => Adapters}/RecetaDataBaseHelper.kt (97%)
 rename app/src/main/java/{com/terratenientes/medicalhealth => Data}/Doctor.kt (76%)
 rename app/src/main/java/{com/terratenientes/medicalhealth => Data}/Paciente.kt (86%)
 rename app/src/main/java/{com/terratenientes/medicalhealth => Data}/Receta.kt (82%)
 rename app/src/main/java/{com/terratenientes/medicalhealth => Reports}/ConsultarPacientesActivity.kt (96%)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0c0c338..7d885b6 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State />
+        <State>
+          <runningDeviceTargetSelectedWithDropDown>
+            <Target>
+              <type value="RUNNING_DEVICE_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="VIRTUAL_DEVICE_PATH" />
+                  <value value="C:\Users\USER\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </runningDeviceTargetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-05-02T15:23:11.192908200Z" />
+        </State>
       </entry>
     </value>
   </component>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 43354a3..7e8c7fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
             android:name=".RegistrarDActivity"
             android:exported="false" />
         <activity
-            android:name=".ConsultarPacientesActivity"
+            android:name="Reports.ConsultarPacientesActivity"
             android:exported="false" />
         <activity
             android:name=".EliminarActivity"
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/DoctorDataBaseHelper.kt b/app/src/main/java/Adapters/DoctorDataBaseHelper.kt
similarity index 96%
rename from app/src/main/java/com/terratenientes/medicalhealth/DoctorDataBaseHelper.kt
rename to app/src/main/java/Adapters/DoctorDataBaseHelper.kt
index 6c67445..8c97e4d 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/DoctorDataBaseHelper.kt
+++ b/app/src/main/java/Adapters/DoctorDataBaseHelper.kt
@@ -1,14 +1,16 @@
-package com.terratenientes.medicalhealth
+package Adapters
 
 import android.annotation.SuppressLint
 import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import android.widget.Toast
+import Data.Doctor
+import Data.Paciente
 
 class DoctorDataBaseHelper (context: Context) : SQLiteOpenHelper(context, DATABASE_NAME,null,
-    DATABASE_VERSION){
+    DATABASE_VERSION
+){
     companion object{
         private const val DATABASE_NAME ="MedicalHealth"
         private const val DATABASE_VERSION=1
@@ -124,7 +126,7 @@ class DoctorDataBaseHelper (context: Context) : SQLiteOpenHelper(context, DATABA
      fun edadPaciente(nombrePaciente : String) : Int{
         val db=readableDatabase
         var edadPaciente =0
-        val queryEdad= "SELECT ${COLUMN_EDAD} FROM ${TABLE_PACIENTES} WHERE ${COLUMN_NOMBRE_PACIENTE}='${nombrePaciente}'"
+        val queryEdad= "SELECT $COLUMN_EDAD FROM $TABLE_PACIENTES WHERE $COLUMN_NOMBRE_PACIENTE='${nombrePaciente}'"
         val cursor = db.rawQuery(queryEdad,null)
         if(cursor.moveToFirst()){
             val columnEdad = cursor.getColumnIndex(COLUMN_EDAD)
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/PacienteAdapter.kt b/app/src/main/java/Adapters/PacienteAdapter.kt
similarity index 96%
rename from app/src/main/java/com/terratenientes/medicalhealth/PacienteAdapter.kt
rename to app/src/main/java/Adapters/PacienteAdapter.kt
index 3a7fa8d..e5449ed 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/PacienteAdapter.kt
+++ b/app/src/main/java/Adapters/PacienteAdapter.kt
@@ -1,5 +1,6 @@
-package com.terratenientes.medicalhealth
+package Adapters
 
+import Data.Paciente
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/RecetaDataBaseHelper.kt b/app/src/main/java/Adapters/RecetaDataBaseHelper.kt
similarity index 97%
rename from app/src/main/java/com/terratenientes/medicalhealth/RecetaDataBaseHelper.kt
rename to app/src/main/java/Adapters/RecetaDataBaseHelper.kt
index b79a037..1f7e2b9 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/RecetaDataBaseHelper.kt
+++ b/app/src/main/java/Adapters/RecetaDataBaseHelper.kt
@@ -1,5 +1,6 @@
-package com.terratenientes.medicalhealth
+package Adapters
 
+import Data.Receta
 import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/Doctor.kt b/app/src/main/java/Data/Doctor.kt
similarity index 76%
rename from app/src/main/java/com/terratenientes/medicalhealth/Doctor.kt
rename to app/src/main/java/Data/Doctor.kt
index 7d7beb8..9138c25 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/Doctor.kt
+++ b/app/src/main/java/Data/Doctor.kt
@@ -1,3 +1,3 @@
-package com.terratenientes.medicalhealth
+package Data
 
 data class Doctor(var Cedula : String ,var Nombre : String, var Apellido : String, var Telefono : String, var Consultorio : Int)
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/Paciente.kt b/app/src/main/java/Data/Paciente.kt
similarity index 86%
rename from app/src/main/java/com/terratenientes/medicalhealth/Paciente.kt
rename to app/src/main/java/Data/Paciente.kt
index f3eda22..7db0a88 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/Paciente.kt
+++ b/app/src/main/java/Data/Paciente.kt
@@ -1,4 +1,4 @@
-package com.terratenientes.medicalhealth
+package Data
 
 data class Paciente(
     var id: Int, // Este campo representa el ID autoincrementable en la base de datos
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/Receta.kt b/app/src/main/java/Data/Receta.kt
similarity index 82%
rename from app/src/main/java/com/terratenientes/medicalhealth/Receta.kt
rename to app/src/main/java/Data/Receta.kt
index 7d05d73..d31a06c 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/Receta.kt
+++ b/app/src/main/java/Data/Receta.kt
@@ -1,3 +1,3 @@
-package com.terratenientes.medicalhealth
+package Data
 
 data class Receta(val NombrePaciente : String, val edadPaciente : Int, val pesoPaciente: Double, val nombreMedicamento : String, val fecha : String, val dosis : String, val duracion :String)
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/ConsultarPacientesActivity.kt b/app/src/main/java/Reports/ConsultarPacientesActivity.kt
similarity index 96%
rename from app/src/main/java/com/terratenientes/medicalhealth/ConsultarPacientesActivity.kt
rename to app/src/main/java/Reports/ConsultarPacientesActivity.kt
index 80d892f..d393697 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/ConsultarPacientesActivity.kt
+++ b/app/src/main/java/Reports/ConsultarPacientesActivity.kt
@@ -1,4 +1,4 @@
-package com.terratenientes.medicalhealth
+package Reports
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -11,6 +11,11 @@ import android.os.Environment
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import Adapters.DoctorDataBaseHelper
+import com.terratenientes.medicalhealth.ModificarActivity
+import Data.Paciente
+import Adapters.PacienteAdapter
+import com.terratenientes.medicalhealth.R
 import com.terratenientes.medicalhealth.databinding.ActivityConsultarPacientesBinding
 import java.io.File
 import java.io.FileWriter
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/AgregarActivity.kt b/app/src/main/java/com/terratenientes/medicalhealth/AgregarActivity.kt
index 0b1068d..6f694db 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/AgregarActivity.kt
+++ b/app/src/main/java/com/terratenientes/medicalhealth/AgregarActivity.kt
@@ -1,16 +1,14 @@
 package com.terratenientes.medicalhealth
 
+import Adapters.DoctorDataBaseHelper
+import Data.Paciente
 import android.R
 import android.content.Intent
 import android.os.Bundle
 import android.widget.ArrayAdapter
 import android.widget.Toast
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.terratenientes.medicalhealth.databinding.ActivityAgregarPacienteBinding
-import com.terratenientes.medicalhealth.databinding.ActivityMainBinding
 
 class AgregarActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/EliminarActivity.kt b/app/src/main/java/com/terratenientes/medicalhealth/EliminarActivity.kt
index ab37086..0184ac4 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/EliminarActivity.kt
+++ b/app/src/main/java/com/terratenientes/medicalhealth/EliminarActivity.kt
@@ -1,16 +1,12 @@
 package com.terratenientes.medicalhealth
 
-import android.R
+import Adapters.DoctorDataBaseHelper
+import Adapters.PacienteAdapter
+import Data.Paciente
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
-import android.widget.ArrayAdapter
 import android.widget.Toast
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.terratenientes.medicalhealth.databinding.ActivityAgregarPacienteBinding
 import com.terratenientes.medicalhealth.databinding.ActivityEliminarPacienteBinding
 
 class EliminarActivity : AppCompatActivity() {
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/MainActivity.kt b/app/src/main/java/com/terratenientes/medicalhealth/MainActivity.kt
index 6cb7671..d62b115 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/MainActivity.kt
+++ b/app/src/main/java/com/terratenientes/medicalhealth/MainActivity.kt
@@ -1,5 +1,7 @@
 package com.terratenientes.medicalhealth
 
+import Adapters.DoctorDataBaseHelper
+import Data.Doctor
 import android.annotation.SuppressLint
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
@@ -16,7 +18,7 @@ class MainActivity : AppCompatActivity() {
         val view=binding.root
         setContentView(view)
 
-        db =DoctorDataBaseHelper(this@MainActivity)
+        db = DoctorDataBaseHelper(this@MainActivity)
         binding.btnIniciarSesion.setOnClickListener {
             var res=db.validarDatos(binding.tvUsuario.text.toString(),binding.tvContrasena.text.toString())
             if(res==true){
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/ModificarActivity.kt b/app/src/main/java/com/terratenientes/medicalhealth/ModificarActivity.kt
index c394423..231341e 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/ModificarActivity.kt
+++ b/app/src/main/java/com/terratenientes/medicalhealth/ModificarActivity.kt
@@ -1,5 +1,8 @@
 package com.terratenientes.medicalhealth
 
+import Adapters.DoctorDataBaseHelper
+import Data.Paciente
+import Reports.ConsultarPacientesActivity
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/RecetaActivity.kt b/app/src/main/java/com/terratenientes/medicalhealth/RecetaActivity.kt
index 7787101..b539aeb 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/RecetaActivity.kt
+++ b/app/src/main/java/com/terratenientes/medicalhealth/RecetaActivity.kt
@@ -1,7 +1,9 @@
 package com.terratenientes.medicalhealth
 
+import Adapters.DoctorDataBaseHelper
+import Adapters.RecetaDataBaseHelper
+import Data.Receta
 import android.annotation.SuppressLint
-import android.database.sqlite.SQLiteOpenHelper
 import android.os.Bundle
 import android.view.View
 import android.widget.AdapterView
@@ -10,8 +12,6 @@ import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.terratenientes.medicalhealth.databinding.ActivityRecetaBinding
 
 class RecetaActivity : AppCompatActivity(), OnItemSelectedListener {
diff --git a/app/src/main/java/com/terratenientes/medicalhealth/RegistrarDActivity.kt b/app/src/main/java/com/terratenientes/medicalhealth/RegistrarDActivity.kt
index 2e0c2e0..005bd1d 100644
--- a/app/src/main/java/com/terratenientes/medicalhealth/RegistrarDActivity.kt
+++ b/app/src/main/java/com/terratenientes/medicalhealth/RegistrarDActivity.kt
@@ -1,11 +1,10 @@
 package com.terratenientes.medicalhealth
 
+import Adapters.DoctorDataBaseHelper
+import Data.Doctor
 import android.os.Bundle
 import android.widget.Toast
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.terratenientes.medicalhealth.databinding.ActivityRegistrarDactivityBinding
 
 class RegistrarDActivity : AppCompatActivity() {
@@ -28,7 +27,7 @@ class RegistrarDActivity : AppCompatActivity() {
         val telefono=binding.etTelefonoRegisto.text.toString()
         val domicilio = binding.etDomicilio.text.toString()
         val contrasena= binding.etContrasenaRegistro.text.toString()
-        val usuario=Doctor(cedula,nombre,apellido,telefono,domicilio.toInt())
+        val usuario= Doctor(cedula,nombre,apellido,telefono,domicilio.toInt())
         db.agregarDoctores(usuario,contrasena)
         Toast.makeText(this@RegistrarDActivity,"USUARIO AGREGADO",Toast.LENGTH_LONG).show()
     }
diff --git a/app/src/main/res/layout/activity_consultar_pacientes.xml b/app/src/main/res/layout/activity_consultar_pacientes.xml
index 60679a0..5a75051 100644
--- a/app/src/main/res/layout/activity_consultar_pacientes.xml
+++ b/app/src/main/res/layout/activity_consultar_pacientes.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ConsultarPacientesActivity">
+    tools:context="Reports.ConsultarPacientesActivity">
 
     <TextView
         android:layout_width="match_parent"