Skip to content

Commit

Permalink
Modify 7th
Browse files Browse the repository at this point in the history
  • Loading branch information
phandc committed May 14, 2019
1 parent dd9a968 commit f609a24
Show file tree
Hide file tree
Showing 74 changed files with 903 additions and 381 deletions.
8 changes: 8 additions & 0 deletions .idea/dataSources.local.xml

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

13 changes: 13 additions & 0 deletions .idea/libraries/org_loadui_testFx_3_1_2.xml

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

16 changes: 16 additions & 0 deletions .idea/libraries/org_testfx_testfx_junit_4_0_6_alpha.xml

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

734 changes: 454 additions & 280 deletions .idea/workspace.xml

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions UETConnect.iml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/testing" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="joda-time-2.9.1" level="project" />
<orderEntry type="library" name="mysql-connector-java-8.0.111" level="project" />
<orderEntry type="library" name="jfoenix-8.0.8" level="project" />
<orderEntry type="library" name="com.calendarfx:view:8.4.2" level="project" />
<orderEntry type="library" name="jpedal-trial" level="project" />
<orderEntry type="library" exported="" name="joda-time-2.9.1" level="project" />
<orderEntry type="library" exported="" name="mysql-connector-java-8.0.111" level="project" />
<orderEntry type="library" exported="" name="jfoenix-8.0.8" level="project" />
<orderEntry type="library" exported="" name="com.calendarfx:view:8.4.2" level="project" />
<orderEntry type="library" exported="" name="jpedal-trial" level="project" />
<orderEntry type="library" name="org.testfx:testfx-junit:4.0.6-alpha" level="project" />
<orderEntry type="library" name="org.loadui:testFx:3.1.2" level="project" />
</component>
</module>
Binary file added doc/design requirements/requirements.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/screens/studentDashboard.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/screens/teacherDashboard.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib/annotations-3.0.1u2.jar
Binary file not shown.
Binary file added lib/guava-14.0.1.jar
Binary file not shown.
Binary file added lib/guava-21.0.jar
Binary file not shown.
Binary file added lib/hamcrest-all-1.3.jar
Binary file not shown.
Binary file added lib/hamcrest-core-1.3.jar
Binary file not shown.
Binary file added lib/jcip-annotations-1.0.jar
Binary file not shown.
Binary file added lib/jsr305-3.0.1.jar
Binary file not shown.
Binary file added lib/junit-4.10.jar
Binary file not shown.
Binary file added lib/testFx-3.1.2.jar
Binary file not shown.
Binary file added lib/testfx-core-4.0.6-alpha.jar
Binary file not shown.
Binary file added lib/testfx-junit-4.0.6-alpha.jar
Binary file not shown.
Binary file not shown.
Binary file modified out/production/UETConnect/home/Main.class
Binary file not shown.
Binary file modified out/production/UETConnect/home/controllers/DashBoard.class
Binary file not shown.
Binary file not shown.
Binary file modified out/production/UETConnect/home/controllers/Login.class
Binary file not shown.
Binary file modified out/production/UETConnect/home/controllers/Mycourse.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified out/production/UETConnect/home/controllers/TeacherHome.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 10 additions & 0 deletions out/production/UETConnect/home/fxml/Home.fxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.web.WebView?>

<AnchorPane prefHeight="408.0" prefWidth="842.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.Home">
<children>
<WebView fx:id="webView" layoutX="0.0" prefHeight="704.0" prefWidth="971.0" />
</children>
</AnchorPane>
8 changes: 4 additions & 4 deletions out/production/UETConnect/home/fxml/TeacherDashboard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.web.WebView?>

