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

Se me habia olvidado agrupar los botones de la vista manager

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-18 01:49:33 -03:00
parent 80afb200e5
commit 0e8d82ae11
5 changed files with 113 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
.idea/workspace.xml generated
View File

@@ -11,7 +11,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="Generad"> <list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="Generad">
<change beforePath="$PROJECT_DIR$/README.MD" beforeDir="false" afterPath="$PROJECT_DIR$/README.MD" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" /> <ignored path=".idea/" />
@@ -75,13 +75,34 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/README.MD"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="text-editor">
<state split_layout="SPLIT"> <state relative-caret-position="-573">
<first_editor relative-caret-position="372"> <caret line="67" column="42" lean-forward="true" selection-start-line="67" selection-start-column="42" selection-end-line="67" selection-end-column="42" />
<caret line="28" column="46" lean-forward="true" selection-start-line="28" selection-start-column="46" selection-end-line="28" selection-end-column="46" /> <folding>
</first_editor> <element signature="docComment;class#ManagerController#0" />
<second_editor /> <element signature="docComment;method#ManagerController#0;class#ManagerController#0" />
<element signature="method#ManagerController#0;class#ManagerController#0" />
<element signature="docComment;method#setUpDate#0;class#ManagerController#0" />
<element signature="method#setUpDate#0;class#ManagerController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="e#4540#4701#0" />
<element signature="e#4760#4922#0" />
<element signature="e#4979#5191#0" />
<element signature="e#5250#5412#0" />
<element signature="docComment;method#updateCaja#0;class#ManagerController#0" />
<element signature="method#updateCaja#0;class#ManagerController#0" />
<element signature="e#5804#6238#1" />
<element signature="docComment;method#loadCardContents#0;class#ManagerController#0" />
<element signature="docComment;method#loadIngresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadEgresosView#0;class#ManagerController#0" />
<element signature="method#loadEgresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadArqueoView#0;class#ManagerController#0" />
<element signature="method#loadArqueoView#0;class#ManagerController#0" />
<element signature="method#loadInformesView#0;class#ManagerController#0" />
<element signature="docComment;method#pressInitialButton#0;class#ManagerController#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -246,8 +267,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@@ -255,10 +274,45 @@
<item name="caja" type="b2602c69:ProjectViewProjectNode" /> <item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" /> <item name="caja" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" 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" />
</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="ManagerView" type="e9f4de52:FormNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@@ -505,6 +559,8 @@
<workItem from="1547620415099" duration="227000" /> <workItem from="1547620415099" duration="227000" />
<workItem from="1547658180848" duration="766000" /> <workItem from="1547658180848" duration="766000" />
<workItem from="1547682336611" duration="4906000" /> <workItem from="1547682336611" duration="4906000" />
<workItem from="1547782586833" duration="31000" />
<workItem from="1547786446794" duration="380000" />
</task> </task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora"> <task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created> <created>1545280618093</created>
@@ -853,7 +909,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="322938000" /> <option name="totallyTimeSpent" value="323349000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@@ -868,7 +924,7 @@
<frame x="0" y="-18" width="1366" height="765" extended-state="6" /> <frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.16133942" /> <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.16590562" />
<window_info id="Image Layers" order="1" /> <window_info id="Image Layers" order="1" />
<window_info id="Designer" order="2" /> <window_info id="Designer" order="2" />
<window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.20243531" /> <window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.20243531" />
@@ -1026,13 +1082,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <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/HSSFRow.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="38" selection-start-line="38" selection-end-line="38" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar!/org/apache/poi/ss/usermodel/VerticalAlignment.java"> <entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar!/org/apache/poi/ss/usermodel/VerticalAlignment.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161"> <state relative-caret-position="161">
@@ -1309,30 +1358,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1290">
<caret line="202" lean-forward="true" selection-start-line="202" selection-end-line="202" />
<folding>
<element signature="docComment;class#ManagerController#0" />
<element signature="docComment;method#ManagerController#0;class#ManagerController#0" />
<element signature="method#ManagerController#0;class#ManagerController#0" />
<element signature="docComment;method#setUpDate#0;class#ManagerController#0" />
<element signature="method#setUpDate#0;class#ManagerController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="docComment;method#updateCaja#0;class#ManagerController#0" />
<element signature="method#updateCaja#0;class#ManagerController#0" />
<element signature="docComment;method#loadCardContents#0;class#ManagerController#0" />
<element signature="docComment;method#loadIngresosView#0;class#ManagerController#0" />
<element signature="method#loadIngresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadEgresosView#0;class#ManagerController#0" />
<element signature="method#loadEgresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadArqueoView#0;class#ManagerController#0" />
<element signature="docComment;method#pressInitialButton#0;class#ManagerController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/tipos_egreso"> <entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/tipos_egreso">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider"> <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state> <state>
@@ -1543,12 +1568,50 @@
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT"> <state split_layout="SPLIT">
<first_editor relative-caret-position="372"> <first_editor relative-caret-position="372">
<caret line="28" column="46" lean-forward="true" selection-start-line="28" selection-start-column="46" selection-end-line="28" selection-end-column="46" /> <caret line="28" column="46" selection-start-line="28" selection-start-column="46" selection-end-line="28" selection-end-column="46" />
</first_editor> </first_editor>
<second_editor /> <second_editor />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2">
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-573">
<caret line="67" column="42" lean-forward="true" selection-start-line="67" selection-start-column="42" selection-end-line="67" selection-end-column="42" />
<folding>
<element signature="docComment;class#ManagerController#0" />
<element signature="docComment;method#ManagerController#0;class#ManagerController#0" />
<element signature="method#ManagerController#0;class#ManagerController#0" />
<element signature="docComment;method#setUpDate#0;class#ManagerController#0" />
<element signature="method#setUpDate#0;class#ManagerController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="e#4540#4701#0" />
<element signature="e#4760#4922#0" />
<element signature="e#4979#5191#0" />
<element signature="e#5250#5412#0" />
<element signature="docComment;method#updateCaja#0;class#ManagerController#0" />
<element signature="method#updateCaja#0;class#ManagerController#0" />
<element signature="e#5804#6238#1" />
<element signature="docComment;method#loadCardContents#0;class#ManagerController#0" />
<element signature="docComment;method#loadIngresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadEgresosView#0;class#ManagerController#0" />
<element signature="method#loadEgresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadArqueoView#0;class#ManagerController#0" />
<element signature="method#loadArqueoView#0;class#ManagerController#0" />
<element signature="method#loadInformesView#0;class#ManagerController#0" />
<element signature="docComment;method#pressInitialButton#0;class#ManagerController#0" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

