skrd/sistema-caja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

agregada propiedad para agregarle un nombre de prefijo a las ventanas

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-18 18:56:15 -03:00
parent 5a9455eb4b
commit 0f3955ee34
5 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
.idea/workspace.xml generated
View File

@@ -7,21 +7,11 @@
</component>
<component name="ChangeListManager">
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/CalculoFondo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/CalcularFondoView.form" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/CalcularFondoView.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/FondoTableModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/sqlite.sql" beforeDir="false" afterPath="$PROJECT_DIR$/database/sqlite.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/caja.jar" beforeDir="false" afterPath="$PROJECT_DIR$/dist/caja.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/conf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/dist/conf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" />
@@ -69,29 +59,31 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="71" column="85" lean-forward="true" selection-start-line="71" selection-start-column="85" selection-end-line="71" selection-end-column="85" />
<state relative-caret-position="204">
<caret line="46" selection-start-line="46" selection-end-line="46" />
<folding>
<element signature="method#CalcularFondoController#0;class#CalcularFondoController#0" />
<element signature="method#showView#0;class#CalcularFondoController#0" />
<element signature="method#fillTable#0;class#CalcularFondoController#0" />
<element signature="e#1675#1731#1" />
<element signature="e#1809#1865#1" />
<element signature="method#setupViewEvents#0;class#CalcularFondoController#0" />
<element signature="e#3228#3320#1" />
<element signature="method#guardarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#3448#3550#1" />
<element signature="e#3556#3625#1" />
<element signature="e#3582#3684#1" />
<element signature="e#3690#3759#1" />
<element signature="method#editarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#3960#4362#1" />
<element signature="e#3987#4495#1" />
<element signature="method#eliminarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#4507#4847#1" />
<element signature="e#4640#4980#1" />
<element signature="method#guardarCalculoFondo#0;class#CalcularFondoController#0" />
<element signature="method#editarCalculoFondo#0;class#CalcularFondoController#0" />
<element signature="method#updateButtonsEnabled#0;class#CalcularFondoController#0" />
<element signature="e#5738#5867#1" />
<element signature="e#5873#6004#1" />
<element signature="e#5871#6000#1" />
<element signature="e#6006#6137#1" />
<element signature="method#updateResumen#0;class#CalcularFondoController#0" />
<element signature="method#cleanInput#0;class#CalcularFondoController#0" />
<element signature="method#normalizeInput#0;class#CalcularFondoController#0" />
<element signature="e#6536#6604#1" />
<element signature="e#6669#6737#1" />
<element signature="class#GuardarAction#0;class#CalcularFondoController#0" />
<element signature="class#UpdateResumenAction#0;class#CalcularFondoController#0" />
</folding>
@@ -164,7 +156,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informe/InformeMensualContentDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informe/InformeMensualContent.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeMensual.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/utils/NaturalOrderComparator.java" />
@@ -186,7 +177,6 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informes/egresos/InformeEgresosFacturasMateriaPrimaContent.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeEgresosFacturaMateriaPrima.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informes/egresos/InformeEgresosContentDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informes/egresos/SQLiteInformeEgresosContentDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeEgresos.java" />
@@ -213,8 +203,10 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/CalcularFondoView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/CalcularFondoView.form" />
<option value="$PROJECT_DIR$/dist/conf.properties" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" />
</list>
</option>
</component>
@@ -287,9 +279,7 @@
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="dist" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -310,7 +300,7 @@
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.STATE" value="ToolWindow" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547847789135" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547848548523" />
<property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" />
<property name="database.console.LAST_STATE" value="false" />
<property name="database.data.extractors.current.id" value="Tab-separated (TSV)_id" />
@@ -548,14 +538,7 @@
<workItem from="1547827261218" duration="142000" />
<workItem from="1547831772335" duration="2794000" />
<workItem from="1547834617127" duration="7034000" />
<workItem from="1547845161147" duration="2505000" />
</task>
<task id="LOCAL-00004" summary="Cambiado el egresotablemodel para que acepte un egreso como modelo para llenar la tabla">
<created>1545358591232</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1545358591232</updated>
<workItem from="1547845161147" duration="3381000" />
</task>
<task id="LOCAL-00005" summary="Ahora el modelo de egreso se autocarga con el objeto de tipo egreso en vez de con su id">
<created>1545361072926</created>
@@ -893,11 +876,18 @@
<option name="project" value="LOCAL" />
<updated>1547787772304</updated>
</task>
<option name="localTasksCounter" value="53" />
<task id="LOCAL-00053" summary="Agregada una ventana para realizar el calculo del fondo de la caja, es wip, falta la aprobacion del jefe jajaj">
<created>1547847834650</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1547847834651</updated>
</task>
<option name="localTasksCounter" value="54" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="336841000" />
<option name="totallyTimeSpent" value="337717000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -909,10 +899,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-2" y="-20" width="1370" height="790" extended-state="6" />
<editor active="true" />
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" weight="0.1852123" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.18502203" />
<window_info id="Image Layers" order="1" />
<window_info id="Designer" order="2" />
<window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.20131771" />
@@ -931,7 +920,7 @@
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50076103" side_tool="true" weight="0.24077046" />
<window_info anchor="bottom" id="Messages" order="10" weight="0.32730016" />
<window_info anchor="bottom" id="Database Console" order="11" weight="0.36597112" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="12" sideWeight="0.4975923" weight="0.26695526" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="12" sideWeight="0.4975923" weight="0.26646706" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" show_stripe_button="false" weight="0.24961948" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -1038,7 +1027,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="Agregado nro z inicial y nro z final a tabla ingresos" />
<MESSAGE value="Creacion de number formated text field y implementacion de prueba como campos de efectivo" />
<MESSAGE value="Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields" />
<MESSAGE value="Mejora de los NumberFormatedTextFields" />
@@ -1063,21 +1051,14 @@
<MESSAGE value="Se me habia olvidado agrupar los botones de la vista manager" />
<MESSAGE value="El nombre sugerido en los informes no era leido correctamente en windows, creando el archivo correctamente" />
<MESSAGE value="Generalizado el testeo del error con el nombre de archivo a crear para los informes, testea si el path es valido y si no es asi muestra un mensaje de error y sale de la creacion de un informe" />
<option name="LAST_COMMIT_MESSAGE" value="Generalizado el testeo del error con el nombre de archivo a crear para los informes, testea si el path es valido y si no es asi muestra un mensaje de error y sale de la creacion de un informe" />
<MESSAGE value="Agregada una ventana para realizar el calculo del fondo de la caja, es wip, falta la aprobacion del jefe jajaj" />
<option name="LAST_COMMIT_MESSAGE" value="Agregada una ventana para realizar el calculo del fondo de la caja, es wip, falta la aprobacion del jefe jajaj" />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informes/egresos_facturas/InformeEgresoFacturasMateriaPrimaContent.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informes/libro_de_ventas/InformeLibroDeVentasContent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="63" column="34" lean-forward="true" selection-start-line="63" selection-start-column="34" selection-end-line="63" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/EgresoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-90">
@@ -1701,10 +1682,13 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/CalcularFondoView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="260" column="101" selection-start-line="260" selection-start-column="101" selection-end-line="260" selection-end-column="101" />
<state relative-caret-position="210">
<caret line="200" column="34" lean-forward="true" selection-start-line="200" selection-start-column="34" selection-end-line="200" selection-end-column="34" />
<folding>
<element signature="docComment;class#EgresosController#0" />
<element signature="docComment;method#EgresosController#0;class#EgresosController#0" />
@@ -1720,7 +1704,6 @@
<element signature="method#fillEgresosTable#0;class#EgresosController#0" />
<element signature="e#3739#3796#1" />
<element signature="docComment;method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="e#5937#6023#1" />
<element signature="docComment;method#guardarActionListener#0;class#EgresosController#0" />
<element signature="method#guardarActionListener#0;class#EgresosController#0" />
@@ -1730,8 +1713,6 @@
<element signature="method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="e#7414#7737#1" />
<element signature="docComment;method#editarActionListener#0;class#EgresosController#0" />
<element signature="method#editarActionListener#0;class#EgresosController#0" />
<element signature="e#8377#8884#1" />
<element signature="docComment;method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="docComment;method#updateButtonsEnabled#0;class#EgresosController#0" />
@@ -1772,12 +1753,25 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/Properties.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="58" column="30" selection-start-line="58" selection-start-column="30" selection-end-line="58" selection-end-column="30" />
<state relative-caret-position="408">
<caret line="101" column="49" selection-start-line="101" selection-start-column="49" selection-end-line="101" selection-end-column="49" />
<folding>
<element signature="method#run#0;class#Main#0" />
<element signature="e#2801#2905#0" />
<element signature="e#3023#3067#0" />
<element signature="e#3480#3841#1" />
@@ -1786,34 +1780,33 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/CalcularFondoView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="71" column="85" lean-forward="true" selection-start-line="71" selection-start-column="85" selection-end-line="71" selection-end-column="85" />
<state relative-caret-position="204">
<caret line="46" selection-start-line="46" selection-end-line="46" />
<folding>
<element signature="method#CalcularFondoController#0;class#CalcularFondoController#0" />
<element signature="method#showView#0;class#CalcularFondoController#0" />
<element signature="method#fillTable#0;class#CalcularFondoController#0" />
<element signature="e#1675#1731#1" />
<element signature="e#1809#1865#1" />
<element signature="method#setupViewEvents#0;class#CalcularFondoController#0" />
<element signature="e#3228#3320#1" />
<element signature="method#guardarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#3448#3550#1" />
<element signature="e#3556#3625#1" />
<element signature="e#3582#3684#1" />
<element signature="e#3690#3759#1" />
<element signature="method#editarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#3960#4362#1" />
<element signature="e#3987#4495#1" />
<element signature="method#eliminarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#4507#4847#1" />
<element signature="e#4640#4980#1" />
<element signature="method#guardarCalculoFondo#0;class#CalcularFondoController#0" />
<element signature="method#editarCalculoFondo#0;class#CalcularFondoController#0" />
<element signature="method#updateButtonsEnabled#0;class#CalcularFondoController#0" />
<element signature="e#5738#5867#1" />
<element signature="e#5873#6004#1" />
<element signature="e#5871#6000#1" />
<element signature="e#6006#6137#1" />
<element signature="method#updateResumen#0;class#CalcularFondoController#0" />
<element signature="method#cleanInput#0;class#CalcularFondoController#0" />
<element signature="method#normalizeInput#0;class#CalcularFondoController#0" />
<element signature="e#6536#6604#1" />
<element signature="e#6669#6737#1" />
<element signature="class#GuardarAction#0;class#CalcularFondoController#0" />
<element signature="class#UpdateResumenAction#0;class#CalcularFondoController#0" />
</folding>

