Skip to content

Commit

Permalink
Merge pull request #29 from IBrahem-Elyamany/main
Browse files Browse the repository at this point in the history
some edit in transaction, Customer and Borrower (IB)
  • Loading branch information
ahmedsiam0 authored Dec 20, 2023
2 parents ea2e818 + 75ff39c commit 049132b
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 66 deletions.
1 change: 0 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 20 additions & 34 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions src/main/java/com/asu/librarysystem/Admin.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ public Admin( String adminName, String Password, String PhoneNumber) {
super( adminName, Password, PhoneNumber);
}

public void manageBooksAvailablePurchase (){

}
}
3 changes: 0 additions & 3 deletions src/main/java/com/asu/librarysystem/Borrower.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ public boolean getAdmin() {
public void setAdmin(boolean admin) {
this.isAdmin = admin;
}
public ArrayList<Transaction> copyElementOfArrayList(){
return borrowerTransactions;
}

public ArrayList<Book> arrayOFTransactionBooks(){
ArrayList<Book> transactionBooksArrayList=new ArrayList<Book>();
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/com/asu/librarysystem/Customer.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ private int findOrder(int orderId) {
return -1;
}

public void viewItem(int bookId) {
System.out.println("Title = ");
System.out.println("Author = ");
System.out.println("Release Date = ");
System.out.println("Availability = ");
System.out.println("Price = ");
System.out.println("Rating = ");
}

public void addOrder(int bookId, int quantity) {
orders.add(new Order(bookId, quantity));
Expand Down Expand Up @@ -64,9 +56,6 @@ public void setAssignBefore(boolean assignBefore) {
this.assignBefore = true;
}

public ArrayList<Order> copyElementOfArrayList(){
return orders;
}
public ArrayList<Book> arrayOFOrderBooks(){
ArrayList<Book> orderBooksArrayList=new ArrayList<Book>();
for(int i=0;i<orders.size();i++) {
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/com/asu/librarysystem/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,19 @@ public void start(Stage stage) throws IOException {
// Image icon =new Image("E:\\ibrahem\\oop\\project2\\library-system\\src\\main\\resources\\icon\\icons8-library-64.png");
// stage.getIcons().add(icon);
//
// stage.setTitle("library");
//
// stage.setScene(scene);
// stage.show();

FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("hello-view.fxml"));
Scene scene = new Scene(fxmlLoader.load());
stage.setTitle("Hello!");
Scene scene = new Scene(fxmlLoader.load(),1280,720);
// Image icon =new Image("");
// stage.getIcons().add(icon);
stage.setTitle("library");


stage.setScene(scene);
stage.setResizable(false);
st = stage;
stage.show();

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/asu/librarysystem/Transaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class Transaction
{
private static int transactionCount = 0;
private int transactionId;
private final int transactionId;
private int bookId;
private int borrowerId;
private int borrowDate;
Expand Down
20 changes: 10 additions & 10 deletions src/main/resources/com/asu/librarysystem/hello-view.fxml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.AnchorPane?>

<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.asu.librarysystem.MainController">
<children>
<Button fx:id="button" layoutX="274.0" layoutY="188.0" mnemonicParsing="false" onAction="#pressed" text="Jane Eyre" />
</children>
</AnchorPane>
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.AnchorPane?>

<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="720.0" prefWidth="1280.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.asu.librarysystem.MainController">
<children>
<Button fx:id="button" layoutX="599.0" layoutY="345.0" mnemonicParsing="false" onAction="#pressed" text="Jane Eyre" />
</children>
</AnchorPane>

0 comments on commit 049132b

Please sign in to comment.