Skip to content

Commit

Permalink
Sells Stats UI Reworked
Browse files Browse the repository at this point in the history
  • Loading branch information
@averroes96
averroes96 committed Sep 19, 2020
1 parent 1e19f23 commit 7cbfdab
Show file tree
Hide file tree
Showing 18 changed files with 523 additions and 275 deletions.
4 changes: 2 additions & 2 deletions dist/GDP.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
function launchApplication(jnlpfile) {
dtjava.launch( {
url : 'GDP.jnlp',
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iR0RQLmpubHAiPg0KICA8aW5mb3JtYXRpb24+DQogICAgPHRpdGxlPkdEUDwvdGl0bGU+DQogICAgPHZlbmRvcj5BdmVycm9lczwvdmVuZG9yPg0KICAgIDxkZXNjcmlwdGlvbj5udWxsPC9kZXNjcmlwdGlvbj4NCiAgICA8b2ZmbGluZS1hbGxvd2VkLz4NCiAgPC9pbmZvcm1hdGlvbj4NCiAgPHJlc291cmNlcz4NCiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+DQogICAgPGphciBocmVmPSJTJkIuamFyIiBzaXplPSI2MzE5NTciIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxBbmltYXRlRlgtMS4yLjAuamFyIiBzaXplPSI4NTgyMyIgZG93bmxvYWQ9ImVhZ2VyIiAvPg0KICAgIDxqYXIgaHJlZj0ibGliXGNvbW1vbnMtYmVhbnV0aWxzLTEuOS40LmphciIgc2l6ZT0iMjQ2OTE4IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcY29tbW9ucy1jb2xsZWN0aW9uczQtNC40LmphciIgc2l6ZT0iNzUxOTE0IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcY29tbW9ucy1kaWdlc3Rlci0yLjEuamFyIiBzaXplPSIxOTY3NjgiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxjb21tb25zLWxvZ2dpbmctMS4yLmphciIgc2l6ZT0iNjE4MjkiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxjb250cm9sc2Z4LTguNDAuMTEuamFyIiBzaXplPSI5ODU0MjAiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxlY2otNC4yLjIuamFyIiBzaXplPSIxODAxNjM2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy02LjEwLjAuamFyIiBzaXplPSI1NTQ5Njg3IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy1mb250cy02LjEwLjAuamFyIiBzaXplPSIyNDgwNDIxIiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy1qYXZhZmxvdy02LjEwLjAuamFyIiBzaXplPSI1NTU4NTQ5IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamZvZW5peC04LjAuOC5qYXIiIHNpemU9IjI3MDg3NzIiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxteXNxbC1jb25uZWN0b3ItamF2YS01LjEuMjMtYmluLmphciIgc2l6ZT0iODM0MTI2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogIDwvcmVzb3VyY2VzPg0KICA8YXBwbGV0LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uamF2YWZ4Lm1haW4uTm9KYXZhRlhGYWxsYmFjayIgIG5hbWU9IkdEUCIgPg0KICAgIDxwYXJhbSBuYW1lPSJyZXF1aXJlZEZYVmVyc2lvbiIgdmFsdWU9IjguMCsiLz4NCiAgPC9hcHBsZXQtZGVzYz4NCiAgPGpmeDpqYXZhZngtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9IkFwcC5NYWluIiAgbmFtZT0iR0RQIiAvPg0KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4NCjwvam5scD4NCg=='
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iR0RQLmpubHAiPg0KICA8aW5mb3JtYXRpb24+DQogICAgPHRpdGxlPkdEUDwvdGl0bGU+DQogICAgPHZlbmRvcj5BdmVycm9lczwvdmVuZG9yPg0KICAgIDxkZXNjcmlwdGlvbj5udWxsPC9kZXNjcmlwdGlvbj4NCiAgICA8b2ZmbGluZS1hbGxvd2VkLz4NCiAgPC9pbmZvcm1hdGlvbj4NCiAgPHJlc291cmNlcz4NCiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+DQogICAgPGphciBocmVmPSJTJkIuamFyIiBzaXplPSI2Mzg0NDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxBbmltYXRlRlgtMS4yLjAuamFyIiBzaXplPSI4NTgyMyIgZG93bmxvYWQ9ImVhZ2VyIiAvPg0KICAgIDxqYXIgaHJlZj0ibGliXGNvbW1vbnMtYmVhbnV0aWxzLTEuOS40LmphciIgc2l6ZT0iMjQ2OTE4IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcY29tbW9ucy1jb2xsZWN0aW9uczQtNC40LmphciIgc2l6ZT0iNzUxOTE0IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcY29tbW9ucy1kaWdlc3Rlci0yLjEuamFyIiBzaXplPSIxOTY3NjgiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxjb21tb25zLWxvZ2dpbmctMS4yLmphciIgc2l6ZT0iNjE4MjkiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxjb250cm9sc2Z4LTguNDAuMTEuamFyIiBzaXplPSI5ODU0MjAiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxlY2otNC4yLjIuamFyIiBzaXplPSIxODAxNjM2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy02LjEwLjAuamFyIiBzaXplPSI1NTQ5Njg3IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy1mb250cy02LjEwLjAuamFyIiBzaXplPSIyNDgwNDIxIiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy1qYXZhZmxvdy02LjEwLjAuamFyIiBzaXplPSI1NTU4NTQ5IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamZvZW5peC04LjAuOC5qYXIiIHNpemU9IjI3MDg3NzIiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxteXNxbC1jb25uZWN0b3ItamF2YS01LjEuMjMtYmluLmphciIgc2l6ZT0iODM0MTI2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogIDwvcmVzb3VyY2VzPg0KICA8YXBwbGV0LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uamF2YWZ4Lm1haW4uTm9KYXZhRlhGYWxsYmFjayIgIG5hbWU9IkdEUCIgPg0KICAgIDxwYXJhbSBuYW1lPSJyZXF1aXJlZEZYVmVyc2lvbiIgdmFsdWU9IjguMCsiLz4NCiAgPC9hcHBsZXQtZGVzYz4NCiAgPGpmeDpqYXZhZngtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9IkFwcC5NYWluIiAgbmFtZT0iR0RQIiAvPg0KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4NCjwvam5scD4NCg=='
},
{
javafx : '8.0+'
Expand All @@ -24,7 +24,7 @@
placeholder : 'javafx-app-placeholder',
width : '800',
height : '600',
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iR0RQLmpubHAiPg0KICA8aW5mb3JtYXRpb24+DQogICAgPHRpdGxlPkdEUDwvdGl0bGU+DQogICAgPHZlbmRvcj5BdmVycm9lczwvdmVuZG9yPg0KICAgIDxkZXNjcmlwdGlvbj5udWxsPC9kZXNjcmlwdGlvbj4NCiAgICA8b2ZmbGluZS1hbGxvd2VkLz4NCiAgPC9pbmZvcm1hdGlvbj4NCiAgPHJlc291cmNlcz4NCiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+DQogICAgPGphciBocmVmPSJTJkIuamFyIiBzaXplPSI2MzE5NTciIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxBbmltYXRlRlgtMS4yLjAuamFyIiBzaXplPSI4NTgyMyIgZG93bmxvYWQ9ImVhZ2VyIiAvPg0KICAgIDxqYXIgaHJlZj0ibGliXGNvbW1vbnMtYmVhbnV0aWxzLTEuOS40LmphciIgc2l6ZT0iMjQ2OTE4IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcY29tbW9ucy1jb2xsZWN0aW9uczQtNC40LmphciIgc2l6ZT0iNzUxOTE0IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcY29tbW9ucy1kaWdlc3Rlci0yLjEuamFyIiBzaXplPSIxOTY3NjgiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxjb21tb25zLWxvZ2dpbmctMS4yLmphciIgc2l6ZT0iNjE4MjkiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxjb250cm9sc2Z4LTguNDAuMTEuamFyIiBzaXplPSI5ODU0MjAiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxlY2otNC4yLjIuamFyIiBzaXplPSIxODAxNjM2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy02LjEwLjAuamFyIiBzaXplPSI1NTQ5Njg3IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy1mb250cy02LjEwLjAuamFyIiBzaXplPSIyNDgwNDIxIiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy1qYXZhZmxvdy02LjEwLjAuamFyIiBzaXplPSI1NTU4NTQ5IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamZvZW5peC04LjAuOC5qYXIiIHNpemU9IjI3MDg3NzIiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxteXNxbC1jb25uZWN0b3ItamF2YS01LjEuMjMtYmluLmphciIgc2l6ZT0iODM0MTI2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogIDwvcmVzb3VyY2VzPg0KICA8YXBwbGV0LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uamF2YWZ4Lm1haW4uTm9KYXZhRlhGYWxsYmFjayIgIG5hbWU9IkdEUCIgPg0KICAgIDxwYXJhbSBuYW1lPSJyZXF1aXJlZEZYVmVyc2lvbiIgdmFsdWU9IjguMCsiLz4NCiAgPC9hcHBsZXQtZGVzYz4NCiAgPGpmeDpqYXZhZngtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9IkFwcC5NYWluIiAgbmFtZT0iR0RQIiAvPg0KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4NCjwvam5scD4NCg=='
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iR0RQLmpubHAiPg0KICA8aW5mb3JtYXRpb24+DQogICAgPHRpdGxlPkdEUDwvdGl0bGU+DQogICAgPHZlbmRvcj5BdmVycm9lczwvdmVuZG9yPg0KICAgIDxkZXNjcmlwdGlvbj5udWxsPC9kZXNjcmlwdGlvbj4NCiAgICA8b2ZmbGluZS1hbGxvd2VkLz4NCiAgPC9pbmZvcm1hdGlvbj4NCiAgPHJlc291cmNlcz4NCiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+DQogICAgPGphciBocmVmPSJTJkIuamFyIiBzaXplPSI2Mzg0NDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxBbmltYXRlRlgtMS4yLjAuamFyIiBzaXplPSI4NTgyMyIgZG93bmxvYWQ9ImVhZ2VyIiAvPg0KICAgIDxqYXIgaHJlZj0ibGliXGNvbW1vbnMtYmVhbnV0aWxzLTEuOS40LmphciIgc2l6ZT0iMjQ2OTE4IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcY29tbW9ucy1jb2xsZWN0aW9uczQtNC40LmphciIgc2l6ZT0iNzUxOTE0IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcY29tbW9ucy1kaWdlc3Rlci0yLjEuamFyIiBzaXplPSIxOTY3NjgiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxjb21tb25zLWxvZ2dpbmctMS4yLmphciIgc2l6ZT0iNjE4MjkiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxjb250cm9sc2Z4LTguNDAuMTEuamFyIiBzaXplPSI5ODU0MjAiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxlY2otNC4yLjIuamFyIiBzaXplPSIxODAxNjM2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy02LjEwLjAuamFyIiBzaXplPSI1NTQ5Njg3IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy1mb250cy02LjEwLjAuamFyIiBzaXplPSIyNDgwNDIxIiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamFzcGVycmVwb3J0cy1qYXZhZmxvdy02LjEwLjAuamFyIiBzaXplPSI1NTU4NTQ5IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcamZvZW5peC04LjAuOC5qYXIiIHNpemU9IjI3MDg3NzIiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgICA8amFyIGhyZWY9ImxpYlxteXNxbC1jb25uZWN0b3ItamF2YS01LjEuMjMtYmluLmphciIgc2l6ZT0iODM0MTI2IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogIDwvcmVzb3VyY2VzPg0KICA8YXBwbGV0LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uamF2YWZ4Lm1haW4uTm9KYXZhRlhGYWxsYmFjayIgIG5hbWU9IkdEUCIgPg0KICAgIDxwYXJhbSBuYW1lPSJyZXF1aXJlZEZYVmVyc2lvbiIgdmFsdWU9IjguMCsiLz4NCiAgPC9hcHBsZXQtZGVzYz4NCiAgPGpmeDpqYXZhZngtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9IkFwcC5NYWluIiAgbmFtZT0iR0RQIiAvPg0KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4NCjwvam5scD4NCg=='
},
{
javafx : '8.0+'
Expand Down
2 changes: 1 addition & 1 deletion dist/GDP.jnlp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</information>
<resources>
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="S&B.jar" size="631957" download="eager" />
<jar href="S&B.jar" size="638446" download="eager" />
<jar href="lib\AnimateFX-1.2.0.jar" size="85823" download="eager" />
<jar href="lib\commons-beanutils-1.9.4.jar" size="246918" download="eager" />
<jar href="lib\commons-collections4-4.4.jar" size="751914" download="eager" />
Expand Down
Binary file modified dist/S&B.jar
View file
Binary file not shown.
12 changes: 9 additions & 3 deletions nbproject/private/private.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Controllers/UpdateBuyController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Main.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Preloader/SplashController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Controllers/SellStatsController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Controllers/BuyStatsController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/FXMLs/Login.fxml</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/Include/GDPController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Controllers/UpdateSellController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Controllers/LoginController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Controllers/MainController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Preloader/MyPreLoader.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/Include/Init.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Controllers/ChangePassController.java</file>
<file>file:/C:/Users/user/Documents/NetBeansProjects/gdp/src/App/Bundles/bundle_ar_AR.properties</file>
</group>
</open-files>
</project-private>
43 changes: 43 additions & 0 deletions src/App/Bundles/bundle_ar_AR.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
# The contents of this file are subject to the terms of either the GNU
# General Public License Version 2 only ("GPL") or the Common
# Development and Distribution License("CDDL") (collectively, the
# "License"). You may not use this file except in compliance with the
# License. You can obtain a copy of the License at
# http://www.netbeans.org/cddl-gplv2.html
# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
# specific language governing permissions and limitations under the
# License. When distributing the software, include this License Header
# Notice in each file and include the License file at
# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the GPL Version 2 section of the License file that
# accompanied this code. If applicable, add the following below the
# License Header, with the fields enclosed by brackets [] replaced by
# your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
#
# If you wish your version of this file to be governed by only the CDDL
# or only the GPL Version 2, indicate your decision by adding
# "[Contributor] elects to include this software in this distribution
# under the [CDDL or GPL Version 2] license." If you do not indicate a
# single choice of license, a recipient has the option to distribute
# your version of this file under either the CDDL, the GPL Version 2 or
# to extend the choice of license to its licensees as provided above.
# However, if you add GPL Version 2 code and therefore, elected the GPL
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
#
# Contributor(s):


enter = \u062f\u062e\u0648\u0644
username = \u0625\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645
password = \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631

22 changes: 10 additions & 12 deletions src/App/Controllers/BuyStatsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ private void getData(String name, String start, String end){

series.getData().forEach((data) -> {
data.getNode().addEventHandler(MouseEvent.MOUSE_ENTERED, (MouseEvent event1) -> {
Tooltip.install(data.getNode(), new Tooltip(data.getYValue().toString()));
});
Tooltip.install(data.getNode(), new Tooltip(String.valueOf(data.getYValue().floatValue())));
});
});

series.setName("عدد المشراءات حسب اليوم");
series.setName("عدد المشتريات حسب اليوم");

query = "SELECT date(buy_date), SUM(buy_price) FROM buy INNER JOIN product ON product.prod_id = buy.prod_id INNER JOIN user ON user.user_id = buy.user_id " + whereClause + "Group by date(buy_date) " ;

Expand Down Expand Up @@ -241,7 +241,7 @@ public void customDialog(String title, String body, String icon, boolean btnIncl
loadDialog(layout, btnIncluded);
}

public static void search(JFXTextField field, ObservableList<Buy> list, TableView table)
public void search(JFXTextField field, ObservableList<Buy> list, TableView table)
{

String keyword = field.getText();
Expand All @@ -259,8 +259,6 @@ public static void search(JFXTextField field, ObservableList<Buy> list, TableVie
}

}



@Override
public void initialize(URL url, ResourceBundle rb) {
Expand All @@ -286,7 +284,7 @@ public void initialize(URL url, ResourceBundle rb) {
prodField.setItems(nameList);
prodField.getSelectionModel().selectFirst();

getData("الكل",startDate.getEditor().getText(),endDate.getEditor().getText());
getData(ALL, startDate.getEditor().getText(), endDate.getEditor().getText());

search.setOnAction(Action -> {

Expand All @@ -300,21 +298,21 @@ public void initialize(URL url, ResourceBundle rb) {
if(endDate.getValue().equals(LocalDate.now())){
switch(interv){
case 7:
interval.setText("مبيعات آخر أسبوع");
interval.setText(LAST_WEEK_BUYS);
break;
case 30:
interval.setText("مبيعات آخر شهر");
interval.setText(LAST_MONTH_BUYS);
break;
case 365:
interval.setText("مبيعات آخر عام");
interval.setText(LAST_YEAR_BUYS);
break;
default:
interval.setText("مبيعات آخر " + interv + " يوم");
interval.setText("مشتريات آخر " + interv + " يوم");
break;
}
}
else{
interval.setText("مبيعات " + startDate.getValue().toString() + " ----- " + endDate.getValue().toString());
interval.setText(BUYS + startDate.getValue().toString() + " ----- " + endDate.getValue().toString());
}

buysTable.getItems().clear();
Expand Down
2 changes: 1 addition & 1 deletion src/App/Controllers/LoginController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public void login(ActionEvent event) throws IOException{
else{

JFXDialogLayout layout = new JFXDialogLayout();
initLayout(layout, CONNECTION_ERROR, CONNECTION_ERROR_MESSAGE, ERROR_SMALL);
initLayout(layout, USER_INFO, USER_INFO_MESSAGE, ERROR_SMALL);

loadDialog(layout);

Expand Down
Loading

0 comments on commit 7cbfdab

Please sign in to comment.