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

La comprobacion del path estaba hecha al reves :c

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-19 16:55:27 -03:00
parent 0f3955ee34
commit 0d41e533c0
4 changed files with 93 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
.idea/workspace.xml generated
View File

@@ -9,9 +9,8 @@
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<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$/dist/conf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/dist/conf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" afterDir="false" />
<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/utils/FileUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/utils/FileUtils.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" />
@@ -56,41 +55,27 @@
</component>
<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/CalcularFondoController.java">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/utils/FileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="46" selection-start-line="46" selection-end-line="46" />
<state relative-caret-position="120">
<caret line="32" column="28" selection-start-line="32" selection-start-column="28" selection-end-line="32" selection-end-column="28" />
<folding>
<element signature="method#CalcularFondoController#0;class#CalcularFondoController#0" />
<element signature="method#showView#0;class#CalcularFondoController#0" />
<element signature="method#fillTable#0;class#CalcularFondoController#0" />
<element signature="e#1809#1865#1" />
<element signature="method#setupViewEvents#0;class#CalcularFondoController#0" />
<element signature="e#3228#3320#1" />
<element signature="method#guardarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#3582#3684#1" />
<element signature="e#3690#3759#1" />
<element signature="method#editarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#3987#4495#1" />
<element signature="method#eliminarActionListener#0;class#CalcularFondoController#0" />
<element signature="e#4640#4980#1" />
<element signature="method#guardarCalculoFondo#0;class#CalcularFondoController#0" />
<element signature="method#editarCalculoFondo#0;class#CalcularFondoController#0" />
<element signature="method#updateButtonsEnabled#0;class#CalcularFondoController#0" />
<element signature="e#5871#6000#1" />
<element signature="e#6006#6137#1" />
<element signature="method#updateResumen#0;class#CalcularFondoController#0" />
<element signature="method#cleanInput#0;class#CalcularFondoController#0" />
<element signature="method#normalizeInput#0;class#CalcularFondoController#0" />
<element signature="e#6669#6737#1" />
<element signature="class#GuardarAction#0;class#CalcularFondoController#0" />
<element signature="class#UpdateResumenAction#0;class#CalcularFondoController#0" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
<caret line="132" column="35" lean-forward="true" selection-start-line="132" selection-start-column="35" selection-end-line="132" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -187,8 +172,6 @@
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/README.MD" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/utils/FileUtils.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/CalculoFondo.java" />
<option value="$PROJECT_DIR$/database/sqlite.sql" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java" />
@@ -207,6 +190,8 @@
<option value="$PROJECT_DIR$/dist/conf.properties" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/utils/FileUtils.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" />
</list>
</option>
</component>
@@ -251,6 +236,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -285,7 +271,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
@@ -300,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="1547848548523" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547848581787" />
<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" />
@@ -538,14 +523,9 @@
<workItem from="1547827261218" duration="142000" />
<workItem from="1547831772335" duration="2794000" />
<workItem from="1547834617127" duration="7034000" />
<workItem from="1547845161147" duration="3381000" />
</task>
<task id="LOCAL-00005" summary="Ahora el modelo de egreso se autocarga con el objeto de tipo egreso en vez de con su id">
<created>1545361072926</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1545361072926</updated>
<workItem from="1547845161147" duration="3421000" />
<workItem from="1547860939162" duration="1083000" />
<workItem from="1547878415974" duration="1068000" />
</task>
<task id="LOCAL-00006" summary="Validacion cuando se guarda un egreso desde la vista">
<created>1545420806001</created>
@@ -883,11 +863,18 @@
<option name="project" value="LOCAL" />
<updated>1547847834651</updated>
</task>
<option name="localTasksCounter" value="54" />
<task id="LOCAL-00054" summary="agregada propiedad para agregarle un nombre de prefijo a las ventanas">
<created>1547848576090</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1547848576090</updated>
</task>
<option name="localTasksCounter" value="55" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="337717000" />
<option name="totallyTimeSpent" value="339908000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -901,7 +888,7 @@
<component name="ToolWindowManager">
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.18502203" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" weight="0.18502203" />
<window_info id="Image Layers" order="1" />
<window_info id="Designer" order="2" />
<window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.20131771" />
@@ -920,7 +907,7 @@
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50076103" side_tool="true" weight="0.24077046" />
<window_info anchor="bottom" id="Messages" order="10" weight="0.32730016" />
<window_info anchor="bottom" id="Database Console" order="11" weight="0.36597112" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="12" sideWeight="0.4975923" weight="0.26646706" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="12" sideWeight="0.4975923" weight="0.26518518" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" show_stripe_button="false" weight="0.24961948" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -1027,7 +1014,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="Creacion de number formated text field y implementacion de prueba como campos de efectivo" />
<MESSAGE value="Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields" />
<MESSAGE value="Mejora de los NumberFormatedTextFields" />
<MESSAGE value="NumberFormatTextField agregado en el campo value de ingresos y formateado los campos integer en los tablemodels" />
@@ -1052,20 +1038,14 @@
<MESSAGE value="El nombre sugerido en los informes no era leido correctamente en windows, creando el archivo correctamente" />
<MESSAGE value="Generalizado el testeo del error con el nombre de archivo a crear para los informes, testea si el path es valido y si no es asi muestra un mensaje de error y sale de la creacion de un informe" />
<MESSAGE value="Agregada una ventana para realizar el calculo del fondo de la caja, es wip, falta la aprobacion del jefe jajaj" />
<option name="LAST_COMMIT_MESSAGE" value="Agregada una ventana para realizar el calculo del fondo de la caja, es wip, falta la aprobacion del jefe jajaj" />
<MESSAGE value="agregada propiedad para agregarle un nombre de prefijo a las ventanas" />
<option name="LAST_COMMIT_MESSAGE" value="agregada propiedad para agregarle un nombre de prefijo a las ventanas" />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/EgresoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-90">
<caret line="40" column="22" selection-start-line="40" selection-start-column="22" selection-end-line="40" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informes/libro_de_ventas/InformeLibroDeVentasContentDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4">
@@ -1212,23 +1192,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeEgresos.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2">
<caret line="70" column="75" selection-start-line="70" selection-start-column="75" selection-end-line="70" selection-end-column="75" />
<folding>
<element signature="method#InformeEgresosFacturaMateriaPrima#0;class#InformeEgresosFacturaMateriaPrima#0" />
<element signature="method#fillHeaders#0;class#InformeEgresosFacturaMateriaPrima#0" />
<element signature="method#fillData#0;class#InformeEgresosFacturaMateriaPrima#0" />
<element signature="method#fillTotales#0;class#InformeEgresosFacturaMateriaPrima#0" />
<element signature="method#addBorders#0;class#InformeEgresosFacturaMateriaPrima#0" />
<element signature="method#setStyles#0;class#InformeEgresosFacturaMateriaPrima#0" />
<element signature="method#generateStyles#0;class#InformeEgresosFacturaMateriaPrima#0" />
<element signature="method#generarInforme#0;class#InformeEgresosFacturaMateriaPrima#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/TipoEgresoSelectDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
@@ -1296,49 +1259,6 @@
</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="186">
<caret line="77" column="43" selection-start-line="77" selection-start-column="43" selection-end-line="77" selection-end-column="43" />
<folding>
<element signature="method#InformesController#0;class#InformesController#0" />
<element signature="method#setupViewEvents#0;class#InformesController#0" />
<element signature="method#generarInformeLibroDeVentasListener#0;class#InformesController#0" />
<element signature="e#2375#2406#1" />
<element signature="e#2702#2733#1" />
<element signature="method#generarInformeEgresosListener#0;class#InformesController#0" />
<element signature="e#3061#3092#1" />
<element signature="e#3162#3193#1" />
<element signature="e#3494#3525#1" />
<element signature="method#askForMonth#0;class#InformesController#0" />
<element signature="e#3905#3965#1" />
<element signature="e#3971#4007#1" />
<element signature="method#askForTipoEgreso#0;class#InformesController#0" />
<element signature="e#4220#4290#1" />
<element signature="e#4296#4332#1" />
<element signature="method#askForFile#0;class#InformesController#0" />
<element signature="e#4745#5047#1" />
<element signature="e#4864#4908#1" />
<element signature="e#4946#4997#1" />
<element signature="e#5053#5089#1" />
<element signature="method#showConfirmation#0;class#InformesController#0" />
<element signature="e#5488#5656#1" />
<element signature="e#5506#5570#0" />
<element signature="e#5593#5645#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/utils/FileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="30" column="50" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="50" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/sqlite.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
@@ -1813,6 +1733,60 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/utils/NaturalOrderComparator.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeEgresos.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="365">
<caret line="92" column="5" lean-forward="true" selection-start-line="92" selection-start-column="5" selection-end-line="92" selection-end-column="5" />
<folding>
<element signature="method#InformeEgresos#0;class#InformeEgresos#0" />
<element signature="method#fillHeaders#0;class#InformeEgresos#0" />
<element signature="e#3291#3365#1" />
<element signature="method#fillData#0;class#InformeEgresos#0" />
<element signature="e#3560#4558#1" />
<element signature="e#4269#4521#1" />
<element signature="method#fillTotales#0;class#InformeEgresos#0" />
<element signature="e#4827#5546#1" />
<element signature="e#5220#5278#1" />
<element signature="e#5284#5536#1" />
<element signature="method#addBorders#0;class#InformeEgresos#0" />
<element signature="e#6123#6393#1" />
<element signature="method#setStyles#0;class#InformeEgresos#0" />
<element signature="e#7835#8117#1" />
<element signature="e#8198#8671#1" />
<element signature="e#8845#8895#1" />
<element signature="e#8932#8982#1" />
<element signature="method#generateStyles#0;class#InformeEgresos#0" />
<element signature="method#generarInforme#0;class#InformeEgresos#0" />
<element signature="e#11680#11756#0" />
<element signature="e#11779#11823#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/utils/FileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="32" column="28" selection-start-line="32" selection-start-column="28" selection-end-line="32" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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="363">
<caret line="132" column="35" lean-forward="true" selection-start-line="132" selection-start-column="35" selection-end-line="132" selection-end-column="35" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

BIN
dist/caja.jar vendored
View File

Binary file not shown.

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

@@ -125,8 +125,8 @@ public class InformesController {
chooser.setFileFilter(new FileNameExtensionFilter("Excel 2007", "xls"));
if (chooser.showSaveDialog(this.view.getContentPanel()) == JFileChooser.APPROVE_OPTION) {
String filename = chooser.getSelectedFile().toString();
if (FileUtils.isValidPath(filename)) {
String filename = chooser.getSelectedFile().getPath();
if (!FileUtils.isValidPath(filename)) {
JOptionPane.showMessageDialog(this.view.getContentPanel(),"El archivo seleccionado no es valido","Archivo no valido", JOptionPane.ERROR_MESSAGE);
return null;
} else if (!filename.endsWith(".xls")) {

1
src/danielcortes/xyz/utils/FileUtils.java
View File

@@ -32,6 +32,7 @@ public class FileUtils {
try {
Paths.get(path);
} catch (InvalidPathException | NullPointerException ex) {
ex.printStackTrace();
return false;
}
return true;