<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="578.0" prefWidth="1109.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.TeacherHome">
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="578.0" prefWidth="1109.0" stylesheets="@../css/stylesheet.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.TeacherHome">
<children>
<Pane layoutX="291.0" layoutY="-2.0" prefHeight="129.0" prefWidth="842.0" style="-fx-background-color: #3a84c3;" AnchorPane.bottomAnchor="408.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
Expand Down Expand Up @@ -40,7 +40,7 @@
</graphic>
</Button>
<Button mnemonicParsing="false" />
<Button fx:id="myCourseBtn" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicker" prefHeight="42.0" prefWidth="259.0" stylesheets="@../css/stylesheet.css" text="My Course">
<Button fx:id="myCourseBtn" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicker" prefHeight="42.0" prefWidth="281.0" stylesheets="@../css/stylesheet.css" text="My Course">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -52,7 +52,7 @@
<Insets left="50.0" />
</padding>
</Button>
<Button fx:id="timeTableBtn" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicker" prefHeight="42.0" prefWidth="259.0" stylesheets="@../css/stylesheet.css" text="Time Table ">
<Button fx:id="timeTableBtn" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicker" prefHeight="42.0" prefWidth="322.0" stylesheets="@../css/stylesheet.css" text="Time Table ">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -64,7 +64,7 @@
<Insets left="50.0" />
</padding>
</Button>
<Button fx:id="signOutBtn" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicker" prefHeight="43.0" prefWidth="259.0" stylesheets="@../css/stylesheet.css" text="Sign Out">
<Button fx:id="signOutBtn" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicker" prefHeight="43.0" prefWidth="275.0" stylesheets="@../css/stylesheet.css" text="Sign Out">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand Down
26 changes: 26 additions & 0 deletions out/production/UETConnect/home/fxml/coursesView.fxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Hyperlink?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.layout.AnchorPane?>

<AnchorPane fx:id="ap" prefHeight="420.0" prefWidth="841.0" stylesheets="@../css/stylesheet.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.coursesView">
<children>
<TableView fx:id="tableView" layoutX="14.0" layoutY="56.0" prefHeight="366.0" prefWidth="813.0">
<columns>
<TableColumn fx:id="week" prefWidth="105.0" text="Week" />
<TableColumn fx:id="date" prefWidth="116.0" text="Date" />
<TableColumn fx:id="fileName" prefWidth="186.0" text="File Name" />
</columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
</columnResizePolicy>
</TableView>
<Button fx:id="uploadBtn" layoutX="551.0" layoutY="13.0" mnemonicParsing="false" onAction="#handleTableView" text="Upload File" />
<Button fx:id="viewFileBtn" layoutX="653.0" layoutY="13.0" mnemonicParsing="false" onAction="#handleTableView" text="View File" />
<Button fx:id="refreshBtn" layoutX="740.0" layoutY="13.0" mnemonicParsing="false" onAction="#handleTableView" text="Resources" />
<Hyperlink fx:id="txtBook" layoutX="14.0" layoutY="14.0" onAction="#handleTableView" prefHeight="24.0" prefWidth="182.0" text="Textbook and References" />
</children>
</AnchorPane>
14 changes: 7 additions & 7 deletions out/production/UETConnect/home/fxml/dashboard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="578.0" prefWidth="1109.0" style="-fx-background-color: #02030A;" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.DashBoard">
<children>
<VBox alignment="TOP_CENTER" prefHeight="576.0" prefWidth="281.0" style="-fx-background-color: #05071F;" stylesheets="@../css/stylesheet.css" AnchorPane.bottomAnchor="0.0" AnchorPane.topAnchor="0.0">
<VBox alignment="TOP_CENTER" prefHeight="578.0" prefWidth="269.0" style="-fx-background-color: #05071F;" stylesheets="@../css/stylesheet.css" AnchorPane.bottomAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<Button fx:id="btnMyhome" accessibleRole="IMAGE_VIEW" contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#handleClicks" prefHeight="150.0" prefWidth="180.0">
<graphic>
Expand All @@ -25,7 +25,7 @@
</graphic>
</Button>
<Button mnemonicParsing="false" />
<Button fx:id="btnMycourse" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="259.0" stylesheets="@../css/stylesheet.css" text="My Course">
<Button fx:id="btnMycourse" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="272.0" stylesheets="@../css/stylesheet.css" text="My Course">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -37,7 +37,7 @@
<Insets left="50.0" />
</padding>
</Button>
<Button fx:id="btntimetable" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="259.0" stylesheets="@../css/stylesheet.css" text="Time Table">
<Button fx:id="btntimetable" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="272.0" stylesheets="@../css/stylesheet.css" text="Time Table">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -49,7 +49,7 @@
<Insets left="50.0" />
</padding>
</Button>
<Button fx:id="btndoc" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="252.0" stylesheets="@../css/stylesheet.css" text="Document">
<Button fx:id="btndoc" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="276.0" stylesheets="@../css/stylesheet.css" text="Document">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -61,7 +61,7 @@
<Insets left="50.0" />
</padding>
</Button>
<Button fx:id="btnnews" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="259.0" stylesheets="@../css/stylesheet.css" text="News">
<Button fx:id="btnnews" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="275.0" stylesheets="@../css/stylesheet.css" text="News">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -73,7 +73,7 @@
<Insets left="50.0" />
</padding>
</Button>
<Button fx:id="btnSettings" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="259.0" stylesheets="@../css/stylesheet.css" text="Settings">
<Button fx:id="btnSettings" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="42.0" prefWidth="274.0" stylesheets="@../css/stylesheet.css" text="Settings">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -85,7 +85,7 @@
<Insets left="50.0" />
</padding>
</Button>
<Button fx:id="btnSignout" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="43.0" prefWidth="259.0" stylesheets="@../css/stylesheet.css" text="Sign Out">
<Button fx:id="btnSignout" alignment="BASELINE_LEFT" graphicTextGap="22.0" mnemonicParsing="false" onAction="#handleClicks" prefHeight="43.0" prefWidth="275.0" stylesheets="@../css/stylesheet.css" text="Sign Out">
<graphic>
<ImageView fitHeight="23.0" fitWidth="27.0" pickOnBounds="true" preserveRatio="true">
<image>
Expand Down
22 changes: 11 additions & 11 deletions out/production/UETConnect/home/fxml/login.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -11,56 +11,56 @@
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>

<AnchorPane fx:id="anchorPane1" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="570.0" prefWidth="640.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.Login">
<AnchorPane fx:id="anchorPane1" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="649.0" prefWidth="637.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.Login">
<children>
<ImageView fitHeight="233.0" fitWidth="640.0" layoutY="-3.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/logo.png" />
</image>
</ImageView>
<Pane layoutY="226.0" prefHeight="343.0" prefWidth="640.0" style="-fx-background-color: #A1DFFF;">
<Pane layoutY="226.0" prefHeight="428.0" prefWidth="640.0" style="-fx-background-color: #A1DFFF;">
<children>
<Label layoutX="152.0" layoutY="75.0" prefHeight="21.0" prefWidth="100.0" text="Username:">
<Label layoutX="170.0" layoutY="108.0" prefHeight="21.0" prefWidth="100.0" text="Username:">
<font>
<Font size="17.0" />
</font>
</Label>
<Label layoutX="159.0" layoutY="158.0" prefHeight="21.0" prefWidth="100.0" text="Password:">
<Label layoutX="170.0" layoutY="180.0" prefHeight="21.0" prefWidth="100.0" text="Password:">
<font>
<Font size="17.0" />
</font>
</Label>
<JFXPasswordField fx:id="textPassword" layoutX="280.0" layoutY="151.0" prefHeight="26.0" prefWidth="211.0" promptText="Password">
<JFXPasswordField fx:id="textPassword" layoutX="308.0" layoutY="171.0" maxWidth="217.0" minWidth="217.0" prefHeight="43.0" prefWidth="217.0" promptText="Password">
<font>
<Font name="System Italic" size="16.0" />
</font>
</JFXPasswordField>
<JFXTextField fx:id="textEmail" layoutX="280.0" layoutY="67.0" prefHeight="26.0" prefWidth="211.0" promptText="Username">
<JFXTextField fx:id="textEmail" layoutX="308.0" layoutY="99.0" maxWidth="217.0" minWidth="217.0" prefHeight="43.0" prefWidth="217.0" promptText="Username">
<font>
<Font name="System Italic" size="16.0" />
</font>
</JFXTextField>
<JFXCheckBox layoutX="152.0" layoutY="232.0" prefHeight="26.0" prefWidth="149.0" text="Remember Me">
<JFXCheckBox layoutX="121.0" layoutY="273.0" prefHeight="26.0" prefWidth="149.0" text="Remember Me">
<font>
<Font size="17.0" />
</font>
</JFXCheckBox>
<JFXButton layoutX="366.0" layoutY="229.0" onAction="#loginAction" prefHeight="31.0" prefWidth="125.0" style="-fx-background-color: #1E75E7;" text="Login">
<JFXButton fx:id="loginButton" layoutX="398.0" layoutY="267.0" onAction="#loginAction" prefHeight="37.0" prefWidth="114.0" style="-fx-background-color: #1E75E7;" text="Login">
<font>
<Font size="16.0" />
</font>
</JFXButton>
<JFXButton layoutX="242.0" layoutY="279.0" prefHeight="37.0" prefWidth="171.0" text="Forgot Password ?" underline="true">
<JFXButton layoutX="246.0" layoutY="327.0" prefHeight="37.0" prefWidth="171.0" text="Forgot Password ?" underline="true">
<font>
<Font size="16.0" />
</font>
</JFXButton>
<ImageView fitHeight="26.0" fitWidth="37.0" layoutX="112.0" layoutY="73.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="26.0" fitWidth="37.0" layoutX="125.0" layoutY="108.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/user3.png" />
</image>
</ImageView>
<ImageView fitHeight="26.0" fitWidth="26.0" layoutX="112.0" layoutY="156.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="26.0" fitWidth="26.0" layoutX="125.0" layoutY="180.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/pass3.png" />
</image>
Expand Down
12 changes: 7 additions & 5 deletions out/production/UETConnect/home/fxml/mycourse.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.Pane?>

