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

Cambiado el nombre del informe mensual a libro de ventas mensual, ademas se agrego una utilidad para strings que por ahora solo contiene el toUpperCase aunque se ira llenando a medida que se necesite.

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-15 16:45:44 -03:00
parent 6830d81dce
commit e9dd21cb65
9 changed files with 212 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

340
.idea/workspace.xml generated
View File

@@ -10,10 +10,16 @@
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java" line="149" mnemonic="0" />
</component>
<component name="ChangeListManager">
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/README.MD" 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" />
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="Cambiado el nombre del informe gener">
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/utils/StringUtils.java" 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/InformesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeMensual.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeLibroDeVentas.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/MonthSelectDialog.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/MonthSelectDialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" />
@@ -77,13 +83,15 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/README.MD">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="188">
<caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
</first_editor>
<second_editor />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="347">
<caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" />
<folding>
<element signature="method#askForMonth#0;class#InformesController#0" />
<element signature="method#askForFile#0;class#InformesController#0" />
<element signature="method#showConfirmation#0;class#InformesController#0" />
</folding>
</state>
</provider>
</entry>
@@ -153,8 +161,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/IngresoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/JNumberFormatedTextField.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" />
@@ -183,8 +189,6 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/YearSpinnerModel.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/File.java" />
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console_1.sql" />
@@ -204,6 +208,10 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
<option value="$APPLICATION_CONFIG_DIR$/idea.properties" />
<option value="$PROJECT_DIR$/README.MD" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeLibroDeVentas.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/utils/StringUtils.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" />
</list>
</option>
</component>
@@ -231,6 +239,7 @@
</order>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="683" />
<option name="y" value="-18" />
<option name="width" value="683" />
<option name="height" value="765" />
@@ -248,7 +257,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -267,11 +275,41 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
</path>
<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="informes" type="462c0819:PsiDirectoryNode" />
</path>
<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="utils" type="462c0819:PsiDirectoryNode" />
</path>
<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" />
</path>
<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="MonthSelectDialog" type="e9f4de52:FormNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -285,7 +323,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="1547343977352" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547581481351" />
<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" />
@@ -510,6 +548,9 @@
<workItem from="1547338647576" duration="1052000" />
<workItem from="1547339992467" duration="1275000" />
<workItem from="1547341595934" duration="2081000" />
<workItem from="1547421210768" duration="453000" />
<workItem from="1547521814953" duration="798000" />
<workItem from="1547574832331" duration="1485000" />
</task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created>
@@ -830,7 +871,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="299291000" />
<option name="totallyTimeSpent" value="302027000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -845,7 +886,7 @@
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" weight="0.23211567" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.23211567" />
<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.20243531" />
@@ -1003,87 +1044,8 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="134" lean-forward="true" selection-start-line="134" selection-end-line="134" />
<folding>
<element signature="docComment;class#IngresosController#0" />
<element signature="docComment;method#IngresosController#0;class#IngresosController#0" />
<element signature="method#IngresosController#0;class#IngresosController#0" />
<element signature="docComment;method#getIngresoDAO#0;class#IngresosController#0" />
<element signature="docComment;method#getTipoIngresoDAO#0;class#IngresosController#0" />
<element signature="docComment;method#updateCaja#0;class#IngresosController#0" />
<element signature="method#updateCaja#0;class#IngresosController#0" />
<element signature="docComment;method#fillTipoIngresoCombo#0;class#IngresosController#0" />
<element signature="method#fillTipoIngresoCombo#0;class#IngresosController#0" />
<element signature="e#3404#3452#1" />
<element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="e#3792#3851#1" />
<element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" />
<element signature="e#6512#6599#1" />
<element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
<element signature="method#guardarActionListener#0;class#IngresosController#0" />
<element signature="e#7513#7633#1" />
<element signature="e#7639#7760#1" />
<element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="e#8230#8531#1" />
<element signature="docComment;method#editarActionListener#0;class#IngresosController#0" />
<element signature="method#editarActionListener#0;class#IngresosController#0" />
<element signature="e#9163#9907#1" />
<element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" />
<element signature="method#updateTotalIngresos#0;class#IngresosController#0" />
<element signature="docComment;method#updateButtonsEnabled#0;class#IngresosController#0" />
<element signature="method#updateButtonsEnabled#0;class#IngresosController#0" />
<element signature="e#10496#10625#1" />
<element signature="e#10629#10760#1" />
<element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" />
<element signature="method#guardarIngreso#0;class#IngresosController#0" />
<element signature="e#11215#11765#1" />
<element signature="docComment;method#editarIngreso#0;class#IngresosController#0" />
<element signature="method#editarIngreso#0;class#IngresosController#0" />
<element signature="e#12256#12874#1" />
<element signature="docComment;method#validateInput#0;class#IngresosController#0" />
<element signature="method#validateInput#0;class#IngresosController#0" />
<element signature="docComment;method#validateCaja#0;class#IngresosController#0" />
<element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" />
<element signature="method#validateNroInicial#0;class#IngresosController#0" />
<element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" />
<element signature="method#validateNroFinal#0;class#IngresosController#0" />
<element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" />
<element signature="method#hideErrorMessages#0;class#IngresosController#0" />
<element signature="docComment;method#clearInputs#0;class#IngresosController#0" />
<element signature="method#clearInputs#0;class#IngresosController#0" />
<element signature="docComment;method#normalizeInputs#0;class#IngresosController#0" />
<element signature="method#normalizeInputs#0;class#IngresosController#0" />
<element signature="docComment;method#resetFocus#0;class#IngresosController#0" />
<element signature="n#!!block;n#resetFocus#0;n#IngresosController#0" />
<element signature="class#NextAction#0;class#IngresosController#0" />
<element signature="n#!!block;n#NextAction#0;n#NextAction#0;n#IngresosController#0" />
<element signature="class#GuardarAction#0;class#IngresosController#0" />
<element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#IngresosController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/egresos">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/sqlite_master">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/egresos" />
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/sqlite_master" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
@@ -1182,40 +1144,11 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="736">
<caret line="85" selection-start-line="85" selection-end-line="89" />
<folding>
<element signature="method#onOK#0;class#InformeMensualDialog#0" />
<element signature="method#$$$setupUI$$$#0;class#InformeMensualDialog#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/MonthSelectDialog.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Demo.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/File.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="64" column="49" selection-start-line="64" selection-start-column="49" selection-end-line="64" selection-end-column="49" />
<folding>
<element signature="method#InformesController#0;class#InformesController#0" />
<element signature="method#setupViewEvents#0;class#InformesController#0" />
<element signature="e#1991#2022#1" />
<element signature="method#askForMonth#0;class#InformesController#0" />
<element signature="method#askForFile#0;class#InformesController#0" />
<element signature="method#showConfirmation#0;class#InformesController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console_1.sql" />
<entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar!/org/apache/poi/hssf/usermodel/HSSFRow.java">
<provider selected="true" editor-type-id="text-editor">
@@ -1241,20 +1174,8 @@
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/caja">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/ingresos">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/caja" />
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/ingresos" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/Caja.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167">
@@ -1272,13 +1193,7 @@
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/tipos_ingreso">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/tipos_ingreso" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informe/InformeMensualContentDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
@@ -1290,23 +1205,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeMensual.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-149">
<caret line="90" column="30" selection-start-line="90" selection-start-column="30" selection-end-line="90" selection-end-column="30" />
<folding>
<element signature="method#InformeMensual#0;class#InformeMensual#0" />
<element signature="method#fillHeaders#0;class#InformeMensual#0" />
<element signature="method#fillTotales#0;class#InformeMensual#0" />
<element signature="method#joinCells#0;class#InformeMensual#0" />
<element signature="method#addBorders#0;class#InformeMensual#0" />
<element signature="method#setStyles#0;class#InformeMensual#0" />
<element signature="method#generarInforme#0;class#InformeMensual#0" />
<element signature="method#generateStyles#0;class#InformeMensual#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informe/InformeMensualContent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
@@ -1339,13 +1237,7 @@
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/tipos_egreso">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/tipos_egreso" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/MysqlDocumentosDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
@@ -1367,34 +1259,8 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/sqlite.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="134" column="62" lean-forward="true" selection-start-line="134" selection-end-line="135" />
<folding>
<element signature="e#0#1102#0" />
<element signature="e#1355#1427#0" />
<element signature="e#1430#1512#0" />
<element signature="e#3181#3560#0" />
<element signature="e#3215#3560#0" />
</folding>
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/documentos">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/efectivos">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/documentos" />
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/efectivos" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/Documentos.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
@@ -1578,13 +1444,81 @@
<entry file="file://$PROJECT_DIR$/README.MD">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="188">
<first_editor relative-caret-position="123">
<caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/sqlite.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="49" column="24" selection-start-line="49" selection-start-column="24" selection-end-line="49" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeLibroDeVentas.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="713">
<caret line="300" column="33" selection-start-line="300" selection-start-column="33" selection-end-line="300" selection-end-column="33" />
<folding>
<element signature="method#InformeMensual#0;class#InformeMensual#0" />
<element signature="n#!!block;n#sortInforme#0;n#InformeMensual#0" />
<element signature="method#fillHeaders#0;class#InformeMensual#0" />
<element signature="e#3548#3622#1" />
<element signature="e#3680#3760#1" />
<element signature="method#fillData#0;class#InformeMensual#0" />
<element signature="e#3872#6313#1" />
<element signature="e#6086#6172#1" />
<element signature="e#6178#6286#1" />
<element signature="method#fillTotales#0;class#InformeMensual#0" />
<element signature="method#joinCells#0;class#InformeMensual#0" />
<element signature="method#addBorders#0;class#InformeMensual#0" />
<element signature="method#setStyles#0;class#InformeMensual#0" />
<element signature="e#9786#9900#1" />
<element signature="e#10001#10115#1" />
<element signature="e#10219#12058#1" />
<element signature="e#12191#12320#1" />
<element signature="e#12947#13014#1" />
<element signature="e#13118#13166#1" />
<element signature="method#generarInforme#0;class#InformeMensual#0" />
<element signature="e#13459#13535#0" />
<element signature="e#13558#13602#0" />
<element signature="method#generateStyles#0;class#InformeMensual#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/MonthSelectDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1104">
<caret line="85" selection-start-line="85" selection-end-line="89" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/utils/StringUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="27" selection-start-line="27" selection-end-line="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="347">
<caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" />
<folding>
<element signature="method#askForMonth#0;class#InformesController#0" />
<element signature="method#askForFile#0;class#InformesController#0" />
<element signature="method#showConfirmation#0;class#InformesController#0" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

BIN
dist/caja.jar vendored
View File

Binary file not shown.

38
src/danielcortes/xyz/controllers/InformesController.java
View File

@@ -24,8 +24,9 @@
package danielcortes.xyz.controllers;
import danielcortes.xyz.informes.InformeMensual;
import danielcortes.xyz.views.InformeMensualDialog;
import danielcortes.xyz.informes.InformeLibroDeVentas;
import danielcortes.xyz.utils.StringUtils;
import danielcortes.xyz.views.MonthSelectDialog;
import danielcortes.xyz.views.InformesView;
import javax.swing.*;
@@ -45,33 +46,32 @@ public class InformesController {
}
private void setupViewEvents() {
this.view.getInformeMensualButton().addActionListener(e -> generarInformeMensualListener());
this.view.getInformeLibroDeVentasButton().addActionListener(e -> generarInformeLibroDeVentasListener());
}
private void generarInformeMensualListener() {
private void generarInformeLibroDeVentasListener() {
LocalDate month = askForMonth();
if (month == null) {
return;
}
if (month != null) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMMM YYYY");
String formatedName = month.format(formatter);
String capitalized = formatedName.substring(0, 1).toUpperCase() + formatedName.substring(1);
File saveFile = askForFile("Informe " + capitalized);
if (saveFile == null) {
return;
}
InformeMensual informeMensual = new InformeMensual(month, saveFile);
File generatedFile = informeMensual.generarInforme();
String formatedName = month.format(formatter);
String capitalized = StringUtils.toUpperCase(formatedName);
File saveFile = askForFile("Libro " + capitalized);
if (saveFile != null) {
InformeLibroDeVentas informeLibroDeVentas = new InformeLibroDeVentas(month, saveFile);
File generatedFile = informeLibroDeVentas.generarInforme();
this.showConfirmation(generatedFile);
}
}
}
private LocalDate askForMonth() {
InformeMensualDialog informeMensualDialog = new InformeMensualDialog(this.view.getContentPanel());
if (informeMensualDialog.isAcepted()) {
return informeMensualDialog.getMonth();
MonthSelectDialog monthSelectDialog = new MonthSelectDialog(this.view.getContentPanel());
if (monthSelectDialog.isAcepted()) {
return monthSelectDialog.getMonth();
} else {
return null;
}

4
src/danielcortes/xyz/informes/InformeMensual.java → src/danielcortes/xyz/informes/InformeLibroDeVentas.java
View File

@@ -40,7 +40,7 @@ import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
public class InformeMensual {
public class InformeLibroDeVentas {
private final String[] titles = {
"", "",
"BOLETA MANUAL", "", "",
@@ -74,7 +74,7 @@ public class InformeMensual {
private CreationHelper createHelper;
private HashMap<String, CellStyle> styles;
public InformeMensual(LocalDate date, File saveFile) {
public InformeLibroDeVentas(LocalDate date, File saveFile) {
new SQLiteCajaDAO().createCajasForMonth(date);
this.informe = new ArrayList<>(new SQLiteInformeMensualContentDAO().getInformeMensual(date));

31
src/danielcortes/xyz/utils/StringUtils.java Normal file
View File

@@ -0,0 +1,31 @@
/*
* MIT License
*
* Copyright (c) 2018-2019 Daniel Cortes
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package danielcortes.xyz.utils;
public class StringUtils {
public static String toUpperCase(String string){
return string.substring(0, 1).toUpperCase() + string.substring(1);
}
}

16
src/danielcortes/xyz/views/InformesView.form
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="danielcortes.xyz.views.InformesView">
<grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="338" height="356"/>
@@ -8,7 +8,7 @@
<properties/>
<border type="none"/>
<children>
<grid id="ae41b" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="ae41b" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -21,14 +21,9 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Informe Mensual"/>
<text value="Libro de Ventas Mensual"/>
</properties>
</component>
<vspacer id="3849b">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
<grid id="7ae6d" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -61,6 +56,11 @@
</hspacer>
</children>
</grid>
<vspacer id="215a5">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
</form>

18
src/danielcortes/xyz/views/InformesView.java
View File

@@ -39,7 +39,7 @@ public class InformesView {
return contentPanel;
}
public JButton getInformeMensualButton() {
public JButton getInformeLibroDeVentasButton() {
return informeMensualButton;
}
@@ -59,26 +59,26 @@ public class InformesView {
*/
private void $$$setupUI$$$() {
contentPanel = new JPanel();
contentPanel.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1));
contentPanel.setLayout(new GridLayoutManager(2, 3, new Insets(0, 0, 0, 0), -1, -1));
final JPanel panel1 = new JPanel();
panel1.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
panel1.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
contentPanel.add(panel1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Informes"));
informeMensualButton = new JButton();
informeMensualButton.setText("Informe Mensual");
informeMensualButton.setText("Libro de Ventas Mensual");
panel1.add(informeMensualButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final Spacer spacer1 = new Spacer();
panel1.add(spacer1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
final JPanel panel2 = new JPanel();
panel2.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
contentPanel.add(panel2, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final Spacer spacer2 = new Spacer();
panel2.add(spacer2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
final Spacer spacer1 = new Spacer();
panel2.add(spacer1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
final JPanel panel3 = new JPanel();
panel3.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
contentPanel.add(panel3, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final Spacer spacer2 = new Spacer();
panel3.add(spacer2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
final Spacer spacer3 = new Spacer();
panel3.add(spacer3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
contentPanel.add(spacer3, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
}
/**

2
src/danielcortes/xyz/views/InformeMensualDialog.form → src/danielcortes/xyz/views/MonthSelectDialog.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="danielcortes.xyz.views.InformeMensualDialog">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="danielcortes.xyz.views.MonthSelectDialog">
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="10" left="10" bottom="10" right="10"/>
<constraints>

4
src/danielcortes/xyz/views/InformeMensualDialog.java → src/danielcortes/xyz/views/MonthSelectDialog.java
View File

@@ -38,7 +38,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
public class InformeMensualDialog extends JDialog {
public class MonthSelectDialog extends JDialog {
private JPanel contentPane;
private JButton buttonOK;
private JButton buttonCancel;
@@ -49,7 +49,7 @@ public class InformeMensualDialog extends JDialog {
private boolean acepted;
public InformeMensualDialog(JComponent parent) {
public MonthSelectDialog(JComponent parent) {
$$$setupUI$$$();
setContentPane(contentPane);
setModalityType(ModalityType.APPLICATION_MODAL);