BIN
dist/caja.jar vendored
View File

Binary file not shown.

3
dist/conf.properties vendored
View File

@@ -23,3 +23,6 @@ look_and_feel = javax.swing.plaf.metal.MetalLookAndFeel
#look_and_feel = com.sun.java.swing.plaf.motif.MotifLookAndFeel
#look_and_feel = com.sun.java.swing.plaf.gtk.GTKLookAndFeel
#look_and_feel = com.sun.java.swing.plaf.windows.WindowsLookAndFeel
# nombre_caja sirve para darle un nombre a la caja con la que se esta trabajando, por ahora le da un nombre a las ventanas del sistema.
nombre_caja = Rodriguez

2
src/danielcortes/xyz/Main.java
View File

@@ -98,7 +98,7 @@ public class Main {
ManagerView view = new ManagerView();
ManagerController managerController = new ManagerController(view, cajaDAO, documentosDAO, efectivoDAO, egresoDAO, ingresoDAO, tipoEgresoDAO, tipoIngresoDAO);
JFrame frame = new JFrame("Caja");
JFrame frame = new JFrame("Caja: " + Properties.getInstance().getProperty("nombre_caja"));
frame.setContentPane(view.getContentPanel());
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

3
src/danielcortes/xyz/controllers/CalcularFondoController.java
View File

@@ -1,6 +1,7 @@
package danielcortes.xyz.controllers;
import danielcortes.xyz.controllers.actions.NextAction;
import danielcortes.xyz.data.Properties;
import danielcortes.xyz.models.caja.Caja;
import danielcortes.xyz.models.calculo_fondo.CalculoFondo;
import danielcortes.xyz.models.calculo_fondo.CalculoFondoDAO;
@@ -36,7 +37,7 @@ public class CalcularFondoController {
}
private void showView() {
JFrame frame = new JFrame("Calculo de Fondo");
JFrame frame = new JFrame("Calculo de Fondo: " + Properties.getInstance().getProperty("nombre_caja"));
frame.setContentPane(view.getContentPanel());
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
frame.pack();