Skip to content

Incentive approval refactor codes #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtcuison merged 2 commits into from
Nov 17, 2021
Merged

Incentive approval refactor codes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6a78b8
Incentive Confirmation
unclejo Nov 10, 2021
a22e0d5
refactor ui and codes
unclejo Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/css/EmployeeIncentives.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
.glyph-icon {
-fx-fill: white;
}
.text-area {
-fx-opacity: 1.0;
-fx-background-color:
grey,
white;
-fx-text-fill: black;
}

.text-field {
-fx-opacity: 1.0;
-fx-background-color:
Expand Down
107 changes: 55 additions & 52 deletions src/gridergui/EmployeeBankInfo.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<children>
<BorderPane>
<top>
<AnchorPane prefHeight="25.0" style="-fx-background-color: #515151;" BorderPane.alignment="CENTER">
<AnchorPane prefHeight="25.0" style="-fx-background-color: #515151; -fx-background-radius: 5;" BorderPane.alignment="CENTER">
<children>
<Label alignment="CENTER" layoutX="375.0" layoutY="-8.0" prefHeight="20.0" prefWidth="896.0" text="EMPLOYEE INCENTIVE BANK INFO" textFill="WHITE" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<font>
Expand All @@ -29,7 +29,7 @@
<Separator layoutY="26.0" prefHeight="0.0" prefWidth="500.0" style="-fx-background-color: orange;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
</children>
<BorderPane.margin>
<Insets left="10.0" right="10.0" top="10.0" />
<Insets bottom="5.0" left="10.0" right="10.0" top="5.0" />
</BorderPane.margin>
</AnchorPane>
</top>
Expand Down Expand Up @@ -120,61 +120,64 @@
</bottom>
<center>
<AnchorPane prefHeight="261.0" prefWidth="896.0" BorderPane.alignment="CENTER">
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" />
</BorderPane.margin>
<children>
<AnchorPane layoutX="14.0" layoutY="96.0" prefHeight="136.0" prefWidth="371.0" style="-fx-border-color: orange; -fx-border-radius: 5;" AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="70.0">
<AnchorPane prefHeight="200.0" prefWidth="896.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<children>
<Label layoutX="17.0" layoutY="25.0" text="EMPLOYEE :">
<font>
<Font name="MS Reference Sans Serif" size="12.0" />
</font>
</Label>
<TextField fx:id="txtField1" layoutX="106.0" layoutY="18.0" prefHeight="23.0" prefWidth="238.0" promptText="Search: F3" style="-fx-border-radius: 5;" AnchorPane.rightAnchor="17.0" AnchorPane.topAnchor="18.0">
<font>
<Font size="14.0" />
</font>
</TextField>
<Label layoutX="17.0" layoutY="60.0" text="BANK NAME :">
<font>
<Font name="MS Reference Sans Serif" size="12.0" />
</font>
</Label>
<TextField fx:id="txtField2" layoutX="115.0" layoutY="53.0" prefHeight="23.0" prefWidth="238.0" promptText="Search: F3" style="-fx-border-radius: 5;" AnchorPane.rightAnchor="17.0">
<font>
<Font size="14.0" />
</font>
</TextField>
<TextField fx:id="txtField3" layoutX="114.0" layoutY="88.0" prefHeight="23.0" prefWidth="238.0" style="-fx-border-radius: 5;" AnchorPane.bottomAnchor="18.0" AnchorPane.rightAnchor="17.0">
<font>
<Font size="14.0" />
</font>
</TextField>
<Label layoutX="16.0" layoutY="95.0" text="ACCOUNT NO :">
<font>
<Font name="MS Reference Sans Serif" size="12.0" />
</font>
</Label>
<AnchorPane fx:id="searchBar" prefWidth="896.0" style="-fx-border-color: #F88222; -fx-border-radius: 5; -fx-background-color: #F88222; -fx-background-radius-buttom: 5;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<Label layoutX="14.0" layoutY="8.0" text="EMPLOYEE :" AnchorPane.bottomAnchor="5.0" AnchorPane.topAnchor="5.0">
<font>
<Font name="System Bold" size="12.0" />
</font>
</Label>
<TextField fx:id="txtSeeks5" layoutX="116.0" layoutY="5.0" prefHeight="23.0" prefWidth="247.0" promptText="Search: F3" style="-fx-border-radius: 5;" AnchorPane.bottomAnchor="5.0" AnchorPane.topAnchor="5.0" />
<Label fx:id="lblStatus" alignment="CENTER" layoutX="854.0" layoutY="9.0" prefWidth="140.0" textFill="WHITE" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0">
<font>
<Font name="System Bold" size="12.0" />
</font>
</Label>
</children>
</AnchorPane>
<AnchorPane layoutY="41.0" prefHeight="133.0" prefWidth="371.0" style="-fx-border-color: orange; -fx-border-radius: 5;">
<children>
<TextField fx:id="txtField1" layoutX="119.0" layoutY="14.0" prefHeight="23.0" prefWidth="238.0" promptText="Search: F3" style="-fx-border-radius: 5;">
<font>
<Font size="14.0" />
</font>
</TextField>
<Label layoutX="14.0" layoutY="22.0" text="EMPLOYEE :" AnchorPane.leftAnchor="10.0">
<font>
<Font name="MS Reference Sans Serif" size="12.0" />
</font>
</Label>
<TextField fx:id="txtField2" layoutX="119.0" layoutY="52.0" prefHeight="23.0" prefWidth="238.0" promptText="Search: F3" style="-fx-border-radius: 5;">
<font>
<Font size="14.0" />
</font>
</TextField>
<Label layoutX="14.0" layoutY="60.0" text="BANK NAME" AnchorPane.leftAnchor="10.0">
<font>
<Font name="MS Reference Sans Serif" size="12.0" />
</font>
</Label>
<TextField fx:id="txtField3" layoutX="119.0" layoutY="90.0" prefHeight="23.0" prefWidth="238.0" style="-fx-border-radius: 5;">
<font>
<Font size="14.0" />
</font>
</TextField>
<Label layoutX="14.0" layoutY="105.0" text="ACCOUNT NO :" AnchorPane.leftAnchor="10.0">
<font>
<Font name="MS Reference Sans Serif" size="12.0" />
</font>
</Label>
</children>
</AnchorPane>
</children>
</AnchorPane>
<Label layoutX="15.0" layoutY="14.0" text="EMPLOYEE :" AnchorPane.leftAnchor="15.0">
<font>
<Font name="System Bold" size="12.0" />
</font>
</Label>
<TextField fx:id="txtSeeks5" layoutX="97.0" layoutY="8.0" prefHeight="23.0" prefWidth="238.0" promptText="Search: F3" style="-fx-border-radius: 5;">
<font>
<Font size="14.0" />
</font>
</TextField>
<Separator prefHeight="0.0" prefWidth="500.0" style="-fx-background-color: orange;" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="45.0" />
<Label fx:id="lblStatus" alignment="CENTER" layoutX="738.0" layoutY="5.0" prefHeight="36.0" prefWidth="140.0" text="Activated" textFill="WHITE" AnchorPane.rightAnchor="18.0" AnchorPane.topAnchor="5.0">
<font>
<Font name="System Bold" size="12.0" />
</font>
</Label>
</children>
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" />
</BorderPane.margin>
</AnchorPane>
</center>
</BorderPane>
Expand Down
4 changes: 2 additions & 2 deletions src/gridergui/EmployeeBankInfoController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import java.net.URL;
import java.sql.SQLException;
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import javafx.animation.FadeTransition;
import javafx.beans.property.ReadOnlyBooleanPropertyBase;
import javafx.beans.value.ChangeListener;
Expand Down Expand Up @@ -182,6 +180,8 @@ private void cmdButton_Click(ActionEvent event) {
case "btnNew": //create new transaction
pbLoaded = true;
if (oTrans.NewRecord()){
if (!oTrans.searchBank("Banco De Oro", false))
MsgBox.showOk(oTrans.getMessage());
loadRecord();
pnEditMode = oTrans.getEditMode();
} else
Expand Down
1 change: 1 addition & 0 deletions src/gridergui/FXMLDocument.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<MenuItem fx:id="mnuEmployeeIncentivesBank" mnemonicParsing="false" onAction="#mnuEmployeeBankInfoClick" text="Employee Incentive Bank Info" />
<MenuItem fx:id="mnuIncentiveParameter" mnemonicParsing="false" onAction="#mnuIncentiveParameterClick" text="Incentive Parameter" />
<MenuItem fx:id="mnuIncentiveReleasing" mnemonicParsing="false" onAction="#mnuIncentiveReleasingClick" text="Incentive Releasing" />
<MenuItem fx:id="mnuIncentiveConfirmation" mnemonicParsing="false" onAction="#mnuIncentiveConfirmationClick" text="Incentive Confirmation" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Reports">
Expand Down
9 changes: 9 additions & 0 deletions src/gridergui/FXMLDocumentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ public class FXMLDocumentController implements Initializable, ScreenInterface {
private MenuItem mnuEmployeeIncentivesBank;
@FXML
private MenuItem mnuIncentiveReleasing;
@FXML
private MenuItem mnuIncentiveConfirmation;

/**
* Initializes the controller class.
Expand Down Expand Up @@ -103,6 +105,7 @@ private AnchorPane loadAnimate(String fsFormName){
}

private ScreenInterface getController(String fsValue){
System.out.println(fsValue);
switch (fsValue){
case "MainScreenBG.fxml":
return new MainScreenBGController();
Expand All @@ -116,6 +119,8 @@ private ScreenInterface getController(String fsValue){
return new AddIncentivesController();
case "IncentiveReleasing.fxml":
return new IncentiveReleasingController();
case "IncentiveConfirmation.fxml":
return new IncentiveConfirmationController();
default:
return null;
}
Expand All @@ -142,5 +147,9 @@ private void mnuIncentiveParameterClick(ActionEvent event) {
@FXML
private void mnuIncentiveReleasingClick(ActionEvent event) {
setScene(loadAnimate("IncentiveReleasing.fxml"));
}
@FXML
private void mnuIncentiveConfirmationClick(ActionEvent event) {
setScene(loadAnimate("IncentiveConfirmation.fxml"));
}
}
Loading