creado un readme para mejor presentacion (si es que alguien alguna vez ve mi proyecto xD)
This commit is contained in:
Daniel Cortes
@@ -53,227 +53,232 @@
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<key id="21" parent="7">
|
||||
<column id="21" parent="7" name="retiros">
|
||||
<Position>5</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<DefaultExpression>0</DefaultExpression>
|
||||
</column>
|
||||
<key id="22" parent="7">
|
||||
<ColNames>id</ColNames>
|
||||
<Primary>1</Primary>
|
||||
</key>
|
||||
<foreign-key id="22" parent="7">
|
||||
<foreign-key id="23" parent="7">
|
||||
<ColNames>caja_id</ColNames>
|
||||
<RefTableName>caja</RefTableName>
|
||||
<RefColNames>id</RefColNames>
|
||||
<OnDelete>restrict</OnDelete>
|
||||
<OnUpdate>cascade</OnUpdate>
|
||||
</foreign-key>
|
||||
<column id="23" parent="8" name="id">
|
||||
<column id="24" parent="8" name="id">
|
||||
<Position>1</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
</column>
|
||||
<column id="24" parent="8" name="veinte_mil">
|
||||
<column id="25" parent="8" name="veinte_mil">
|
||||
<Position>2</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="25" parent="8" name="diez_mil">
|
||||
<column id="26" parent="8" name="diez_mil">
|
||||
<Position>3</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="26" parent="8" name="cinco_mil">
|
||||
<column id="27" parent="8" name="cinco_mil">
|
||||
<Position>4</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="27" parent="8" name="dos_mil">
|
||||
<column id="28" parent="8" name="dos_mil">
|
||||
<Position>5</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="28" parent="8" name="mil">
|
||||
<column id="29" parent="8" name="mil">
|
||||
<Position>6</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="29" parent="8" name="quinientos">
|
||||
<column id="30" parent="8" name="quinientos">
|
||||
<Position>7</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="30" parent="8" name="cien">
|
||||
<column id="31" parent="8" name="cien">
|
||||
<Position>8</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="31" parent="8" name="cincuenta">
|
||||
<column id="32" parent="8" name="cincuenta">
|
||||
<Position>9</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="32" parent="8" name="diez">
|
||||
<column id="33" parent="8" name="diez">
|
||||
<Position>10</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="33" parent="8" name="caja_id">
|
||||
<column id="34" parent="8" name="caja_id">
|
||||
<Position>11</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<key id="34" parent="8">
|
||||
<key id="35" parent="8">
|
||||
<ColNames>id</ColNames>
|
||||
<Primary>1</Primary>
|
||||
</key>
|
||||
<foreign-key id="35" parent="8">
|
||||
<foreign-key id="36" parent="8">
|
||||
<ColNames>caja_id</ColNames>
|
||||
<RefTableName>caja</RefTableName>
|
||||
<RefColNames>id</RefColNames>
|
||||
<OnDelete>restrict</OnDelete>
|
||||
<OnUpdate>cascade</OnUpdate>
|
||||
</foreign-key>
|
||||
<column id="36" parent="9" name="id">
|
||||
<column id="37" parent="9" name="id">
|
||||
<Position>1</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
</column>
|
||||
<column id="37" parent="9" name="nro">
|
||||
<column id="38" parent="9" name="nro">
|
||||
<Position>2</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="38" parent="9" name="descripcion">
|
||||
<column id="39" parent="9" name="descripcion">
|
||||
<Position>3</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="39" parent="9" name="valor">
|
||||
<column id="40" parent="9" name="valor">
|
||||
<Position>4</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="40" parent="9" name="tipo_egreso_id">
|
||||
<column id="41" parent="9" name="tipo_egreso_id">
|
||||
<Position>5</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="41" parent="9" name="caja_id">
|
||||
<column id="42" parent="9" name="caja_id">
|
||||
<Position>6</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<key id="42" parent="9">
|
||||
<key id="43" parent="9">
|
||||
<ColNames>id</ColNames>
|
||||
<Primary>1</Primary>
|
||||
</key>
|
||||
<foreign-key id="43" parent="9">
|
||||
<foreign-key id="44" parent="9">
|
||||
<ColNames>tipo_egreso_id</ColNames>
|
||||
<RefTableName>tipos_egreso</RefTableName>
|
||||
<RefColNames>id</RefColNames>
|
||||
<OnDelete>restrict</OnDelete>
|
||||
<OnUpdate>cascade</OnUpdate>
|
||||
</foreign-key>
|
||||
<foreign-key id="44" parent="9">
|
||||
<foreign-key id="45" parent="9">
|
||||
<ColNames>caja_id</ColNames>
|
||||
<RefTableName>caja</RefTableName>
|
||||
<RefColNames>id</RefColNames>
|
||||
<OnDelete>restrict</OnDelete>
|
||||
<OnUpdate>cascade</OnUpdate>
|
||||
</foreign-key>
|
||||
<column id="45" parent="10" name="id">
|
||||
<column id="46" parent="10" name="id">
|
||||
<Position>1</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
</column>
|
||||
<column id="46" parent="10" name="valor">
|
||||
<column id="47" parent="10" name="valor">
|
||||
<Position>2</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="47" parent="10" name="nro_inicial">
|
||||
<column id="48" parent="10" name="nro_inicial">
|
||||
<Position>3</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="48" parent="10" name="nro_final">
|
||||
<column id="49" parent="10" name="nro_final">
|
||||
<Position>4</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="49" parent="10" name="tipo_ingreso_id">
|
||||
<column id="50" parent="10" name="tipo_ingreso_id">
|
||||
<Position>5</Position>
|
||||
<DataType>integer unsigned|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="50" parent="10" name="caja_id">
|
||||
<column id="51" parent="10" name="caja_id">
|
||||
<Position>6</Position>
|
||||
<DataType>integer unsigned|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<column id="51" parent="10" name="nro_z_inicial">
|
||||
<column id="52" parent="10" name="nro_z_inicial">
|
||||
<Position>7</Position>
|
||||
<DefaultExpression>''</DefaultExpression>
|
||||
</column>
|
||||
<column id="52" parent="10" name="nro_z_final">
|
||||
<column id="53" parent="10" name="nro_z_final">
|
||||
<Position>8</Position>
|
||||
<DefaultExpression>''</DefaultExpression>
|
||||
</column>
|
||||
<key id="53" parent="10">
|
||||
<key id="54" parent="10">
|
||||
<ColNames>id</ColNames>
|
||||
<Primary>1</Primary>
|
||||
</key>
|
||||
<foreign-key id="54" parent="10">
|
||||
<foreign-key id="55" parent="10">
|
||||
<ColNames>tipo_ingreso_id</ColNames>
|
||||
<RefTableName>tipos_ingreso</RefTableName>
|
||||
<RefColNames>id</RefColNames>
|
||||
<OnDelete>restrict</OnDelete>
|
||||
<OnUpdate>cascade</OnUpdate>
|
||||
</foreign-key>
|
||||
<foreign-key id="55" parent="10">
|
||||
<foreign-key id="56" parent="10">
|
||||
<ColNames>caja_id</ColNames>
|
||||
<RefTableName>caja</RefTableName>
|
||||
<RefColNames>id</RefColNames>
|
||||
<OnDelete>restrict</OnDelete>
|
||||
<OnUpdate>cascade</OnUpdate>
|
||||
</foreign-key>
|
||||
<column id="56" parent="11" name="type">
|
||||
<column id="57" parent="11" name="type">
|
||||
<Position>1</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
</column>
|
||||
<column id="57" parent="11" name="name">
|
||||
<column id="58" parent="11" name="name">
|
||||
<Position>2</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
</column>
|
||||
<column id="58" parent="11" name="tbl_name">
|
||||
<column id="59" parent="11" name="tbl_name">
|
||||
<Position>3</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
</column>
|
||||
<column id="59" parent="11" name="rootpage">
|
||||
<column id="60" parent="11" name="rootpage">
|
||||
<Position>4</Position>
|
||||
<DataType>int|0s</DataType>
|
||||
</column>
|
||||
<column id="60" parent="11" name="sql">
|
||||
<column id="61" parent="11" name="sql">
|
||||
<Position>5</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
</column>
|
||||
<column id="61" parent="12" name="id">
|
||||
<column id="62" parent="12" name="id">
|
||||
<Position>1</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
</column>
|
||||
<column id="62" parent="12" name="nombre">
|
||||
<column id="63" parent="12" name="nombre">
|
||||
<Position>2</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<key id="63" parent="12">
|
||||
<key id="64" parent="12">
|
||||
<ColNames>id</ColNames>
|
||||
<Primary>1</Primary>
|
||||
</key>
|
||||
<column id="64" parent="13" name="id">
|
||||
<column id="65" parent="13" name="id">
|
||||
<Position>1</Position>
|
||||
<DataType>integer|0s</DataType>
|
||||
</column>
|
||||
<column id="65" parent="13" name="nombre">
|
||||
<column id="66" parent="13" name="nombre">
|
||||
<Position>2</Position>
|
||||
<DataType>text|0s</DataType>
|
||||
<NotNull>1</NotNull>
|
||||
</column>
|
||||
<key id="66" parent="13">
|
||||
<key id="67" parent="13">
|
||||
<ColNames>id</ColNames>
|
||||
<Primary>1</Primary>
|
||||
</key>
|
||||
|
||||
245
.idea/workspace.xml
generated
245
.idea/workspace.xml
generated
@@ -11,15 +11,9 @@
|
||||
</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" />
|
||||
<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/database.sqlite" beforeDir="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/documentos/Documentos.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/Documentos.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/DocumentosDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/DocumentosDAO.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.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" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/target/" />
|
||||
<ignored path=".idea/" />
|
||||
@@ -83,44 +77,13 @@
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<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="-228">
|
||||
<caret line="230" column="50" lean-forward="true" selection-start-line="230" selection-start-column="50" selection-end-line="230" selection-end-column="50" />
|
||||
<folding>
|
||||
<element signature="docComment;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
|
||||
<element signature="method#ArqueoController#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="method#fillEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;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#6268#6357#1" />
|
||||
<element signature="e#6361#6448#1" />
|
||||
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
|
||||
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
|
||||
<element signature="e#9186#9251#0" />
|
||||
<element signature="e#9319#9384#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="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="class#GuardarEfectivoAction#0;class#ArqueoController#0" />
|
||||
<element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#0;n#ArqueoController#0" />
|
||||
<element signature="class#GuardarDocumentosAction#0;class#ArqueoController#0" />
|
||||
<element signature="n#!!block;n#GuardarDocumentosAction#0;n#GuardarDocumentosAction#0;n#ArqueoController#0" />
|
||||
</folding>
|
||||
<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 />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -190,8 +153,6 @@
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/database/mysql.sql" />
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/Ingreso.java" />
|
||||
<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" />
|
||||
@@ -241,6 +202,8 @@
|
||||
<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" />
|
||||
<option value="$APPLICATION_CONFIG_DIR$/idea.properties" />
|
||||
<option value="$PROJECT_DIR$/README.MD" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -285,6 +248,7 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@@ -303,53 +267,10 @@
|
||||
<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="controllers" 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="ArqueoView" type="e9f4de52:FormNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="caja" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="database" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Scratches and Consoles" type="1a2a3e82:ScratchProjectViewPane$MyProjectNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Scratches and Consoles" type="1a2a3e82:ScratchProjectViewPane$MyProjectNode" />
|
||||
<item name="Database Consoles" type="d62648e6:ScratchProjectViewPane$MyRootNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Scratches and Consoles" type="1a2a3e82:ScratchProjectViewPane$MyProjectNode" />
|
||||
<item name="Database Consoles" type="d62648e6:ScratchProjectViewPane$MyRootNode" />
|
||||
<item name="6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50" type="1e004dc1:ScratchProjectViewPane$MyRootNode$1$1" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
</panes>
|
||||
</component>
|
||||
@@ -364,7 +285,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="1547326684094" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547343885937" />
|
||||
<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" />
|
||||
@@ -584,7 +505,11 @@
|
||||
<workItem from="1547322244451" duration="1427000" />
|
||||
<workItem from="1547324215778" duration="2265000" />
|
||||
<workItem from="1547326945767" duration="555000" />
|
||||
<workItem from="1547328258113" duration="823000" />
|
||||
<workItem from="1547328258113" duration="923000" />
|
||||
<workItem from="1547338014749" duration="399000" />
|
||||
<workItem from="1547338647576" duration="1052000" />
|
||||
<workItem from="1547339992467" duration="1275000" />
|
||||
<workItem from="1547341595934" duration="2081000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
|
||||
<created>1545280618093</created>
|
||||
@@ -894,11 +819,18 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1547327482896</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="45" />
|
||||
<task id="LOCAL-00045" summary="Agregado en documentos el campo de retiros">
|
||||
<created>1547329170323</created>
|
||||
<option name="number" value="00045" />
|
||||
<option name="presentableId" value="LOCAL-00045" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1547329170323</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="46" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="294384000" />
|
||||
<option name="totallyTimeSpent" value="299291000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
@@ -1039,7 +971,6 @@
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
|
||||
<option name="CHECK_NEW_TODO" value="false" />
|
||||
<MESSAGE value="Separando un poco las clases de los modelos" />
|
||||
<MESSAGE value="Creando documentacion basica" />
|
||||
<MESSAGE value="Documentado el controlador de egresos" />
|
||||
<MESSAGE value="Documentado el controlador de ingresos" />
|
||||
@@ -1064,41 +995,14 @@
|
||||
<MESSAGE value="Informes mejorados, pensado para transcribirlo a un informe de ventas" />
|
||||
<MESSAGE value="Corregido error en la generacion del informe, mucho se tuvo que cambiar del mismo para que voliera a funcionar Presentaba errores al intentar conseguir los numeros de las distintos numeros de boleta dado a la query que se estaba realizando, se corrige creando 2 querys separadas y se comprueba que los numeros de boleta sean minimos o maimos en el codigo" />
|
||||
<MESSAGE value="Error en que los numeros de boletas eran comparados segun sus valor ascii y no de forma natural Se agrego una clase de otra persona que hace el trabajo, gracias buen hombre <3" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Error en que los numeros de boletas eran comparados segun sus valor ascii y no de forma natural Se agrego una clase de otra persona que hace el trabajo, gracias buen hombre <3" />
|
||||
<MESSAGE value="Agregado en documentos el campo de retiros" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Agregado en documentos el campo de retiros" />
|
||||
</component>
|
||||
<component name="antWorkspaceConfiguration">
|
||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||
<option name="FILTER_TARGETS" value="false" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar!/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="195">
|
||||
<caret line="46" column="28" lean-forward="true" selection-start-line="46" selection-start-column="28" selection-end-line="46" selection-end-column="28" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar!/org/apache/poi/hssf/usermodel/HSSFWorkbook.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="195">
|
||||
<caret line="1758" column="24" selection-start-line="1758" selection-start-column="24" selection-end-line="1758" selection-end-column="24" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar!/org/apache/poi/hssf/usermodel/HSSFDataFormat.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="121">
|
||||
<caret line="177" column="36" lean-forward="true" selection-start-line="177" selection-start-column="36" selection-end-line="177" selection-end-column="36" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="212">
|
||||
<caret line="182" column="66" selection-start-line="182" selection-start-column="66" selection-end-line="182" selection-end-column="66" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="138">
|
||||
@@ -1361,13 +1265,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2647">
|
||||
<caret line="162" column="19" lean-forward="true" selection-start-line="162" selection-start-column="19" selection-end-line="162" selection-end-column="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/CajaDAO.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="117">
|
||||
@@ -1442,18 +1339,6 @@
|
||||
</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="299">
|
||||
<caret line="112" lean-forward="true" selection-start-line="112" selection-end-line="112" />
|
||||
<folding>
|
||||
<element signature="e#2714#2715#0" expanded="true" />
|
||||
<element signature="e#2735#2736#0" expanded="true" />
|
||||
<element signature="method#run#0;class#Main#0" />
|
||||
</folding>
|
||||
</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>
|
||||
@@ -1605,37 +1490,43 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-228">
|
||||
<caret line="230" column="50" lean-forward="true" selection-start-line="230" selection-start-column="50" selection-end-line="230" selection-end-column="50" />
|
||||
<state relative-caret-position="138">
|
||||
<caret line="41" selection-start-line="41" selection-end-line="41" />
|
||||
<folding>
|
||||
<element signature="docComment;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
|
||||
<element signature="method#ArqueoController#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
|
||||
<element signature="method#updateCaja#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
|
||||
<element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
|
||||
<element signature="method#fillEfectivo#0;class#ArqueoController#0" />
|
||||
<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="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#6268#6357#1" />
|
||||
<element signature="e#6361#6448#1" />
|
||||
<element signature="e#6338#6427#1" />
|
||||
<element signature="e#6431#6518#1" />
|
||||
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
|
||||
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
|
||||
<element signature="e#9186#9251#0" />
|
||||
<element signature="e#9319#9384#0" />
|
||||
<element signature="e#9491#9556#0" />
|
||||
<element signature="e#9624#9689#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="class#GuardarEfectivoAction#0;class#ArqueoController#0" />
|
||||
<element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#0;n#ArqueoController#0" />
|
||||
<element signature="class#GuardarDocumentosAction#0;class#ArqueoController#0" />
|
||||
@@ -1644,6 +1535,56 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="138">
|
||||
<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$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="742">
|
||||
<caret line="162" column="19" lean-forward="true" selection-start-line="162" selection-start-column="19" selection-end-line="162" selection-end-column="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="236">
|
||||
<caret line="182" column="66" selection-start-line="182" selection-start-column="66" selection-end-line="182" selection-end-column="66" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$APPLICATION_CONFIG_DIR$/idea.properties">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="46">
|
||||
<caret line="2" column="29" selection-start-line="2" selection-start-column="29" selection-end-line="2" selection-end-column="29" />
|
||||
</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="138">
|
||||
<caret line="55" column="13" selection-start-line="55" selection-start-column="13" selection-end-line="55" selection-end-column="13" />
|
||||
<folding>
|
||||
<element signature="e#2714#2715#0" expanded="true" />
|
||||
<element signature="e#2735#2736#0" expanded="true" />
|
||||
<element signature="method#run#0;class#Main#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<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 />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
@@ -1662,10 +1603,10 @@
|
||||
<settings>
|
||||
<artifact-editor>
|
||||
<show-content>
|
||||
<type id="jpa-descriptors" />
|
||||
<type id="javaee-facet-resources" />
|
||||
<type id="library" />
|
||||
<type id="artifact" />
|
||||
<type id="javaee-facet-resources" />
|
||||
<type id="jpa-descriptors" />
|
||||
</show-content>
|
||||
</artifact-editor>
|
||||
<last-edited>Programa Caja</last-edited>
|
||||
|
||||
35
README.MD
Normal file
35
README.MD
Normal file
@@ -0,0 +1,35 @@
|
||||
#Programa de caja (WIP)
|
||||
|
||||
### Que es?
|
||||
Es un pequeño programa pensado para realizar el conteo de dinero en la caja de nuestro restaurant familiar `:3`
|
||||
Ademas de tener la capacidad de generar informes en xls.
|
||||
|
||||
### Como utilizarlo?
|
||||
Para poder hacer build del programa es necesario importarlo a IntelliJ y hacer build del artifact `Programa Caja`, por ello esta incluida la carpeta `.idea` en el repositorio. IntelliJ deberia hacerse cargo de las dependencias del projecto (intente utilizar maven sinceramente pero no funciono muy bien al hacer una build junto desde el IDE).
|
||||
|
||||
Luego de hacer la build, en la carpeta `dist` se encontrara el archivo `caja.jar` el cual es el ejecutable, junto al el se encuentra el archivo `properties` que ya esta disponible en el repositorio, en este se puede seleccionar el look and feel que tendra el programa y el sistema de base de datos que se utilizara, por ahora solo tiene soporte para mysql y sqlite, siendo sqlite el que realmente funcionara ya que aun no termino de portar las querys para mysql.
|
||||
|
||||
Para crear la base de datos se tienen los scripts en la carpeta `database` donde estan los archivos `mysql.sql` y `sqlite.sql`, como dije anteriormente sqlite realmente esta al dia asi que ese deberia ser utilizado.
|
||||
Deberia usar un orm pero no e encontrado uno que realmente me venga bien, tomando en cuenta que estoy usando sqlite y no hay mucho soporte para el en los orm para java.
|
||||
|
||||
### Screenshots!
|
||||
##### Pantalla de ingresos
|
||||
|
||||
##### Pantalla de egresos
|
||||
|
||||
##### Pantalla de arqueo
|
||||
|
||||
##### Libro de ventas
|
||||
|
||||
|
||||
### Features?
|
||||
* Calcula total de ingresos y total de egresos
|
||||
* Generacion de informes, por ahora solo presente un informe de libro mensual
|
||||
* Pueden agregarse distintos tipos de ingresos y egresos facilmente (Aunque los informes deben ser modificados para agregar esta informacion en ellos)
|
||||
* Realiza los calculos del arqueo de la caja, comprobando cuanta diferencia existe entre los lo que se a rendido y lo que se debe rendir.
|
||||
* Se pueden realizar operaciones matematicas en los campos numericos, como son los campos de valor, efectivo y documentos.
|
||||
|
||||
### TODO
|
||||
- [x] Informe de libro mensual.
|
||||
- [ ] Informe de egresos.
|
||||
- [ ] Migrar a un ORM para mejor soporte de base de datos y mayor velocidad (Mi codigo de comunicacion con base de datos no es el mejor).
|
||||
Reference in New Issue
Block a user