<AnchorPane fx:id="rootpane" prefHeight="447.0" prefWidth="842.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.Mycourse">
<AnchorPane fx:id="rootpane" prefHeight="447.0" prefWidth="842.0" stylesheets="@../css/stylesheet.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="home.controllers.Mycourse">
<children>
<Pane prefHeight="447.0" prefWidth="842.0">
<children>
<JFXListView fx:id="list" layoutX="25.0" layoutY="60.0" onMouseClicked="#handleMouseClicked" prefHeight="356.0" prefWidth="425.0" />
<JFXListView fx:id="list" layoutX="25.0" layoutY="60.0" onMouseClicked="#handleMouseClicked" prefHeight="356.0" prefWidth="396.0" />
<Label layoutX="25.0" layoutY="24.0" prefHeight="21.0" prefWidth="94.0" text="Your Course" />
<PieChart fx:id="pie" layoutX="492.0" layoutY="83.0" prefHeight="310.0" prefWidth="323.0" />
<Button fx:id="leaveCourse" layoutX="708.0" layoutY="22.0" mnemonicParsing="false" onMouseClicked="#handleMouseClicked" text="Leave Course" />
<Button fx:id="viewCourse" layoutX="591.0" layoutY="22.0" mnemonicParsing="false" onMouseClicked="#handleMouseClicked" text="View Course" />
<PieChart fx:id="pie" layoutX="442.0" layoutY="63.0" prefHeight="356.0" prefWidth="403.0" />
<Button fx:id="leaveCourse" layoutX="720.0" layoutY="19.0" mnemonicParsing="false" onMouseClicked="#handleMouseClicked" text="Leave Course" />
<Button fx:id="viewCourse" layoutX="612.0" layoutY="19.0" mnemonicParsing="false" onMouseClicked="#handleMouseClicked" text="View Course" />
<Label fx:id="attended" layoutX="734.0" layoutY="279.0" prefHeight="21.0" prefWidth="108.0" />
<Label fx:id="absent" layoutX="734.0" layoutY="310.0" prefHeight="21.0" prefWidth="108.0" />
</children>
</Pane>
</children>
Expand Down
Loading

0 comments on commit f609a24

Please sign in to comment.