CSS Style and Images Path corrected for JAR Packaging.

iFadi · Jan 20, 2016 · 8c1b3f2 · 8c1b3f2
1 parent ccde047
commit 8c1b3f2
Show file tree

Hide file tree

Showing 61 changed files with 1,203 additions and 786 deletions.
diff --git a/.classpath b/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
 	<classpathentry kind="lib" path="lib/opencsv-2.3.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.11-20141221.jar"/>

diff --git a/README.md b/README.md
@@ -1,10 +1,8 @@
 # ILIAS User Import - IUI
 This App generates a XML file from a CSV or Excel file as input. The XML file can then be imported into the [ILIAS e-Learning System](http://www.ilias.de/).
 
-**THIS IS A BETA VERSION, which means it might not work as expected.**
-
 ## Latest Release
-  * [2.0 beta 4](https://github.com/iFadi/ilias-userimport/releases/download/2.0.beta4/IUI_2_beta4.jar)
+  * [2.0 beta 5](https://github.com/iFadi/ilias-userimport/releases/download/2.0.beta5/IUI_2_beta5.jar)
 
 ## Screenshots
 ![iui_1](https://dl.dropbox.com/u/3098106/IUI/IUI_2.0.0_beta1.png)
@@ -18,12 +16,12 @@ Need Coffee ...... :)
 [<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif">](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=fadi_asbih%40yahoo%2ede&lc=US&item_name=Support%20Developing%20ILIAS%20User%20Import&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest)
 
 ## Legal
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
diff --git a/build.fxbuild b/build.fxbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <anttasks:AntTask xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:anttasks="http://org.eclipse.fx.ide.jdt/1.0" buildDirectory="${project}/build">
-  <deploy packagingFormat="dmg">
-    <application name="AddressApp" mainclass="de.unihannover.elsa.iui.MainApp" version="2.0-beta1"/>
+  <deploy packagingFormat="all">
+    <application name="AddressApp" mainclass="de.unihannover.elsa.iui.MainApp" version="2.0-beta"/>
     <info title="ILIASUserImport" vendor="Fadi Asbih"/>
   </deploy>
   <signjar/>

diff --git a/build/build.xml b/build/build.xml
@@ -5,64 +5,63 @@
 			<filelist>
 				<file name="${java.home}\..\lib\ant-javafx.jar"/>
 				<file name="${java.home}\lib\jfxrt.jar"/>
-				<file name="${basedir}"/>
 			</filelist>
 		</path>
 
-		<taskdef resource="com/sun/javafx/tools/ant/antlib.xml"      
+		<taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
 			uri="javafx:com.sun.javafx.tools.ant"
 			classpathref="fxant"/>
 	</target>
 	<target name="setup-staging-area">
 		<delete dir="externalLibs" />
 		<delete dir="project" />
 		<delete dir="projectRefs" />
-		
+
 		<mkdir dir="externalLibs" />
-		
+
 		<copy todir="externalLibs">
 			<fileset dir="/Users/fadi/git/ilias-userimport/lib">
-				<filename name="controlsfx-8.0.6.jar"/>	
+				<filename name="opencsv-2.3.jar"/>
 			</fileset>
 		</copy>
 		<copy todir="externalLibs">
 			<fileset dir="/Users/fadi/git/ilias-userimport/lib">
-				<filename name="opencsv-2.3.jar"/>	
+				<filename name="commons-io-2.4.jar"/>
 			</fileset>
 		</copy>
 		<copy todir="externalLibs">
 			<fileset dir="/Users/fadi/git/ilias-userimport/lib">
-				<filename name="commons-io-2.4.jar"/>	
+				<filename name="poi-ooxml-schemas-3.11-20141221.jar"/>
 			</fileset>
 		</copy>
 		<copy todir="externalLibs">
 			<fileset dir="/Users/fadi/git/ilias-userimport/lib">
-				<filename name="poi-ooxml-schemas-3.11-20141221.jar"/>	
+				<filename name="poi-ooxml-3.11-20141221.jar"/>
 			</fileset>
 		</copy>
 		<copy todir="externalLibs">
 			<fileset dir="/Users/fadi/git/ilias-userimport/lib">
-				<filename name="poi-ooxml-3.11-20141221.jar"/>	
+				<filename name="xmlbeans-2.6.0.jar"/>
 			</fileset>
 		</copy>
 		<copy todir="externalLibs">
 			<fileset dir="/Users/fadi/git/ilias-userimport/lib">
-				<filename name="xmlbeans-2.6.0.jar"/>	
+				<filename name="controlsfx-8.40.9.jar"/>
 			</fileset>
 		</copy>
 		<copy todir="externalLibs">
 			<fileset dir="/Users/fadi/git/ilias-userimport/lib">
-				<filename name="poi-3.11-20141221.jar"/>	
+				<filename name="poi-3.11-20141221.jar"/>
 			</fileset>
 		</copy>
-		
+
 		<mkdir dir="project" />
 		<copy todir="project">
 			<fileset dir="/Users/fadi/git/ilias-userimport">
 				<include name="src/**" />
 			</fileset>
 		</copy>
-		
+
 		<mkdir dir="projectRefs" />
 	</target>
 	<target name='do-compile'>
@@ -77,9 +76,9 @@
 				<include name="poi-ooxml-schemas-3.11-20141221.jar"/>
 				<include name="poi-ooxml-3.11-20141221.jar"/>
 				<include name="xmlbeans-2.6.0.jar"/>
-				<include name="controlsfx-8.0.6.jar"/>
 				<include name="poi-3.11-20141221.jar"/>
 				<include name="commons-io-2.4.jar"/>
+				<include name="controlsfx-8.40.9.jar"/>
 				<include name="opencsv-2.3.jar"/>
 			</fileset>
 		</copy>
@@ -100,7 +99,7 @@
 				</fileset>
 			</classpath>
 		</javac>
-		
+
 		<!-- Copy over none Java-Files -->
 		<copy todir="build/classes">
 		<fileset dir="project/src">
@@ -113,47 +112,45 @@
 	<target name="do-deploy" depends="setup-staging-area, do-compile, init-fx-tasks">
 		<delete file="dist"/>
 		<delete file="deploy" />
-		
+
 		<mkdir dir="dist" />
 		<mkdir dir="dist/libs" />
-		
+
 		<copy todir="dist/libs">
 			<fileset dir="externalLibs">
 				<include name="*" />
 			</fileset>
 		</copy>
-		
-		
+
+
 		<fx:resources id="appRes">
 			<fx:fileset dir="dist" includes="ilias-userimport.jar"/>
 			<fx:fileset dir="dist" includes="libs/*"/>
-		    <fx:fileset dir="dist" includes="resources/**"/>
-		</fx:resources> 
-
+		</fx:resources>
+
 		<fx:application id="fxApplication"
 			name="ILIASUserImport"
 			mainClass="de.unihannover.elsa.iui.MainApp"
-		    version="2.0-beta1"
 		/>
 
 		<mkdir dir="build/classes/META-INF" />
-		
-		
-		
+
+
+
 		<fx:jar destfile="dist/ilias-userimport.jar">
 			<fx:application refid="fxApplication"/>
 			<fileset dir="build/classes">
 			</fileset>
 			<fx:resources refid="appRes"/>
-			
+
 			<manifest>
 				<attribute name="Implementation-Vendor" value="Fadi Asbih"/>
 				<attribute name="Implementation-Title" value="ILIASUserImport"/>
-				<attribute name="Implementation-Version" value="2.0-beta1"/>
+				<attribute name="Implementation-Version" value="2.0-beta"/>
 				<attribute name="JavaFX-Feature-Proxy" value="None"/>
 			</manifest>
 		</fx:jar>
-		
+
 
 		<mkdir dir="deploy" />
 		<!-- Need to use ${basedir} because somehow the ant task is calculating the directory differently -->
@@ -163,14 +160,16 @@
 			includeDT="false"
 			offlineAllowed="true"
 			outdir="${basedir}/deploy"
-			outfile="ilias-userimport" nativeBundles="dmg"
+			outfile="ilias-userimport" nativeBundles="all"
 			updatemode="background" >
 
+			<fx:platform basedir="${java.home}"/>
 			<fx:info title="ilias-userimport" vendor="Fadi Asbih"/>
+
 			<fx:application refId="fxApplication"/>
 			<fx:resources refid="appRes"/>
 		</fx:deploy>
-		
-		
+
+
 	</target>
 </project>
diff --git a/build/build/classes/de/unihannover/elsa/iui/MainApp.class b/build/build/classes/de/unihannover/elsa/iui/MainApp.class
diff --git a/build/build/classes/de/unihannover/elsa/iui/model/Password.class b/build/build/classes/de/unihannover/elsa/iui/model/Password.class
diff --git a/build/build/classes/de/unihannover/elsa/iui/model/User.class b/build/build/classes/de/unihannover/elsa/iui/model/User.class
diff --git a/build/build/classes/de/unihannover/elsa/iui/util/DateUtil.class b/build/build/classes/de/unihannover/elsa/iui/util/DateUtil.class
diff --git a/build/build/classes/de/unihannover/elsa/iui/view/RootLayout.fxml b/build/build/classes/de/unihannover/elsa/iui/view/RootLayout.fxml
@@ -25,21 +25,18 @@
                      <accelerator>
                         <KeyCodeCombination alt="UP" code="I" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
                      </accelerator></MenuItem>
-                  <MenuItem mnemonicParsing="false" onAction="#handlePrint" text="Print">
-                     <accelerator>
-                        <KeyCodeCombination alt="UP" code="P" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
-                     </accelerator></MenuItem>
                   <MenuItem mnemonicParsing="false" onAction="#handleSave" text="Save">
                      <accelerator>
                         <KeyCodeCombination alt="UP" code="S" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
                      </accelerator></MenuItem>
-                  <MenuItem mnemonicParsing="false" onAction="#handleSaveAs" text="Save As" />
+                  <MenuItem mnemonicParsing="false" onAction="#export" text="Export" />
                   <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
             </items>
           </Menu>
           <Menu mnemonicParsing="false" text="Edit">
             <items>
               <MenuItem mnemonicParsing="false" onAction="#handleSettings" text="Settings" />
+                  <MenuItem mnemonicParsing="false" onAction="#handleDummyAccounts" text="Generate dummy accounts" />
             </items>
           </Menu>
           <Menu mnemonicParsing="false" text="Help">

diff --git a/build/build/classes/de/unihannover/elsa/iui/view/RootLayoutController.class b/build/build/classes/de/unihannover/elsa/iui/view/RootLayoutController.class
diff --git a/build/build/classes/de/unihannover/elsa/iui/view/SettingsDialog.fxml b/build/build/classes/de/unihannover/elsa/iui/view/SettingsDialog.fxml
@@ -11,7 +11,7 @@
 
 <AnchorPane prefHeight="391.0" prefWidth="511.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.unihannover.elsa.iui.view.SettingsDialogController">
    <children>
-      <GridPane layoutX="14.0" layoutY="40.0" prefHeight="70.0" prefWidth="345.0" AnchorPane.bottomAnchor="281.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="40.0">
+      <GridPane layoutX="14.0" layoutY="51.0" prefHeight="70.0" prefWidth="345.0" AnchorPane.bottomAnchor="270.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="40.0">
         <columnConstraints>
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -24,10 +24,10 @@
             <Label text="Local Role" GridPane.rowIndex="1" />
             <Label text="Global Role" />
             <TextField fx:id="globalRoleField" promptText="User" text="User" GridPane.columnIndex="1" />
-            <TextField fx:id="localRoleField" promptText="klausur_am_04.02.2015" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+            <TextField fx:id="localRoleField" promptText="klausur_am_04.02.2015" text="klausur_am_04.02.2015" GridPane.columnIndex="1" GridPane.rowIndex="1" />
          </children>
       </GridPane>
-      <Label layoutX="14.0" layoutY="14.0" prefHeight="26.0" prefWidth="374.0" text="These settings will be applied to all users." AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="14.0">
+      <Label layoutX="14.0" layoutY="4.0" prefHeight="34.0" prefWidth="463.0" text="These settings will be applied to all currently imported users." AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="4.0">
          <font>
             <Font name="System Bold" size="13.0" />
          </font></Label>
@@ -57,15 +57,13 @@
          <children>
             <Label text="From" />
             <Label text="Until" GridPane.rowIndex="1" />
-            <TextField fx:id="timeLimitFromField" disable="true" promptText="04-02-2015" GridPane.columnIndex="1" />
-            <TextField fx:id="timeLimitUntilField" disable="true" promptText="05-02-2015" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+            <TextField fx:id="timeLimitFromField" disable="true" promptText="04-02-2015" text="04-02-2015" GridPane.columnIndex="1" />
+            <TextField fx:id="timeLimitUntilField" disable="true" promptText="05-02-2015" text="05-02-2015" GridPane.columnIndex="1" GridPane.rowIndex="1" />
          </children>
       </GridPane>
       <ToggleButton fx:id="limitedButton" layoutX="14.0" layoutY="140.0" mnemonicParsing="false" text="Limited Access" />
-      <GridPane layoutX="12.0" layoutY="255.0" prefHeight="81.0" prefWidth="479.0">
+      <GridPane layoutX="12.0" layoutY="255.0" prefHeight="81.0" prefWidth="496.0">
         <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
           <ColumnConstraints hgrow="SOMETIMES" maxWidth="148.0" minWidth="10.0" prefWidth="148.0" />
             <ColumnConstraints hgrow="SOMETIMES" maxWidth="121.0" minWidth="10.0" prefWidth="102.0" />
         </columnConstraints>
@@ -74,12 +72,14 @@
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <CheckBox mnemonicParsing="false" text="Generate Login" />
-            <CheckBox mnemonicParsing="false" text="Generate Password" GridPane.columnIndex="2" />
-            <Label text="Password" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-            <TextField fx:id="passwordField" GridPane.columnIndex="3" GridPane.rowIndex="1" />
+            <CheckBox fx:id="generatePassword" mnemonicParsing="false" selected="true" text="Generate Password" />
+            <Label text="Password" GridPane.rowIndex="1" />
+            <TextField fx:id="passwordField" disable="true" text="testing" GridPane.columnIndex="1" GridPane.rowIndex="1" />
          </children>
       </GridPane>
+      <Separator layoutY="127.0" prefHeight="5.0" prefWidth="517.0" />
+      <Separator layoutY="250.0" prefHeight="5.0" prefWidth="517.0" />
+      <Separator layoutY="38.0" prefHeight="5.0" prefWidth="517.0" />
    </children>
    <stylesheets>
       <URL value="@JMetroLightTheme.css" />

diff --git a/build/build/classes/de/unihannover/elsa/iui/view/SettingsDialogController.class b/build/build/classes/de/unihannover/elsa/iui/view/SettingsDialogController.class
diff --git a/build/build/classes/de/unihannover/elsa/iui/view/UserOverview.fxml b/build/build/classes/de/unihannover/elsa/iui/view/UserOverview.fxml
@@ -12,7 +12,7 @@
         <items>
           <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
                <children>
-                  <TableView fx:id="userTable" layoutX="-13.0" layoutY="42.0" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                  <TableView fx:id="userTable" layoutX="-13.0" layoutY="18.0" prefHeight="380.0" prefWidth="234.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="18.0">
                     <columns>
                       <TableColumn fx:id="firstNameColumn" prefWidth="75.0" text="First Name" />
                       <TableColumn fx:id="lastNameColumn" prefWidth="75.0" text="Last Name" />
@@ -23,6 +23,8 @@
                         <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
                      </columnResizePolicy>
                   </TableView>
+                  <Label layoutX="4.0" layoutY="-1.0" prefHeight="17.0" prefWidth="167.0" text="number of users:" />
+                  <Label fx:id="numberOfUsersLabel" layoutX="110.0" layoutY="-1.0" prefHeight="17.0" prefWidth="44.0" text="0" />
                </children>
             </AnchorPane>
           <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="300.0" prefWidth="200.0" styleClass="background">
@@ -74,29 +76,22 @@
                         <Label fx:id="passwordLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                      </children>
                   </GridPane>
-                  <HBox layoutX="237.0" layoutY="354.0">
-                     <children>
-                        <Button layoutX="188.0" layoutY="258.0" mnemonicParsing="false" onAction="#handleNewPerson" prefHeight="30.0" prefWidth="100.0" text="New">
-                           <HBox.margin>
-                              <Insets right="5.0" />
-                           </HBox.margin></Button>
-                        <Button layoutX="265.0" layoutY="258.0" mnemonicParsing="false" onAction="#handleEditPerson" prefHeight="30.0" prefWidth="100.0" text="Edit">
-                           <padding>
-                              <Insets right="5.0" />
-                           </padding>
-                           <HBox.margin>
-                              <Insets right="5.0" />
-                           </HBox.margin></Button>
-                        <Button layoutX="342.0" layoutY="258.0" mnemonicParsing="false" onAction="#handleDeletePerson" prefHeight="30.0" prefWidth="100.0" text="Delete">
-                           <padding>
-                              <Insets right="5.0" />
-                           </padding>
-                           <HBox.margin>
-                              <Insets right="5.0" />
-                           </HBox.margin></Button>
-                     </children>
-                  </HBox>
-                  <Button layoutX="74.0" layoutY="354.0" mnemonicParsing="false" onAction="#handlePrint" text="print" />
+                  <HBox layoutX="237.0" layoutY="354.0" />
+                  <Button layoutX="5.0" layoutY="347.0" mnemonicParsing="false" onAction="#handleNewPerson" prefHeight="30.0" prefWidth="100.0" text="New" AnchorPane.leftAnchor="5.0">
+                     <padding>
+                        <Insets right="5.0" />
+                     </padding>
+                  </Button>
+                  <Button layoutX="110.0" layoutY="347.0" mnemonicParsing="false" onAction="#handleEditPerson" prefHeight="30.0" prefWidth="100.0" text="Edit">
+                     <padding>
+                        <Insets right="5.0" />
+                     </padding>
+                  </Button>
+                  <Button layoutX="215.0" layoutY="347.0" mnemonicParsing="false" onAction="#handleDeletePerson" prefHeight="30.0" prefWidth="100.0" text="Delete">
+                     <padding>
+                        <Insets right="5.0" />
+                     </padding>
+                  </Button>
                </children>
             </AnchorPane>
         </items>

diff --git a/build/build/classes/de/unihannover/elsa/iui/view/UserOverviewController.class b/build/build/classes/de/unihannover/elsa/iui/view/UserOverviewController.class