From 99328a22c7e8e4d091afc358820708441f2edb44 Mon Sep 17 00:00:00 2001 From: Daniel Cortes Date: Thu, 3 Jan 2019 15:29:34 -0300 Subject: [PATCH] =?UTF-8?q?Actualizada=20licencia=20al=20a=C3=B1o=202019?= =?UTF-8?q?=20Ademas=20se=20cambio=20el=20output=20de=20la=20compilacion?= =?UTF-8?q?=20a=20la=20carpeta=20dist,=20donde=20se=20almacenaran=20todos?= =?UTF-8?q?=20los=20archivos=20necesarios=20para=20el=20funcionamiento=20d?= =?UTF-8?q?el=20sistema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/artifacts/caja_jar.xml | 2 +- .idea/copyright/MIT_License.xml | 2 +- .idea/workspace.xml | 517 ++++++++---------- database/mysql.sql | 2 +- database/sqlite.sql | 2 +- conf.properties => dist/conf.properties | 0 database.sqlite => dist/database.sqlite | Bin src/danielcortes/xyz/Main.java | 2 +- .../xyz/controllers/ArqueoController.java | 2 +- .../xyz/controllers/EgresosController.java | 2 +- .../xyz/controllers/IngresosController.java | 2 +- .../xyz/controllers/ManagerController.java | 2 +- .../xyz/controllers/actions/NextAction.java | 2 +- .../xyz/data/ConnectionHolder.java | 2 +- .../xyz/data/MysqlConnectionHolder.java | 2 +- src/danielcortes/xyz/data/Properties.java | 2 +- .../xyz/data/SQLiteConnectionHolder.java | 2 +- src/danielcortes/xyz/models/caja/Caja.java | 2 +- src/danielcortes/xyz/models/caja/CajaDAO.java | 2 +- .../xyz/models/caja/MysqlCajaDAO.java | 2 +- .../xyz/models/caja/SQLiteCajaDAO.java | 2 +- .../xyz/models/documentos/Documentos.java | 2 +- .../xyz/models/documentos/DocumentosDAO.java | 2 +- .../models/documentos/MysqlDocumentosDAO.java | 2 +- .../documentos/SQLiteDocumentosDAO.java | 2 +- .../xyz/models/efectivo/Efectivo.java | 2 +- .../xyz/models/efectivo/EfectivoDAO.java | 2 +- .../xyz/models/efectivo/MysqlEfectivoDAO.java | 2 +- .../models/efectivo/SQLiteEfectivoDAO.java | 2 +- .../xyz/models/egreso/Egreso.java | 2 +- .../xyz/models/egreso/EgresoDAO.java | 2 +- .../xyz/models/egreso/MysqlEgresoDAO.java | 2 +- .../xyz/models/egreso/SQLiteEgresoDAO.java | 2 +- .../xyz/models/ingreso/Ingreso.java | 2 +- .../xyz/models/ingreso/IngresoDAO.java | 2 +- .../xyz/models/ingreso/MysqlIngresoDAO.java | 2 +- .../xyz/models/ingreso/SQLiteIngresoDAO.java | 2 +- .../tipo_egreso/MysqlTipoEgresoDAO.java | 2 +- .../tipo_egreso/SQLiteTipoEgresoDAO.java | 2 +- .../xyz/models/tipo_egreso/TipoEgreso.java | 4 +- .../xyz/models/tipo_egreso/TipoEgresoDAO.java | 4 +- .../tipo_ingreso/MysqlTipoIngresoDAO.java | 2 +- .../tipo_ingreso/SQLiteTipoIngresoDAO.java | 2 +- .../xyz/models/tipo_ingreso/TipoIngreso.java | 4 +- .../models/tipo_ingreso/TipoIngresoDAO.java | 2 +- src/danielcortes/xyz/views/ArqueoView.java | 2 +- src/danielcortes/xyz/views/EgresosView.java | 2 +- src/danielcortes/xyz/views/IngresosView.java | 2 +- src/danielcortes/xyz/views/ManagerView.java | 2 +- .../views/components/EgresosTableModel.java | 2 +- .../views/components/IngresosTableModel.java | 2 +- 51 files changed, 267 insertions(+), 352 deletions(-) rename conf.properties => dist/conf.properties (100%) rename database.sqlite => dist/database.sqlite (100%) diff --git a/.idea/artifacts/caja_jar.xml b/.idea/artifacts/caja_jar.xml index 68e84cb..eda620c 100644 --- a/.idea/artifacts/caja_jar.xml +++ b/.idea/artifacts/caja_jar.xml @@ -1,6 +1,6 @@ - $PROJECT_DIR$/out/artifacts/caja_jar + $PROJECT_DIR$/dist diff --git a/.idea/copyright/MIT_License.xml b/.idea/copyright/MIT_License.xml index 0e326f2..834f43b 100644 --- a/.idea/copyright/MIT_License.xml +++ b/.idea/copyright/MIT_License.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d12732..f069337 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,16 +11,55 @@ + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -79,142 +118,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + @@ -232,8 +140,6 @@ - getColumn - select addRow set print @@ -262,6 +168,8 @@ updateB inputmap editar + toggleSortOrder + Copyright (c) 2018 Daniel Cortes 2018 Daniel Cortes @@ -270,6 +178,7 @@ from efectivos text integer primary key + Copyright (c) 2018-2019 Daniel Cortes $PROJECT_DIR$/src @@ -281,13 +190,6 @@ @@ -396,43 +305,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +