Skip to content

Commit

Permalink
Merge pull request #39 from WPI-CS3733-C17-Gamma/feature-save-and-revert
Browse files Browse the repository at this point in the history 
Resized for small displays
  • Loading branch information
@SaahilClaypool
SaahilClaypool committed Feb 10, 2017
2 parents c251b25 + 1ba5935 commit f62eb16
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 42 deletions.
6 changes: 3 additions & 3 deletions src/main/java/ApplicationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void createPatientDisplay(){
loader.setController(controller);
Parent root = loader.load();
pStage.setTitle("PatientDisplay");
pStage.setScene(new Scene(root, 1200, 800));
pStage.setScene(new Scene(root, 1000, 600));
}
catch (Exception e){
e.printStackTrace();
Expand All @@ -69,7 +69,7 @@ public void createMapAdminDisplay(){
loader.setController(controller);
Parent root = loader.load();
pStage.setTitle("MapAdmin");
pStage.setScene(new Scene(root, 1200, 800));
pStage.setScene(new Scene(root, 1000, 600));
}
catch (Exception e){
e.printStackTrace();
Expand All @@ -88,7 +88,7 @@ public void createDirectoryAdminDisplay(){
loader.setController(controller);
Parent root = loader.load();
pStage.setTitle("DirectoryAdmin");
pStage.setScene(new Scene(root, 1200, 800));
pStage.setScene(new Scene(root, 1000, 600));
}
catch (Exception e){
e.printStackTrace();
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/AdminDisplay.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>

<BorderPane maxHeight="-Infinity" minHeight="-Infinity" prefHeight="800.0" prefWidth="1200.0" style="-fx-background-color: #d4e3ed;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<BorderPane maxHeight="-Infinity" minHeight="-Infinity" prefHeight="600.0" prefWidth="1000.0" style="-fx-background-color: #d4e3ed;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<top>
<AnchorPane prefHeight="93.0" prefWidth="1200.0" BorderPane.alignment="CENTER">
<children>
Expand All @@ -22,18 +22,18 @@
</AnchorPane>
</top>
<bottom>
<AnchorPane prefHeight="58.0" prefWidth="1200.0" BorderPane.alignment="CENTER">
<AnchorPane prefHeight="54.0" prefWidth="1171.0" BorderPane.alignment="CENTER">
<children>
<Button fx:id="buttonDone" layoutX="1085.0" layoutY="14.0" mnemonicParsing="false" onAction="#done" onMouseClicked="#done" text="Save and Exit" />
<Button layoutX="694.0" layoutY="14.0" mnemonicParsing="false" onAction="#undo" text="Undo" />
<Button layoutX="776.0" layoutY="14.0" mnemonicParsing="false" onAction="#preview" text="Preview" />
<Button layoutX="618.0" layoutY="14.0" mnemonicParsing="false" onAction="#undo" text="Undo" />
<Button layoutX="685.0" layoutY="14.0" mnemonicParsing="false" onAction="#preview" text="Preview" />
<Button layoutX="57.0" layoutY="14.0" mnemonicParsing="false" text="Help" />
<Button fx:id="buttonDone" layoutX="866.0" layoutY="15.0" mnemonicParsing="false" onAction="#done" onMouseClicked="#done" text="Save and Exit" />
</children></AnchorPane>
</bottom>
<center>
<AnchorPane fx:id="anchorpaneMap" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<children>
<ImageView fx:id="imageviewMap" fitHeight="586.0" fitWidth="1018.0" layoutX="91.0" layoutY="14.0" onMousePressed="#isPressed" onMouseReleased="#isReleased" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imageviewMap" fitHeight="456.0" fitWidth="915.0" layoutX="108.0" layoutY="3.0" onMousePressed="#isPressed" onMouseReleased="#isReleased" pickOnBounds="true" preserveRatio="true" />
</children>
</AnchorPane>
</center>
Expand Down
56 changes: 28 additions & 28 deletions src/main/resources/DirectoryAdminDisplay.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" style="-fx-background-color: #d4e3ed;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="1000.0" style="-fx-background-color: #d4e3ed;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<bottom>
<ToolBar prefHeight="40.0" prefWidth="200.0" style="-fx-background-color: #d4e3ed;" BorderPane.alignment="CENTER">
<ToolBar prefHeight="11.0" prefWidth="1000.0" style="-fx-background-color: #d4e3ed;" BorderPane.alignment="CENTER">
<items>
<Button fx:id="help" mnemonicParsing="false" onAction="#help" text="Help" />
<Button mnemonicParsing="false" onAction="#createEntry" text="Create" />
<AnchorPane prefHeight="15.0" prefWidth="981.0">
<AnchorPane prefHeight="25.0" prefWidth="784.0">
<children>
<Button layoutX="899.0" layoutY="1.0" mnemonicParsing="false" onAction="#logout" text="Save and Exit" />
<Button layoutX="639.0" layoutY="3.0" mnemonicParsing="false" onAction="#undo" text="Undo" />
<Button layoutX="706.0" layoutY="3.0" mnemonicParsing="false" onAction="#preview" text="Preview" />
<Button layoutX="195.0" mnemonicParsing="false" onAction="#createEntry" text="Create" />
<Button layoutX="691.0" mnemonicParsing="false" onAction="#logout" text="Save and Exit" />
<Button layoutX="461.0" mnemonicParsing="false" onAction="#undo" text="Undo" />
<Button layoutX="526.0" mnemonicParsing="false" onAction="#preview" text="Preview" />
<Button fx:id="help" mnemonicParsing="false" onAction="#help" text="Help" />
</children>
</AnchorPane>
</items>
Expand All @@ -40,34 +40,34 @@
</VBox>
</left>
<center>
<StackPane prefHeight="150.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<StackPane prefHeight="466.0" prefWidth="548.0" BorderPane.alignment="CENTER">
<children>
<Label fx:id="helpLabel" onMouseClicked="#help" prefHeight="418.0" prefWidth="363.0" visible="false" />
<AnchorPane fx:id="roomEditor" prefHeight="200.0" prefWidth="200.0" visible="false">
<AnchorPane fx:id="roomEditor" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="519.0" prefWidth="496.0" visible="false">
<children>
<Label layoutX="66.0" layoutY="98.0" text="Name:" />
<Label layoutX="66.0" layoutY="178.0" text="Services:" />
<TextField fx:id="roomName" layoutX="142.0" layoutY="94.0" prefHeight="25.0" prefWidth="156.0" text="Name" />
<TextField fx:id="serviceSearch" layoutX="142.0" layoutY="174.0" prefHeight="25.0" prefWidth="128.0" text="Add Service" />
<Button fx:id="addServiceButton" layoutX="270.0" layoutY="174.0" mnemonicParsing="false" text="+" />
<Label layoutX="49.0" layoutY="25.0" text="Name:" />
<Label layoutX="44.0" layoutY="89.0" text="Services:" />
<TextField fx:id="roomName" layoutX="133.0" layoutY="21.0" prefHeight="25.0" prefWidth="156.0" text="Name" />
<TextField fx:id="serviceSearch" layoutX="142.0" layoutY="85.0" prefHeight="25.0" prefWidth="128.0" text="Add Service" />
<Button fx:id="addServiceButton" layoutX="270.0" layoutY="85.0" mnemonicParsing="false" text="+" />
<ListView fx:id="serviceOptions" layoutX="142.0" layoutY="199.0" opacity="0.9" prefHeight="80.0" prefWidth="200.0" visible="false" />
<ListView fx:id="currentServices" layoutX="142.0" layoutY="280.0" prefHeight="200.0" prefWidth="200.0" />
<ListView fx:id="currentServices" layoutX="142.0" layoutY="126.0" prefHeight="200.0" prefWidth="200.0" />
</children>
</AnchorPane>
<AnchorPane fx:id="entryEditor" prefHeight="200.0" prefWidth="200.0" visible="false">
<AnchorPane fx:id="entryEditor" prefHeight="553.0" prefWidth="676.0" visible="false">
<children>
<TextField fx:id="entryName" layoutX="128.0" layoutY="55.0" text="Name" />
<TextField fx:id="entryRoomSearch" layoutX="128.0" layoutY="223.0" onKeyReleased="#filterRooms" prefHeight="25.0" prefWidth="122.0" promptText="search location" />
<TextField fx:id="entryTitle" layoutX="128.0" layoutY="126.0" text="Title" />
<Label layoutX="26.0" layoutY="59.0" text="Name:" />
<Label layoutX="30.0" layoutY="130.0" text="Title:" />
<Label layoutX="30.0" layoutY="227.0" text="Locations:" />
<ListView fx:id="entryRoomOptions" layoutX="128.0" layoutY="255.0" opacity="0.9" prefHeight="69.0" prefWidth="201.0" visible="false" />
<ListView fx:id="entryCurrentLocations" layoutX="128.0" layoutY="350.0" prefHeight="200.0" prefWidth="200.0" />
<Button layoutX="277.0" layoutY="579.0" mnemonicParsing="false" onAction="#saveEntry" onMouseClicked="#saveEntry" prefHeight="30.0" prefWidth="70.0" text="Save" />
<TextField fx:id="entryName" layoutX="115.0" layoutY="51.0" text="Name" />
<TextField fx:id="entryRoomSearch" layoutX="115.0" layoutY="161.0" onKeyReleased="#filterRooms" prefHeight="25.0" prefWidth="122.0" promptText="search location" />
<TextField fx:id="entryTitle" layoutX="115.0" layoutY="102.0" text="Title" />
<Label layoutX="28.0" layoutY="55.0" text="Name:" />
<Label layoutX="33.0" layoutY="106.0" text="Title:" />
<Label layoutX="32.0" layoutY="165.0" text="Locations:" />
<ListView fx:id="entryRoomOptions" layoutX="115.0" layoutY="186.0" opacity="0.9" prefHeight="69.0" prefWidth="201.0" visible="false" />
<ListView fx:id="entryCurrentLocations" layoutX="116.0" layoutY="263.0" prefHeight="200.0" prefWidth="200.0" />
<Button layoutX="264.0" layoutY="474.0" mnemonicParsing="false" onAction="#saveEntry" onMouseClicked="#saveEntry" prefHeight="25.0" prefWidth="70.0" text="Save" />
<Button fx:id="entryDeleteRoom" layoutX="348.0" layoutY="350.0" mnemonicParsing="false" onAction="#entryDeleteSelectedRoom" style="-fx-background-color: pink;" text="Delete" visible="false" />
<Button layoutX="137.0" layoutY="580.0" mnemonicParsing="false" onAction="#entryCancel" text="Cancel" />
<Button fx:id="entryDeleteEntry" layoutX="433.0" layoutY="685.0" mnemonicParsing="false" onAction="#entryDeleteSelectedEntry" style="-fx-background-color: pink;" text="Delete Entry" />
<Button layoutX="116.0" layoutY="470.0" mnemonicParsing="false" onAction="#entryCancel" prefHeight="27.0" prefWidth="52.0" text="Cancel" />
<Button fx:id="entryDeleteEntry" layoutX="410.0" layoutY="472.0" mnemonicParsing="false" onAction="#entryDeleteSelectedEntry" style="-fx-background-color: pink;" text="Delete Entry" />
</children>
</AnchorPane>
</children>
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/PatientDisplay.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.text.Font?>

<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" style="-fx-background-color: #d4e3ed;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="1000.0" style="-fx-background-color: #d4e3ed;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<bottom>
<ToolBar prefHeight="40.0" prefWidth="200.0" style="-fx-background-color: #d4e3ed;" BorderPane.alignment="CENTER">
<items>
Expand All @@ -23,9 +23,9 @@
</ToolBar>
</bottom>
<left>
<AnchorPane fx:id="anchorPane" prefHeight="800.0" prefWidth="1200.0" BorderPane.alignment="CENTER">
<AnchorPane fx:id="anchorPane" prefHeight="560.0" prefWidth="853.0" BorderPane.alignment="CENTER">
<children>
<ImageView fx:id="imageView" fitHeight="650.0" fitWidth="1053.0" layoutX="69.0" layoutY="100.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imageView" fitHeight="404.0" fitWidth="759.0" layoutX="123.0" layoutY="134.0" pickOnBounds="true" preserveRatio="true" />
<TextField fx:id="searchBar" layoutX="69.0" layoutY="22.0" onKeyReleased="#search" prefHeight="25.0" prefWidth="198.0" promptText="Search!">
<font>
<Font size="28.0" />
Expand All @@ -42,12 +42,12 @@
<cursor>
<Cursor fx:constant="HAND" />
</cursor></ListView>
<ImageView fitHeight="53.0" fitWidth="45.0" layoutX="1141.0" layoutY="13.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="53.0" fitWidth="45.0" layoutX="850.0" layoutY="22.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@JonsGammaLogo.png" />
</image>
</ImageView>
<ImageView fitHeight="109.0" fitWidth="491.0" layoutX="421.0" layoutY="10.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="109.0" fitWidth="491.0" layoutX="280.0" layoutY="10.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@BWFH_logo_rgb%20(1).png" />
</image>
Expand Down

0 comments on commit f62eb16

Please sign in to comment.