Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields
This commit is contained in:
Daniel Cortes
3
.idea/uiDesigner.xml
generated
3
.idea/uiDesigner.xml
generated
@@ -47,6 +47,9 @@
|
||||
<item class="com.github.lgooddatepicker.components.DatePicker" icon="images/DatePickerIcon 16x16.png" removable="true" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
|
||||
</item>
|
||||
<item class="danielcortes.xyz.views.components.NumberFormatedTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="true" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||
</item>
|
||||
</group>
|
||||
<group name="Swing">
|
||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
|
||||
243
.idea/workspace.xml
generated
243
.idea/workspace.xml
generated
@@ -7,17 +7,15 @@
|
||||
</component>
|
||||
<component name="BookmarkManager">
|
||||
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" line="489" mnemonic="0" />
|
||||
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="54" />
|
||||
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="55" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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$/src/danielcortes/xyz/views/IngresosView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" afterDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/target/" />
|
||||
<ignored path=".idea/" />
|
||||
@@ -74,11 +72,11 @@
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="25">
|
||||
<caret line="285" column="5" selection-start-line="285" selection-start-column="5" selection-end-line="285" selection-end-column="5" />
|
||||
<state relative-caret-position="253">
|
||||
<caret line="159" column="36" selection-start-line="159" selection-start-column="36" selection-end-line="159" selection-end-column="36" />
|
||||
<folding>
|
||||
<element signature="docComment;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
|
||||
@@ -91,27 +89,32 @@
|
||||
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="method#fillDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
|
||||
<element signature="method#fillResumen#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
|
||||
<element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
|
||||
<element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
|
||||
<element signature="e#6767#6856#1" />
|
||||
<element signature="e#6860#6947#1" />
|
||||
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
|
||||
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
|
||||
<element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
|
||||
<element signature="method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="e#12466#12757#1" />
|
||||
<element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
|
||||
<element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
|
||||
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
|
||||
<element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
|
||||
<element signature="e#13746#13890#1" />
|
||||
<element signature="e#13921#14054#1" />
|
||||
<element signature="e#14113#14244#1" />
|
||||
<element signature="e#14279#14431#1" />
|
||||
<element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
|
||||
<element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
|
||||
@@ -125,62 +128,6 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-67">
|
||||
<caret line="130" column="5" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#2776#2777#0" expanded="true" />
|
||||
<element signature="e#2811#2812#0" expanded="true" />
|
||||
<element signature="e#2869#2870#0" expanded="true" />
|
||||
<element signature="e#2906#2907#0" expanded="true" />
|
||||
<element signature="e#2962#2963#0" expanded="true" />
|
||||
<element signature="e#2997#2998#0" expanded="true" />
|
||||
<element signature="e#3054#3055#0" expanded="true" />
|
||||
<element signature="e#3090#3091#0" expanded="true" />
|
||||
<element signature="e#3145#3146#0" expanded="true" />
|
||||
<element signature="e#3179#3180#0" expanded="true" />
|
||||
<element signature="e#3231#3232#0" expanded="true" />
|
||||
<element signature="e#3262#3263#0" expanded="true" />
|
||||
<element signature="e#3321#3322#0" expanded="true" />
|
||||
<element signature="e#3359#3360#0" expanded="true" />
|
||||
<element signature="e#3412#3413#0" expanded="true" />
|
||||
<element signature="e#3444#3445#0" expanded="true" />
|
||||
<element signature="e#3502#3503#0" expanded="true" />
|
||||
<element signature="e#3539#3540#0" expanded="true" />
|
||||
<element signature="e#3592#3593#0" expanded="true" />
|
||||
<element signature="e#3624#3625#0" expanded="true" />
|
||||
<element signature="e#3667#3668#0" expanded="true" />
|
||||
<element signature="e#3702#3703#0" expanded="true" />
|
||||
<element signature="e#3746#3747#0" expanded="true" />
|
||||
<element signature="e#3782#3783#0" expanded="true" />
|
||||
<element signature="e#3826#3827#0" expanded="true" />
|
||||
<element signature="e#3862#3863#0" expanded="true" />
|
||||
<element signature="e#3908#3909#0" expanded="true" />
|
||||
<element signature="e#3946#3947#0" expanded="true" />
|
||||
<element signature="e#3989#3990#0" expanded="true" />
|
||||
<element signature="e#4024#4025#0" expanded="true" />
|
||||
<element signature="e#4067#4068#0" expanded="true" />
|
||||
<element signature="e#4102#4103#0" expanded="true" />
|
||||
<element signature="e#4151#4152#0" expanded="true" />
|
||||
<element signature="e#4195#4196#0" expanded="true" />
|
||||
<element signature="e#4246#4247#0" expanded="true" />
|
||||
<element signature="e#4292#4293#0" expanded="true" />
|
||||
<element signature="e#4991#4992#0" expanded="true" />
|
||||
<element signature="e#5026#5027#0" expanded="true" />
|
||||
<element signature="e#5066#5067#0" expanded="true" />
|
||||
<element signature="e#5102#5103#0" expanded="true" />
|
||||
<element signature="e#5148#5149#0" expanded="true" />
|
||||
<element signature="e#5186#5187#0" expanded="true" />
|
||||
<element signature="e#5232#5233#0" expanded="true" />
|
||||
<element signature="e#5270#5271#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
@@ -292,9 +239,9 @@
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form" />
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/JNumberFormatedTextField.java" />
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" />
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" />
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" />
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -413,7 +360,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="1546736382443" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546737874455" />
|
||||
<property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" />
|
||||
<property name="database.console.LAST_STATE" value="false" />
|
||||
<property name="extract.method.default.visibility" value="private" />
|
||||
@@ -595,7 +542,7 @@
|
||||
<workItem from="1546482678909" duration="5004000" />
|
||||
<workItem from="1546533252017" duration="4537000" />
|
||||
<workItem from="1546719990258" duration="3560000" />
|
||||
<workItem from="1546732125785" duration="4070000" />
|
||||
<workItem from="1546732125785" duration="5101000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
|
||||
<created>1545280618093</created>
|
||||
@@ -793,11 +740,18 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1546722949902</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="29" />
|
||||
<task id="LOCAL-00029" summary="Creacion de number formated text field y implementacion de prueba como campos de efectivo">
|
||||
<created>1546736429914</created>
|
||||
<option name="number" value="00029" />
|
||||
<option name="presentableId" value="LOCAL-00029" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1546736429914</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="30" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="209622000" />
|
||||
<option name="totallyTimeSpent" value="210653000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
@@ -901,7 +855,6 @@
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
|
||||
<option name="CHECK_NEW_TODO" value="false" />
|
||||
<MESSAGE value="Creada ventana principal para mostrar el resto de ellas en un cardlayout!" />
|
||||
<MESSAGE value="Cambiado el egresotablemodel para que acepte un egreso como modelo para llenar la tabla" />
|
||||
<MESSAGE value="Ahora el modelo de egreso se autocarga con el objeto de tipo egreso en vez de con su id" />
|
||||
<MESSAGE value="Validacion cuando se guarda un egreso desde la vista" />
|
||||
@@ -926,7 +879,8 @@
|
||||
<MESSAGE value="Comodidades! Arreglado el problema de index al ordenar las tablas" />
|
||||
<MESSAGE value="Reordenado el resumen de arqueo para mayor claridad" />
|
||||
<MESSAGE value="Agregado nro z inicial y nro z final a tabla ingresos" />
|
||||
<option name="LAST_COMMIT_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" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Creacion de number formated text field y implementacion de prueba como campos de efectivo" />
|
||||
</component>
|
||||
<component name="antWorkspaceConfiguration">
|
||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||
@@ -1430,17 +1384,12 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="370">
|
||||
<caret line="89" column="52" selection-start-line="89" selection-start-column="52" selection-end-line="89" selection-end-column="52" />
|
||||
<state relative-caret-position="255">
|
||||
<caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="method#NumberFormatedTextField#0;class#NumberFormatedTextField#0" />
|
||||
<element signature="n#!!block;n#setValue#0;n#NumberFormatedTextField#0" />
|
||||
<element signature="n#!!block;n#getValue#0;n#NumberFormatedTextField#0" />
|
||||
<element signature="method#readValue#0;class#NumberFormatedTextField#0" />
|
||||
<element signature="e#1935#1992#0" />
|
||||
<element signature="e#2018#2092#1" />
|
||||
<element signature="e#2018#2062#0" />
|
||||
<element signature="n#!!block;n#formatText#0;n#NumberFormatedTextField#0" />
|
||||
<element signature="class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
|
||||
<element signature="docComment;method#focusGained#0;class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
|
||||
@@ -1449,10 +1398,6 @@
|
||||
<element signature="class#FieldKeyAdapter#0;class#NumberFormatedTextField#0" />
|
||||
<element signature="docComment;method#keyTyped#0;class#FieldKeyAdapter#0;class#NumberFormatedTextField#0" />
|
||||
<element signature="method#keyTyped#0;class#FieldKeyAdapter#0;class#NumberFormatedTextField#0" />
|
||||
<element signature="e#3157#3405#1" />
|
||||
<element signature="e#3137#3208#0" />
|
||||
<element signature="e#3235#3288#0" />
|
||||
<element signature="e#2848#2900#1" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -1460,10 +1405,63 @@
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form">
|
||||
<provider selected="true" editor-type-id="ui-designer" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1677">
|
||||
<caret line="60" column="37" selection-start-line="60" selection-start-column="37" selection-end-line="60" selection-end-column="37" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#2595#2596#0" expanded="true" />
|
||||
<element signature="e#2653#2654#0" expanded="true" />
|
||||
<element signature="e#2690#2691#0" expanded="true" />
|
||||
<element signature="e#2746#2747#0" expanded="true" />
|
||||
<element signature="e#2781#2782#0" expanded="true" />
|
||||
<element signature="e#2838#2839#0" expanded="true" />
|
||||
<element signature="e#2874#2875#0" expanded="true" />
|
||||
<element signature="e#2929#2930#0" expanded="true" />
|
||||
<element signature="e#2963#2964#0" expanded="true" />
|
||||
<element signature="e#3015#3016#0" expanded="true" />
|
||||
<element signature="e#3046#3047#0" expanded="true" />
|
||||
<element signature="e#3105#3106#0" expanded="true" />
|
||||
<element signature="e#3143#3144#0" expanded="true" />
|
||||
<element signature="e#3196#3197#0" expanded="true" />
|
||||
<element signature="e#3228#3229#0" expanded="true" />
|
||||
<element signature="e#3286#3287#0" expanded="true" />
|
||||
<element signature="e#3323#3324#0" expanded="true" />
|
||||
<element signature="e#3376#3377#0" expanded="true" />
|
||||
<element signature="e#3408#3409#0" expanded="true" />
|
||||
<element signature="e#3451#3452#0" expanded="true" />
|
||||
<element signature="e#3486#3487#0" expanded="true" />
|
||||
<element signature="e#3530#3531#0" expanded="true" />
|
||||
<element signature="e#3566#3567#0" expanded="true" />
|
||||
<element signature="e#3623#3624#0" expanded="true" />
|
||||
<element signature="e#3659#3660#0" expanded="true" />
|
||||
<element signature="e#3718#3719#0" expanded="true" />
|
||||
<element signature="e#3756#3757#0" expanded="true" />
|
||||
<element signature="e#3812#3813#0" expanded="true" />
|
||||
<element signature="e#3847#3848#0" expanded="true" />
|
||||
<element signature="e#3903#3904#0" expanded="true" />
|
||||
<element signature="e#3938#3939#0" expanded="true" />
|
||||
<element signature="e#3987#3988#0" expanded="true" />
|
||||
<element signature="e#4031#4032#0" expanded="true" />
|
||||
<element signature="e#4082#4083#0" expanded="true" />
|
||||
<element signature="e#4128#4129#0" expanded="true" />
|
||||
<element signature="e#4167#4168#0" expanded="true" />
|
||||
<element signature="e#4202#4203#0" expanded="true" />
|
||||
<element signature="e#4242#4243#0" expanded="true" />
|
||||
<element signature="e#4278#4279#0" expanded="true" />
|
||||
<element signature="e#4337#4338#0" expanded="true" />
|
||||
<element signature="e#4375#4376#0" expanded="true" />
|
||||
<element signature="e#4434#4435#0" expanded="true" />
|
||||
<element signature="e#4472#4473#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="25">
|
||||
<caret line="285" column="5" selection-start-line="285" selection-start-column="5" selection-end-line="285" selection-end-column="5" />
|
||||
<state relative-caret-position="253">
|
||||
<caret line="159" column="36" selection-start-line="159" selection-start-column="36" selection-end-line="159" selection-end-column="36" />
|
||||
<folding>
|
||||
<element signature="docComment;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
|
||||
@@ -1476,27 +1474,32 @@
|
||||
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="method#fillDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
|
||||
<element signature="method#fillResumen#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
|
||||
<element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
|
||||
<element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
|
||||
<element signature="e#6767#6856#1" />
|
||||
<element signature="e#6860#6947#1" />
|
||||
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
|
||||
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
|
||||
<element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
|
||||
<element signature="method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="e#12466#12757#1" />
|
||||
<element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
|
||||
<element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
|
||||
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
|
||||
<element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
|
||||
<element signature="e#13746#13890#1" />
|
||||
<element signature="e#13921#14054#1" />
|
||||
<element signature="e#14113#14244#1" />
|
||||
<element signature="e#14279#14431#1" />
|
||||
<element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
|
||||
<element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
|
||||
@@ -1509,60 +1512,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-67">
|
||||
<caret line="130" column="5" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#2776#2777#0" expanded="true" />
|
||||
<element signature="e#2811#2812#0" expanded="true" />
|
||||
<element signature="e#2869#2870#0" expanded="true" />
|
||||
<element signature="e#2906#2907#0" expanded="true" />
|
||||
<element signature="e#2962#2963#0" expanded="true" />
|
||||
<element signature="e#2997#2998#0" expanded="true" />
|
||||
<element signature="e#3054#3055#0" expanded="true" />
|
||||
<element signature="e#3090#3091#0" expanded="true" />
|
||||
<element signature="e#3145#3146#0" expanded="true" />
|
||||
<element signature="e#3179#3180#0" expanded="true" />
|
||||
<element signature="e#3231#3232#0" expanded="true" />
|
||||
<element signature="e#3262#3263#0" expanded="true" />
|
||||
<element signature="e#3321#3322#0" expanded="true" />
|
||||
<element signature="e#3359#3360#0" expanded="true" />
|
||||
<element signature="e#3412#3413#0" expanded="true" />
|
||||
<element signature="e#3444#3445#0" expanded="true" />
|
||||
<element signature="e#3502#3503#0" expanded="true" />
|
||||
<element signature="e#3539#3540#0" expanded="true" />
|
||||
<element signature="e#3592#3593#0" expanded="true" />
|
||||
<element signature="e#3624#3625#0" expanded="true" />
|
||||
<element signature="e#3667#3668#0" expanded="true" />
|
||||
<element signature="e#3702#3703#0" expanded="true" />
|
||||
<element signature="e#3746#3747#0" expanded="true" />
|
||||
<element signature="e#3782#3783#0" expanded="true" />
|
||||
<element signature="e#3826#3827#0" expanded="true" />
|
||||
<element signature="e#3862#3863#0" expanded="true" />
|
||||
<element signature="e#3908#3909#0" expanded="true" />
|
||||
<element signature="e#3946#3947#0" expanded="true" />
|
||||
<element signature="e#3989#3990#0" expanded="true" />
|
||||
<element signature="e#4024#4025#0" expanded="true" />
|
||||
<element signature="e#4067#4068#0" expanded="true" />
|
||||
<element signature="e#4102#4103#0" expanded="true" />
|
||||
<element signature="e#4151#4152#0" expanded="true" />
|
||||
<element signature="e#4195#4196#0" expanded="true" />
|
||||
<element signature="e#4246#4247#0" expanded="true" />
|
||||
<element signature="e#4292#4293#0" expanded="true" />
|
||||
<element signature="e#4991#4992#0" expanded="true" />
|
||||
<element signature="e#5026#5027#0" expanded="true" />
|
||||
<element signature="e#5066#5067#0" expanded="true" />
|
||||
<element signature="e#5102#5103#0" expanded="true" />
|
||||
<element signature="e#5148#5149#0" expanded="true" />
|
||||
<element signature="e#5186#5187#0" expanded="true" />
|
||||
<element signature="e#5232#5233#0" expanded="true" />
|
||||
<element signature="e#5270#5271#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
|
||||
BIN
dist/caja.jar
vendored
BIN
dist/caja.jar
vendored
Binary file not shown.
BIN
dist/database.sqlite
vendored
BIN
dist/database.sqlite
vendored
Binary file not shown.
@@ -33,6 +33,7 @@ import danielcortes.xyz.models.efectivo.EfectivoDAO;
|
||||
import danielcortes.xyz.models.egreso.EgresoDAO;
|
||||
import danielcortes.xyz.models.ingreso.IngresoDAO;
|
||||
import danielcortes.xyz.views.ArqueoView;
|
||||
import danielcortes.xyz.views.components.NumberFormatedTextField;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
@@ -124,7 +125,7 @@ public class ArqueoController {
|
||||
* Calcula el total de efectivo y lo muestra en el efectivoField
|
||||
*/
|
||||
private void updateResumenEfectivo() {
|
||||
JTextField efectivoField = this.view.getEfectivoField();
|
||||
NumberFormatedTextField efectivoField = this.view.getEfectivoField();
|
||||
int total = 0;
|
||||
total += this.efectivo.getDiez();
|
||||
total += this.efectivo.getCincuenta();
|
||||
@@ -136,19 +137,19 @@ public class ArqueoController {
|
||||
total += this.efectivo.getDiezMil();
|
||||
total += this.efectivo.getVeinteMil();
|
||||
|
||||
efectivoField.setText(String.valueOf(total));
|
||||
efectivoField.setValue(total);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calcula el total de documentos y lo muestra en el documentosField
|
||||
*/
|
||||
private void updateResumenDocumentos() {
|
||||
JTextField documentosField = this.view.getDocumentosField();
|
||||
NumberFormatedTextField documentosField = this.view.getDocumentosField();
|
||||
int total = 0;
|
||||
total += this.documentos.getCheques();
|
||||
total += this.documentos.getTarjetas();
|
||||
|
||||
documentosField.setText(String.valueOf(total));
|
||||
documentosField.setValue(total);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -156,24 +157,24 @@ public class ArqueoController {
|
||||
*/
|
||||
private void updateResumenEgresos() {
|
||||
int total = this.egresoDAO.getTotalEgreso(this.caja);
|
||||
this.view.getEgresosField().setText(String.valueOf(total));
|
||||
this.view.getEgresosField().setValue(total);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calcula los datos de arqueo, rendido y ajuste y los muestra en sus campos correspondientes
|
||||
*/
|
||||
private void updateResumenArqueo() {
|
||||
int totalEfectivo = Integer.parseInt(this.view.getEfectivoField().getText());
|
||||
int totalDocumentos = Integer.parseInt(this.view.getDocumentosField().getText());
|
||||
int totalEfectivo = this.view.getEfectivoField().getValue();
|
||||
int totalDocumentos = this.view.getDocumentosField().getValue();
|
||||
int totalIngresos = ingresoDAO.getTotalIngreso(this.caja);
|
||||
int totalEgresos = Integer.parseInt(this.view.getEgresosField().getText());
|
||||
int totalEgresos = this.view.getEgresosField().getValue();
|
||||
|
||||
int rendido = totalDocumentos + totalEfectivo + totalEgresos;
|
||||
int diferencia = rendido - totalIngresos;
|
||||
|
||||
this.view.getRendidoField().setText(String.valueOf(rendido));
|
||||
this.view.getDebeRendirField().setText(String.valueOf(totalIngresos));
|
||||
this.view.getDiferenciaField().setText(String.valueOf(diferencia));
|
||||
this.view.getRendidoField().setValue(rendido);
|
||||
this.view.getDebeRendirField().setValue(totalIngresos);
|
||||
this.view.getDiferenciaField().setValue(diferencia);
|
||||
|
||||
if(diferencia < 0) {
|
||||
this.view.getDiferenciaField().setForeground(new Color(255,0,0));
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<text value="Total Egresos"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="3093a" class="javax.swing.JTextField" binding="egresosField">
|
||||
<component id="167a8" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="egresosField">
|
||||
<constraints>
|
||||
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -34,10 +34,10 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="509b2" class="javax.swing.JTextField" binding="diferenciaField">
|
||||
<component id="3ea68" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="diferenciaField">
|
||||
<constraints>
|
||||
<grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -46,7 +46,7 @@
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<font style="1"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="bafd7" class="javax.swing.JLabel">
|
||||
@@ -71,7 +71,7 @@
|
||||
<text value="Debe Rendir"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="b117a" class="javax.swing.JTextField" binding="debeRendirField">
|
||||
<component id="e8102" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="debeRendirField">
|
||||
<constraints>
|
||||
<grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -80,10 +80,10 @@
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<font style="1"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="b0664" class="javax.swing.JTextField" binding="rendidoField">
|
||||
<component id="b7f03" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="rendidoField">
|
||||
<constraints>
|
||||
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -92,7 +92,7 @@
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<font style="1"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="cee37" class="javax.swing.JLabel">
|
||||
@@ -111,7 +111,7 @@
|
||||
<text value="Total Documentos"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="42661" class="javax.swing.JTextField" binding="documentosField">
|
||||
<component id="ac144" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="documentosField">
|
||||
<constraints>
|
||||
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -119,7 +119,7 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="1dc40" class="javax.swing.JLabel">
|
||||
@@ -130,7 +130,7 @@
|
||||
<text value="Total Efectivo"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="df645" class="javax.swing.JTextField" binding="efectivoField">
|
||||
<component id="80dc1" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="efectivoField">
|
||||
<constraints>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -138,7 +138,7 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
</children>
|
||||
|
||||
@@ -47,16 +47,16 @@ public class ArqueoView {
|
||||
private NumberFormatedTextField diezField;
|
||||
private JTextField chequesField;
|
||||
private JTextField tarjetasField;
|
||||
private JTextField efectivoField;
|
||||
private JTextField documentosField;
|
||||
private JTextField egresosField;
|
||||
private JTextField rendidoField;
|
||||
private NumberFormatedTextField efectivoField;
|
||||
private NumberFormatedTextField documentosField;
|
||||
private NumberFormatedTextField egresosField;
|
||||
private NumberFormatedTextField rendidoField;
|
||||
private JButton guardarEfectivoButton;
|
||||
private JButton guardarDocumentosButton;
|
||||
private JLabel errorCheques;
|
||||
private JLabel errorTarjetas;
|
||||
private JTextField diferenciaField;
|
||||
private JTextField debeRendirField;
|
||||
private NumberFormatedTextField diferenciaField;
|
||||
private NumberFormatedTextField debeRendirField;
|
||||
|
||||
public JPanel getContentPanel() {
|
||||
return contentPanel;
|
||||
@@ -106,19 +106,19 @@ public class ArqueoView {
|
||||
return tarjetasField;
|
||||
}
|
||||
|
||||
public JTextField getEfectivoField() {
|
||||
public NumberFormatedTextField getEfectivoField() {
|
||||
return efectivoField;
|
||||
}
|
||||
|
||||
public JTextField getDocumentosField() {
|
||||
public NumberFormatedTextField getDocumentosField() {
|
||||
return documentosField;
|
||||
}
|
||||
|
||||
public JTextField getEgresosField() {
|
||||
public NumberFormatedTextField getEgresosField() {
|
||||
return egresosField;
|
||||
}
|
||||
|
||||
public JTextField getRendidoField() {
|
||||
public NumberFormatedTextField getRendidoField() {
|
||||
return rendidoField;
|
||||
}
|
||||
|
||||
@@ -138,11 +138,11 @@ public class ArqueoView {
|
||||
return errorTarjetas;
|
||||
}
|
||||
|
||||
public JTextField getDiferenciaField() {
|
||||
public NumberFormatedTextField getDiferenciaField() {
|
||||
return diferenciaField;
|
||||
}
|
||||
|
||||
public JTextField getDebeRendirField() {
|
||||
public NumberFormatedTextField getDebeRendirField() {
|
||||
return debeRendirField;
|
||||
}
|
||||
|
||||
@@ -170,15 +170,15 @@ public class ArqueoView {
|
||||
final JLabel label1 = new JLabel();
|
||||
label1.setText("Total Egresos");
|
||||
panel1.add(label1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
|
||||
egresosField = new JTextField();
|
||||
egresosField = new NumberFormatedTextField();
|
||||
egresosField.setEditable(false);
|
||||
egresosField.setText("0");
|
||||
egresosField.setText("");
|
||||
panel1.add(egresosField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
|
||||
diferenciaField = new JTextField();
|
||||
diferenciaField = new NumberFormatedTextField();
|
||||
diferenciaField.setEditable(false);
|
||||
Font diferenciaFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, diferenciaField.getFont());
|
||||
if (diferenciaFieldFont != null) diferenciaField.setFont(diferenciaFieldFont);
|
||||
diferenciaField.setText("0");
|
||||
diferenciaField.setText("");
|
||||
panel1.add(diferenciaField, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
|
||||
final JLabel label2 = new JLabel();
|
||||
label2.setText("Diferencia");
|
||||
@@ -188,17 +188,17 @@ public class ArqueoView {
|
||||
final JLabel label3 = new JLabel();
|
||||
label3.setText("Debe Rendir");
|
||||
panel1.add(label3, new GridConstraints(5, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
|
||||
debeRendirField = new JTextField();
|
||||
debeRendirField = new NumberFormatedTextField();
|
||||
debeRendirField.setEditable(false);
|
||||
Font debeRendirFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, debeRendirField.getFont());
|
||||
if (debeRendirFieldFont != null) debeRendirField.setFont(debeRendirFieldFont);
|
||||
debeRendirField.setText("0");
|
||||
debeRendirField.setText("");
|
||||
panel1.add(debeRendirField, new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
|
||||
rendidoField = new JTextField();
|
||||
rendidoField = new NumberFormatedTextField();
|
||||
rendidoField.setEditable(false);
|
||||
Font rendidoFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, rendidoField.getFont());
|
||||
if (rendidoFieldFont != null) rendidoField.setFont(rendidoFieldFont);
|
||||
rendidoField.setText("0");
|
||||
rendidoField.setText("");
|
||||
panel1.add(rendidoField, new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
|
||||
final JLabel label4 = new JLabel();
|
||||
label4.setText("Rendido");
|
||||
@@ -206,16 +206,16 @@ public class ArqueoView {
|
||||
final JLabel label5 = new JLabel();
|
||||
label5.setText("Total Documentos");
|
||||
panel1.add(label5, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
|
||||
documentosField = new JTextField();
|
||||
documentosField = new NumberFormatedTextField();
|
||||
documentosField.setEditable(false);
|
||||
documentosField.setText("0");
|
||||
documentosField.setText("");
|
||||
panel1.add(documentosField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
|
||||
final JLabel label6 = new JLabel();
|
||||
label6.setText("Total Efectivo");
|
||||
panel1.add(label6, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
|
||||
efectivoField = new JTextField();
|
||||
efectivoField = new NumberFormatedTextField();
|
||||
efectivoField.setEditable(false);
|
||||
efectivoField.setText("0");
|
||||
efectivoField.setText("");
|
||||
panel1.add(efectivoField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
|
||||
final JPanel panel2 = new JPanel();
|
||||
panel2.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
|
||||
|
||||
Reference in New Issue
Block a user