Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
aa1bdc0
testing branch
malexanderboyd Feb 16, 2016
c5c0327
Testing an External SQL server to host all database related things
malexanderboyd Mar 1, 2016
f415fd3
Pushing SQLMethods with the correct IP to use for testing.
malexanderboyd Mar 1, 2016
7b81d35
How-To-Login Update
malexanderboyd Apr 7, 2016
b11b935
Shared Drive Directory Update
malexanderboyd Apr 7, 2016
53deb15
Implemented login system and working file submits
malexanderboyd Apr 12, 2016
21d967f
Everyone on same page update
Apr 13, 2016
b484f59
Added Enter to submit student login
malexanderboyd Apr 13, 2016
8a4c557
Added Navbar v1
malexanderboyd Apr 13, 2016
e46ef26
Delete C:\Sync\Export\MasterReport.xls
Apr 13, 2016
4632a0c
Delete C:\\Sync\\ObjectLabPrinters\\Submissions\\PlayOnLinux_4_2016-0…
Apr 13, 2016
6032caa
Delete C:\\Sync\\ObjectLabPrinters\\Submissions\\assignment1_2016-02-…
Apr 13, 2016
54496e9
Delete C:\\Sync\\ObjectLabPrinters\\Submissions\\humans_2016-03-01_09…
Apr 14, 2016
36a10dc
Delete C:\\Sync\\ObjectLabPrinters\\Submissions\\humans_2016-03-01_10…
Apr 14, 2016
473dc98
Delete C:\\Sync\\ObjectLabPrinters\\Submissions\\initializr-verekia-4…
Apr 14, 2016
6ef776e
Navbar v2
malexanderboyd Apr 14, 2016
ea41233
Normilised names on job view using string array
Apr 14, 2016
629339f
Navbar Update 2
malexanderboyd Apr 14, 2016
d416983
View refresh after successful submission
ngarrison39 Apr 17, 2016
378a6b9
Update AddStudentView.java
hgrad12 Apr 18, 2016
d4862cc
Update RemoveBuildView.java
hgrad12 Apr 18, 2016
fea60fe
Update StudentSubmissionView.java
hgrad12 Apr 18, 2016
8307160
Implementing net user cmd & tab spacing
malexanderboyd Apr 18, 2016
3ce583f
Updated Student Login
malexanderboyd Apr 18, 2016
14d4a4a
completed view
Apr 18, 2016
8b175fe
Updated Navbar, Student Submission Menu, Settings Menu
malexanderboyd Apr 18, 2016
bc1b4e6
Merge remote-tracking branch 'origin/dev' into dev
malexanderboyd Apr 18, 2016
61c70c2
Updated to demo2 version
malexanderboyd Apr 18, 2016
9fb3541
Added new Job Manager Window
malexanderboyd Apr 22, 2016
fdba7ee
Press 'Enter' to login for admin
malexanderboyd Apr 22, 2016
34a1f50
Finished Jobs Manager, added stat tracking system, polished navbar
malexanderboyd Apr 22, 2016
1d0c4e5
Added new settings menu, manage classes menu, manage devices prototype
malexanderboyd Apr 24, 2016
d2b49ed
Manage Device window implementation, nav bar on settings menu
malexanderboyd Apr 24, 2016
f919ec6
Fixed Settings Window Dimensions
malexanderboyd Apr 24, 2016
2919e71
Fixed reports view (well, it opens)
malexanderboyd Apr 25, 2016
451244c
fixed it , yah
Apr 27, 2016
102518f
fixed laser printer
Apr 27, 2016
bdd0353
Update MainView.java
tyoung17 Apr 28, 2016
58b8381
Populated class and device box after submission
tyoung17 Apr 28, 2016
372c1ac
Removed help button from tab
tyoung17 Apr 28, 2016
cfb71d9
Update newSettingsMenu.java
tyoung17 Apr 29, 2016
f965dcd
Update DeviceMgr.java
tyoung17 May 1, 2016
27c9be8
Update PasswordDialogView.java
tyoung17 May 2, 2016
726e819
Integrated new BuildView UI
tyoung17 May 2, 2016
1018b7f
Added logoutBttn (commented out for now)
tyoung17 May 2, 2016
b9e238f
Uncommented logoutBttn in Settings
tyoung17 May 2, 2016
b125190
Fixed arrows
malexanderboyd May 2, 2016
b0cbb1a
White background and centered nav buttons
ngarrison39 May 3, 2016
9581fb0
Made background white
ngarrison39 May 3, 2016
ec3f902
Made background white
ngarrison39 May 3, 2016
4705443
White background, lowered login button, extended error message length
ngarrison39 May 3, 2016
3902f24
White background
ngarrison39 May 3, 2016
71cce95
White background
ngarrison39 May 3, 2016
4a9a161
Update ReportsView.java
ngarrison39 May 3, 2016
6eab03a
Only arrows for Remove Class panel
ngarrison39 May 4, 2016
2f16deb
Made arrows longer
ngarrison39 May 4, 2016
3e415bd
Fixed Build View, Email Fixes
malexanderboyd May 4, 2016
72069df
Merge branch 'dev' of
malexanderboyd May 4, 2016
bba1756
ClassMgr lost and found
malexanderboyd May 4, 2016
c88dbac
bigger arrows in classmgr
malexanderboyd May 4, 2016
403503d
Fixed Error Messages in StudentSubmission
tyoung17 May 4, 2016
61fe00a
Changed the DefaultCloseOperation in ReportsView
tyoung17 May 4, 2016
51c9121
Update newJobsMgr.java
tyoung17 May 4, 2016
179b1e5
2.0
May 4, 2016
7cfc032
Add files via upload
scott789 Oct 5, 2016
6691b04
Merge pull request #1 from scott789/scott789-sql-patch
scott789 Oct 5, 2016
5a00747
Updated database credentials for db4free.net
scott789 Oct 12, 2016
385a66c
Changed "user options" to "admin" tab
scott789 Oct 19, 2016
be68bf8
Created rejected job icon
scott789 Oct 19, 2016
bfb39a6
Added rejected file manager button
scott789 Oct 19, 2016
5568c60
Fixed incorrect month number in export sheet and ldap workaround
scott789 Oct 19, 2016
c05f594
Brought up-to-date with Russell's updates
scott789 Oct 19, 2016
f7175d7
Added rejected job icon
scott789 Oct 19, 2016
96b54cc
ldap workaround
scott789 Oct 19, 2016
5ab2461
Added code to allow design view of StudentSubmissionView to be editted.
scott789 Oct 24, 2016
73892e2
Test- summary
scott789 Oct 25, 2016
94bf4cf
Test2
russellgehret Oct 25, 2016
3746d58
Student Balance Page
russellgehret Oct 25, 2016
d955014
Nav Bar
russellgehret Oct 25, 2016
5e602fa
Test
qoutte1 Oct 26, 2016
74341af
Student Info View
russellgehret Oct 26, 2016
1955233
Student File Status View
russellgehret Oct 26, 2016
44aba32
Material Balance
russellgehret Oct 30, 2016
59afea5
New Student View
russellgehret Oct 31, 2016
7aabcdf
Material File Change
russellgehret Oct 31, 2016
f44aa97
Column Adjustments
russellgehret Nov 1, 2016
c0a1e68
Email System
russellgehret Nov 2, 2016
784d0e4
Tiger
russellgehret Nov 2, 2016
528fd11
Minor Adjustments
russellgehret Nov 3, 2016
f3cf69a
Drag & Drop
russellgehret Nov 7, 2016
7400549
Rejected FIle
russellgehret Nov 7, 2016
a366f5e
Added transaction_history logging
scott789 Nov 7, 2016
e5783bf
History View Outline
scott789 Nov 8, 2016
c6ef8cd
More Transaction History Preparation
scott789 Nov 8, 2016
f33b350
Data is ready in transaction view
scott789 Nov 8, 2016
d62367d
Material Transaction Table
russellgehret Nov 9, 2016
66e33b7
Insert new users into material table
scott789 Nov 10, 2016
574b2c2
Drag and Drop Delete Files
russellgehret Nov 17, 2016
ac29aaa
Validate File Extensions
scott789 Nov 20, 2016
069bedd
Change SQL Methods for Error Checking
scott789 Nov 21, 2016
64de834
Add Rejection Comment
scott789 Nov 21, 2016
0e1da0b
Comment Student Side
russellgehret Nov 21, 2016
f057e3f
Redirect Logout to MainView
scott789 Nov 28, 2016
36d161b
Merge branch 'Fall2016' of https://github.com/scott789/Object-Lab-Int…
scott789 Nov 28, 2016
9eb4be7
BuildView Changes
russellgehret Dec 1, 2016
a96b019
Buildview Update
russellgehret Dec 1, 2016
25f1256
newJobsManager
russellgehret Dec 1, 2016
f8d3c68
Updates
russellgehret Dec 7, 2016
ebe2af1
Reject Comment Appear on StudentView
scott789 Dec 7, 2016
29fbf3f
Hit Enter to Login
qoutte1 Dec 7, 2016
fb79aac
ReportsView Show Active Printers
scott789 Dec 7, 2016
7f5ba20
Resize Settings
russellgehret Dec 7, 2016
536a0d7
Master Export Only Current Devices
scott789 Dec 7, 2016
001604f
Adding Logout Button To BuildView
qoutte1 Dec 7, 2016
8b37f34
Deduct Material From Balance & History on Job Submit
scott789 Dec 7, 2016
7d8907e
Merge branch 'Fall2016' of https://github.com/scott789/Object-Lab-Int…
scott789 Dec 7, 2016
681a720
Adding logout Button to ReportsView
qoutte1 Dec 7, 2016
07dc637
Balance View UI
russellgehret Dec 7, 2016
81c4cca
DB Name Retrieval
russellgehret Dec 7, 2016
7696f75
Build View Update
russellgehret Dec 8, 2016
70a65ea
Z Printer Approving Stat Fix
russellgehret Dec 8, 2016
2c882c5
StudentView Only Display Date
scott789 Dec 8, 2016
0991969
StudentView Display Most Recent Files on Top
scott789 Dec 8, 2016
0b06a5b
Punctuation Fix
scott789 Dec 8, 2016
811cf71
Allow Students to Submit Invalid File Extensions
scott789 Dec 8, 2016
759b089
StudentView Transaction History Date Cleanup
scott789 Dec 8, 2016
71b5206
Admin Can Approve Jobs With Insufficient Balance
scott789 Dec 8, 2016
80efe9a
Build View look
jrajewski Dec 8, 2016
c06a115
Build View Logout
jrajewski Dec 8, 2016
e1bbd1c
ReportsView Only Show Date
scott789 Dec 8, 2016
574f365
Reports View GUI fixes
jrajewski Dec 9, 2016
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
47 changes: 47 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="ObjectLabSoftware/src"/>
<classpathentry kind="lib" path="deployment/app/lib/AbsoluteLayout.jar"/>
<classpathentry kind="lib" path="deployment/app/lib/beansbinding-1.2.1.jar"/>
<classpathentry kind="lib" path="deployment/app/lib/commonsio2.4.jar"/>
<classpathentry kind="lib" path="deployment/app/lib/derby.jar"/>
<classpathentry kind="lib" path="deployment/app/lib/mail.jar"/>
<classpathentry kind="lib" path="deployment/app/lib/mysql-connector-java-5.1.23-bin.jar"/>
<classpathentry kind="lib" path="deployment/app/lib/ojdbc14.jar"/>
<classpathentry kind="lib" path="deployment/app/lib/poi-3.11-beta3-20141111.jar"/>
<classpathentry kind="lib" path="deployment/app/TomSoft.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/charsets.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/access-bridge-64.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/cldrdata.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/dnsns.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/jaccess.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/jfxrt.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/localedata.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/nashorn.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/sunec.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/sunjce_provider.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/sunmscapi.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/sunpkcs11.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/ext/zipfs.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/javaws.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/jce.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/jfr.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/jfxswt.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/jsse.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/management-agent.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/plugin.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/resources.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/rt.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/security/local_policy.jar"/>
<classpathentry kind="lib" path="deployment/runtime/jre/lib/security/US_export_policy.jar"/>
<classpathentry kind="lib" path="ObjectLabSoftware/lib/AbsoluteLayout.jar"/>
<classpathentry kind="lib" path="ObjectLabSoftware/lib/commonsio2.4.jar"/>
<classpathentry kind="lib" path="ObjectLabSoftware/lib/derby.jar"/>
<classpathentry kind="lib" path="ObjectLabSoftware/lib/mail.jar"/>
<classpathentry kind="lib" path="ObjectLabSoftware/lib/mysql-connector-java-5.1.23-bin.jar"/>
<classpathentry kind="lib" path="ObjectLabSoftware/lib/ojdbc14.jar"/>
<classpathentry kind="lib" path="ObjectLabSoftware/lib/poi-3.11-beta3-20141111.jar"/>
<classpathentry kind="lib" path="ObjectLabSoftware/lib/postgresql-9.4.1208.jre6.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/ObjectLabSoftware/nbproject/private/
/ObjectLabSoftware/build/
/ObjectLabSoftware/dist/
*.bak
*.bak
/bin/
17 changes: 17 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>OLI</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Binary file added Documentation/new BuildView.docx
Binary file not shown.
1 change: 1 addition & 0 deletions ObjectLabSoftware/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.23-bin.jar"/>
<classpathentry kind="lib" path="lib/ojdbc14.jar"/>
<classpathentry kind="lib" path="lib/poi-3.11-beta3-20141111.jar"/>
<classpathentry kind="lib" path="lib/postgresql-9.4.1208.jre6.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Empty file added ObjectLabSoftware/computername
Empty file.
1 change: 1 addition & 0 deletions ObjectLabSoftware/computername.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
127.0.0.1
Binary file not shown.
14 changes: 10 additions & 4 deletions ObjectLabSoftware/nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,12 @@ is divided into following sections:
</not>
</and>
</condition>
<property name="javac.fork" value="${jdkBug6558476}"/>
<condition else="false" property="javac.fork">
<or>
<istrue value="${jdkBug6558476}"/>
<istrue value="${javac.external.vm}"/>
</or>
</condition>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
<property name="copylibs.rebase" value="true"/>
Expand All @@ -218,6 +223,7 @@ is divided into following sections:
<condition else="" property="testng.debug.mode" value="-mixed">
<istrue value="${junit+testng.available}"/>
</condition>
<property name="java.failonerror" value="true"/>
</target>
<target name="-post-init">
<!-- Empty placeholder for easier customization. -->
Expand Down Expand Up @@ -694,7 +700,7 @@ is divided into following sections:
<sequential>
<property environment="env"/>
<resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
<java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
<java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg line="${profiler.info.jvmargs}"/>
Expand Down Expand Up @@ -769,7 +775,7 @@ is divided into following sections:
<attribute default="${debug.classpath}" name="classpath"/>
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true">
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg line="${debug-args-line}"/>
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
Expand All @@ -796,7 +802,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true">
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
Expand Down
8 changes: 3 additions & 5 deletions ObjectLabSoftware/nbproject/build-native.xml
Original file line number Diff line number Diff line change
Expand Up @@ -389,11 +389,9 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
<echo message="exec-error:${exec-error}" level="verbose"/>
<echo message="exec-result:${exec-result}" level="verbose"/>
<condition property="missing.WiX">
<not><and>
<contains string="${exec-output}" substring="Windows Installer Xml Compiler version"/>
<not><contains string="${exec-output}" substring="Windows Installer Xml Compiler version 1"/></not>
<not><contains string="${exec-output}" substring="Windows Installer Xml Compiler version 2"/></not>
</and></not>
<not>
<matches string="${exec-output}" pattern="windows\s+installer\s+xml\s+(toolset\s+)?compiler\s+version\s+3.*" casesensitive="false"/>
</not>
</condition>
</target>
<target name="-check-dpkg-presence" depends="-check-native-bundling-type" if="need.dpkg.presence">
Expand Down
Loading