BIN
dist/caja.jar vendored
View File

Binary file not shown.

3
src/danielcortes/xyz/views/ManagerView.form
View File

@@ -80,10 +80,11 @@
</children> </children>
</grid> </grid>
<buttonGroups> <buttonGroups>
<group name="btnGroup"> <group name="buttonGroup">
<member id="a853b"/> <member id="a853b"/>
<member id="a494c"/> <member id="a494c"/>
<member id="d23e2"/> <member id="d23e2"/>
<member id="91b71"/>
</group> </group>
</buttonGroups> </buttonGroups>
<inspectionSuppressions> <inspectionSuppressions>

1
src/danielcortes/xyz/views/ManagerView.java
View File

@@ -120,6 +120,7 @@ public class ManagerView {
buttonGroup.add(egresosButton); buttonGroup.add(egresosButton);
buttonGroup.add(ingresosButton); buttonGroup.add(ingresosButton);
buttonGroup.add(arqueoButton); buttonGroup.add(arqueoButton);
buttonGroup.add(informesButton);
} }
/** /**

6
src/danielcortes/xyz/views/TipoEgresoSelectDialog.java
View File

@@ -123,12 +123,12 @@ public class TipoEgresoSelectDialog extends JDialog {
buttonCancel.setText("Cancel"); buttonCancel.setText("Cancel");
panel2.add(buttonCancel, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); panel2.add(buttonCancel, new GridConstraints(0, 1, 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 JPanel panel3 = new JPanel(); final JPanel panel3 = new JPanel();
panel3.setLayout(new GridLayoutManager(2, 2, new Insets(0, 0, 0, 0), -1, -1)); panel3.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
contentPane.add(panel3, 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)); contentPane.add(panel3, 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));
panel3.add(tipoEgresoCombo, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); panel3.add(tipoEgresoCombo, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JLabel label1 = new JLabel(); final JLabel label1 = new JLabel();
label1.setText("Seleccione el Tipo de Egreso:"); label1.setText("Seleccione el Tipo de Egreso:");
panel3.add(label1, new GridConstraints(0, 0, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); panel3.add(label1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
} }
/** /**