release: v1

abuomerSD · Jan 14, 2025 · 0e4af6c · 0e4af6c
1 parent 5c464b2
commit 0e4af6c
Show file tree

Hide file tree

Showing 16 changed files with 279 additions and 4 deletions.
diff --git a/resources/fonts/Almarai-Bold.ttf b/resources/fonts/Almarai-Bold.ttf
diff --git a/resources/fonts/Almarai-Bold_1.ttf b/resources/fonts/Almarai-Bold_1.ttf
diff --git a/resources/fonts/Almarai-ExtraBold.ttf b/resources/fonts/Almarai-ExtraBold.ttf
diff --git a/resources/fonts/Almarai-Light.ttf b/resources/fonts/Almarai-Light.ttf
diff --git a/resources/fonts/Almarai-Regular.ttf b/resources/fonts/Almarai-Regular.ttf
diff --git a/resources/images/LOGO-removebg-preview.png b/resources/images/LOGO-removebg-preview.png
diff --git a/resources/images/QR-removebg-preview.png b/resources/images/QR-removebg-preview.png
diff --git a/resources/images/cover-removebg-preview.png b/resources/images/cover-removebg-preview.png
diff --git a/resources/images/default.jpg b/resources/images/default.jpg
diff --git a/resources/images/newQr.png b/resources/images/newQr.png
diff --git a/resources/images/smalllogo.png b/resources/images/smalllogo.png
diff --git a/resources/images/smallqr.png b/resources/images/smallqr.png
diff --git a/resources/style/style.css b/resources/style/style.css
@@ -0,0 +1,272 @@
+/*@font-face {
+    font-family: 'Cairo';
+    src: url('/badrbillingsystem/resources/fonts/Cairo-VariableFont_slnt,wght.ttf');
+}*/
+/*@import "Almarai.otf";*/
+@font-face {
+    font-family: 'almarai';
+    /*src: url('Almarai.otf');*/ 
+    src: url('/fonts/Almarai-Bold.ttf'); 
+}
+
+.sidebar-button {
+    -fx-font-family: 'almarai';
+    -fx-background-color: #3A3960;
+    -fx-font-size: 20;
+    -fx-text-fill: white;
+}
+
+.sidebar-button:hover {
+    -fx-font-family: 'almarai';
+    -fx-background-color: #5E686D;
+    -fx-font-size: 20;
+    -fx-text-fill: white;
+    -fx-cursor: hand;
+}
+
+.sidebar-logout-button {
+    -fx-font-family: 'almarai';
+    -fx-background-color: #3A3960;
+    -fx-font-size: 14;
+    -fx-text-fill: white;
+}
+
+.sidebar-logout-button:hover {
+    -fx-font-family: 'almarai';
+    -fx-background-color: #5E686D;
+    -fx-font-size: 14;
+    -fx-text-fill: white;
+    -fx-cursor: hand;
+}
+
+.sidebar {
+    -fx-background-color: #3A3960;
+    -fx-font-family: 'almarai';
+    -fx-text-fill: white;
+}
+
+.title {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 20;
+}
+
+.textfeild-class {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 14;
+}
+
+.label-class {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 14;
+}
+
+.text-field{
+    -fx-font-family: 'almarai';
+    -fx-font-size: 14;
+}
+
+.textaria{
+    -fx-font-family: 'almarai';
+    -fx-font-size: 14;
+}
+
+.label {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 14;
+}
+
+.combo-box {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 14;
+}
+
+.btn-save {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 17;
+    -fx-background-color: #31511E;
+    -fx-text-fill: white;
+}
+
+.btn-edit {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 17;
+    -fx-background-color: #37AFE1;
+    -fx-text-fill: white;
+}
+
+.btn-delete {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 17;
+    -fx-background-color: #C62300;
+    -fx-text-fill: white;
+}
+
+.btn-primary {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 17;
+    -fx-background-color: #4B5945;
+    -fx-text-fill: white;
+}
+
+.btn-secondary {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 17;
+    -fx-background-color: #54473F;
+    -fx-text-fill: white;
+}
+
+/* button hover*/
+
+.btn-save:hover {
+    -fx-background-color: #859F3D;
+    -fx-cursor: hand;
+}
+
+.btn-edit:hover {
+    -fx-background-color: #4CC9FE;
+    -fx-cursor: hand;
+}
+
+.btn-delete:hover {
+    -fx-background-color: #F14A00;
+    -fx-cursor: hand;
+
+}
+
+.btn-primary:hover {
+    -fx-background-color: #66785F;
+    -fx-cursor: hand;
+}
+
+.btn-secondary:hover {
+    -fx-background-color: #9A7E6F;
+    -fx-cursor: hand;
+}
+
+/*tableview*/
+
+.table-view .column-header,
+.table-view .column-header-background .filler {
+    -fx-background-color:  #3A3960; 
+    -fx-font-family: 'almarai';
+    -fx-font-size: 12;
+}
+.table-view .column-header .label{
+   -fx-text-fill: white;
+   -fx-font-weight: bold; 
+   -fx-alignment: CENTER;
+   -fx-font-family: 'almarai';
+   -fx-font-size: 14;
+}/*
+.table-view .cell{
+   -fx-cell-size: 35;
+  -fx-alignment: center-left;
+  -fx-background-color: #EEE;
+  -fx-border-color: #EEE;
+  -fx-text-fill: black;
+  -fx-alignment: CENTER_LEFT;
+  -fx-font-family: 'almarai';
+  -fx-font-size: 14;
+   
+}
+
+.table-row-cell {
+    -fx-background-color: -fx-table-cell-border-color, #616161;
+    -fx-background-insets: 0, 0 0 1 0;
+    -fx-padding: 0.0em;  0 
+}
+.table-row-cell:selected {
+   -fx-background-color: whitesmoke; 
+   -fx-text-background-color:  #6622CC;       
+}
+
+.table-row-cell .label:hover {
+   -fx-background-color: #3A3960;
+    -fx-text-fill: white;       
+}
+
+.table-row-cell:filled:hover {
+    -fx-background-color: #3A3960;
+    -fx-text-fill: white; 
+}*/
+
+
+* {
+	-fx-primary-color: #007acc;
+	-fx-secondary-color: #4B6EAF;
+	-fx-accent-color: #B6FF00;
+	-fx-grey-color: #b9b9b9;
+	-fx-light-grey-color: #d1d1d1;
+	-fx-lightest-grey-color: #F9F9FB;
+
+	-fx-focus-color: -fx-secondary-color;
+}
+
+.table-button {
+	-fx-background-color: -fx-primary-color;
+	-fx-cursor: hand;
+}
+.table-button:hover{
+	-fx-background-color: transparent;
+}
+.table-view {
+	-fx-border-color: transparent;
+	-fx-background-color: transparent; /* OR  -fx-background-insets: 0.0; */
+}
+/*.table-view .column-header-background,
+.table-view .column-header-background .filler,
+.table-view .corner {
+	-fx-background-color: transparent;
+}
+.table-view .column-header {
+	-fx-background-color: -fx-light-grey-color;
+	-fx-border-color: -fx-grey-color;
+        -fx-alignment: CENTER;
+}
+.table-view .column-header .label{
+	-fx-font-weight: bold; 
+	-fx-alignment: CENTER;
+}*/
+
+/* This is just magic */
+.table-row-cell:filled {
+	-fx-background-color: transparent;
+	-fx-border-color: transparent -fx-lightest-grey-color -fx-lightest-grey-color -fx-lightest-grey-color, transparent;
+	-fx-border-insets: 0, 1;
+}
+.table-row-cell:empty {
+	-fx-background-color: transparent;
+}
+.table-row-cell:filled:hover {
+	-fx-background-color: -fx-light-grey-color;
+}
+.table-row-cell:filled:selected:hover {
+	-fx-background-color: -fx-light-grey-color;
+}
+.table-row-cell:filled:selected {
+  	-fx-background-color: #eaeaea;
+ 	-fx-background-insets: 0.0;
+	-fx-background-radius: 0.0;
+}
+.table-row-cell:filled:selected .table-cell {
+	-fx-text-fill: black;
+}
+.table-view .cell:filled{
+	-fx-cell-size: 30;
+	-fx-alignment: CENTER;
+}
+.check-box-table-cell > .check-box:selected .box .mark {
+	-fx-background-color: white;
+}
+.check-box-table-cell > .check-box:selected .box{
+	-fx-background-color: -fx-accent-color;
+}
+.table-view .placeholder .label {
+	-fx-text-fill: red;
+	-fx-padding:20px;
+}
+
+.table-view {
+    -fx-font-family: 'almarai';
+    -fx-font-size: 14;
+}
diff --git a/src/badrbillingsystem/controller/ProductsController.java b/src/badrbillingsystem/controller/ProductsController.java
@@ -11,13 +11,16 @@
 import badrbillingsystem.utils.NotificationMaker;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
@@ -107,7 +110,7 @@ public void changed(ObservableValue<? extends TablePosition> observable, TablePo
 
     ObservableList<Product> data ;
     ProductRepo repo = new ProductRepo();
-    String imagePath = "src/badrbillingsystem/resources/images/default.jpg";
+    String imagePath = "resources/images/default.jpg";
 
     @FXML
     void OpenFileChooser(ActionEvent event) {

diff --git a/src/badrbillingsystem/database/DatabaseTableCreator.java b/src/badrbillingsystem/database/DatabaseTableCreator.java
@@ -233,10 +233,10 @@ private static void insertDefaultCompanyInfo() {
             info.setAddress("المدينة المنورة الحرة الشرقية - طريق الملك عبد العزيز");
             info.setBranch("الفرع الرئيسي");
             info.setInstructions("البضاعة المباعة لا ترد و لا تستبدل الا بحضور الفاتورة الاصل. * العدد اليدوية لا ترد و لا تستبدل * الدينموهات و الغطاسات و اوتوماتيك دينمو ضمان الشركة و ليس المحل * الدريلات و الصواريخ و الخلاطات و الشطافات ضمان الشركة * التوصيلات الكهربائية و اللمبات و مراوح الشفط ضمان الشركة");
-            info.setLogo("src/badrbillingsystem/resources/images/smalllogo.png");
+            info.setLogo("resources/images/smalllogo.png");
             info.setName("مؤسسة بن سعد للتجارة");
             info.setPhone("0539068795");
-            info.setQrCode("src/badrbillingsystem/resources/images/smallqr.png");
+            info.setQrCode("resources/images/smallqr.png");
             info.setTaxNumber("300414463400003");
 
             ArrayList<CompanyInfo> list = repo.findAll();

diff --git a/src/badrbillingsystem/ui/productMovement.fxml b/src/badrbillingsystem/ui/productMovement.fxml
@@ -118,7 +118,7 @@
             </HBox>
             <HBox alignment="CENTER" prefHeight="90.0" prefWidth="900.0">
                <children>
-                  <Button mnemonicParsing="false" onAction="#printReport" prefHeight="67.0" prefWidth="164.0" styleClass="btn-primary" text="طباعة">
+                  <Button mnemonicParsing="false" onAction="#printReport" prefHeight="67.0" prefWidth="164.0" styleClass="btn-primary" text="طباعة" visible="false">
                      <graphic>
                         <FontAwesomeIcon fill="WHITE" iconName="PRINT" size="25" />
                      </graphic>